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/01/14 17:28:00 UTC
qpid-jms git commit: Remove these leftover bits from old client work,
the adviusory stuff would need to be figured out via some management
spec probably.
Repository: qpid-jms
Updated Branches:
refs/heads/master b8d40c2c1 -> d041eccd2
Remove these leftover bits from old client work, the adviusory stuff
would need to be figured out via some management spec probably.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/d041eccd
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/d041eccd
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/d041eccd
Branch: refs/heads/master
Commit: d041eccd2c815732cb4d93e6b2d77e1b1442245f
Parents: b8d40c2
Author: Timothy Bish <ta...@gmail.com>
Authored: Wed Jan 14 11:22:00 2015 -0500
Committer: Timothy Bish <ta...@gmail.com>
Committed: Wed Jan 14 11:22:00 2015 -0500
----------------------------------------------------------------------
.../java/org/apache/qpid/jms/JmsConnection.java | 18 +----------------
.../apache/qpid/jms/meta/JmsConnectionInfo.java | 21 --------------------
.../qpid/jms/meta/JmsConnectionInfoTest.java | 4 ----
3 files changed, 1 insertion(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/d041eccd/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 e16b990..39ece2f 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
@@ -490,6 +490,7 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
if (transacted) {
result = Session.SESSION_TRANSACTED;
}
+
return result;
}
@@ -521,12 +522,6 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
this.connectionInfo = createResource(connectionInfo);
this.connected.set(true);
-
- // TODO - Advisory Support.
- //
- // Providers should have an interface for adding a listener for temporary
- // destination advisory messages for create / destroy so we can track them
- // and throw exceptions when producers try to send to deleted destinations.
}
}
@@ -977,15 +972,6 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
return this.connectionInfo.getConnectionId();
}
- //TODO: unused? remove?
- public boolean isWatchRemoteDestinations() {
- return this.connectionInfo.isWatchRemoteDestinations();
- }
- //TODO: unused? remove?
- public void setWatchRemoteDestinations(boolean watchRemoteDestinations) {
- this.connectionInfo.setWatchRemoteDestinations(watchRemoteDestinations);
- }
-
public JmsMessageFactory getMessageFactory() {
if (messageFactory == null) {
throw new RuntimeException("Message factory should never be null");
@@ -1033,8 +1019,6 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
@Override
public void onConnectionRecovery(Provider provider) throws Exception {
- // TODO - Recover Advisory Consumer once we can support it.
-
LOG.debug("Connection {} is starting recovery.", connectionInfo.getConnectionId());
ProviderFuture request = new ProviderFuture();
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/d041eccd/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 fc101af..93e6537 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
@@ -32,13 +32,11 @@ public final class JmsConnectionInfo implements JmsResource, Comparable<JmsConne
private final JmsConnectionId connectionId;
private String clientId;
- private String clientIp;
private String username;
private String password;
private boolean forceAsyncSend;
private boolean alwaysSyncSend;
private boolean omitHost;
- private boolean watchRemoteDestinations;
public long sendTimeout = DEFAULT_SEND_TIMEOUT;
public long requestTimeout = DEFAULT_REQUEST_TIMEOUT;
public long connectTimeout = DEFAULT_CONNECT_TIMEOUT;
@@ -64,7 +62,6 @@ public final class JmsConnectionInfo implements JmsResource, Comparable<JmsConne
copy.clientId = clientId;
copy.username = username;
copy.password = password;
- copy.clientIp = clientIp;
copy.forceAsyncSend = forceAsyncSend;
copy.alwaysSyncSend = alwaysSyncSend;
copy.omitHost = omitHost;
@@ -103,14 +100,6 @@ public final class JmsConnectionInfo implements JmsResource, Comparable<JmsConne
public void setClientId(String clientId) {
this.clientId = clientId;
}
- //TODO: unused? remove?
- public String getClientIp() {
- return clientIp;
- }
- //TODO: unused? remove?
- public void setClientIp(String clientIp) {
- this.clientIp = clientIp;
- }
public String getUsername() {
return username;
@@ -184,16 +173,6 @@ public final class JmsConnectionInfo implements JmsResource, Comparable<JmsConne
this.requestTimeout = requestTimeout;
}
- //TODO: unused? remove?
- public boolean isWatchRemoteDestinations() {
- return watchRemoteDestinations;
- }
-
- //TODO: unused? remove?
- public void setWatchRemoteDestinations(boolean watchRemoteDestinations) {
- this.watchRemoteDestinations = watchRemoteDestinations;
- }
-
@Override
public String toString() {
return ToStringSupport.toString(this);
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/d041eccd/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionInfoTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionInfoTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionInfoTest.java
index 75bc241..643b28d 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionInfoTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionInfoTest.java
@@ -62,7 +62,6 @@ public class JmsConnectionInfoTest {
info.setAlwaysSyncSend(true);
info.setClientId("test");
- info.setClientIp("127.0.0.1");
info.setCloseTimeout(100);
info.setConnectTimeout(200);
info.setForceAsyncSends(true);
@@ -73,13 +72,11 @@ public class JmsConnectionInfoTest {
info.setSendTimeout(150);
info.setTopicPrefix("topic");
info.setUsername("user");
- info.setWatchRemoteDestinations(false);
JmsConnectionInfo copy = info.copy();
assertEquals(true, copy.isAlwaysSyncSend());
assertEquals("test", copy.getClientId());
- assertEquals("127.0.0.1", copy.getClientIp());
assertEquals(100, copy.getCloseTimeout());
assertEquals(200, copy.getConnectTimeout());
assertEquals(true, copy.isForceAsyncSend());
@@ -90,7 +87,6 @@ public class JmsConnectionInfoTest {
assertEquals(150, copy.getSendTimeout());
assertEquals("topic", copy.getTopicPrefix());
assertEquals("user", copy.getUsername());
- assertEquals(false, copy.isWatchRemoteDestinations());
assertEquals(info, copy);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org