Skip to content

Commit

Permalink
Merge branch 'release/1.2.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mostroverkhov
mostroverkhov committed May 30, 2023
2 parents 858064b + 359096b commit 039841c
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 43 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ EchoWebSocketHandler http1WebSocketHandler = new EchoWebSocketHandler();
Http2WebSocketClientHandshaker handShaker = Http2WebSocketClientHandshaker.create(channel);
Http2Headers headers =
new DefaultHttp2Headers().set("user-agent", "jauntsdn-websocket-http2-client/1.2.1");
new DefaultHttp2Headers().set("user-agent", "jauntsdn-websocket-http2-client/1.2.2");
ChannelFuture handshakeFuture =
/*http1 websocket handler*/
handShaker.handshake("/echo", headers, new EchoWebSocketHandler());
Expand Down Expand Up @@ -286,7 +286,7 @@ repositories {
}
dependencies {
implementation 'com.jauntsdn.netty:netty-websocket-http2:1.2.1'
implementation 'com.jauntsdn.netty:netty-websocket-http2:1.2.2'
}
```

Expand Down
14 changes: 7 additions & 7 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
group=com.jauntsdn.netty
version=1.2.2
version=1.2.3

googleJavaFormatPluginVersion=0.9
dependencyManagementPluginVersion=1.1.0
gitPluginVersion=0.13.0
osDetectorPluginVersion=1.7.1
versionsPluginVersion=0.44.0
osDetectorPluginVersion=1.7.3
versionsPluginVersion=0.45.0

nettyVersion=4.1.87.Final
jauntNettyWebsocketHttp1=0.9.1
nettyTcnativeVersion=2.0.56.Final
nettyVersion=4.1.93.Final
jauntNettyWebsocketHttp1=1.1.0
nettyTcnativeVersion=2.0.61.Final
hdrHistogramVersion=2.1.12
slf4jVersion=1.7.36
logbackVersion=1.2.11
jsr305Version=3.0.2

junitVersion=5.9.2
junitVersion=5.9.3
assertjVersion=3.24.2

org.gradle.parallel=true
Expand Down
20 changes: 10 additions & 10 deletions netty-websocket-http2-callbacks-codec/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ com.google.errorprone:javac-shaded:9+181-r4173-1=googleJavaFormat1.6
com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6
com.google.guava:guava:22.0=googleJavaFormat1.6
com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6
com.jauntsdn.netty:netty-websocket-http1:0.9.1=compileClasspath
io.netty:netty-buffer:4.1.87.Final=compileClasspath
io.netty:netty-codec-http2:4.1.87.Final=compileClasspath
io.netty:netty-codec-http:4.1.87.Final=compileClasspath
io.netty:netty-codec:4.1.87.Final=compileClasspath
io.netty:netty-common:4.1.87.Final=compileClasspath
io.netty:netty-handler:4.1.87.Final=compileClasspath
io.netty:netty-resolver:4.1.87.Final=compileClasspath
io.netty:netty-transport-native-unix-common:4.1.87.Final=compileClasspath
io.netty:netty-transport:4.1.87.Final=compileClasspath
com.jauntsdn.netty:netty-websocket-http1:1.1.0=compileClasspath
io.netty:netty-buffer:4.1.93.Final=compileClasspath
io.netty:netty-codec-http2:4.1.93.Final=compileClasspath
io.netty:netty-codec-http:4.1.93.Final=compileClasspath
io.netty:netty-codec:4.1.93.Final=compileClasspath
io.netty:netty-common:4.1.93.Final=compileClasspath
io.netty:netty-handler:4.1.93.Final=compileClasspath
io.netty:netty-resolver:4.1.93.Final=compileClasspath
io.netty:netty-transport-native-unix-common:4.1.93.Final=compileClasspath
io.netty:netty-transport:4.1.93.Final=compileClasspath
org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6
empty=annotationProcessor
34 changes: 17 additions & 17 deletions netty-websocket-http2/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,27 @@ com.google.errorprone:javac-shaded:9+181-r4173-1=googleJavaFormat1.6
com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6
com.google.guava:guava:22.0=googleJavaFormat1.6
com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6
io.netty:netty-buffer:4.1.87.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.netty:netty-codec-http2:4.1.87.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.netty:netty-codec-http:4.1.87.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.netty:netty-codec:4.1.87.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.netty:netty-common:4.1.87.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.netty:netty-handler:4.1.87.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.netty:netty-resolver:4.1.87.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.netty:netty-tcnative-boringssl-static:2.0.56.Final=testRuntimeClasspath
io.netty:netty-tcnative-classes:2.0.56.Final=testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.1.87.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.1.87.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.netty:netty-buffer:4.1.93.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.netty:netty-codec-http2:4.1.93.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.netty:netty-codec-http:4.1.93.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.netty:netty-codec:4.1.93.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.netty:netty-common:4.1.93.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.netty:netty-handler:4.1.93.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.netty:netty-resolver:4.1.93.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.netty:netty-tcnative-boringssl-static:2.0.61.Final=testRuntimeClasspath
io.netty:netty-tcnative-classes:2.0.61.Final=testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.1.93.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.1.93.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
net.bytebuddy:byte-buddy:1.12.21=testCompileClasspath,testRuntimeClasspath
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
org.assertj:assertj-core:3.24.2=testCompileClasspath,testRuntimeClasspath
org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6
org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter-engine:5.9.2=testRuntimeClasspath
org.junit.jupiter:junit-jupiter-params:5.9.2=testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-engine:1.9.2=testRuntimeClasspath
org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter-api:5.9.3=testCompileClasspath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter-engine:5.9.3=testRuntimeClasspath
org.junit.jupiter:junit-jupiter-params:5.9.3=testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-commons:1.9.3=testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-engine:1.9.3=testRuntimeClasspath
org.junit:junit-bom:5.9.3=testCompileClasspath,testRuntimeClasspath
org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath
org.slf4j:slf4j-api:1.7.36=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
empty=annotationProcessor,testAnnotationProcessor
6 changes: 3 additions & 3 deletions ...src/test/java/com/jauntsdn/netty/handler/codec/http2/websocketx/HeadersValidatorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ private static CharSequence asciiString(String s) {
}

private static Http2Headers validWebSocketRequestHeaders() {
return new DefaultHttp2Headers()
return new DefaultHttp2Headers(false)
.method(asciiString("connect"))
.set(asciiString(":protocol"), asciiString("websocket"))
.scheme(asciiString("https"))
Expand All @@ -269,15 +269,15 @@ private static Http2Headers validWebSocketRequestHeaders() {
}

private static Http2Headers validHttpRequestHeaders() {
return new DefaultHttp2Headers()
return new DefaultHttp2Headers(false)
.method(asciiString("get"))
.scheme(asciiString("https"))
.authority(asciiString("localhost"))
.path(asciiString("/"));
}

private static Http2Headers validResponseHeaders() {
return new DefaultHttp2Headers()
return new DefaultHttp2Headers(false)
.status(asciiString("200"))
.set(asciiString("user-agent"), asciiString("test"));
}
Expand Down
8 changes: 4 additions & 4 deletions ...rc/test/java/com/jauntsdn/netty/handler/codec/http2/websocketx/ProtocolHandshakeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ void invalidWebSocketRequestRejected(Http2Headers invalidHttp2RequestHeaders) th

static Stream<Http2Headers> invalidWebSocketRequests() {
Http2Headers emptyPath =
Http2WebSocketProtocol.extendedConnect(new DefaultHttp2Headers())
Http2WebSocketProtocol.extendedConnect(new DefaultHttp2Headers(false))
.scheme("https")
.authority("localhost")
.path("")
Expand All @@ -206,7 +206,7 @@ static Stream<Http2Headers> invalidWebSocketRequests() {
Http2WebSocketProtocol.HEADER_WEBSOCKET_VERSION_VALUE);

Http2Headers emptyAuthority =
Http2WebSocketProtocol.extendedConnect(new DefaultHttp2Headers())
Http2WebSocketProtocol.extendedConnect(new DefaultHttp2Headers(false))
.scheme("https")
.authority("")
.path("path")
Expand All @@ -216,7 +216,7 @@ static Stream<Http2Headers> invalidWebSocketRequests() {
Http2WebSocketProtocol.HEADER_WEBSOCKET_VERSION_VALUE);

Http2Headers emptyScheme =
Http2WebSocketProtocol.extendedConnect(new DefaultHttp2Headers())
Http2WebSocketProtocol.extendedConnect(new DefaultHttp2Headers(false))
.scheme("")
.authority("localhost")
.path("path")
Expand All @@ -226,7 +226,7 @@ static Stream<Http2Headers> invalidWebSocketRequests() {
Http2WebSocketProtocol.HEADER_WEBSOCKET_VERSION_VALUE);

Http2Headers nonHttpScheme =
Http2WebSocketProtocol.extendedConnect(new DefaultHttp2Headers())
Http2WebSocketProtocol.extendedConnect(new DefaultHttp2Headers(false))
.scheme("ftp")
.authority("localhost")
.path("path")
Expand Down
2 changes: 2 additions & 0 deletions perf_server_callbacks_run.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/sh

export NETTY_WEBSOCKET_HTTP2_PERFTEST_CALLBACKS_SERVER_OPTS='--add-exports java.base/sun.security.x509=ALL-UNNAMED'

cd netty-websocket-http2-perftest/build/install/netty-websocket-http2-perftest/bin && ./netty-websocket-http2-perftest-callbacks-server

0 comments on commit 039841c

Please sign in to comment.