Merge remote-tracking branch 'upstream/main'

Conflicts: protonj2/src/main/java/org/apache/qpid/protonj2/buffer/netty/ProtonBufferToNetty5Adapter.java
rabbitmq · Sep 23, 2024 · 0aabfc2 · 0aabfc2
2 parents 68e7208 + aec6228
commit 0aabfc2
Show file tree

Hide file tree

Showing 48 changed files with 132 additions and 11,616 deletions.
diff --git a/apache-qpid-protonj2/pom.xml b/apache-qpid-protonj2/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>protonj2-parent</artifactId>
-    <version>1.0.0-M22-SNAPSHOT</version>
+    <version>1.0.0-M23-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.apache.qpid</groupId>
   <artifactId>protonj2-parent</artifactId>
-  <version>1.0.0-M22-SNAPSHOT</version>
+  <version>1.0.0-M23-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Qpid ProtonJ2 Parent</name>
@@ -48,7 +48,6 @@
     <hamcrest.version>3.0</hamcrest.version>
     <netty.version>4.1.113.Final</netty.version>
     <netty.iouring.version>0.0.25.Final</netty.iouring.version>
-    <netty5.version>5.0.0.Alpha5</netty5.version>
     <netty.tcnative.version>2.0.66.Final</netty.tcnative.version>
 
     <!-- Plugin versions -->
@@ -64,15 +63,10 @@
     <netty-transport-native-epoll-classifier>linux-x86_64</netty-transport-native-epoll-classifier>
     <netty-transport-native-kqueue-classifier>osx-x86_64</netty-transport-native-kqueue-classifier>
 
-    <netty5-scope>provided</netty5-scope>
-    <netty5-transport-native-io-uring-classifier>linux-x86_64</netty5-transport-native-io-uring-classifier>
-    <netty5-transport-native-epoll-classifier>linux-x86_64</netty5-transport-native-epoll-classifier>
-    <netty5-transport-native-kqueue-classifier>osx-x86_64</netty5-transport-native-kqueue-classifier>
-
     <!-- surefire forked jvm arguments -->
     <argLine>-Xmx2g -enableassertions ${jacoco-config}</argLine>
 
-    <project.build.outputTimestamp>2024-07-15T21:17:57Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-09-17T16:16:12Z</project.build.outputTimestamp>
   </properties>
 
   <url>https://qpid.apache.org/proton</url>
@@ -170,44 +164,6 @@
         <version>${netty.iouring.version}</version>
         <classifier>${netty-transport-native-io-uring-classifier}</classifier>
       </dependency>
