diff --git a/rsocket-core/src/main/java/io/rsocket/ConnectionSetupPayload.java b/rsocket-core/src/main/java/io/rsocket/ConnectionSetupPayload.java index 49724beff..63640b9b2 100644 --- a/rsocket-core/src/main/java/io/rsocket/ConnectionSetupPayload.java +++ b/rsocket-core/src/main/java/io/rsocket/ConnectionSetupPayload.java @@ -30,7 +30,6 @@ public abstract class ConnectionSetupPayload extends AbstractReferenceCounted im public static final int NO_FLAGS = 0; public static final int HONOR_LEASE = SetupFrameFlyweight.FLAGS_WILL_HONOR_LEASE; - public static final int STRICT_INTERPRETATION = SetupFrameFlyweight.FLAGS_STRICT_INTERPRETATION; public static ConnectionSetupPayload create(String metadataMimeType, String dataMimeType) { return new DefaultConnectionSetupPayload( @@ -73,10 +72,6 @@ public boolean willClientHonorLease() { return Frame.isFlagSet(getFlags(), HONOR_LEASE); } - public boolean doesClientRequestStrictInterpretation() { - return STRICT_INTERPRETATION == (getFlags() & STRICT_INTERPRETATION); - } - @Override public boolean hasMetadata() { return Frame.isFlagSet(getFlags(), FLAGS_M); diff --git a/rsocket-core/src/main/java/io/rsocket/RSocketFactory.java b/rsocket-core/src/main/java/io/rsocket/RSocketFactory.java index f69630757..d47cdc1dd 100644 --- a/rsocket-core/src/main/java/io/rsocket/RSocketFactory.java +++ b/rsocket-core/src/main/java/io/rsocket/RSocketFactory.java @@ -82,7 +82,7 @@ public static class ClientRSocketFactory implements ClientTransportAcceptor { private Consumer errorConsumer = Throwable::printStackTrace; private int mtu = 0; private PluginRegistry plugins = new PluginRegistry(Plugins.defaultPlugins()); - private int flags = SetupFrameFlyweight.FLAGS_STRICT_INTERPRETATION; + private int flags = 0; private Payload setupPayload = EmptyPayload.INSTANCE; private Function frameDecoder = DefaultPayload::create; diff --git a/rsocket-core/src/main/java/io/rsocket/frame/SetupFrameFlyweight.java b/rsocket-core/src/main/java/io/rsocket/frame/SetupFrameFlyweight.java index 020a38c84..408bcdc7d 100644 --- a/rsocket-core/src/main/java/io/rsocket/frame/SetupFrameFlyweight.java +++ b/rsocket-core/src/main/java/io/rsocket/frame/SetupFrameFlyweight.java @@ -32,17 +32,9 @@ private SetupFrameFlyweight() {} public static final int FLAGS_RESUME_ENABLE = 0b00_1000_0000; /** A flag used to indicate that the client will honor LEASE sent by the server */ public static final int FLAGS_WILL_HONOR_LEASE = 0b00_0100_0000; - /** - * (obsolete) flag indicating that the server should reject the SETUP if it finds anything - * in the data or metadata that it doesn't understand - * - * @deprecated removed between protocol version 0.2 and 1.0RC - */ - @Deprecated - public static final int FLAGS_STRICT_INTERPRETATION = 0b00_0010_0000; public static final int VALID_FLAGS = - FLAGS_RESUME_ENABLE | FLAGS_WILL_HONOR_LEASE | FLAGS_STRICT_INTERPRETATION | FLAGS_M; + FLAGS_RESUME_ENABLE | FLAGS_WILL_HONOR_LEASE | FLAGS_M; public static final int CURRENT_VERSION = VersionFlyweight.encode(1, 0);