chore: apply codereview suggestions

Author: ttypic

java/build.gradle.kts

@@ -79,6 +79,8 @@ tasks.register<Test>("testRestSuite") {
     }
     jvmArgs("--add-opens", "java.base/java.time=ALL-UNNAMED")
     jvmArgs("--add-opens", "java.base/java.lang=ALL-UNNAMED")
+    jvmArgs("--add-opens", "java.base/java.net=ALL-UNNAMED")
+    jvmArgs("--add-opens", "java.base/java.lang.reflect=ALL-UNNAMED")
     beforeTest(closureOf<TestDescriptor> { logger.lifecycle("-> $this") })
     outputs.upToDateWhen { false }
     testLogging {

lib/src/main/java/io/ably/lib/rest/MessageEditsMixin.java

@@ -197,7 +197,7 @@ private Http.Request<UpdateDeleteResult> updateMessageImpl(Http http, Message me
                     if (error != null) throw AblyException.fromErrorInfo(error);
                     UpdateDeleteResult[] results = bodyHandler.handleResponseBody(response.contentType, response.body);
                     if (results != null && results.length > 0) return results[0];
-                    throw AblyException.fromErrorInfo(new ErrorInfo("No versionSerial in the update message response", 500, 50000));
+                    throw AblyException.fromErrorInfo(new ErrorInfo("No versionSerial in the response", 500, 50000));
                 },
                 true,
                 callback);

lib/src/main/java/io/ably/lib/util/Listeners.java

@@ -21,6 +21,12 @@
 import org.junit.Test;
 import org.junit.rules.Timeout;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.net.HttpURLConnection;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.UUID;
 import java.util.function.Predicate;
@@ -38,22 +44,21 @@ public class RestChannelMessageEditTest extends ParameterizedTest {
     @Rule
     public Timeout testTimeout = Timeout.seconds(300);
     private AblyRest ably;
-    private EngineType engineType;
 
     @Before
     public void setUpBefore() throws Exception {
         ClientOptions opts = createOptions(testVars.keys[0].keyStr);
         ably = new AblyRest(opts);
-        engineType = HttpEngineFactory.getFirstAvailable().getEngineType();
+        if (HttpEngineFactory.getFirstAvailable().getEngineType() == EngineType.DEFAULT) {
+            addPatchSupport();
+        }
     }
 
     /**
      * Test getMessage: Publish a message and retrieve it by serial
      */
     @Test
     public void getMessage_retrieveBySerial() throws Exception {
-        if (engineType == EngineType.DEFAULT) return;
-
         String channelName = "mutable:get_message_" + UUID.randomUUID() + "_" + testParams.name;
         Channel channel = ably.channels.get(channelName);
 
@@ -83,8 +88,6 @@ public void getMessage_retrieveBySerial() throws Exception {
      */
     @Test
     public void updateMessage_updateData() throws Exception {
-        if (engineType == EngineType.DEFAULT) return;
-
         String channelName = "mutable:update_message_" + UUID.randomUUID() + "_" + testParams.name;
         Channel channel = ably.channels.get(channelName);
 
@@ -123,8 +126,6 @@ public void updateMessage_updateData() throws Exception {
      */
     @Test
     public void updateMessage_updateEncodedData() throws Exception {
-        if (engineType == EngineType.DEFAULT) return;
-
         String channelName = "mutable:update_encodedmessage_" + UUID.randomUUID() + "_" + testParams.name;
         ChannelOptions channelOptions = ChannelOptions.withCipherKey(Crypto.generateRandomKey());
         Channel channel = ably.channels.get(channelName, channelOptions);
@@ -164,8 +165,6 @@ public void updateMessage_updateEncodedData() throws Exception {
      */
     @Test
     public void updateMessage_async() throws Exception {
-        if (engineType == EngineType.DEFAULT) return;
-
         String channelName = "mutable:update_message_async_" + UUID.randomUUID() + "_" + testParams.name;
         Channel channel = ably.channels.get(channelName);
 
@@ -202,8 +201,6 @@ public void updateMessage_async() throws Exception {
      */
     @Test
     public void deleteMessage_softDelete() throws Exception {
-        if (engineType == EngineType.DEFAULT) return;
-
         String channelName = "mutable:delete_message_" + UUID.randomUUID() + "_" + testParams.name;
         Channel channel = ably.channels.get(channelName);
 
@@ -239,8 +236,6 @@ public void deleteMessage_softDelete() throws Exception {
      */
     @Test
     public void appendMessage_checkUpdatedData() throws Exception {
-        if (engineType == EngineType.DEFAULT) return;
-
         String channelName = "mutable:append_message_" + UUID.randomUUID() + "_" + testParams.name;
         Channel channel = ably.channels.get(channelName);
 
@@ -277,8 +272,6 @@ public void appendMessage_checkUpdatedData() throws Exception {
      */
     @Test
     public void deleteMessage_async() throws Exception {
-        if (engineType == EngineType.DEFAULT) return;
-
         String channelName = "mutable:delete_message_async_" + UUID.randomUUID() + "_" + testParams.name;
         Channel channel = ably.channels.get(channelName);
 
@@ -315,8 +308,6 @@ public void deleteMessage_async() throws Exception {
      */
     @Test
     public void getMessageVersions_retrieveHistory() throws Exception {
-        if (engineType == EngineType.DEFAULT) return;
-
         String channelName = "mutable:message_versions_" + UUID.randomUUID() + "_" + testParams.name;
         Channel channel = ably.channels.get(channelName);
 
@@ -366,8 +357,6 @@ public void getMessageVersions_retrieveHistory() throws Exception {
      */
     @Test
     public void getMessageVersions_async() throws Exception {
-        if (engineType == EngineType.DEFAULT) return;
-
         String channelName = "mutable:message_versions_async_" + UUID.randomUUID() + "_" + testParams.name;
         Channel channel = ably.channels.get(channelName);
 
@@ -445,8 +434,6 @@ public void deleteMessage_emptySerial() {
      */
     @Test
     public void completeWorkflow_publishUpdateVersionsDelete() throws Exception {
-        if (engineType == EngineType.DEFAULT) return;
-
         String channelName = "mutable:complete_workflow_" + UUID.randomUUID() + "_" + testParams.name;
         Channel channel = ably.channels.get(channelName);
 
@@ -525,4 +512,22 @@ private Message waitForDeletedMessageAppear(Channel channel, String serial) thro
             Thread.sleep(200);
         }
     }
+
+    /**
+     * We need to add patch support for HttpUrlConnect
+     */
+    private static void addPatchSupport() throws Exception {
+        Field methodsField = HttpURLConnection.class.getDeclaredField("methods");
+
+        MethodHandles.Lookup lookup = MethodHandles.privateLookupIn(Field.class, MethodHandles.lookup());
+        VarHandle modifiers = lookup.findVarHandle(Field.class, "modifiers", int.class);
+        modifiers.set(methodsField, methodsField.getModifiers() & ~Modifier.FINAL);
+        methodsField.setAccessible(true);
+
+        String[] methods = (String[]) methodsField.get(null);
+        String[] newMethods = Arrays.copyOf(methods, methods.length + 1);
+        newMethods[methods.length] = "PATCH";
+
+        methodsField.set(null, newMethods);
+    }
 }