-      <!--  Netty 5 Dependencies-->
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty5-buffer</artifactId>
-        <version>${netty5.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty5-common</artifactId>
-        <version>${netty5.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty5-handler</artifactId>
-        <version>${netty5.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty5-transport</artifactId>
-        <version>${netty5.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty5-codec-http</artifactId>
-        <version>${netty5.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty5-transport-native-epoll</artifactId>
-        <version>${netty5.version}</version>
-        <classifier>${netty-transport-native-epoll-classifier}</classifier>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty5-transport-native-kqueue</artifactId>
-        <version>${netty5.version}</version>
-        <classifier>${netty-transport-native-kqueue-classifier}</classifier>
-      </dependency>
       <!--  Testing only Uber Jar inclusion -->
       <dependency>
          <groupId>io.netty</groupId>

diff --git a/protonj2-client-docs/pom.xml b/protonj2-client-docs/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>protonj2-parent</artifactId>
-    <version>1.0.0-M22-SNAPSHOT</version>
+    <version>1.0.0-M23-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/protonj2-client-examples/pom.xml b/protonj2-client-examples/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>protonj2-parent</artifactId>
-    <version>1.0.0-M22-SNAPSHOT</version>
+    <version>1.0.0-M23-SNAPSHOT</version>
   </parent>
 
   <artifactId>protonj2-client-examples</artifactId>

diff --git a/protonj2-client/pom.xml b/protonj2-client/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>protonj2-parent</artifactId>
-    <version>1.0.0-M22-SNAPSHOT</version>
+    <version>1.0.0-M23-SNAPSHOT</version>
   </parent>
 
   <artifactId>protonj2-client</artifactId>
@@ -83,44 +83,6 @@
       <classifier>${netty-transport-native-kqueue-classifier}</classifier>
       <scope>${netty-scope}</scope>
     </dependency>
-    <!-- Netty 5 Development dependencies -->
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty5-buffer</artifactId>
-      <scope>${netty5-scope}</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty5-common</artifactId>
-      <scope>${netty5-scope}</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty5-handler</artifactId>
-      <scope>${netty5-scope}</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty5-transport</artifactId>
-      <scope>${netty5-scope}</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty5-codec-http</artifactId>
-      <scope>${netty5-scope}</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty5-transport-native-epoll</artifactId>
-      <classifier>${netty-transport-native-epoll-classifier}</classifier>
-      <scope>${netty5-scope}</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty5-transport-native-kqueue</artifactId>
-      <classifier>${netty5-transport-native-kqueue-classifier}</classifier>
-      <scope>${netty5-scope}</scope>
-    </dependency>
     <!-- Test dependencies -->
     <dependency>
       <groupId>org.apache.qpid</groupId>

diff --git a/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/impl/ClientDeliveryState.java b/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/impl/ClientDeliveryState.java
@@ -217,7 +217,7 @@ public ClientRejected(String condition, String description, Map<String, Object>
 
         @Override
         public Type getType() {
-            return Type.RELEASED;
+            return Type.REJECTED;
         }
 
         @Override
@@ -240,7 +240,9 @@ public static class ClientModified extends ClientDeliveryState {
         ClientModified(Modified modified) {
             this.modified.setDeliveryFailed(modified.isDeliveryFailed());
             this.modified.setUndeliverableHere(modified.isUndeliverableHere());
-            this.modified.setMessageAnnotations(new LinkedHashMap<>(modified.getMessageAnnotations()));
+            if (modified.getMessageAnnotations() != null) {
+                this.modified.setMessageAnnotations(new LinkedHashMap<>(modified.getMessageAnnotations()));
+            }
         }
 
         /**

diff --git a/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/transport/IOContext.java b/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/transport/IOContext.java
@@ -21,8 +21,6 @@
 import org.apache.qpid.protonj2.client.TransportOptions;
 import org.apache.qpid.protonj2.client.transport.netty4.Netty4IOContext;
 import org.apache.qpid.protonj2.client.transport.netty4.Netty4Support;
-import org.apache.qpid.protonj2.client.transport.netty5.Netty5IOContext;
-import org.apache.qpid.protonj2.client.transport.netty5.Netty5Support;
 import org.apache.qpid.protonj2.engine.Scheduler;
 
 /**
@@ -69,8 +67,6 @@ public interface IOContext {
     static IOContext create(TransportOptions options, SslOptions sslOptions, String ioThreadName) {
         if (Netty4Support.isAvailable()) {
             return new Netty4IOContext(options, sslOptions, ioThreadName);
-        } else if (Netty5Support.isAvailable()) {
-            return new Netty5IOContext(options, sslOptions, ioThreadName);
         }
 
         throw new UnsupportedOperationException("Netty not available on the class path");

diff --git a/...2-client/src/main/java/org/apache/qpid/protonj2/client/transport/netty5/EpollSupport.java b/...2-client/src/main/java/org/apache/qpid/protonj2/client/transport/netty5/EpollSupport.java
diff --git a/...client/src/main/java/org/apache/qpid/protonj2/client/transport/netty5/IOUringSupport.java b/...client/src/main/java/org/apache/qpid/protonj2/client/transport/netty5/IOUringSupport.java
diff --git a/...-client/src/main/java/org/apache/qpid/protonj2/client/transport/netty5/KQueueSupport.java b/...-client/src/main/java/org/apache/qpid/protonj2/client/transport/netty5/KQueueSupport.java