From e636ef906639ac979ec6bcf272729681e8cdc519 Mon Sep 17 00:00:00 2001 From: Kacper Kluka Date: Mon, 21 Nov 2022 12:29:24 +0100 Subject: [PATCH 1/2] Revert to protocol 1.1 --- lib/src/main/java/io/ably/lib/transport/Defaults.java | 2 +- .../java/io/ably/lib/test/realtime/RealtimeHttpHeaderTest.java | 2 +- lib/src/test/java/io/ably/lib/test/rest/HttpHeaderTest.java | 2 +- lib/src/test/java/io/ably/lib/transport/DefaultsTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/src/main/java/io/ably/lib/transport/Defaults.java b/lib/src/main/java/io/ably/lib/transport/Defaults.java index b2871f3a3..09f05edea 100644 --- a/lib/src/main/java/io/ably/lib/transport/Defaults.java +++ b/lib/src/main/java/io/ably/lib/transport/Defaults.java @@ -9,7 +9,7 @@ public class Defaults { /* versions */ - public static final float ABLY_VERSION_NUMBER = 1.2f; + public static final float ABLY_VERSION_NUMBER = 1.1f; public static final String ABLY_VERSION = new DecimalFormat("0.0", new DecimalFormatSymbols(Locale.ENGLISH)).format(ABLY_VERSION_NUMBER); public static final String ABLY_AGENT_VERSION = String.format("%s/%s", "ably-java", BuildConfig.VERSION); diff --git a/lib/src/test/java/io/ably/lib/test/realtime/RealtimeHttpHeaderTest.java b/lib/src/test/java/io/ably/lib/test/realtime/RealtimeHttpHeaderTest.java index 88aaa1692..56cd2d857 100644 --- a/lib/src/test/java/io/ably/lib/test/realtime/RealtimeHttpHeaderTest.java +++ b/lib/src/test/java/io/ably/lib/test/realtime/RealtimeHttpHeaderTest.java @@ -81,7 +81,7 @@ public void realtime_websocket_param_test() { * Defaults.ABLY_VERSION_PARAM, as ultimately the request param has been derived from those values. */ assertEquals("Verify correct version", requestParameters.get("v"), - Collections.singletonList("1.2")); + Collections.singletonList("1.1")); /* Spec RSC7d3 * This test should not directly validate version against Defaults.ABLY_AGENT_VERSION, nor diff --git a/lib/src/test/java/io/ably/lib/test/rest/HttpHeaderTest.java b/lib/src/test/java/io/ably/lib/test/rest/HttpHeaderTest.java index 61dffaa15..a46e320f4 100644 --- a/lib/src/test/java/io/ably/lib/test/rest/HttpHeaderTest.java +++ b/lib/src/test/java/io/ably/lib/test/rest/HttpHeaderTest.java @@ -84,7 +84,7 @@ public void header_lib_channel_publish() { * from those values. */ Assert.assertNotNull("Expected headers", headers); - Assert.assertEquals(headers.get("x-ably-version"), "1.2"); + Assert.assertEquals(headers.get("x-ably-version"), "1.1"); Assert.assertEquals(headers.get("ably-agent"), expectedAblyAgentHeader); } catch (AblyException e) { e.printStackTrace(); diff --git a/lib/src/test/java/io/ably/lib/transport/DefaultsTest.java b/lib/src/test/java/io/ably/lib/transport/DefaultsTest.java index 3dcf45318..24b981696 100644 --- a/lib/src/test/java/io/ably/lib/transport/DefaultsTest.java +++ b/lib/src/test/java/io/ably/lib/transport/DefaultsTest.java @@ -9,7 +9,7 @@ public class DefaultsTest { @Test public void versions() { - assertThat(Defaults.ABLY_VERSION, is("1.2")); + assertThat(Defaults.ABLY_VERSION, is("1.1")); } @Test From 9df77169b32550b59e706f9c5e591cb52352704e Mon Sep 17 00:00:00 2001 From: Kacper Kluka Date: Mon, 21 Nov 2022 13:12:49 +0100 Subject: [PATCH 2/2] Always enable idempotent rest publishing --- lib/src/main/java/io/ably/lib/types/ClientOptions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/main/java/io/ably/lib/types/ClientOptions.java b/lib/src/main/java/io/ably/lib/types/ClientOptions.java index c14a3c790..70717d6c6 100644 --- a/lib/src/main/java/io/ably/lib/types/ClientOptions.java +++ b/lib/src/main/java/io/ably/lib/types/ClientOptions.java @@ -170,7 +170,7 @@ public ClientOptions(String key) throws AblyException { *

* Spec: RSL1k1, RTL6a1, TO3n */ - public boolean idempotentRestPublishing = (Defaults.ABLY_VERSION_NUMBER >= 1.2); + public boolean idempotentRestPublishing = true; /** * Timeout for opening a connection to Ably to initiate an HTTP request.