From a3605c4969c0ccd479fceee3a93d550feeeb6f76 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Thu, 4 Mar 2010 11:19:28 +0000
Subject: QPID-2379: move getCreateTime() up to the ConfiguredObject supertype,
 add implementation to remaining *Config implementors and their associated
 QMFService delegates

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@918943 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/java/org/apache/qpid/qmf/ManagementExchange.java    | 2 +-
 java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java    | 9 +++------
 java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java | 6 ++++++
 .../main/java/org/apache/qpid/server/binding/BindingFactory.java | 2 +-
 .../java/org/apache/qpid/server/configuration/BindingConfig.java | 2 --
 .../java/org/apache/qpid/server/configuration/BridgeConfig.java  | 2 --
 .../java/org/apache/qpid/server/configuration/BrokerConfig.java  | 2 --
 .../org/apache/qpid/server/configuration/ConfiguredObject.java   | 1 +
 .../org/apache/qpid/server/configuration/ExchangeConfig.java     | 2 --
 .../java/org/apache/qpid/server/configuration/LinkConfig.java    | 2 --
 .../java/org/apache/qpid/server/configuration/QueueConfig.java   | 2 --
 .../java/org/apache/qpid/server/configuration/SystemConfig.java  | 2 --
 .../org/apache/qpid/server/configuration/VirtualHostConfig.java  | 2 --
 .../java/org/apache/qpid/server/exchange/AbstractExchange.java   | 2 +-
 .../main/java/org/apache/qpid/server/federation/BrokerLink.java  | 7 ++++++-
 .../java/org/apache/qpid/server/protocol/AMQProtocolEngine.java  | 6 ++++++
 .../org/apache/qpid/server/protocol/ProtocolEngine_0_10.java     | 6 ++++++
 .../main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java   | 2 +-
 .../org/apache/qpid/server/subscription/SubscriptionImpl.java    | 6 ++++++
 .../org/apache/qpid/server/subscription/Subscription_0_10.java   | 6 ++++++
 .../java/org/apache/qpid/server/transport/ServerSession.java     | 6 ++++++
 21 files changed, 50 insertions(+), 27 deletions(-)

(limited to 'java')

diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java b/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java
index b639cb9fc1..aa18b5a136 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java
+++ b/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java
@@ -80,7 +80,7 @@ public class ManagementExchange implements Exchange, QMFService.Listener
 
     private final CopyOnWriteArrayList<BindingListener> _listeners = new CopyOnWriteArrayList<Exchange.BindingListener>();
 
-    // TODO
+    //TODO : persist creation time
     private long _createTime = System.currentTimeMillis();
 
 
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java b/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
index 69d9ccb431..8a59178b77 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
+++ b/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
@@ -1227,8 +1227,7 @@ public class QMFService implements ConfigStore.ConfigEventListener
 
         public long getCreateTime()
         {
-            // TODO
-            return 0;
+            return _obj.getCreateTime();
         }
 
         @Override
@@ -1351,8 +1350,7 @@ public class QMFService implements ConfigStore.ConfigEventListener
 
         public long getCreateTime()
         {
-            // TODO
-            return 0;  //To change body of implemented methods use File | Settings | File Templates.
+            return _obj.getCreateTime();
         }
     }
 
@@ -1419,8 +1417,7 @@ public class QMFService implements ConfigStore.ConfigEventListener
 
         public long getCreateTime()
         {
-            // TODO
-            return 0;  //To change body of implemented methods use File | Settings | File Templates.
+            return _obj.getCreateTime();
         }
     }
 
diff --git a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
index ec1b22270f..3b17da5af7 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
@@ -157,6 +157,7 @@ public class AMQChannel implements SessionConfig
     private static final
     AMQShortString IMMEDIATE_DELIVERY_REPLY_TEXT = new AMQShortString("Immediate delivery is not possible.");
     private final UUID _id;
+    private long _createTime = System.currentTimeMillis();
 
     public AMQChannel(AMQProtocolSession session, int channelId, MessageStore messageStore)
             throws AMQException
@@ -1367,4 +1368,9 @@ public class AMQChannel implements SessionConfig
     {
         return getConnectionConfig().getAddress() + "/" + getChannelId();
     }
