Skip to content

Remove strict flag #461

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
merged 1 commit into from
Jan 12, 2018
Merged

Remove strict flag #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions rsocket-core/src/main/java/io/rsocket/ConnectionSetupPayload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion rsocket-core/src/main/java/io/rsocket/RSocketFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public static class ClientRSocketFactory implements ClientTransportAcceptor {
private Consumer<Throwable> 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<Frame, ? extends Payload> frameDecoder = DefaultPayload::create;
Expand Down
10 changes: 1 addition & 9 deletions rsocket-core/src/main/java/io/rsocket/frame/SetupFrameFlyweight.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down