Repository: qpid-jms Updated Branches: refs/heads/master 9d88cf840 -> 1e5a918df
NO-JIRA - Move all the connection properties into the JmsConnectionInfo class. Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/1e5a918d Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/1e5a918d Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/1e5a918d Branch: refs/heads/master Commit: 1e5a918df0d88e72b7314185b860148cbf14757b Parents: 9d88cf8 Author: Timothy Bish <[email protected]> Authored: Thu Aug 27 15:28:28 2015 -0400 Committer: Timothy Bish <[email protected]> Committed: Thu Aug 27 15:28:28 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/qpid/jms/JmsConnection.java | 65 +++++++--------- .../apache/qpid/jms/meta/JmsConnectionInfo.java | 79 ++++++++++++++++++-- 2 files changed, 102 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1e5a918d/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java index cf1bb31..7c7edc5 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java @@ -90,23 +90,15 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti private final AtomicBoolean closing = new AtomicBoolean(); private final AtomicBoolean started = new AtomicBoolean(); private final AtomicBoolean failed = new AtomicBoolean(); - private final Object connectLock = new Object(); - private IOException firstFailureError; + private final JmsConnectionInfo connectionInfo; + private final ThreadPoolExecutor executor; - private JmsConnectionInfo connectionInfo; - private URI configuredURI; - private URI connectedURI; - private JmsPrefetchPolicy prefetchPolicy = new JmsPrefetchPolicy(); - private JmsRedeliveryPolicy redeliveryPolicy = new JmsRedeliveryPolicy(); - private boolean localMessagePriority; + private IOException firstFailureError; private boolean clientIdSet; - private boolean sendAcksAsync; - private boolean localMessageExpiry; private ExceptionListener exceptionListener; - - private final ThreadPoolExecutor executor; - + private JmsMessageFactory messageFactory; private Provider provider; + private final Set<JmsConnectionListener> connectionListeners = new CopyOnWriteArraySet<JmsConnectionListener>(); private final Map<JmsTemporaryDestination, JmsTemporaryDestination> tempDestinations = @@ -114,7 +106,6 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti private final AtomicLong sessionIdGenerator = new AtomicLong(); private final AtomicLong tempDestIdGenerator = new AtomicLong(); private final AtomicLong transactionIdGenerator = new AtomicLong(); - private JmsMessageFactory messageFactory; protected JmsConnection(final String connectionId, Provider provider, IdGenerator clientIdGenerator) throws JMSException { @@ -519,7 +510,7 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti } private void connect() throws JMSException { - synchronized(this.connectLock) { + synchronized(this.connectionInfo) { if (isConnected() || closed.get()) { return; } @@ -797,7 +788,7 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti * the new listener to add to the collection. */ public void addConnectionListener(JmsConnectionListener listener) { - this.connectionListeners.add(listener); + connectionListeners.add(listener); } /** @@ -809,7 +800,7 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti * @return true if the given listener was removed from the current set. */ public boolean removeConnectionListener(JmsConnectionListener listener) { - return this.connectionListeners.remove(listener); + return connectionListeners.remove(listener); } public boolean isForceAsyncSend() { @@ -825,7 +816,7 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti } public void setAlwaysSyncSend(boolean alwaysSyncSend) { - this.connectionInfo.setAlwaysSyncSend(alwaysSyncSend); + connectionInfo.setAlwaysSyncSend(alwaysSyncSend); } public String getTopicPrefix() { @@ -853,27 +844,27 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti } public JmsPrefetchPolicy getPrefetchPolicy() { - return prefetchPolicy; + return connectionInfo.getPrefetchPolicy(); } public void setPrefetchPolicy(JmsPrefetchPolicy prefetchPolicy) { - this.prefetchPolicy = prefetchPolicy.copy(); + connectionInfo.setPrefetchPolicy(prefetchPolicy); } public JmsRedeliveryPolicy getRedeliveryPolicy() { - return redeliveryPolicy; + return connectionInfo.getRedeliveryPolicy(); } public void setRedeliveryPolicy(JmsRedeliveryPolicy redeliveryPolicy) { - this.redeliveryPolicy = redeliveryPolicy.copy(); + connectionInfo.setRedeliveryPolicy(redeliveryPolicy); } public boolean isLocalMessagePriority() { - return localMessagePriority; + return connectionInfo.isLocalMessagePriority(); } public void setLocalMessagePriority(boolean localMessagePriority) { - this.localMessagePriority = localMessagePriority; + this.connectionInfo.setLocalMessagePriority(localMessagePriority); } public long getCloseTimeout() { @@ -885,7 +876,7 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti } public long getConnectTimeout() { - return this.connectionInfo.getConnectTimeout(); + return connectionInfo.getConnectTimeout(); } public void setConnectTimeout(long connectTimeout) { @@ -909,19 +900,19 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti } public URI getConfiguredURI() { - return configuredURI; + return connectionInfo.getConfiguredURI(); } void setConfiguredURI(URI uri) { - this.configuredURI = uri; + connectionInfo.setConfiguredURI(uri); } public URI getConnectedURI() { - return connectedURI; + return connectionInfo.getConnectedURI(); } void setConnectedURI(URI connectedURI) { - this.connectedURI = connectedURI; + connectionInfo.setConnectedURI(connectedURI); } public String getUsername() { @@ -929,7 +920,7 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti } void setUsername(String username) { - this.connectionInfo.setUsername(username);; + connectionInfo.setUsername(username);; } public String getPassword() { @@ -941,11 +932,11 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti } public boolean isConnected() { - return this.connected.get(); + return connected.get(); } public boolean isStarted() { - return this.started.get(); + return started.get(); } public boolean isClosed() { @@ -968,23 +959,23 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti } void setMessageFactory(JmsMessageFactory factory) { - this.messageFactory = factory; + messageFactory = factory; } public boolean isSendAcksAsync() { - return sendAcksAsync; + return connectionInfo.isSendAcksAsync(); } public void setSendAcksAsync(boolean sendAcksAsync) { - this.sendAcksAsync = sendAcksAsync; + connectionInfo.setSendAcksAsync(sendAcksAsync); } public boolean isLocalMessageExpiry() { - return localMessageExpiry; + return connectionInfo.isLocalMessageExpiry(); } public void setLocalMessageExpiry(boolean localMessageExpiry) { - this.localMessageExpiry = localMessageExpiry; + connectionInfo.setLocalMessageExpiry(localMessageExpiry); } //----- Async event handlers ---------------------------------------------// http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1e5a918d/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java index b7d1ae7..2ecc766 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java @@ -16,6 +16,10 @@ */ package org.apache.qpid.jms.meta; +import java.net.URI; + +import org.apache.qpid.jms.JmsPrefetchPolicy; +import org.apache.qpid.jms.JmsRedeliveryPolicy; import org.apache.qpid.jms.util.ToStringSupport; /** @@ -31,18 +35,27 @@ public final class JmsConnectionInfo implements JmsResource, Comparable<JmsConne public static final long DEFAULT_REQUEST_TIMEOUT = INFINITE; private final JmsConnectionId connectionId; + + private URI configuredURI; + private URI connectedURI; private String clientId; private String username; private String password; private boolean forceAsyncSend; private boolean alwaysSyncSend; - public long sendTimeout = DEFAULT_SEND_TIMEOUT; - public long requestTimeout = DEFAULT_REQUEST_TIMEOUT; - public long connectTimeout = DEFAULT_CONNECT_TIMEOUT; - public long closeTimeout = DEFAULT_CLOSE_TIMEOUT; + private boolean validatePropertyNames = true; + private boolean localMessagePriority; + private boolean localMessageExpiry; + private boolean sendAcksAsync; + private long sendTimeout = DEFAULT_SEND_TIMEOUT; + private long requestTimeout = DEFAULT_REQUEST_TIMEOUT; + private long connectTimeout = DEFAULT_CONNECT_TIMEOUT; + private long closeTimeout = DEFAULT_CLOSE_TIMEOUT; private String queuePrefix = null; private String topicPrefix = null; - private boolean validatePropertyNames = true; + + private JmsPrefetchPolicy prefetchPolicy = new JmsPrefetchPolicy(); + private JmsRedeliveryPolicy redeliveryPolicy = new JmsRedeliveryPolicy(); public JmsConnectionInfo(JmsConnectionId connectionId) { if (connectionId == null) { @@ -93,6 +106,22 @@ public final class JmsConnectionInfo implements JmsResource, Comparable<JmsConne return connectionId; } + public URI getConfiguredURI() { + return configuredURI; + } + + public void setConfiguredURI(URI uri) { + configuredURI = uri; + } + + public URI getConnectedURI() { + return connectedURI; + } + + public void setConnectedURI(URI connectedURI) { + this.connectedURI = connectedURI; + } + public String getClientId() { return clientId; } @@ -173,6 +202,46 @@ public final class JmsConnectionInfo implements JmsResource, Comparable<JmsConne this.requestTimeout = requestTimeout; } + public boolean isLocalMessagePriority() { + return localMessagePriority; + } + + public void setLocalMessagePriority(boolean localMessagePriority) { + this.localMessagePriority = localMessagePriority; + } + + public boolean isSendAcksAsync() { + return sendAcksAsync; + } + + public void setSendAcksAsync(boolean sendAcksAsync) { + this.sendAcksAsync = sendAcksAsync; + } + + public boolean isLocalMessageExpiry() { + return localMessageExpiry; + } + + public void setLocalMessageExpiry(boolean localMessageExpiry) { + this.localMessageExpiry = localMessageExpiry; + } + + public JmsPrefetchPolicy getPrefetchPolicy() { + return prefetchPolicy; + } + + public void setPrefetchPolicy(JmsPrefetchPolicy prefetchPolicy) { + this.prefetchPolicy = prefetchPolicy.copy(); + } + + public JmsRedeliveryPolicy getRedeliveryPolicy() { + return redeliveryPolicy; + } + + public void setRedeliveryPolicy(JmsRedeliveryPolicy redeliveryPolicy) { + this.redeliveryPolicy = redeliveryPolicy.copy(); + } + @Override public String toString() { return ToStringSupport.toString(this); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
