Skip to content

Commit 353115f

Browse files
yschimkerobertroeser
authored andcommitted
Remove strict flag (#461)
1 parent 1bf126e commit 353115f

File tree

3 files changed

+2
-15
lines changed

3 files changed

+2
-15
lines changed

rsocket-core/src/main/java/io/rsocket/ConnectionSetupPayload.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public abstract class ConnectionSetupPayload extends AbstractReferenceCounted im
3030

3131
public static final int NO_FLAGS = 0;
3232
public static final int HONOR_LEASE = SetupFrameFlyweight.FLAGS_WILL_HONOR_LEASE;
33-
public static final int STRICT_INTERPRETATION = SetupFrameFlyweight.FLAGS_STRICT_INTERPRETATION;
3433

3534
public static ConnectionSetupPayload create(String metadataMimeType, String dataMimeType) {
3635
return new DefaultConnectionSetupPayload(
@@ -73,10 +72,6 @@ public boolean willClientHonorLease() {
7372
return Frame.isFlagSet(getFlags(), HONOR_LEASE);
7473
}
7574

76-
public boolean doesClientRequestStrictInterpretation() {
77-
return STRICT_INTERPRETATION == (getFlags() & STRICT_INTERPRETATION);
78-
}
79-
8075
@Override
8176
public boolean hasMetadata() {
8277
return Frame.isFlagSet(getFlags(), FLAGS_M);

rsocket-core/src/main/java/io/rsocket/RSocketFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public static class ClientRSocketFactory implements ClientTransportAcceptor {
8282
private Consumer<Throwable> errorConsumer = Throwable::printStackTrace;
8383
private int mtu = 0;
8484
private PluginRegistry plugins = new PluginRegistry(Plugins.defaultPlugins());
85-
private int flags = SetupFrameFlyweight.FLAGS_STRICT_INTERPRETATION;
85+
private int flags = 0;
8686

8787
private Payload setupPayload = EmptyPayload.INSTANCE;
8888
private Function<Frame, ? extends Payload> frameDecoder = DefaultPayload::create;

rsocket-core/src/main/java/io/rsocket/frame/SetupFrameFlyweight.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,9 @@ private SetupFrameFlyweight() {}
3232
public static final int FLAGS_RESUME_ENABLE = 0b00_1000_0000;
3333
/** A flag used to indicate that the client will honor LEASE sent by the server */
3434
public static final int FLAGS_WILL_HONOR_LEASE = 0b00_0100_0000;
35-
/**
36-
* (obsolete) flag indicating that the server should reject the SETUP if it finds anything
37-
* in the data or metadata that it doesn't understand
38-
*
39-
* @deprecated removed between protocol version 0.2 and 1.0RC
40-
*/
41-
@Deprecated
42-
public static final int FLAGS_STRICT_INTERPRETATION = 0b00_0010_0000;
4335

4436
public static final int VALID_FLAGS =
45-
FLAGS_RESUME_ENABLE | FLAGS_WILL_HONOR_LEASE | FLAGS_STRICT_INTERPRETATION | FLAGS_M;
37+
FLAGS_RESUME_ENABLE | FLAGS_WILL_HONOR_LEASE | FLAGS_M;
4638

4739
public static final int CURRENT_VERSION = VersionFlyweight.encode(1, 0);
4840

0 commit comments

Comments
 (0)