[qpid-broker-j] branch dependabot/maven/io.netty-netty-handler-4.1.94.Final created (now 81af238182)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/io.netty-netty-handler-4.1.94.Final in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git at 81af238182 Bump netty-handler from 4.1.90.Final to 4.1.94.Final No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-protonj2] branch dependabot/maven/io.netty-netty-handler-4.1.94.Final created (now df75d938)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/io.netty-netty-handler-4.1.94.Final in repository https://gitbox.apache.org/repos/asf/qpid-protonj2.git at df75d938 Bump netty-handler from 4.1.93.Final to 4.1.94.Final No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-jms] branch dependabot/maven/io.netty-netty-handler-4.1.94.Final created (now 56081295)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/io.netty-netty-handler-4.1.94.Final in repository https://gitbox.apache.org/repos/asf/qpid-jms.git at 56081295 Bump netty-handler from 4.1.93.Final to 4.1.94.Final No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-protonj2] branch main updated (f456aea6 -> e072bb78)
This is an automated email from the ASF dual-hosted git repository. tabish pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/qpid-protonj2.git from f456aea6 PROTON-2739 Update the AmqpValue matcher to handle map order add e072bb78 PROTON-2740 Update to netty 4.1.94.Final No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-protonj2] branch main updated (e072bb78 -> d3ff5493)
This is an automated email from the ASF dual-hosted git repository. tabish pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/qpid-protonj2.git from e072bb78 PROTON-2740 Update to netty 4.1.94.Final add d3ff5493 PROTON-2734 Update Mockito to 3.4.0 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-protonj2] branch main updated: PROTON-2739 Add some extra API for the Attach injection type
This is an automated email from the ASF dual-hosted git repository.
tabish pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-protonj2.git
The following commit(s) were added to refs/heads/main by this push:
new a1609a75 PROTON-2739 Add some extra API for the Attach injection type
a1609a75 is described below
commit a1609a750933b11764d4d6da0d469a2848b09b23
Author: Timothy Bish
AuthorDate: Tue Jun 20 16:21:38 2023 -0400
PROTON-2739 Add some extra API for the Attach injection type
Allows for simpler test writing where the API names provide the values
for enumeration types and string / symbol entries.
---
.../test/driver/actions/AttachInjectAction.java| 100 +
1 file changed, 100 insertions(+)
diff --git
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/actions/AttachInjectAction.java
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/actions/AttachInjectAction.java
index 2ced891c..3914edd9 100644
---
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/actions/AttachInjectAction.java
+++
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/actions/AttachInjectAction.java
@@ -23,6 +23,10 @@ import java.util.UUID;
import org.apache.qpid.protonj2.test.driver.AMQPTestDriver;
import org.apache.qpid.protonj2.test.driver.SessionTracker;
+import org.apache.qpid.protonj2.test.driver.codec.messaging.DeleteOnClose;
+import org.apache.qpid.protonj2.test.driver.codec.messaging.DeleteOnNoLinks;
+import
org.apache.qpid.protonj2.test.driver.codec.messaging.DeleteOnNoLinksOrMessages;
+import org.apache.qpid.protonj2.test.driver.codec.messaging.DeleteOnNoMessages;
import org.apache.qpid.protonj2.test.driver.codec.messaging.Outcome;
import org.apache.qpid.protonj2.test.driver.codec.messaging.Source;
import org.apache.qpid.protonj2.test.driver.codec.messaging.Target;
@@ -372,11 +376,39 @@ public class AttachInjectAction extends
AbstractPerformativeInjectAction
return this;
}
+public SourceBuilder withDurabilityOfNone() {
+return withDurability(TerminusDurability.NONE);
+}
+
+public SourceBuilder withDurabilityOfConfiguration() {
+return withDurability(TerminusDurability.CONFIGURATION);
+}
+
+public SourceBuilder withDurabilityOfUnsettledState() {
+return withDurability(TerminusDurability.UNSETTLED_STATE);
+}
+
public SourceBuilder withDurability(TerminusDurability durability) {
source.setDurable(durability.getValue());
return this;
}
+public SourceBuilder withExpiryPolicyOnConnectionClose() {
+return withExpiryPolicy(TerminusExpiryPolicy.CONNECTION_CLOSE);
+}
+
+public SourceBuilder withExpiryPolicyOnSessionEnd() {
+return withExpiryPolicy(TerminusExpiryPolicy.SESSION_END);
+}
+
+public SourceBuilder withExpiryPolicyOnLinkDetach() {
+return withExpiryPolicy(TerminusExpiryPolicy.LINK_DETACH);
+}
+
+public SourceBuilder withExpiryPolicyOfNever() {
+return withExpiryPolicy(TerminusExpiryPolicy.NEVER);
+}
+
public SourceBuilder withExpiryPolicy(TerminusExpiryPolicy
expiryPolicy) {
source.setExpiryPolicy(expiryPolicy.getPolicy());
return this;
@@ -430,6 +462,30 @@ public class AttachInjectAction extends
AbstractPerformativeInjectAction
return this;
}
+public SourceBuilder withLifetimePolicyOfDeleteOnClose() {
+return withDynamicNodeProperty("lifetime-policy", new
DeleteOnClose());
+}
+
+public SourceBuilder withLifetimePolicyOfDeleteOnNoLinks() {
+return withDynamicNodeProperty("lifetime-policy", new
DeleteOnNoLinks());
+}
+
+public SourceBuilder withLifetimePolicyOfDeleteOnNoLinksOrMessages() {
+return withDynamicNodeProperty("lifetime-policy", new
DeleteOnNoLinksOrMessages());
+}
+
+public SourceBuilder withLifetimePolicyOfDeleteOnNoNoMessages() {
+return withDynamicNodeProperty("lifetime-policy", new
DeleteOnNoMessages());
+}
+
+public SourceBuilder withDistributionModeOfCopy() {
+return withDistributionMode("COPY");
+}
+
+public SourceBuilder withDistributionModeOfMove() {
+return withDistributionMode("MOVE");
+}
+
public SourceBuilder withDistributionMode(String mode) {
source.setDistributionMode(Symbol.valueOf(mode));
return this;
@@ -502,11 +558,39 @@ public class AttachInjectAction extends
AbstractPerformativeInjectAction
return this;
}
+public TargetBuilder withDurabilityOfNone() {
+return withDurability(TerminusDurability.NONE);
+}
+
+public TargetBuild
[qpid-protonj2] branch main updated: PROTON-2744 Ensure the test peer client shuts down its event loop
This is an automated email from the ASF dual-hosted git repository.
tabish pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-protonj2.git
The following commit(s) were added to refs/heads/main by this push:
new a35e8ccc PROTON-2744 Ensure the test peer client shuts down its event
loop
a35e8ccc is described below
commit a35e8cccdaed41a2cd0efb296f58990741d71d77
Author: Timothy Bish
AuthorDate: Tue Jun 20 18:01:14 2023 -0400
PROTON-2744 Ensure the test peer client shuts down its event loop
The event loops created for the client in the test peer should be closed
immediately on channel close.
---
.../protonj2/test/driver/netty/netty4/Netty4Client.java | 13 +
.../protonj2/test/driver/netty/netty5/Netty5Client.java | 13 +
2 files changed, 26 insertions(+)
diff --git
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/netty/netty4/Netty4Client.java
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/netty/netty4/Netty4Client.java
index 1db99dc2..2f2eddca 100644
---
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/netty/netty4/Netty4Client.java
+++
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/netty/netty4/Netty4Client.java
@@ -80,6 +80,7 @@ public final class Netty4Client implements NettyClient {
private static final Logger LOG =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String AMQP_SUB_PROTOCOL = "amqp";
+private static final int SHUTDOWN_TIMEOUT = 50;
private Netty4EventLoop eventLoop;
private Bootstrap bootstrap;
@@ -122,6 +123,18 @@ public final class Netty4Client implements NettyClient {
LOG.debug("Close of channel interrupted while awaiting
result");
}
}
+
+if (group != null && !group.isShutdown()) {
+group.shutdownGracefully(0, SHUTDOWN_TIMEOUT,
TimeUnit.MILLISECONDS);
+try {
+if (!group.awaitTermination(2 * SHUTDOWN_TIMEOUT,
TimeUnit.MILLISECONDS)) {
+LOG.trace("Connection IO Event Loop shutdown failed to
complete in allotted time");
+}
+} catch (InterruptedException e) {
+Thread.interrupted();
+LOG.debug("Shutdown of netty event loop interrupted while
awaiting result");
+}
+}
}
}
diff --git
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/netty/netty5/Netty5Client.java
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/netty/netty5/Netty5Client.java
index bc8a0925..a9d3e16a 100644
---
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/netty/netty5/Netty5Client.java
+++
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/netty/netty5/Netty5Client.java
@@ -79,6 +79,7 @@ public final class Netty5Client implements NettyClient {
private static final Logger LOG =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String AMQP_SUB_PROTOCOL = "amqp";
+private static final int SHUTDOWN_TIMEOUT = 50;
private Netty5EventLoop eventLoop;
private Bootstrap bootstrap;
@@ -121,6 +122,18 @@ public final class Netty5Client implements NettyClient {
LOG.debug("Close of channel interrupted while awaiting
result");
}
}
+
+if (group != null && !group.isShutdown()) {
+group.shutdownGracefully(0, SHUTDOWN_TIMEOUT,
TimeUnit.MILLISECONDS);
+try {
+if (!group.awaitTermination(2 * SHUTDOWN_TIMEOUT,
TimeUnit.MILLISECONDS)) {
+LOG.trace("Connection IO Event Loop shutdown failed to
complete in allotted time");
+}
+} catch (InterruptedException e) {
+Thread.interrupted();
+LOG.debug("Shutdown of netty event loop interrupted while
awaiting result");
+}
+}
}
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
