Ready to test

awslabs · Dec 11, 2024 · bb9e272 · bb9e272
1 parent 39081e2
commit bb9e272
Show file tree

Hide file tree

Showing 5 changed files with 199 additions and 48 deletions.
diff --git a/src/main/java/software/amazon/awssdk/crt/iot/SubscriptionStatusEvent.java b/src/main/java/software/amazon/awssdk/crt/iot/SubscriptionStatusEvent.java
@@ -11,17 +11,16 @@
  * An event that describes a change in subscription status for a streaming operation.
  */
 public class SubscriptionStatusEvent {
-    private SubscriptionStatusEventType type;
-    private Optional<Integer> error;
-
-    private SubscriptionStatusEvent(SubscriptionStatusEventType type) {
-        this.type = type;
-        this.error = Optional.empty();
-    }
+    private final SubscriptionStatusEventType type;
+    private final Optional<Integer> error;
 
     private SubscriptionStatusEvent(SubscriptionStatusEventType type, int errorCode) {
         this.type = type;
-        this.error = Optional.of(errorCode);
+        if (errorCode != 0) {
+            this.error = Optional.of(errorCode);
+        } else {
+            this.error = Optional.empty();
+        }
     }
 
     /**

diff --git a/src/main/resources/META-INF/native-image/software.amazon.awssdk/crt/aws-crt/jni-config.json b/src/main/resources/META-INF/native-image/software.amazon.awssdk/crt/aws-crt/jni-config.json
@@ -186,6 +186,17 @@
       }
     ]
   },
+  {
+    "name": "java.util.function.Consumer",
+    "methods": [
+      {
+        "name": "accept",
+        "parameterTypes": [
+          "java.lang.Object"
+        ]
+      }
+    ]
+  },
   {
     "name": "java.util.function.Predicate",
     "methods": [

diff --git a/src/native/java_class_ids.c b/src/native/java_class_ids.c
@@ -2430,19 +2430,12 @@ static void s_cache_subscription_status_event_properties(JNIEnv *env) {
 
     subscription_status_event_properties.subscription_status_event_class = (*env)->NewGlobalRef(env, cls);
 
-    subscription_status_event_properties.constructor_method_id1 = (*env)->GetMethodID(
-        env,
-        subscription_status_event_properties.subscription_status_event_class,
-        "<init>",
-        "(Lsoftware/amazon/awssdk/crt/iot/SubscriptionStatusEventType;)V");
-    AWS_FATAL_ASSERT(subscription_status_event_properties.constructor_method_id1);
-
-    subscription_status_event_properties.constructor_method_id2 = (*env)->GetMethodID(
+    subscription_status_event_properties.constructor_method_id = (*env)->GetMethodID(
         env,
         subscription_status_event_properties.subscription_status_event_class,
         "<init>",
         "(Lsoftware/amazon/awssdk/crt/iot/SubscriptionStatusEventType;I)V");
-    AWS_FATAL_ASSERT(subscription_status_event_properties.constructor_method_id2);
+    AWS_FATAL_ASSERT(subscription_status_event_properties.constructor_method_id);
 }
 
 struct java_streaming_operation_options_properties streaming_operation_options_properties;
@@ -2465,6 +2458,19 @@ static void s_cache_streaming_operation_options_properties(JNIEnv *env) {
     AWS_FATAL_ASSERT(streaming_operation_options_properties.subscription_status_event_callback_field_id);
 }
 
+struct java_consumer_properties consumer_properties;
+
+static void s_cache_consumer_properties(JNIEnv *env) {
+    jclass cls = (*env)->FindClass(env, "java/util/function/Consumer");
+    AWS_FATAL_ASSERT(cls);
+
+    consumer_properties.consumer_class = (*env)->NewGlobalRef(env, cls);
+
+    consumer_properties.accept_method_id =
+        (*env)->GetMethodID(env, consumer_properties.consumer_class, "accept", "(Ljava/lang/Object;)V");
+    AWS_FATAL_ASSERT(consumer_properties.accept_method_id);
+}
+
 static void s_cache_java_class_ids(void *user_data) {
     JNIEnv *env = user_data;
     s_cache_http_request_body_stream(env);
@@ -2577,6 +2583,7 @@ static void s_cache_java_class_ids(void *user_data) {
     s_cache_subscription_status_event_type_properties(env);
     s_cache_subscription_status_event_properties(env);
     s_cache_streaming_operation_options_properties(env);
+    s_cache_consumer_properties(env);
 }
 
 static aws_thread_once s_cache_once_init = AWS_THREAD_ONCE_STATIC_INIT;

diff --git a/src/native/java_class_ids.h b/src/native/java_class_ids.h
@@ -1017,8 +1017,7 @@ extern struct java_subscription_status_event_type_properties subscription_status
 /* SubscriptionStatusEvent */
 struct java_subscription_status_event_properties {
     jclass subscription_status_event_class;
-    jmethodID constructor_method_id1; // SubscriptionStatusEvent(SubscriptionStatusEventType type)
-    jmethodID constructor_method_id2; // SubscriptionStatusEvent(SubscriptionStatusEventType type, int errorCode)
+    jmethodID constructor_method_id;
 };
 extern struct java_subscription_status_event_properties subscription_status_event_properties;
 
@@ -1031,6 +1030,13 @@ struct java_streaming_operation_options_properties {
 };
 extern struct java_streaming_operation_options_properties streaming_operation_options_properties;
 
+/* Consumer */
+struct java_consumer_properties {
+    jclass consumer_class;
+    jmethodID accept_method_id;
+};
+extern struct java_consumer_properties consumer_properties;
+
 /**
  * All functions bound to JNI MUST call this before doing anything else.
  * This caches all JNI IDs the first time it is called. Any further calls are no-op; it is thread-safe.