[jboss-cvs] JBoss Messaging SVN: r3804 - in trunk: src/main/org/jboss/messaging/core/security and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 26 15:56:09 EST 2008
Author: timfox
Date: 2008-02-26 15:56:08 -0500 (Tue, 26 Feb 2008)
New Revision: 3804
Added:
trunk/src/main/org/jboss/messaging/core/version/impl/VersionImpl.java
Removed:
trunk/src/main/org/jboss/messaging/util/VersionImpl.java
Modified:
trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionFactoryImpl.java
trunk/src/main/org/jboss/messaging/core/security/Role.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessageImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/XidImpl.java
trunk/src/main/org/jboss/messaging/core/settings/impl/HierarchicalObjectRepository.java
trunk/src/main/org/jboss/messaging/core/settings/impl/Match.java
trunk/src/main/org/jboss/messaging/jms/JBossDestination.java
trunk/src/main/org/jboss/messaging/jms/JBossQueue.java
trunk/src/main/org/jboss/messaging/jms/JBossTemporaryQueue.java
trunk/src/main/org/jboss/messaging/jms/JBossTemporaryTopic.java
trunk/src/main/org/jboss/messaging/jms/JBossTopic.java
trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java
trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java
trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionMetaData.java
trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java
trunk/src/main/org/jboss/messaging/jms/client/JMSExceptionHelper.java
trunk/src/main/org/jboss/messaging/jms/client/JMSMessageListenerWrapper.java
trunk/src/main/org/jboss/messaging/jms/client/SelectorTranslator.java
trunk/src/main/org/jboss/messaging/jms/referenceable/ConnectionFactoryObjectFactory.java
trunk/src/main/org/jboss/messaging/jms/referenceable/DestinationObjectFactory.java
trunk/src/main/org/jboss/messaging/jms/referenceable/SerializableObjectRefAddr.java
trunk/src/main/org/jboss/messaging/jms/server/ConnectionInfo.java
trunk/src/main/org/jboss/messaging/jms/server/JMSServerManager.java
trunk/src/main/org/jboss/messaging/jms/server/SessionInfo.java
trunk/src/main/org/jboss/messaging/jms/server/SubscriptionInfo.java
trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
trunk/tests/src/org/jboss/messaging/core/server/impl/test/unit/MessagingXidTest.java
Log:
More tewaks - mainly final fields and params
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionFactoryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionFactoryImpl.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionFactoryImpl.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -59,23 +59,23 @@
// Attributes -----------------------------------------------------------------------------------
- private RemotingConfiguration remotingConfig;
+ private final RemotingConfiguration remotingConfig;
- private Version serverVersion;
+ private final Version serverVersion;
- private int serverID;
+ private final int serverID;
- private int prefetchSize = 150;
+ private final int prefetchSize;
- private boolean strictTck;
+ private final boolean strictTck;
// Static ---------------------------------------------------------------------------------------
// Constructors ---------------------------------------------------------------------------------
- public ClientConnectionFactoryImpl(int serverID,
- RemotingConfiguration remotingConfig, Version serverVersion, boolean strictTck,
- int prefetchSize)
+ public ClientConnectionFactoryImpl(final int serverID, final RemotingConfiguration remotingConfig,
+ final Version serverVersion, final boolean strictTck,
+ final int prefetchSize)
{
this.serverID = serverID;
this.remotingConfig = remotingConfig;
@@ -84,16 +84,12 @@
this.prefetchSize = prefetchSize;
}
- public ClientConnectionFactoryImpl()
- {
- }
-
public ClientConnection createConnection() throws MessagingException
{
return createConnection(null, null);
}
- public ClientConnection createConnection(String username, String password) throws MessagingException
+ public ClientConnection createConnection(final String username, final String password) throws MessagingException
{
int v = serverVersion.getIncrementingVersion();
Modified: trunk/src/main/org/jboss/messaging/core/security/Role.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/security/Role.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/core/security/Role.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -29,6 +29,8 @@
*/
public class Role implements Serializable
{
+ private static final long serialVersionUID = 3560097227776448872L;
+
public static final String WRITE_NAME="write";
public static final String READ_NAME="read";
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessageImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessageImpl.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessageImpl.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -46,9 +46,6 @@
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
* @version <tt>$Revision: 2740 $</tt>
*
- * Note this class is only serializable so messages can be returned from JMX operations
- * e.g. listAllMessages.
- *
* For normal message transportation serialization is not used
*
* $Id: MessageSupport.java 2740 2007-05-30 11:36:28Z timfox $
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -60,7 +60,7 @@
import org.jboss.messaging.core.settings.impl.HierarchicalObjectRepository;
import org.jboss.messaging.core.settings.impl.QueueSettings;
import org.jboss.messaging.core.version.Version;
-import org.jboss.messaging.util.VersionImpl;
+import org.jboss.messaging.core.version.impl.VersionImpl;
import org.jboss.security.AuthenticationManager;
/**
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/XidImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/XidImpl.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/XidImpl.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -50,13 +50,6 @@
private boolean hashCalculated;
/**
- * For serialization only
- */
- public XidImpl()
- {
- }
-
- /**
* Standard constructor
* @param branchQualifier
* @param formatId
Modified: trunk/src/main/org/jboss/messaging/core/settings/impl/HierarchicalObjectRepository.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/settings/impl/HierarchicalObjectRepository.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/core/settings/impl/HierarchicalObjectRepository.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -37,35 +37,37 @@
* allows objects to be mapped against a regex pattern and held in order in a list
*
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
+ * @author <a href="tim.fox at jboss.com">Tim Fox</a>
*/
public class HierarchicalObjectRepository<T> implements HierarchicalRepository<T>
{
/**
* The default Match to fall back to
*/
- T defaultmatch;
+ private T defaultmatch;
/**
* all the matches
*/
- HashMap<String, Match<T>> matches = new HashMap<String, Match<T>>();
+ private final Map<String, Match<T>> matches = new HashMap<String, Match<T>>();
/**
* a regex comparator
*/
- MatchComparator<String> matchComparator = new MatchComparator<String>();
+ private final MatchComparator<String> matchComparator = new MatchComparator<String>();
/**
* a cache
*/
- Map<String, T> cache = new ConcurrentHashMap<String,T>();
+ private final Map<String, T> cache = new ConcurrentHashMap<String,T>();
+
/**
* Add a new match to the repository
*
* @param match The regex to use to match against
* @param value the value to hold agains the match
*/
- public void addMatch(String match, T value)
+ public void addMatch(final String match, final T value)
{
cache.clear();
Match.verify(match);
@@ -81,7 +83,7 @@
* @param match the match to look for
* @return the value
*/
- public T getMatch(String match)
+ public T getMatch(final String match)
{
if(cache.get(match) != null)
{
@@ -102,7 +104,7 @@
* @param orderedMatches
* @return
*/
- private T merge(List<Match<T>> orderedMatches)
+ private T merge(final List<Match<T>> orderedMatches)
{
T actualMatch = null;
for (Match<T> match : orderedMatches)
@@ -125,7 +127,7 @@
* @param possibleMatches
* @return
*/
- private List<Match<T>> sort(HashMap<String, Match<T>> possibleMatches)
+ private List<Match<T>> sort(final Map<String, Match<T>> possibleMatches)
{
List<String> keys = new ArrayList<String>(possibleMatches.keySet());
Collections.sort(keys, matchComparator);
@@ -142,7 +144,7 @@
*
* @param match the match to remove
*/
- public void removeMatch(String match)
+ public void removeMatch(final String match)
{
matches.remove(match);
}
@@ -152,7 +154,7 @@
*
* @param defaultValue the value
*/
- public void setDefault(T defaultValue)
+ public void setDefault(final T defaultValue)
{
cache.clear();
defaultmatch = defaultValue;
@@ -163,9 +165,10 @@
* @param match
* @return
*/
- private HashMap<String, Match<T>> getPossibleMatches(String match)
+ private HashMap<String, Match<T>> getPossibleMatches(final String match)
{
HashMap<String, Match<T>> possibleMatches = new HashMap<String, Match<T>>();
+
for (String key : matches.keySet())
{
if (matches.get(key).getPattern().matcher(match).matches())
@@ -177,12 +180,11 @@
}
/**
- * compares to matches to seew hich one is more specific
+ * compares to matches to see which one is more specific
*/
- class MatchComparator<T extends String> implements Comparator<T>
+ private static class MatchComparator<T extends String> implements Comparator<T>
{
-
- public int compare(String o1, String o2)
+ public int compare(final String o1, final String o2)
{
if (o1.contains(Match.WILDCARD) && !o2.contains(Match.WILDCARD))
{
Modified: trunk/src/main/org/jboss/messaging/core/settings/impl/Match.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/settings/impl/Match.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/core/settings/impl/Match.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -27,8 +27,7 @@
a Match is the holder for the match string and the object to hold against it.
*/
public class Match<T>
-{
-
+{
public static String WORD_WILDCARD = "^";
private static String WORD_WILDCARD_REPLACEMENT = "[^.]+";
public static String WILDCARD = "*";
Copied: trunk/src/main/org/jboss/messaging/core/version/impl/VersionImpl.java (from rev 3800, trunk/src/main/org/jboss/messaging/util/VersionImpl.java)
===================================================================
--- trunk/src/main/org/jboss/messaging/core/version/impl/VersionImpl.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/version/impl/VersionImpl.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -0,0 +1,141 @@
+/**
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.messaging.core.version.impl;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.Serializable;
+
+import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.version.Version;
+import org.jboss.messaging.util.Streamable;
+
+/**
+ *
+ * A VersionImpl
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ */
+public class VersionImpl implements Version, Streamable, Serializable
+{
+ // Constants -----------------------------------------------------
+
+ private static final Logger log = Logger.getLogger(VersionImpl.class);
+
+ // Static --------------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ private String versionName;
+
+ private int majorVersion;
+
+ private int minorVersion;
+
+ private int microVersion;
+
+ private int incrementingVersion;
+
+ private String versionSuffix;
+
+ // Constructors --------------------------------------------------
+
+ public VersionImpl(final String versionName, final int majorVersion, final int minorVersion,
+ final int microVersion, final int incrementingVersion, final String versionSuffix)
+ {
+ this.versionName = versionName;
+
+ this.majorVersion = majorVersion;
+
+ this.minorVersion = minorVersion;
+
+ this.microVersion = microVersion;
+
+ this.incrementingVersion = incrementingVersion;
+
+ this.versionSuffix = versionSuffix;
+ }
+
+ // Version implementation ------------------------------------------
+
+ public String getFullVersion()
+ {
+ return majorVersion + "." + minorVersion + "." + microVersion + "." + versionSuffix +
+ " (" + versionName + ", " + incrementingVersion +")";
+ }
+
+ public String getVersionName()
+ {
+ return versionName;
+ }
+
+ public int getMajorVersion()
+ {
+ return majorVersion;
+ }
+
+ public int getMinorVersion()
+ {
+ return minorVersion;
+ }
+
+ public int getMicroVersion()
+ {
+ return microVersion;
+ }
+
+ public String getVersionSuffix()
+ {
+ return versionSuffix;
+ }
+
+ public int getIncrementingVersion()
+ {
+ return incrementingVersion;
+ }
+
+ // Public -------------------------------------------------------
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
+ public void read(DataInputStream in) throws Exception
+ {
+ versionName = in.readUTF();
+
+ majorVersion = in.readInt();
+
+ minorVersion = in.readInt();
+
+ microVersion = in.readInt();
+
+ versionSuffix = in.readUTF();
+
+ incrementingVersion = in.readInt();
+ }
+
+ public void write(DataOutputStream out) throws Exception
+ {
+ out.writeUTF(versionName);
+
+ out.writeInt(majorVersion);
+
+ out.writeInt(minorVersion);
+
+ out.writeInt(microVersion);
+
+ out.writeUTF(versionSuffix);
+
+ out.writeInt(incrementingVersion);
+ }
+
+ // Inner classes -------------------------------------------------
+}
Modified: trunk/src/main/org/jboss/messaging/jms/JBossDestination.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/JBossDestination.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/jms/JBossDestination.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -37,27 +37,26 @@
*
* $Id$
*/
-public abstract class JBossDestination implements Destination, Serializable /*, Referenceable http://jira.jboss.org/jira/browse/JBMESSAGING-395*/
+public abstract class JBossDestination implements Destination, Serializable/*, Referenceable http://jira.jboss.org/jira/browse/JBMESSAGING-395*/
{
// Constants -----------------------------------------------------
// Static --------------------------------------------------------
- protected static String escape(String input)
+ protected static String escape(final String input)
{
return input.replace("\\", "\\\\").replace(".", "\\.");
}
// Attributes ----------------------------------------------------
- protected String name;
+ protected final String name;
- private String address;
-
-
+ private final String address;
+
// Constructors --------------------------------------------------
- public JBossDestination(String address, String name)
+ public JBossDestination(final String address, final String name)
{
this.address = address;
Modified: trunk/src/main/org/jboss/messaging/jms/JBossQueue.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/JBossQueue.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/jms/JBossQueue.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -35,9 +35,9 @@
{
// Constants -----------------------------------------------------
- private static final long serialVersionUID = 4121129234371655479L;
-
- public static final String JMS_QUEUE_ADDRESS_PREFIX = "queuejms.";
+ private static final long serialVersionUID = -1106092883162295462L;
+
+ public static final String JMS_QUEUE_ADDRESS_PREFIX = "queuejms.";
// Static --------------------------------------------------------
@@ -45,12 +45,12 @@
// Constructors --------------------------------------------------
- public JBossQueue(String name)
+ public JBossQueue(final String name)
{
super(JMS_QUEUE_ADDRESS_PREFIX + name, name);
}
- protected JBossQueue(String address, String name)
+ protected JBossQueue(final String address, final String name)
{
super(address, name);
}
Modified: trunk/src/main/org/jboss/messaging/jms/JBossTemporaryQueue.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/JBossTemporaryQueue.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/jms/JBossTemporaryQueue.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -36,18 +36,19 @@
{
// Constants -----------------------------------------------------
- private static final long serialVersionUID = 8957042889037273330L;
+ private static final long serialVersionUID = -4624930377557954624L;
- private static final String JMS_TEMP_QUEUE_ADDRESS_PREFIX = "queuetempjms.";
+ private static final String JMS_TEMP_QUEUE_ADDRESS_PREFIX = "queuetempjms.";
+
// Static --------------------------------------------------------
// Attributes ----------------------------------------------------
- private transient JBossSession session;
+ private final transient JBossSession session;
// Constructors --------------------------------------------------
- public JBossTemporaryQueue(JBossSession session, String name)
+ public JBossTemporaryQueue(final JBossSession session, final String name)
{
super(JMS_TEMP_QUEUE_ADDRESS_PREFIX + name, name);
Modified: trunk/src/main/org/jboss/messaging/jms/JBossTemporaryTopic.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/JBossTemporaryTopic.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/jms/JBossTemporaryTopic.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -36,18 +36,19 @@
{
// Constants -----------------------------------------------------
- private static final long serialVersionUID = -8455283004195652511L;
+ private static final long serialVersionUID = 845450764835635266L;
- private static final String JMS_TEMP_TOPIC_ADDRESS_PREFIX = "topictempjms.";
+ private static final String JMS_TEMP_TOPIC_ADDRESS_PREFIX = "topictempjms.";
+
// Static --------------------------------------------------------
// Attributes ----------------------------------------------------
- private transient JBossSession session;
+ private final transient JBossSession session;
// Constructors --------------------------------------------------
- public JBossTemporaryTopic(JBossSession session, String name)
+ public JBossTemporaryTopic(final JBossSession session, final String name)
{
super(JMS_TEMP_TOPIC_ADDRESS_PREFIX + name, name);
Modified: trunk/src/main/org/jboss/messaging/jms/JBossTopic.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/JBossTopic.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/jms/JBossTopic.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -37,20 +37,20 @@
{
// Constants -----------------------------------------------------
- private static final long serialVersionUID = 3257845497845724981L;
-
- public static final String JMS_TOPIC_ADDRESS_PREFIX = "topicjms.";
+ private static final long serialVersionUID = 7873614001276404156L;
+ public static final String JMS_TOPIC_ADDRESS_PREFIX = "topicjms.";
+
+ private static final char SEPARATOR = '.';
+
// Static --------------------------------------------------------
-
- private static final char SEPARATOR = '.';
-
- public static String createQueueNameForDurableSubscription(String clientID, String subscriptionName)
+
+ public static String createQueueNameForDurableSubscription(final String clientID, final String subscriptionName)
{
return escape(clientID) + SEPARATOR + escape(subscriptionName);
}
- public static Pair<String, String> decomposeQueueNameForDurableSubscription(String queueName)
+ public static Pair<String, String> decomposeQueueNameForDurableSubscription(final String queueName)
{
StringBuffer[] parts = new StringBuffer[2];
int currentPart = 0;
@@ -102,12 +102,12 @@
// Constructors --------------------------------------------------
- public JBossTopic(String name)
+ public JBossTopic(final String name)
{
super(JMS_TOPIC_ADDRESS_PREFIX + name, name);
}
- protected JBossTopic(String address, String name)
+ protected JBossTopic(final String address, final String name)
{
super(address, name);
}
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -62,12 +62,10 @@
Connection, QueueConnection, TopicConnection,
XAConnection, XAQueueConnection, XATopicConnection
{
-
// Constants ------------------------------------------------------------------------------------
private static final Logger log = Logger.getLogger(JBossConnection.class);
-
static final int TYPE_GENERIC_CONNECTION = 0;
static final int TYPE_QUEUE_CONNECTION = 1;
@@ -78,26 +76,26 @@
// Attributes -----------------------------------------------------------------------------------
- protected ClientConnection connection;
+ private final ClientConnection connection;
- private int connectionType;
+ private final int connectionType;
- private String clientID;
+ private final Version version;
- private boolean justCreated = true;
+ private final int dupsOKBatchSize;
- private ConnectionMetaData metaData;
+ private volatile ExceptionListener exceptionListener;
- private Version version;
+ private volatile boolean justCreated = true;
- private ExceptionListener exceptionListener;
+ private volatile ConnectionMetaData metaData;
- private int dupsOKBatchSize;
-
+ private String clientID;
+
// Constructors ---------------------------------------------------------------------------------
- public JBossConnection(ClientConnection connection, int connectionType, Version version,
- String clientID, int dupsOKBatchSize)
+ public JBossConnection(final ClientConnection connection, final int connectionType, final Version version,
+ final String clientID, final int dupsOKBatchSize)
{
this.connection = connection;
@@ -112,7 +110,7 @@
// Connection implementation --------------------------------------------------------------------
- public Session createSession(boolean transacted, int acknowledgeMode) throws JMSException
+ public Session createSession(final boolean transacted, final int acknowledgeMode) throws JMSException
{
return createSessionInternal(transacted, acknowledgeMode, false, TYPE_GENERIC_CONNECTION, false);
}
@@ -126,7 +124,7 @@
return clientID;
}
- public void setClientID(String clientID) throws JMSException
+ public void setClientID(final String clientID) throws JMSException
{
checkClosed();
@@ -166,7 +164,7 @@
return exceptionListener;
}
- public void setExceptionListener(ExceptionListener listener) throws JMSException
+ public void setExceptionListener(final ExceptionListener listener) throws JMSException
{
try
{
@@ -230,20 +228,20 @@
}
}
- public ConnectionConsumer createConnectionConsumer(Destination destination,
- String messageSelector,
- ServerSessionPool sessionPool,
- int maxMessages) throws JMSException
+ public ConnectionConsumer createConnectionConsumer(final Destination destination,
+ final String messageSelector,
+ final ServerSessionPool sessionPool,
+ final int maxMessages) throws JMSException
{
//TODO
return null;
}
- public ConnectionConsumer createDurableConnectionConsumer(Topic topic,
- String subscriptionName,
- String messageSelector,
- ServerSessionPool sessionPool,
- int maxMessages) throws JMSException
+ public ConnectionConsumer createDurableConnectionConsumer(final Topic topic,
+ final String subscriptionName,
+ final String messageSelector,
+ final ServerSessionPool sessionPool,
+ final int maxMessages) throws JMSException
{
// As spec. section 4.11
if (connectionType == TYPE_QUEUE_CONNECTION)
@@ -258,16 +256,16 @@
// QueueConnection implementation ---------------------------------------------------------------
- public QueueSession createQueueSession(boolean transacted,
- int acknowledgeMode) throws JMSException
+ public QueueSession createQueueSession(final boolean transacted,
+ final int acknowledgeMode) throws JMSException
{
return createSessionInternal(transacted, acknowledgeMode, false,
JBossSession.TYPE_QUEUE_SESSION, false);
}
- public ConnectionConsumer createConnectionConsumer(Queue queue, String messageSelector,
- ServerSessionPool sessionPool,
- int maxMessages) throws JMSException
+ public ConnectionConsumer createConnectionConsumer(final Queue queue, final String messageSelector,
+ final ServerSessionPool sessionPool,
+ final int maxMessages) throws JMSException
{
//TODO
@@ -276,16 +274,16 @@
// TopicConnection implementation ---------------------------------------------------------------
- public TopicSession createTopicSession(boolean transacted,
- int acknowledgeMode) throws JMSException
+ public TopicSession createTopicSession(final boolean transacted,
+ final int acknowledgeMode) throws JMSException
{
return createSessionInternal(transacted, acknowledgeMode, false,
JBossSession.TYPE_TOPIC_SESSION, false);
}
- public ConnectionConsumer createConnectionConsumer(Topic topic, String messageSelector,
- ServerSessionPool sessionPool,
- int maxMessages) throws JMSException
+ public ConnectionConsumer createConnectionConsumer(final Topic topic, final String messageSelector,
+ final ServerSessionPool sessionPool,
+ final int maxMessages) throws JMSException
{
//TODO
@@ -323,31 +321,32 @@
// We provide some overloaded createSession methods to allow the value of cacheProducers to be specified
- public Session createSession(boolean transacted, int acknowledgeMode, boolean cacheProducers) throws JMSException
+ public Session createSession(final boolean transacted, final int acknowledgeMode,
+ final boolean cacheProducers) throws JMSException
{
return createSessionInternal(transacted, acknowledgeMode, false, TYPE_GENERIC_CONNECTION, cacheProducers);
}
- public TopicSession createTopicSession(boolean transacted,
- int acknowledgeMode, boolean cacheProducers) throws JMSException
+ public TopicSession createTopicSession(final boolean transacted,
+ final int acknowledgeMode, final boolean cacheProducers) throws JMSException
{
return createSessionInternal(transacted, acknowledgeMode, false,
JBossSession.TYPE_TOPIC_SESSION, cacheProducers);
}
- public XASession createXASession(boolean cacheProducers) throws JMSException
+ public XASession createXASession(final boolean cacheProducers) throws JMSException
{
return createSessionInternal(true, Session.SESSION_TRANSACTED, true,
JBossSession.TYPE_GENERIC_SESSION, cacheProducers);
}
- public XAQueueSession createXAQueueSession(boolean cacheProducers) throws JMSException
+ public XAQueueSession createXAQueueSession(final boolean cacheProducers) throws JMSException
{
return createSessionInternal(true, Session.SESSION_TRANSACTED, true,
JBossSession.TYPE_QUEUE_SESSION, cacheProducers);
}
- public XATopicSession createXATopicSession(boolean cacheProducers) throws JMSException
+ public XATopicSession createXATopicSession(final boolean cacheProducers) throws JMSException
{
return createSessionInternal(true, Session.SESSION_TRANSACTED, true,
JBossSession.TYPE_TOPIC_SESSION, cacheProducers);
@@ -374,8 +373,8 @@
// Protected ------------------------------------------------------------------------------------
- protected JBossSession createSessionInternal(boolean transacted, int acknowledgeMode,
- boolean isXA, int type, boolean cacheProducers) throws JMSException
+ protected JBossSession createSessionInternal(final boolean transacted, int acknowledgeMode,
+ final boolean isXA, final int type, final boolean cacheProducers) throws JMSException
{
if (transacted)
{
@@ -447,7 +446,7 @@
private class JMSFailureListener implements FailureListener
{
- public void onFailure(MessagingException me)
+ public void onFailure(final MessagingException me)
{
JMSException je = new JMSException(me.toString());
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -67,15 +67,16 @@
// Attributes -----------------------------------------------------------------------------------
- private ClientConnectionFactory connectionFactory;
+ private final ClientConnectionFactory connectionFactory;
- private String clientID;
+ private final String clientID;
- private int dupsOKBatchSize;
+ private final int dupsOKBatchSize;
// Constructors ---------------------------------------------------------------------------------
- public JBossConnectionFactory(ClientConnectionFactory connectionFactory, String clientID, int dupsOKBatchSize)
+ public JBossConnectionFactory(final ClientConnectionFactory connectionFactory, final String clientID,
+ final int dupsOKBatchSize)
{
this.connectionFactory = connectionFactory;
@@ -91,7 +92,7 @@
return createConnection(null, null);
}
- public Connection createConnection(String username, String password) throws JMSException
+ public Connection createConnection(final String username, final String password) throws JMSException
{
return createConnectionInternal(username, password, false,
JBossConnection.TYPE_GENERIC_CONNECTION);
@@ -104,7 +105,7 @@
return createQueueConnection(null, null);
}
- public QueueConnection createQueueConnection(String username, String password)
+ public QueueConnection createQueueConnection(final String username, final String password)
throws JMSException
{
return createConnectionInternal(username, password, false,
@@ -118,7 +119,7 @@
return createTopicConnection(null, null);
}
- public TopicConnection createTopicConnection(String username, String password)
+ public TopicConnection createTopicConnection(final String username, final String password)
throws JMSException
{
return createConnectionInternal(username, password, false,
@@ -132,7 +133,7 @@
return createXAConnection(null, null);
}
- public XAConnection createXAConnection(String username, String password) throws JMSException
+ public XAConnection createXAConnection(final String username, final String password) throws JMSException
{
return createConnectionInternal(username, password, true,
JBossConnection.TYPE_GENERIC_CONNECTION);
@@ -145,7 +146,7 @@
return createXAQueueConnection(null, null);
}
- public XAQueueConnection createXAQueueConnection(String username, String password)
+ public XAQueueConnection createXAQueueConnection(final String username, final String password)
throws JMSException
{
return createConnectionInternal(username, password, true,
@@ -159,7 +160,7 @@
return createXATopicConnection(null, null);
}
- public XATopicConnection createXATopicConnection(String username, String password)
+ public XATopicConnection createXATopicConnection(final String username, final String password)
throws JMSException
{
return createConnectionInternal(username, password, true,
@@ -192,8 +193,8 @@
// Protected ------------------------------------------------------------------------------------
- protected JBossConnection createConnectionInternal(String username, String password,
- boolean isXA, int type)
+ protected JBossConnection createConnectionInternal(final String username, final String password,
+ final boolean isXA, final int type)
throws JMSException
{
try
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionMetaData.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionMetaData.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionMetaData.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -45,14 +45,14 @@
// Attributes ----------------------------------------------------
- protected Version serverVersion;
+ private final Version serverVersion;
// Constructors --------------------------------------------------
/**
* Create a new JBossConnectionMetaData object.
*/
- public JBossConnectionMetaData(Version serverVersion)
+ public JBossConnectionMetaData(final Version serverVersion)
{
this.serverVersion = serverVersion;
}
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -97,28 +97,28 @@
// Attributes ----------------------------------------------------
- private JBossConnection connection;
+ private final JBossConnection connection;
- private ClientSession session;
+ private final ClientSession session;
- private int sessionType;
+ private final int sessionType;
- private LinkedList<AsfMessageHolder> asfMessages;
+ private final int ackMode;
- private MessageListener distinguishedListener;
+ private final boolean transacted;
- private int ackMode;
+ private final boolean xa;
- private boolean transacted;
+ private LinkedList<AsfMessageHolder> asfMessages;
- private boolean xa;
-
+ private MessageListener distinguishedListener;
+
private boolean recoverCalled;
// Constructors --------------------------------------------------
- public JBossSession(JBossConnection connection, boolean transacted, boolean xa, int ackMode,
- ClientSession session, int sessionType)
+ public JBossSession(final JBossConnection connection, final boolean transacted, final boolean xa,
+ final int ackMode, final ClientSession session, final int sessionType)
{
this.connection = connection;
@@ -163,7 +163,7 @@
return new JBossObjectMessage();
}
- public ObjectMessage createObjectMessage(Serializable object) throws JMSException
+ public ObjectMessage createObjectMessage(final Serializable object) throws JMSException
{
checkClosed();
@@ -188,7 +188,7 @@
return new JBossTextMessage();
}
- public TextMessage createTextMessage(String text) throws JMSException
+ public TextMessage createTextMessage(final String text) throws JMSException
{
checkClosed();
@@ -292,7 +292,7 @@
return distinguishedListener;
}
- public void setMessageListener(MessageListener listener) throws JMSException
+ public void setMessageListener(final MessageListener listener) throws JMSException
{
checkClosed();
@@ -329,14 +329,14 @@
//Need to work out how to get ASF to work with core
}
- public MessageProducer createProducer(Destination d) throws JMSException
+ public MessageProducer createProducer(final Destination destination) throws JMSException
{
- if (d != null && !(d instanceof JBossDestination))
+ if (destination != null && !(destination instanceof JBossDestination))
{
- throw new InvalidDestinationException("Not a JBoss Destination:" + d);
+ throw new InvalidDestinationException("Not a JBoss Destination:" + destination);
}
- JBossDestination jbd = (JBossDestination)d;
+ JBossDestination jbd = (JBossDestination)destination;
try
{
@@ -350,37 +350,37 @@
}
}
- public MessageConsumer createConsumer(Destination d) throws JMSException
+ public MessageConsumer createConsumer(final Destination destination) throws JMSException
{
- return createConsumer(d, null, false);
+ return createConsumer(destination, null, false);
}
- public MessageConsumer createConsumer(Destination d, String messageSelector) throws JMSException
+ public MessageConsumer createConsumer(final Destination destination, final String messageSelector) throws JMSException
{
- return createConsumer(d, messageSelector, false);
+ return createConsumer(destination, messageSelector, false);
}
- public MessageConsumer createConsumer(Destination dest, String messageSelector, boolean noLocal)
+ public MessageConsumer createConsumer(final Destination destination, final String messageSelector, final boolean noLocal)
throws JMSException
{
- if (dest == null)
+ if (destination == null)
{
throw new InvalidDestinationException("Cannot create a consumer with a null destination");
}
- if (!(dest instanceof JBossDestination))
+ if (!(destination instanceof JBossDestination))
{
- throw new InvalidDestinationException("Not a JBossDestination:" + dest);
+ throw new InvalidDestinationException("Not a JBossDestination:" + destination);
}
- JBossDestination jbdest = (JBossDestination)dest;
+ JBossDestination jbdest = (JBossDestination)destination;
ClientConsumer cd = createConsumer(jbdest, null, messageSelector, noLocal);
- return new JBossMessageConsumer(this, cd, noLocal, dest, messageSelector, dest instanceof Topic);
+ return new JBossMessageConsumer(this, cd, noLocal, destination, messageSelector, destination instanceof Topic);
}
- public Queue createQueue(String queueName) throws JMSException
+ public Queue createQueue(final String queueName) throws JMSException
{
//As per spec. section 4.11
if (sessionType == TYPE_TOPIC_SESSION)
@@ -409,7 +409,7 @@
}
}
- public Topic createTopic(String topicName) throws JMSException
+ public Topic createTopic(final String topicName) throws JMSException
{
//As per spec. section 4.11
if (sessionType == TYPE_QUEUE_SESSION)
@@ -438,7 +438,7 @@
}
}
- public TopicSubscriber createDurableSubscriber(Topic topic, String name) throws JMSException
+ public TopicSubscriber createDurableSubscriber(final Topic topic, final String name) throws JMSException
{
//As per spec. section 4.11
if (sessionType == TYPE_QUEUE_SESSION)
@@ -461,8 +461,9 @@
return new JBossMessageConsumer(this, cd, false, topic, null, false);
}
- private ClientConsumer createConsumer(JBossDestination dest,
- String subscriptionName, String selectorString, boolean noLocal)
+ private ClientConsumer createConsumer(final JBossDestination dest,
+ final String subscriptionName, String selectorString,
+ final boolean noLocal)
throws JMSException
{
try
@@ -582,10 +583,8 @@
}
}
- public TopicSubscriber createDurableSubscriber(Topic topic,
- String name,
- String messageSelector,
- boolean noLocal)
+ public TopicSubscriber createDurableSubscriber(final Topic topic, final String name,
+ String messageSelector, final boolean noLocal)
throws JMSException
{
//As per spec. section 4.11
@@ -613,12 +612,12 @@
return new JBossMessageConsumer(this, cd, noLocal, topic, messageSelector, false);
}
- public QueueBrowser createBrowser(Queue queue) throws JMSException
+ public QueueBrowser createBrowser(final Queue queue) throws JMSException
{
return createBrowser(queue, null);
}
- public QueueBrowser createBrowser(Queue queue, String messageSelector) throws JMSException
+ public QueueBrowser createBrowser(final Queue queue, String messageSelector) throws JMSException
{
//As per spec. section 4.11
if (sessionType == TYPE_TOPIC_SESSION)
@@ -702,7 +701,7 @@
}
}
- public void unsubscribe(String name) throws JMSException
+ public void unsubscribe(final String name) throws JMSException
{
// As per spec. section 4.11
if (sessionType == TYPE_QUEUE_SESSION)
@@ -754,17 +753,17 @@
// QueueSession implementation
- public QueueReceiver createReceiver(Queue queue, String messageSelector) throws JMSException
+ public QueueReceiver createReceiver(final Queue queue, final String messageSelector) throws JMSException
{
return (QueueReceiver)createConsumer(queue, messageSelector);
}
- public QueueReceiver createReceiver(Queue queue) throws JMSException
+ public QueueReceiver createReceiver(final Queue queue) throws JMSException
{
return (QueueReceiver)createConsumer(queue);
}
- public QueueSender createSender(Queue queue) throws JMSException
+ public QueueSender createSender(final Queue queue) throws JMSException
{
return (QueueSender)createProducer(queue);
}
@@ -778,18 +777,18 @@
// TopicSession implementation
- public TopicPublisher createPublisher(Topic topic) throws JMSException
+ public TopicPublisher createPublisher(final Topic topic) throws JMSException
{
return (TopicPublisher)createProducer(topic);
}
- public TopicSubscriber createSubscriber(Topic topic, String messageSelector,
- boolean noLocal) throws JMSException
+ public TopicSubscriber createSubscriber(final Topic topic, final String messageSelector,
+ final boolean noLocal) throws JMSException
{
return (TopicSubscriber)createConsumer(topic, messageSelector, noLocal);
}
- public TopicSubscriber createSubscriber(Topic topic) throws JMSException
+ public TopicSubscriber createSubscriber(final Topic topic) throws JMSException
{
return (TopicSubscriber)createConsumer(topic);
}
@@ -818,12 +817,12 @@
return recoverCalled;
}
- public void setRecoverCalled(boolean recoverCalled)
+ public void setRecoverCalled(final boolean recoverCalled)
{
this.recoverCalled = recoverCalled;
}
- public void deleteTemporaryDestination(JBossDestination destination) throws JMSException
+ public void deleteTemporaryDestination(final JBossDestination destination) throws JMSException
{
try
{
@@ -873,8 +872,8 @@
* This method is used by the JBossConnectionConsumer to load up the session
* with messages to be processed by the session's run() method
*/
- void addAsfMessage(JBossMessage m, String consumerID, String queueName, int maxDeliveries,
- ClientSession connectionConsumerSession) throws JMSException
+ void addAsfMessage(final JBossMessage m, final String consumerID, final String queueName, final int maxDeliveries,
+ final ClientSession connectionConsumerSession) throws JMSException
{
AsfMessageHolder holder =
Modified: trunk/src/main/org/jboss/messaging/jms/client/JMSExceptionHelper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JMSExceptionHelper.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/jms/client/JMSExceptionHelper.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -41,7 +41,7 @@
// Static --------------------------------------------------------
- public static JMSException convertFromMessagingException(MessagingException me)
+ public static JMSException convertFromMessagingException(final MessagingException me)
{
JMSException je;
switch (me.getCode())
Modified: trunk/src/main/org/jboss/messaging/jms/client/JMSMessageListenerWrapper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JMSMessageListenerWrapper.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/jms/client/JMSMessageListenerWrapper.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -40,13 +40,13 @@
{
private static final Logger log = Logger.getLogger(JMSMessageListenerWrapper.class);
- private JBossSession session;
+ private final JBossSession session;
- private MessageListener listener;
+ private final MessageListener listener;
- private boolean transactedOrClientAck;
+ private final boolean transactedOrClientAck;
- public JMSMessageListenerWrapper(JBossSession session, MessageListener listener, int ackMode)
+ public JMSMessageListenerWrapper(final JBossSession session, final MessageListener listener, final int ackMode)
{
this.session = session;
@@ -59,7 +59,7 @@
* In this method we apply the JMS acknowledgement and redelivery semantics
* as per JMS spec
*/
- public void onMessage(Message message)
+ public void onMessage(final Message message)
{
JBossMessage jbm = JBossMessage.createMessage(message, session.getCoreSession());
@@ -127,8 +127,6 @@
}
}
- session.setRecoverCalled(false);
-
+ session.setRecoverCalled(false);
}
-
}
Modified: trunk/src/main/org/jboss/messaging/jms/client/SelectorTranslator.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/SelectorTranslator.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/jms/client/SelectorTranslator.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -44,7 +44,7 @@
*/
public class SelectorTranslator
{
- public static String convertToJBMFilterString(String selectorString)
+ public static String convertToJBMFilterString(final String selectorString)
{
if (selectorString == null)
{
@@ -71,7 +71,7 @@
}
- private static String parse(String input, String match, String replace)
+ private static String parse(final String input, final String match, final String replace)
{
final char quote = '\'';
Modified: trunk/src/main/org/jboss/messaging/jms/referenceable/ConnectionFactoryObjectFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/referenceable/ConnectionFactoryObjectFactory.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/jms/referenceable/ConnectionFactoryObjectFactory.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -43,8 +43,8 @@
*/
public class ConnectionFactoryObjectFactory implements ObjectFactory
{
- public Object getObjectInstance(Object ref, Name name, Context ctx,
- Hashtable props) throws Exception
+ public Object getObjectInstance(final Object ref, final Name name, final Context ctx,
+ final Hashtable props) throws Exception
{
Reference r = (Reference)ref;
Modified: trunk/src/main/org/jboss/messaging/jms/referenceable/DestinationObjectFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/referenceable/DestinationObjectFactory.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/jms/referenceable/DestinationObjectFactory.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -44,8 +44,8 @@
*/
public class DestinationObjectFactory implements ObjectFactory
{
- public Object getObjectInstance(Object ref, Name name, Context ctx,
- Hashtable props) throws Exception
+ public Object getObjectInstance(final Object ref, final Name name, final Context ctx,
+ final Hashtable props) throws Exception
{
Reference r = (Reference)ref;
Modified: trunk/src/main/org/jboss/messaging/jms/referenceable/SerializableObjectRefAddr.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/referenceable/SerializableObjectRefAddr.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/jms/referenceable/SerializableObjectRefAddr.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -47,9 +47,9 @@
{
private static final long serialVersionUID = 9158134548376171898L;
- private byte[] bytes;
+ private final byte[] bytes;
- public SerializableObjectRefAddr(String type, Object content) throws NamingException
+ public SerializableObjectRefAddr(final String type, final Object content) throws NamingException
{
super(type);
@@ -77,7 +77,7 @@
return bytes;
}
- public static Object deserialize(byte[] bytes) throws IOException, ClassNotFoundException
+ public static Object deserialize(final byte[] bytes) throws IOException, ClassNotFoundException
{
ByteArrayInputStream bis = new ByteArrayInputStream(bytes);
Modified: trunk/src/main/org/jboss/messaging/jms/server/ConnectionInfo.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/ConnectionInfo.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/jms/server/ConnectionInfo.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -31,23 +31,21 @@
*/
public class ConnectionInfo implements Serializable
{
- private static final SimpleDateFormat SIMPLE_DATE_FORMAT = new SimpleDateFormat("HH:mm:ss, EEE, MMM d, yyyy");
+ private static final long serialVersionUID = -2525719954021417273L;
+
+ private static final SimpleDateFormat SIMPLE_DATE_FORMAT = new SimpleDateFormat("HH:mm:ss, EEE, MMM d, yyyy");
public enum status{ STARTED, STOPPED }
- private String id;
- private String user;
- private String address;
- private boolean started;
- private long created;
+ private final String id;
+ private final String user;
+ private final String address;
+ private final boolean started;
+ private final long created;
- public ConnectionInfo()
+ public ConnectionInfo(final String id, final String user, final String address,
+ final boolean started, final long created)
{
-
- }
-
- public ConnectionInfo(String id, String user, String address, boolean started, long created)
- {
this.id = id;
this.user = user;
this.address = address;
Modified: trunk/src/main/org/jboss/messaging/jms/server/JMSServerManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/JMSServerManager.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/jms/server/JMSServerManager.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -1,16 +1,11 @@
package org.jboss.messaging.jms.server;
-import org.jboss.messaging.core.server.impl.ServerConnectionImpl;
-import org.jboss.messaging.core.server.impl.ServerSessionImpl;
-import org.jboss.messaging.jms.server.MessageStatistics;
-
-import javax.jms.Message;
+import java.io.Serializable;
import java.util.List;
-import java.util.ArrayList;
-import java.util.Collection;
import java.util.Set;
-import java.io.Serializable;
+import javax.jms.Message;
+
/**
* The JMS Management interface.
*
Modified: trunk/src/main/org/jboss/messaging/jms/server/SessionInfo.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/SessionInfo.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/jms/server/SessionInfo.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -29,11 +29,11 @@
*/
public class SessionInfo implements Serializable
{
- private String id;
+ private final String id;
- private String connectionID;
+ private final String connectionID;
- public SessionInfo(String id, String connectionID)
+ public SessionInfo(final String id, final String connectionID)
{
this.id = id;
this.connectionID = connectionID;
Modified: trunk/src/main/org/jboss/messaging/jms/server/SubscriptionInfo.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/SubscriptionInfo.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/jms/server/SubscriptionInfo.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -36,21 +36,22 @@
{
private static final long serialVersionUID = -38689006079435295L;
- private String id;
+ private final String id;
- private boolean durable;
+ private final boolean durable;
- private String name;
+ private final String name;
- private String clientID;
+ private final String clientID;
- private String selector;
+ private final String selector;
- private int messageCount;
+ private final int messageCount;
- private int maxSize;
+ private final int maxSize;
- public SubscriptionInfo(String id, boolean durable, String name, String clientID, String selector, int messageCount, int maxSize)
+ public SubscriptionInfo(final String id, final boolean durable, final String name,
+ final String clientID, final String selector, final int messageCount, final int maxSize)
{
this.id = id;
this.durable = durable;
Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -35,9 +35,8 @@
{
Logger log = Logger.getLogger(JMSServerManagerImpl.class);
- JMSServerManager jmsServerManager;
+ private JMSServerManager jmsServerManager;
-
private static final String CLIENTID_ELEMENT = "client-id";
private static final String DUPS_OK_BATCH_SIZE_ELEMENT = "dups-ok-batch-size";
private static final String PREFETECH_SIZE_ELEMENT = "prefetch-size";
@@ -95,7 +94,7 @@
* @param node the element to deploy
* @throws Exception .
*/
- public void deploy(Node node) throws Exception
+ public void deploy(final Node node) throws Exception
{
createAndBindObject(node);
}
@@ -106,7 +105,7 @@
* @param node the config
* @throws Exception .
*/
- private void createAndBindObject(Node node) throws Exception
+ private void createAndBindObject(final Node node) throws Exception
{
if (node.getNodeName().equals(CONNECTION_FACTORY_NODE_NAME))
{
@@ -200,7 +199,7 @@
* @param node the element to undeploy
* @throws Exception .
*/
- public void undeploy(Node node) throws Exception
+ public void undeploy(final Node node) throws Exception
{
if (node.getNodeName().equals(CONNECTION_FACTORY_NODE_NAME))
{
Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -26,6 +26,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.jms.Message;
@@ -51,7 +52,6 @@
import org.jboss.messaging.jms.server.MessageStatistics;
import org.jboss.messaging.jms.server.SessionInfo;
import org.jboss.messaging.jms.server.SubscriptionInfo;
-import org.jboss.messaging.jms.server.JMSServerManager.ListType;
import org.jboss.messaging.util.JNDIUtil;
import org.jboss.messaging.util.Pair;
@@ -63,22 +63,22 @@
*/
public class JMSServerManagerImpl implements JMSServerManager
{
- Logger log = Logger.getLogger(JMSServerManagerImpl.class);
+ private static final Logger log = Logger.getLogger(JMSServerManagerImpl.class);
/**
* the initial context to bind to
*/
- InitialContext initialContext;
+ private InitialContext initialContext;
- HashMap<String, List<String>> destinations = new HashMap<String, List<String>>();
- HashMap<String, JBossConnectionFactory> connectionFactories = new HashMap<String, JBossConnectionFactory>();
+ private final Map<String, List<String>> destinations = new HashMap<String, List<String>>();
+
+ private final Map<String, JBossConnectionFactory> connectionFactories = new HashMap<String, JBossConnectionFactory>();
- HashMap<String, List<String>> connectionFactoryBindings = new HashMap<String, List<String>>();
+ private final Map<String, List<String>> connectionFactoryBindings = new HashMap<String, List<String>>();
+ private MessagingServerManagement messagingServerManagement;
- MessagingServerManagement messagingServerManagement;
-
- public void setMessagingServerManagement(MessagingServerManagement messagingServerManagement)
+ public void setMessagingServerManagement(final MessagingServerManagement messagingServerManagement)
{
this.messagingServerManagement = messagingServerManagement;
}
@@ -99,8 +99,7 @@
}
- private boolean bindToJndi(String jndiName, Object objectToBind)
- throws NamingException
+ private boolean bindToJndi(final String jndiName, final Object objectToBind) throws NamingException
{
String parentContext;
String jndiNameInContext;
Deleted: trunk/src/main/org/jboss/messaging/util/VersionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/util/VersionImpl.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/src/main/org/jboss/messaging/util/VersionImpl.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -1,140 +0,0 @@
-/**
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.messaging.util;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.Serializable;
-
-import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.version.Version;
-
-/**
- *
- * A VersionImpl
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- *
- */
-public class VersionImpl implements Version, Streamable, Serializable
-{
- // Constants -----------------------------------------------------
-
- private static final Logger log = Logger.getLogger(VersionImpl.class);
-
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- private String versionName;
-
- private int majorVersion;
-
- private int minorVersion;
-
- private int microVersion;
-
- private int incrementingVersion;
-
- private String versionSuffix;
-
- // Constructors --------------------------------------------------
-
- public VersionImpl(String versionName, int majorVersion, int minorVersion, int microVersion,
- int incrementingVersion, String versionSuffix)
- {
- this.versionName = versionName;
-
- this.majorVersion = majorVersion;
-
- this.minorVersion = minorVersion;
-
- this.microVersion = microVersion;
-
- this.incrementingVersion = incrementingVersion;
-
- this.versionSuffix = versionSuffix;
- }
-
- // Version implementation ------------------------------------------
-
- public String getFullVersion()
- {
- return majorVersion + "." + minorVersion + "." + microVersion + "." + versionSuffix +
- " (" + versionName + ", " + incrementingVersion +")";
- }
-
- public String getVersionName()
- {
- return versionName;
- }
-
- public int getMajorVersion()
- {
- return majorVersion;
- }
-
- public int getMinorVersion()
- {
- return minorVersion;
- }
-
- public int getMicroVersion()
- {
- return microVersion;
- }
-
- public String getVersionSuffix()
- {
- return versionSuffix;
- }
-
- public int getIncrementingVersion()
- {
- return incrementingVersion;
- }
-
- // Public -------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- public void read(DataInputStream in) throws Exception
- {
- versionName = in.readUTF();
-
- majorVersion = in.readInt();
-
- minorVersion = in.readInt();
-
- microVersion = in.readInt();
-
- versionSuffix = in.readUTF();
-
- incrementingVersion = in.readInt();
- }
-
- public void write(DataOutputStream out) throws Exception
- {
- out.writeUTF(versionName);
-
- out.writeInt(majorVersion);
-
- out.writeInt(minorVersion);
-
- out.writeInt(microVersion);
-
- out.writeUTF(versionSuffix);
-
- out.writeInt(incrementingVersion);
- }
-
- // Inner classes -------------------------------------------------
-}
Modified: trunk/tests/src/org/jboss/messaging/core/server/impl/test/unit/MessagingXidTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/server/impl/test/unit/MessagingXidTest.java 2008-02-26 19:10:31 UTC (rev 3803)
+++ trunk/tests/src/org/jboss/messaging/core/server/impl/test/unit/MessagingXidTest.java 2008-02-26 20:56:08 UTC (rev 3804)
@@ -96,17 +96,6 @@
assertEquals(xid2, xid2);
}
- public void testDefaultConstructor()
- {
- XidImpl xid1 = new XidImpl();
-
- assertNull(xid1.getBranchQualifier());
-
- assertNull(xid1.getGlobalTransactionId());
-
- assertEquals(0, xid1.getFormatId());
- }
-
public void testEqualsWithForeign()
{
XidImpl xid1 = new XidImpl(RandomUtil.randomBytes(), RandomUtil.randomInt(),
More information about the jboss-cvs-commits
mailing list