QPID-5746 : [Java Broker] Split attribute annotations into separate annotations for derived and automated, and allow derived attributes to be persisted

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1592030 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 30 insertions, 29 deletions

diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNode.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNode.java
index e18c76b986..691096f59f 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNode.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNode.java
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.server.virtualhostnode.berkeleydb;
 
+import org.apache.qpid.server.model.DerivedAttribute;
 import org.apache.qpid.server.model.ManagedAttribute;
 import org.apache.qpid.server.model.ManagedObject;
 import org.apache.qpid.server.model.RemoteReplicationNode;
@@ -33,19 +34,19 @@ public interface BDBHARemoteReplicationNode<X extends BDBHARemoteReplicationNode
     String LAST_KNOWN_REPLICATION_TRANSACTION_ID = "lastKnownReplicationTransactionId";
     String JOIN_TIME = "joinTime";
 
-    @ManagedAttribute(derived = true)
+    @DerivedAttribute
     String getGroupName();
 
-    @ManagedAttribute(derived = true)
+    @DerivedAttribute
     String getAddress();
 
-    @ManagedAttribute(automate = true)
+    @ManagedAttribute(persist = false)
     String getRole();
 
-    @ManagedAttribute(derived = true)
+    @DerivedAttribute
     long getJoinTime();
 
-    @ManagedAttribute(derived = true)
+    @DerivedAttribute
     long getLastKnownReplicationTransactionId();
 
 }
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
index 8e94649a1a..23dd2ee5c0 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
@@ -25,7 +25,10 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 
+import com.sleepycat.je.rep.MasterStateException;
+import com.sleepycat.je.rep.ReplicatedEnvironment;
 import org.apache.log4j.Logger;
+
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.model.AbstractConfiguredObject;
 import org.apache.qpid.server.model.ConfiguredObject;
@@ -34,9 +37,6 @@ import org.apache.qpid.server.model.ManagedAttributeField;
 import org.apache.qpid.server.model.State;
 import org.apache.qpid.server.store.berkeleydb.replication.ReplicatedEnvironmentFacade;
 
-import com.sleepycat.je.rep.MasterStateException;
-import com.sleepycat.je.rep.ReplicatedEnvironment;
-
 public class BDBHARemoteReplicationNodeImpl extends AbstractConfiguredObject<BDBHARemoteReplicationNodeImpl> implements BDBHARemoteReplicationNode<BDBHARemoteReplicationNodeImpl>
 {
     private static final Logger LOGGER = Logger.getLogger(BDBHARemoteReplicationNodeImpl.class);
@@ -125,7 +125,7 @@ public class BDBHARemoteReplicationNodeImpl extends AbstractConfiguredObject<BDB
     }
 
     @Override
