Merge branch 'main' into more_algos

Author: DmitriyMusatkin

.github/workflows/ci.yml

@@ -202,7 +202,7 @@ jobs:
         python builder.pyz build -p ${{ env.PACKAGE_NAME }} downstream
 
   macos:
-    runs-on: macos-14 #latest
+    runs-on: macos-15 #latest
     steps:
     - uses: aws-actions/configure-aws-credentials@v4
       with:
@@ -220,7 +220,7 @@ jobs:
         python3 codebuild/macos_compatibility_check.py
 
   macos-x64:
-    runs-on: macos-14-large #latest
+    runs-on: macos-15-large #latest
     steps:
     - uses: aws-actions/configure-aws-credentials@v4
       with:
@@ -287,7 +287,7 @@ jobs:
 
 
   localhost-test-macos:
-    runs-on: macos-14 # latest
+    runs-on: macos-15 # latest
     steps:
     - uses: aws-actions/configure-aws-credentials@v4
       with:

src/main/java/software/amazon/awssdk/crt/CRT.java

@@ -492,16 +492,16 @@ private static native void awsCrtInit(int memoryTracingLevel, boolean debugWait,
      * Given an error code, get a boolean to check if an error is transient or not.
      *
      * Transient errors are defined as IO level errors where we are unable to read an HTTP response.
-     * This can occur due to connect timeouts, read timeouts, or the server closing the connection without 
+     * This can occur due to connect timeouts, read timeouts, or the server closing the connection without
      * sending a response. This method helps identify CRT error codes that are not generic or widely adopted.
      *
-     * This is not the complete logic to identify transient or retryable errors, this includes only IO level 
+     * This is not the complete logic to identify transient or retryable errors, this includes only IO level
      * errors that are transient.
      *
      * @param errorCode An error code returned from an exception or other native function call
      * @return A boolean for if the error is transient or not
      */
-    public static native Boolean awsIsTransientError(int errorCode);
+    public static native boolean awsIsTransientError(int errorCode);
 
     /**
      * @return The number of bytes allocated in native resources. If

src/main/java/software/amazon/awssdk/crt/http/Http2StreamManager.java

@@ -123,6 +123,7 @@ private Http2StreamManager(Http2StreamManagerOptions options) {
                 maxConnections,
                 idealConcurrentStreamsPerConnection,
                 maxConcurrentStreamsPerConnection,
+                options.getMaxConcurrentStreams(),
                 options.hasPriorKnowledge(),
                 options.shouldCloseConnectionOnServerError(),
                 options.getConnectionPingPeriodMs(),
@@ -265,6 +266,7 @@ private static native long http2StreamManagerNew(Http2StreamManager thisObj,
             int maxConns,
             int ideal_concurrent_streams_per_connection,
             int max_concurrent_streams_per_connection,
+            int max_concurrent_streams,
             boolean priorKnowledge,
             boolean closeConnectionOnServerError,
             int connectionPingPeriodMs,

src/main/java/software/amazon/awssdk/crt/http/Http2StreamManagerOptions.java

@@ -9,9 +9,7 @@
  * instance
  */
 public class Http2StreamManagerOptions {
-    public static final int DEFAULT_MAX_WINDOW_SIZE = Integer.MAX_VALUE;
     public static final int DEFAULT_MAX = Integer.MAX_VALUE;
-    public static final int DEFAULT_MAX_CONNECTIONS = 2;
     public static final int DEFAULT_CONNECTION_PING_TIMEOUT_MS = 3000;
     private static final String HTTPS = "https";
 
@@ -20,6 +18,7 @@ public class Http2StreamManagerOptions {
     private int idealConcurrentStreamsPerConnection = 100;
     private boolean connectionManualWindowManagement = false;
     private int maxConcurrentStreamsPerConnection = DEFAULT_MAX;
+    private int maxConcurrentStreams = 0;
 
     private boolean priorKnowledge = false;
     private boolean closeConnectionOnServerError = false;
@@ -108,6 +107,28 @@ public int getMaxConcurrentStreamsPerConnection() {
         return maxConcurrentStreamsPerConnection;
     }
 
+    /**
+     * The max number of concurrent streams that can be active across all connections
+     * at the same time. 0 means no limit (default). When this limit is reached, the
+     * stream manager will wait for existing streams to complete before creating new
+     * ones, even if connections have available capacity.
+     *
+     * @param maxConcurrentStreams The max number of concurrent streams across all connections
+     * @return this
+     */
+    public Http2StreamManagerOptions withMaxConcurrentStreams(int maxConcurrentStreams) {
+        this.maxConcurrentStreams = maxConcurrentStreams;
+        return this;
+    }
+
+    /**
+     * @return The max number of concurrent streams across all connections.
+     *         0 means no limit (default).
+     */
+    public int getMaxConcurrentStreams() {
+        return maxConcurrentStreams;
+    }
+
     /**
      * @return The connection level manual flow control enabled or not.
      */

src/main/java/software/amazon/awssdk/crt/http/HttpStreamBase.java

@@ -5,11 +5,7 @@
 
 package software.amazon.awssdk.crt.http;
 
-import software.amazon.awssdk.crt.CRT;
 import software.amazon.awssdk.crt.CrtResource;
-import software.amazon.awssdk.crt.CrtRuntimeException;
-
-import java.util.concurrent.CompletableFuture;
 
 /**
  * An base class represents a single Http Request/Response for both HTTP/1.1 and
@@ -100,6 +96,22 @@ public int getResponseStatusCode() {
         throw new IllegalStateException("Can't get Status Code on Closed Stream");
     }
 
+    /**
+     * Cancels the stream with the default error code (AWS_ERROR_HTTP_STREAM_CANCELLED).
+     * <p>
+     * For HTTP/1.1 streams, this is equivalent to closing the connection.
+     * For HTTP/2 streams, this sends a RST_STREAM frame with AWS_HTTP2_ERR_CANCEL.
+     * <p>
+     * The stream will complete with AWS_ERROR_HTTP_STREAM_CANCELLED, unless the stream is
+     * already completing for other reasons, or the stream is not activated,
+     * in which case this call will have no effect.
+     */
+    public void cancel() {
+        if (!isNull()) {
+            httpStreamBaseCancelDefaultError(getNativeHandle());
+        }
+    }
+
     /*******************************************************************************
      * Native methods
      ******************************************************************************/
@@ -111,4 +123,6 @@ public int getResponseStatusCode() {
     private static native void httpStreamBaseActivate(long http_stream, HttpStreamBase streamObj);
 
     private static native int httpStreamBaseGetResponseStatusCode(long http_stream);
+
+    private static native void httpStreamBaseCancelDefaultError(long http_stream);
 }

src/main/java/software/amazon/awssdk/crt/io/TlsCipherPreference.java

@@ -76,7 +76,12 @@ public enum TlsCipherPreference {
      * This security policy was the system default before PQ was enabled by default, specifically
      * aws-c-io's AWS_IO_TLS_CIPHER_PREF_TLSV1_0_2023_06.
      */
-    TLS_CIPHER_PREF_TLSv1_0_2023(10);
+    TLS_CIPHER_PREF_TLSv1_0_2023(10),
+
+    /**
+     * The latest recommended non-Post-quantum enabled TLS Policy. This policy may change over time.
+     */
+    TLS_CIPHER_NON_PQ_DEFAULT(11);
 
     private int val;
 

src/native/crt.c

@@ -709,7 +709,7 @@ void JNICALL Java_software_amazon_awssdk_crt_CRT_awsCrtInit(
 }
 
 JNIEXPORT
-bool JNICALL
+jboolean JNICALL
     Java_software_amazon_awssdk_crt_CRT_awsIsTransientError(JNIEnv *env, jclass jni_crt_class, jint error_code) {
     (void)env;
     (void)jni_crt_class;

src/native/http2_stream_manager.c

@@ -113,6 +113,7 @@ JNIEXPORT jlong JNICALL Java_software_amazon_awssdk_crt_http_Http2StreamManager_
     jint jni_max_conns,
     jint jni_ideal_concurrent_streams_per_connection,
     jint jni_max_concurrent_streams_per_connection,
+    jint jni_max_concurrent_streams,
     jboolean jni_prior_knowledge,
     jboolean jni_close_connection_on_server_error,
     jint jni_connection_ping_period_ms,
@@ -207,6 +208,7 @@ JNIEXPORT jlong JNICALL Java_software_amazon_awssdk_crt_http_Http2StreamManager_
         .ideal_concurrent_streams_per_connection = (size_t)jni_ideal_concurrent_streams_per_connection,
         .max_concurrent_streams_per_connection = (size_t)jni_max_concurrent_streams_per_connection,
         .max_connections = (size_t)jni_max_conns,
+        .max_concurrent_streams = (size_t)jni_max_concurrent_streams,
     };
 
     struct aws_http_connection_monitoring_options monitoring_options;

src/native/http_request_response.c

@@ -706,6 +706,26 @@ JNIEXPORT void JNICALL Java_software_amazon_awssdk_crt_http_HttpStreamBase_httpS
     aws_http_stream_update_window(stream, window_update);
 }
 
+JNIEXPORT void JNICALL Java_software_amazon_awssdk_crt_http_HttpStreamBase_httpStreamBaseCancelDefaultError(
+    JNIEnv *env,
+    jclass jni_class,
+    jlong jni_binding) {
+
+    (void)jni_class;
+    aws_cache_jni_ids(env);
+
+    struct http_stream_binding *binding = (struct http_stream_binding *)jni_binding;
+    struct aws_http_stream *stream = binding->native_stream;
+
+    if (stream == NULL) {
+        aws_jni_throw_runtime_exception(env, "HttpStream is null.");
+        return;
+    }
+
+    AWS_LOGF_TRACE(AWS_LS_HTTP_STREAM, "Cancelling Stream with default error. stream: %p", (void *)stream);
+    aws_http_stream_cancel_default_error(stream);
+}
+
 JNIEXPORT void JNICALL Java_software_amazon_awssdk_crt_http_Http2Stream_http2StreamResetStream(
     JNIEnv *env,
     jclass jni_class,

src/native/mqtt5_packets.c

@@ -1136,7 +1136,7 @@ struct aws_mqtt5_packet_publish_view_java_jni *aws_mqtt5_packet_publish_view_cre
             mqtt5_publish_packet_properties.publish_payload_field_id,
             s_publish_packet_string,
             "payload",
-            &java_packet->correlation_data_buf,
+            &java_packet->payload_buf,
             &java_packet->payload_cursor,
             true,
             &was_value_set) == AWS_OP_ERR) {