+
+    public long getCreateTime()
+    {
+        return _createTime;
+    }
 }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java b/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java
index e11af5d553..5423f02107 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java
@@ -78,7 +78,7 @@ public class BindingFactory
     private final class BindingImpl extends Binding implements AMQQueue.Task, Exchange.Task, BindingConfig
     {
         private final BindingLogSubject _logSubject;
-        //TODO
+        //TODO : persist creation time
         private long _createTime = System.currentTimeMillis();
 
         private BindingImpl(String bindingKey, final AMQQueue queue, final Exchange exchange, final Map<String, Object> arguments)
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfig.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfig.java
index 9414edcec4..233134abc5 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfig.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfig.java
@@ -37,7 +37,5 @@ public interface BindingConfig extends ConfiguredObject<BindingConfigType, Bindi
 
     String getOrigin();
 
-    long getCreateTime();
-
     long getMatches();
 }
\ No newline at end of file
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfig.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfig.java
index f999bf4578..00ed5fd0dd 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfig.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfig.java
@@ -45,6 +45,4 @@ public interface BridgeConfig extends ConfiguredObject<BridgeConfigType, BridgeC
     Integer getChannelId();
 
     int getAckBatching();
-
-    long getCreateTime();
 }
\ No newline at end of file
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfig.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfig.java
index 4f74a72344..5cdb886821 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfig.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfig.java
@@ -46,8 +46,6 @@ public interface BrokerConfig  extends ConfiguredObject<BrokerConfigType,BrokerC
 
     void addVirtualHost(VirtualHostConfig virtualHost);
 
-    long getCreateTime();
-
     void createBrokerConnection(String transport,
                                 String host,
                                 int port,
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfiguredObject.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfiguredObject.java
index dd116ea29a..34689abe2f 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfiguredObject.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfiguredObject.java
@@ -33,4 +33,5 @@ public interface ConfiguredObject<T extends ConfigObjectType<T,C>, C extends Con
 
     public boolean isDurable();
 
+    long getCreateTime();
 }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfig.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfig.java
index 40dc88c28c..41c51d9684 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfig.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfig.java
@@ -52,6 +52,4 @@ public interface ExchangeConfig extends ConfiguredObject<ExchangeConfigType, Exc
     long getByteReceives();
 
     long getByteRoutes();
-
-    long getCreateTime();
 }
\ No newline at end of file
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfig.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfig.java
index 82e0647917..5a6159df34 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfig.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfig.java
@@ -47,8 +47,6 @@ public interface LinkConfig extends ConfiguredObject<LinkConfigType, LinkConfig>
 
     void close();
 
-    long getCreateTime();
-
     void createBridge(boolean durable,
                       boolean dynamic,
                       boolean srcIsQueue,
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfig.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfig.java
index c3593561bb..95e2aa516b 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfig.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfig.java
@@ -77,6 +77,4 @@ public interface QueueConfig extends ConfiguredObject<QueueConfigType, QueueConf
     long getPersistentMsgDequeues();
 
     void purge(long request);
-
-    long getCreateTime();
 }
\ No newline at end of file
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java
index 1e722ea191..8a9029fbfd 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java
@@ -39,6 +39,4 @@ public interface SystemConfig extends ConfiguredObject<SystemConfigType,SystemCo
     void addBroker(BrokerConfig broker);
 
     void removeBroker(BrokerConfig broker);
-
-    long getCreateTime();
 }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfig.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfig.java
index 9431e5175f..9256724c56 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfig.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfig.java
@@ -31,6 +31,4 @@ public interface VirtualHostConfig extends ConfiguredObject<VirtualHostConfigTyp
 
     void setBroker(BrokerConfig brokerConfig);
 
-    long getCreateTime();
-
 }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
index 32b95ff742..7f6eccdc64 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
@@ -100,7 +100,7 @@ public abstract class AbstractExchange implements Exchange, Managable
 >>>>>>> .r902547
 */
 
-    // TODO
+    //TODO : persist creation time
     private long _createTime = System.currentTimeMillis();
 
     public AbstractExchange(final ExchangeType<? extends Exchange> type)
