QPID-612 : Use same scheme for every creation of temporary queue names

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@578845 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 4 insertions, 128 deletions

diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java b/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java
index 6c954ec3df..7b5781530b 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java
@@ -24,6 +24,7 @@ import org.apache.qpid.framing.AMQShortString;
 
 import javax.jms.JMSException;
 import javax.jms.TemporaryTopic;
+import java.util.UUID;
 
 /**
  * AMQ implementation of TemporaryTopic.
@@ -38,7 +39,7 @@ class AMQTemporaryTopic extends AMQTopic implements TemporaryTopic, TemporaryDes
      */
     public AMQTemporaryTopic(AMQSession session)
     {
-        super(session.getTemporaryTopicExchangeName(),new AMQShortString("TempQueue" + Long.toString(System.currentTimeMillis())));
+        super(session.getTemporaryTopicExchangeName(),new AMQShortString("tmp_" + UUID.randomUUID()));
         _session = session;
     }
 
diff --git a/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java b/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
index 466395f7a3..5fe6ffe6c6 100644
--- a/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
+++ b/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
@@ -53,6 +53,7 @@ import javax.security.sasl.SaslClient;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.UUID;
 
 /**
  * Wrapper for protocol session that provides type-safe access to session attributes. <p/> The underlying protocol
@@ -411,14 +412,8 @@ public class AMQProtocolSession implements AMQVersionAwareProtocolSession
     protected AMQShortString generateQueueName()
     {
         int id;
-        synchronized (_queueIdLock)
-        {
-            id = _queueId++;
-        }
-        // get rid of / and : and ; from address for spec conformance
-        String localAddress = StringUtils.replaceChars(_minaProtocolSession.getLocalAddress().toString(), "/;:", "");
 
-        return new AMQShortString("tmp_" + localAddress + "_" + id);
+        return new AMQShortString("tmp_" + UUID.randomUUID());
     }
 
     /** @param delay delay in seconds (not ms) */
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
deleted file mode 100644
index 3776ff767f..0000000000
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.test.unit.client.protocol;
-
-import junit.framework.TestCase;
-
-import org.apache.mina.common.IoSession;
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.protocol.AMQProtocolHandler;
-import org.apache.qpid.client.protocol.AMQProtocolSession;
-import org.apache.qpid.framing.AMQShortString;
-
-public class AMQProtocolSessionTest extends TestCase
-{
-    private static class AMQProtSession extends AMQProtocolSession
-    {
-
-        public AMQProtSession(AMQProtocolHandler protocolHandler, IoSession protocolSession, AMQConnection connection)
-        {
-            super(protocolHandler,protocolSession,connection);
-        }
-
-        public TestIoSession getMinaProtocolSession()
-        {
-            return (TestIoSession) _minaProtocolSession;
-        }
-
-        public AMQShortString genQueueName()
-        {
-            return generateQueueName();
-        }
-    }
-
-    //private Strings for test values and expected results
-    private String _brokenAddress;
-    private String _generatedAddress;
-    private String _emptyAddress;
-    private String _generatedAddress_2;
-    private String _validAddress;
-    private String _generatedAddress_3;
-    private int _port;
-    private AMQProtSession _testSession;
-
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-
-        //don't care about the values set here apart from the dummy IoSession
-        _testSession = new AMQProtSession(null,new TestIoSession(),null);
-
-        //initialise addresses for test and expected results
-        _port = 123;
-        _brokenAddress = "tcp://myAddress;:";
-        _generatedAddress = "tmp_tcpmyAddress123_1";
-        _emptyAddress = "";
-        _generatedAddress_2 = "tmp_localhost127.0.0.1123_2";
-        _validAddress = "abc";
-        _generatedAddress_3 = "tmp_abc123_3";
-    }
-
-    public void testGenerateQueueName()
-    {
-        AMQShortString testAddress;
-
-        //test address with / and ; chars which generateQueueName should removeKey
-        _testSession.getMinaProtocolSession().setStringLocalAddress(_brokenAddress);
-        _testSession.getMinaProtocolSession().setLocalPort(_port);
-
-        testAddress = _testSession.genQueueName();
-        assertEquals("Failure when generating a queue exchange from an address with special chars",_generatedAddress,testAddress.toString());
-
-        //test empty address
-        _testSession.getMinaProtocolSession().setStringLocalAddress(_emptyAddress);
-
-        testAddress = _testSession.genQueueName();
-        assertEquals("Failure when generating a queue exchange from an empty address",_generatedAddress_2,testAddress.toString());
-
-        //test address with no special chars
-        _testSession.getMinaProtocolSession().setStringLocalAddress(_validAddress);
-
-        testAddress = _testSession.genQueueName();
-        assertEquals("Failure when generating a queue exchange from an address with no special chars",_generatedAddress_3,testAddress.toString());
-
-    }
-
-    protected void tearDown() throws Exception
-    {
-        _testSession = null;
-        _brokenAddress = null;
-        _generatedAddress = null;
-        _emptyAddress = null;
-        _generatedAddress_2 = null;
-        _validAddress = null;
-        _generatedAddress_3 = null;
-        super.tearDown();
-    }
-
-    public static junit.framework.Test suite()
-    {
-        return new junit.framework.TestSuite(AMQProtocolSessionTest.class);
-    }
-}