Skip to content

Revert to protocol 1.1#858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KacperKluka merged 2 commits into from
Nov 23, 2022
Merged

Revert to protocol 1.1 #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e636ef9
Revert to protocol 1.1
KacperKluka Nov 21, 2022
9df7716
Always enable idempotent rest publishing
KacperKluka Nov 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/src/main/java/io/ably/lib/transport/Defaults.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);

Expand Down
2 changes: 1 addition & 1 deletion lib/src/main/java/io/ably/lib/types/ClientOptions.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ public ClientOptions(String key) throws AblyException {
* <p>
* 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.
Expand Down
2 changes: 1 addition & 1 deletion lib/src/test/java/io/ably/lib/test/realtime/RealtimeHttpHeaderTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/src/test/java/io/ably/lib/test/rest/HttpHeaderTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
Expand Down
2 changes: 1 addition & 1 deletion lib/src/test/java/io/ably/lib/transport/DefaultsTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down