-    protected boolean setState(State currentState, State desiredState)
+    protected boolean setState(State desiredState)
     {
         if (desiredState == State.DELETED)
         {
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNode.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNode.java
index c135803717..0d0292ce58 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNode.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNode.java
@@ -22,6 +22,7 @@ package org.apache.qpid.server.virtualhostnode.berkeleydb;
 
 import java.util.Map;
 
+import org.apache.qpid.server.model.DerivedAttribute;
 import org.apache.qpid.server.model.ManagedAttribute;
 
 public interface BDBHAVirtualHostNode<X extends BDBHAVirtualHostNode<X>> extends BDBVirtualHostNode<X>
@@ -39,39 +40,39 @@ public interface BDBHAVirtualHostNode<X extends BDBHAVirtualHostNode<X>> extends
     public static final String LAST_KNOWN_REPLICATION_TRANSACTION_ID = "lastKnownReplicationTransactionId";
     public static final String JOIN_TIME = "joinTime";
 
-    @ManagedAttribute(automate = true, mandatory=true)
+    @ManagedAttribute(mandatory=true)
     String getGroupName();
 
-    @ManagedAttribute(automate = true, mandatory=true)
+    @ManagedAttribute(mandatory=true)
     String getAddress();
 
-    @ManagedAttribute(automate = true, mandatory=true)
+    @ManagedAttribute(mandatory=true)
     String getHelperAddress();
 
-    @ManagedAttribute(automate = true, defaultValue = "NO_SYNC,NO_SYNC,SIMPLE_MAJORITY")
+    @ManagedAttribute(defaultValue = "NO_SYNC,NO_SYNC,SIMPLE_MAJORITY")
     String getDurability();
 
-    @ManagedAttribute(automate = true, defaultValue = "true")
+    @ManagedAttribute(defaultValue = "true")
     boolean isCoalescingSync();
 
-    @ManagedAttribute(automate = true, defaultValue = "false")
+    @ManagedAttribute(defaultValue = "false")
     boolean isDesignatedPrimary();
 
-    @ManagedAttribute(automate = true, defaultValue = "1")
+    @ManagedAttribute(defaultValue = "1")
     int getPriority();
 
-    @ManagedAttribute(automate = true, defaultValue = "0")
+    @ManagedAttribute(defaultValue = "0")
     int getQuorumOverride();
 
-    @ManagedAttribute(automate = true, persist = false)
+    @ManagedAttribute(persist = false)
     String getRole();
 
-    @ManagedAttribute(automate = true)
+    @ManagedAttribute
     Map<String, String> getReplicatedEnvironmentConfiguration();
 
-    @ManagedAttribute(derived = true)
+    @DerivedAttribute
     Long getLastKnownReplicationTransactionId();
 
-    @ManagedAttribute(derived = true)
+    @DerivedAttribute
     Long getJoinTime();
 }
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
index 95f542585c..a6ce1c47df 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
@@ -37,9 +37,8 @@ import com.sleepycat.je.rep.ReplicatedEnvironment;
 import com.sleepycat.je.rep.ReplicationNode;
 import com.sleepycat.je.rep.StateChangeEvent;
 import com.sleepycat.je.rep.StateChangeListener;
-
 import org.apache.log4j.Logger;
-import org.apache.qpid.server.configuration.IllegalConfigurationException;
+
 import org.apache.qpid.server.logging.messages.ConfigStoreMessages;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.BrokerModel;
@@ -385,7 +384,7 @@ public class BDBHAVirtualHostNodeImpl extends AbstractVirtualHostNode<BDBHAVirtu
                     }
                 });
             }
-            host.setDesiredState(host.getState(), State.ACTIVE);
+            host.setDesiredState(State.ACTIVE);
 
         }
         catch (Exception e)
@@ -422,7 +421,7 @@ public class BDBHAVirtualHostNodeImpl extends AbstractVirtualHostNode<BDBHAVirtu
         VirtualHost<?,?,?> virtualHost = getVirtualHost();
         if (virtualHost!= null)
         {
-            virtualHost.setDesiredState(virtualHost.getState(), State.STOPPED);
+            virtualHost.setDesiredState(State.STOPPED);
         }
     }
 
@@ -655,13 +654,13 @@ public class BDBHAVirtualHostNodeImpl extends AbstractVirtualHostNode<BDBHAVirtu
         }
 
         @Override
-        public boolean setState(State currentState, State desiredState)
+        public boolean setState(State desiredState)
         {
             if (desiredState != State.STOPPED)
             {
                 throw new IllegalArgumentException("Unsupported state " + desiredState);
             }
-            return super.setState(currentState, desiredState);
+            return super.setState(desiredState);
         }
     }
 
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNode.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNode.java
index 4785d47447..91b2d7ae63 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNode.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNode.java
@@ -29,6 +29,6 @@ public interface BDBVirtualHostNode<X extends BDBVirtualHostNode<X>> extends Fil
 {
     public static final String ENVIRONMENT_CONFIGURATION = "environmentConfiguration";
 
-    @ManagedAttribute(mandatory=false, automate=true)
+    @ManagedAttribute(mandatory=false)
     Map<String, String> getEnvironmentConfiguration();
-}
\ No newline at end of file
+}