8000 Feature/google java format 1.4 by qweek · Pull Request #403 · rsocket/rsocket-java · GitHub
[go: up one dir, main page]
Skip to content

Feature/google java format 1.4 #403

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

Closed
wants to merge 4 commits into from
Closed

Feature/google java format 1.4 #403

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8f8657
extract java, google java format and jmh to separate script plugins
qweek Oct 2, 2017
900ab52
gradle 4.2
qweek Oct 3, 2017
0f1e740
add binaries and properties
qweek Oct 3, 2017
7095448
google-java-format 1.4
qweek Oct 3, 2017
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
Prev Previous commit
google-java-format 1.4 
upgrade google-java-format to version 1.4
  • Loading branch information
@qweek
qweek committed Oct 3, 2017
commit 709544883f115c87731ed42ca315ae9ed79f3645
2 changes: 1 addition & 1 deletion gradle/codestyle.gradle
8000 View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apply plugin: 'com.github.sherter.google-java-format'

// Use specific version
googleJavaFormat {
toolVersion = '1.1'
toolVersion = '1.4'
}

// NOTE: uncomment to force code formatting before compile
Expand Down
2 changes: 1 addition & 1 deletion rsocket-core/src/jmh/java/io/rsocket/FragmentationPerf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public void smallFragmentationFrameReassembler(Input input) {
Frame frame = smallFragmentAssembler.reassemble();
input.bh.consume(frame);
frame.release();
//input.smallFragmentAssembler.clear();
// input.smallFragmentAssembler.clear();
}

private static ByteBuffer createRandomBytes(int size) {
Expand Down
6 changes: 4 additions & 2 deletions rsocket-core/src/main/java/io/rsocket/RSocketServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ private Mono<Void> handleFrame(Frame frame) {
case METADATA_PUSH:
return metadataPush(new PayloadImpl(frame));
case LEASE:
// Lease must not be received here as this is the server end of the socket which sends leases.
// Lease must not be received here as this is the server end of the socket which sends
// leases.
return Mono.empty();
case NEXT:
receiver = getChannelProcessor(streamId);
Expand Down Expand Up @@ -287,7 +288,8 @@ private Mono<Void> handleChannel(int streamId, Frame firstFrame) {
})
.doFinally(signalType -> removeChannelProcessor(streamId));

// not chained, as the payload should be enqueued in the Unicast processor before this method returns
// not chained, as the payload should be enqueued in the Unicast processor before this method
8000 // returns
// and any later payload can be processed
frames.onNext(new PayloadImpl(firstFrame));

Expand Down
3 changes: 2 additions & 1 deletion rsocket-core/src/main/java/io/rsocket/frame/FrameHeaderFlyweight.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,8 @@ public static void encodeLength(final ByteBuf byteBuf, final int offset, final i
if ((length & ~FRAME_LENGTH_MASK) != 0) {
throw new IllegalArgumentException("Length is larger than 24 bits");
}
// Write each byte separately in reverse order, this mean we can write 1 << 23 without overflowing.
// Write each byte separately in reverse order, this mean we can write 1 << 23 without
// overflowing.
byteBuf.setByte(offset, length >> 16);
byteBuf.setByte(offset + 1, length >> 8);
byteBuf.setByte(offset + 2, length);
Expand Down
2 changes: 1 addition & 1 deletion rsocket-core/src/main/java/io/rsocket/resume/ResumeUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public static boolean isTracked(FrameType frameType) {
case REQUEST_STREAM:
case REQUEST_RESPONSE:
case FIRE_AND_FORGET:
//case METADATA_PUSH:
// case METADATA_PUSH:
case REQUEST_N:
case CANCEL:
case ERROR:
Expand Down
0