diff --git a/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java b/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java
index bb6fb9dcc3..dc7f2654e6 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java
@@ -106,7 +106,7 @@ public class BrokerLink implements LinkConfig, ConnectionListener
 
     private class ConnectionConfigAdapter implements ConnectionConfig
     {
-
+        private long _adapterCreateTime = System.currentTimeMillis();
         private UUID _id = BrokerLink.this.getConfigStore().createId();
 
         public VirtualHost getVirtualHost()
@@ -178,6 +178,11 @@ public class BrokerLink implements LinkConfig, ConnectionListener
         {
             return false;
         }
+        
+        public long getCreateTime()
+        {
+            return _adapterCreateTime;
+        }
     }
 
     private class SessionFactory implements Connection.SessionFactory
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
index 6d2826b55e..3ee4d5529e 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
@@ -152,6 +152,7 @@ public class AMQProtocolEngine implements ProtocolEngine, Managable, AMQProtocol
     private final AtomicBoolean _closing = new AtomicBoolean(false);
     private final UUID _id;
     private final ConfigStore _configStore;
+    private long _createTime = System.currentTimeMillis();
 
     public ManagedObject getManagedObject()
     {
@@ -1133,4 +1134,9 @@ public class AMQProtocolEngine implements ProtocolEngine, Managable, AMQProtocol
         return String.valueOf(getRemoteAddress());
     }
 
+    public long getCreateTime()
+    {
+        return _createTime;
+    }
+
 }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
index 473f68028d..89ba665e72 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
@@ -43,6 +43,7 @@ public class ProtocolEngine_0_10  extends InputHandler implements ProtocolEngine
     private ServerConnection _connection;
     private final UUID _id;
     private final IApplicationRegistry _appRegistry;
+    private long _createTime = System.currentTimeMillis();
 
     public ProtocolEngine_0_10(ServerConnection conn,
                                NetworkDriver networkDriver,
@@ -177,4 +178,9 @@ public class ProtocolEngine_0_10  extends InputHandler implements ProtocolEngine
         super.closed();
         getConfigStore().removeConfiguredObject(this);
     }
+
+    public long getCreateTime()
+    {
+        return _createTime;
+    }
 }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
index df2aec2534..b5d1290e98 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
@@ -180,7 +180,7 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener
     private UUID _id;
     private final Map<String, Object> _arguments;
 
-    //TODO
+    //TODO : persist creation time
     private long _createTime = System.currentTimeMillis();
 
 
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java b/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
index 156b05d15c..c548f3ccad 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
@@ -94,6 +94,7 @@ public abstract class SubscriptionImpl implements Subscription, FlowCreditManage
     private LogSubject _logSubject;
     private LogActor _logActor;
     private UUID _id;
+    private long _createTime = System.currentTimeMillis();
 
 
     static final class BrowserSubscription extends SubscriptionImpl
@@ -770,4 +771,9 @@ public abstract class SubscriptionImpl implements Subscription, FlowCreditManage
     {
         return _channel.isTransactional();
     }
+    
+    public long getCreateTime()
+    {
+        return _createTime;
+    }
 }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java b/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
index 4bad81ec17..4cc7e6fce2 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
@@ -100,6 +100,7 @@ public class Subscription_0_10 implements Subscription, FlowCreditManager.FlowCr
     private UUID _id;
     private String _traceExclude;
     private String _trace;
+    private long _createTime = System.currentTimeMillis();
 
 
     public Subscription_0_10(ServerSession session, String destination, MessageAcceptMode acceptMode,
@@ -853,4 +854,9 @@ public class Subscription_0_10 implements Subscription, FlowCreditManager.FlowCr
     {
         return _session.isTransactional();
     }
+
+    public long getCreateTime()
+    {
+        return _createTime;
+    }
 }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java b/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
index 99c3572a2f..63d540be6b 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
@@ -69,6 +69,7 @@ public class ServerSession extends Session implements PrincipalHolder, SessionCo
 
     private final UUID _id;
     private ConnectionConfig _connectionConfig;
+    private long _createTime = System.currentTimeMillis();
 
     public static interface MessageDispositionChangeListener
     {
@@ -534,4 +535,9 @@ public class ServerSession extends Session implements PrincipalHolder, SessionCo
     {
         return getName().toString();
     }
+
+    public long getCreateTime()
+    {
+        return _createTime;
+    }
 }
-- 
cgit v1.2.1