You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/07/24 18:45:37 UTC
[1/2] qpid-broker-j git commit: QPID-7864: Avoid Guava's 22.0
deprecation warnings - no functional change
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 7aceb5f3f -> d7a945953
QPID-7864: Avoid Guava's 22.0 deprecation warnings - no functional change
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/60087a18
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/60087a18
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/60087a18
Branch: refs/heads/master
Commit: 60087a18c1bfc5b421aee573c415d7e19e6c358c
Parents: 7aceb5f
Author: Keith Wall <ke...@gmail.com>
Authored: Fri Jul 21 20:14:54 2017 +0100
Committer: Keith Wall <ke...@gmail.com>
Committed: Fri Jul 21 20:15:51 2017 +0100
----------------------------------------------------------------------
.../qpid/server/virtualhost/AbstractVirtualHost.java | 13 +++----------
.../virtualhost/AsynchronousMessageStoreRecoverer.java | 9 +--------
2 files changed, 4 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/60087a18/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
index ea56994..0146ffd 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
@@ -66,11 +66,11 @@ import java.util.regex.PatternSyntaxException;
import javax.security.auth.Subject;
-import com.google.common.base.Function;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.JdkFutureAdapters;
import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.SettableFuture;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -1566,14 +1566,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
}
}
ListenableFuture<List<Void>> combinedFuture = Futures.allAsList(connectionCloseFutures);
- return Futures.transform(combinedFuture, new Function<List<Void>, Void>()
- {
- @Override
- public Void apply(List<Void> voids)
- {
- return null;
- }
- });
+ return Futures.transform(combinedFuture, voids -> null, MoreExecutors.directExecutor());
}
private void closeMessageStore()
@@ -2642,7 +2635,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
});
ListenableFuture<List<Void>> combinedFuture = Futures.allAsList(childOpenFutures);
- return Futures.transformAsync(combinedFuture, input -> onActivate());
+ return Futures.transformAsync(combinedFuture, input -> onActivate(), MoreExecutors.directExecutor());
}
private class FileSystemSpaceChecker extends HouseKeepingTask
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/60087a18/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java
index 595b509..0e362bc 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java
@@ -138,14 +138,7 @@ public class AsynchronousMessageStoreRecoverer implements MessageStoreRecoverer
queueRecoveryFutures.add(result);
}
ListenableFuture<List<Void>> combinedFuture = Futures.allAsList(queueRecoveryFutures);
- return Futures.transform(combinedFuture, new Function<List<?>, Void>()
- {
- @Override
- public Void apply(List<?> voids)
- {
- return null;
- }
- });
+ return Futures.transform(combinedFuture, voids -> null, MoreExecutors.directExecutor());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-broker-j git commit: NO-JIRA: [Protocol Tests] Make
FrameTransport's timeout configurable
Posted by kw...@apache.org.
NO-JIRA: [Protocol Tests] Make FrameTransport's timeout configurable
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/d7a94595
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/d7a94595
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/d7a94595
Branch: refs/heads/master
Commit: d7a945953f082c1e975cab02819f1d74c12088e5
Parents: 60087a1
Author: Keith Wall <ke...@gmail.com>
Authored: Mon Jul 24 19:44:25 2017 +0100
Committer: Keith Wall <ke...@gmail.com>
Committed: Mon Jul 24 19:44:34 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/qpid/tests/protocol/v1_0/FrameTransport.java | 2 +-
.../src/main/java/org/apache/qpid/tests/protocol/v1_0/Utils.java | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d7a94595/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/FrameTransport.java
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/FrameTransport.java b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/FrameTransport.java
index 8746941..4cb0ccb 100644
--- a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/FrameTransport.java
+++ b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/FrameTransport.java
@@ -59,7 +59,7 @@ import org.apache.qpid.server.protocol.v1_0.type.transport.Transfer;
public class FrameTransport implements AutoCloseable
{
- public static final long RESPONSE_TIMEOUT = 6000;
+ public static final long RESPONSE_TIMEOUT = Long.getLong("qpid.tests.protocol.frameTransport.responseTimeout",6000);
private static final Response CHANNEL_CLOSED_RESPONSE = new ChannelClosedResponse();
private final BlockingQueue<Response<?>> _queue = new ArrayBlockingQueue<>(1000);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d7a94595/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/Utils.java
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/Utils.java b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/Utils.java
index f0373f5..7fa98c5 100644
--- a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/Utils.java
+++ b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/Utils.java
@@ -20,10 +20,6 @@
package org.apache.qpid.tests.protocol.v1_0;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-
import java.net.InetSocketAddress;
import java.util.List;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org