You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2015/09/23 22:43:19 UTC

qpid-jms git commit: QPIDJMS-109 Remove some unused bits from the resource id object.

Repository: qpid-jms
Updated Branches:
  refs/heads/master 689bd88b7 -> ed1dd4116


QPIDJMS-109 Remove some unused bits from the resource id object.

Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/ed1dd411
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/ed1dd411
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/ed1dd411

Branch: refs/heads/master
Commit: ed1dd4116a4ccd9892a8660d785a23c6b2b223b2
Parents: 689bd88
Author: Timothy Bish <ta...@gmail.com>
Authored: Wed Sep 23 16:43:09 2015 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Wed Sep 23 16:43:09 2015 -0400

----------------------------------------------------------------------
 .../apache/qpid/jms/meta/JmsAbstractResourceId.java | 11 -----------
 .../org/apache/qpid/jms/meta/JmsResourceId.java     | 16 ----------------
 .../apache/qpid/jms/meta/JmsConnectionIdTest.java   |  5 -----
 .../org/apache/qpid/jms/meta/JmsConsumerIdTest.java |  1 -
 .../org/apache/qpid/jms/meta/JmsProducerIdTest.java |  1 -
 .../org/apache/qpid/jms/meta/JmsSessionIdTest.java  |  1 -
 .../apache/qpid/jms/meta/JmsTransactionIdTest.java  |  1 -
 7 files changed, 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/ed1dd411/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsAbstractResourceId.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsAbstractResourceId.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsAbstractResourceId.java
index 93248dd..549e4c9 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsAbstractResourceId.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsAbstractResourceId.java
@@ -22,7 +22,6 @@ package org.apache.qpid.jms.meta;
 public abstract class JmsAbstractResourceId implements JmsResourceId {
 
     protected transient Object providerHint;
-    protected transient Object providerId;
     protected transient int hashCode;
 
     @Override
@@ -34,14 +33,4 @@ public abstract class JmsAbstractResourceId implements JmsResourceId {
     public Object getProviderHint() {
         return providerHint;
     }
-
-    @Override
-    public void setProviderId(Object id) {
-        this.providerId = id;
-    }
-
-    @Override
-    public Object getProviderId() {
-        return providerId;
-    }
 }

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/ed1dd411/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsResourceId.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsResourceId.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsResourceId.java
index 32ee783..5dd4361 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsResourceId.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsResourceId.java
@@ -37,20 +37,4 @@ public interface JmsResourceId {
      */
     Object getProviderHint();
 
-    /**
-     * Allows a provider to set it's own internal Id object for this resource
-     * in the case where the JMS framework Id cannot be used directly by the
-     * Provider implementation.
-     *
-     * @param id
-     */
-    void setProviderId(Object id);
-
-    /**
-     * Returns the previously stored Provider Id value.
-     *
-     * @return the previously stored Provider Id value.
-     */
-    Object getProviderId();
-
 }

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/ed1dd411/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionIdTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionIdTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionIdTest.java
index 6164fb1..1cacc33 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionIdTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionIdTest.java
@@ -78,7 +78,6 @@ public class JmsConnectionIdTest {
         JmsConnectionId id = new JmsConnectionId(firstId);
         assertNotNull(id.getValue());
         assertNull(id.getProviderHint());
-        assertNull(id.getProviderId());
     }
 
     @Test
@@ -86,16 +85,12 @@ public class JmsConnectionIdTest {
         JmsConnectionId id = new JmsConnectionId(firstId);
         assertNotNull(id.getValue());
         assertNull(id.getProviderHint());
-        assertNull(id.getProviderId());
 
         String hint = new String("hint");
-        String pid = new String("id");
 
         id.setProviderHint(hint);
-        id.setProviderId(pid);
 
         assertEquals(hint, id.getProviderHint());
-        assertEquals(pid, id.getProviderId());
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/ed1dd411/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConsumerIdTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConsumerIdTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConsumerIdTest.java
index 64480de..e27cea7 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConsumerIdTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConsumerIdTest.java
@@ -78,7 +78,6 @@ public class JmsConsumerIdTest {
         JmsConsumerId id = new JmsConsumerId(firstId, 1);
         assertNotNull(id.getValue());
         assertNull(id.getProviderHint());
-        assertNull(id.getProviderId());
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/ed1dd411/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsProducerIdTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsProducerIdTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsProducerIdTest.java
index 6621fa1..0bab725 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsProducerIdTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsProducerIdTest.java
@@ -78,7 +78,6 @@ public class JmsProducerIdTest {
         JmsProducerId id = new JmsProducerId(firstId, 1);
         assertNotNull(id.getValue());
         assertNull(id.getProviderHint());
-        assertNull(id.getProviderId());
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/ed1dd411/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsSessionIdTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsSessionIdTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsSessionIdTest.java
index 2baaf6d..fa0c0dd 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsSessionIdTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsSessionIdTest.java
@@ -78,7 +78,6 @@ public class JmsSessionIdTest {
         JmsSessionId id = new JmsSessionId(firstId, 1);
         assertNotNull(id.getValue());
         assertNull(id.getProviderHint());
-        assertNull(id.getProviderId());
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/ed1dd411/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsTransactionIdTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsTransactionIdTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsTransactionIdTest.java
index 9dcde87..effe5a7 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsTransactionIdTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsTransactionIdTest.java
@@ -54,7 +54,6 @@ public class JmsTransactionIdTest {
         assertEquals(firstId, id.getConnectionId());
         assertNotNull(id.getValue());
         assertNull(id.getProviderHint());
-        assertNull(id.getProviderId());
     }
 
     @Test


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org