From b1048862bf7e0e5d59333b66840250bf4e33b364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Tue, 2 Feb 2021 16:35:18 +0100 Subject: [PATCH] no transitive module declaration, IntelliJ IDEA craziness --- gradle.properties | 2 +- .../src/main/java/module-info.java | 4 +++- netty-http-client-rest/build.gradle | 2 ++ .../src/main/java/module-info.java | 7 ++++++- netty-http-client/build.gradle | 1 + netty-http-client/src/main/java/module-info.java | 10 +++++++++- .../netty/http/client/test/pool/PoolTest.java | 2 +- netty-http-common/src/main/java/module-info.java | 16 ++++++++-------- .../src/main/java/module-info.java | 5 ++++- .../src/main/java/module-info.java | 3 ++- netty-http-server/build.gradle | 1 + netty-http-server/src/main/java/module-info.java | 5 ++++- 12 files changed, 42 insertions(+), 16 deletions(-) diff --git a/gradle.properties b/gradle.properties index 73171a8..bbb6fb3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ group = org.xbib name = netty-http -version = 4.1.58.0 +version = 4.1.58.1 gradle.wrapper.version = 6.6.1 netty.version = 4.1.58.Final diff --git a/netty-http-client-api/src/main/java/module-info.java b/netty-http-client-api/src/main/java/module-info.java index afc9e13..b18877e 100644 --- a/netty-http-client-api/src/main/java/module-info.java +++ b/netty-http-client-api/src/main/java/module-info.java @@ -1,4 +1,6 @@ module org.xbib.netty.http.client.api { exports org.xbib.netty.http.client.api; - requires transitive org.xbib.netty.http.common; + requires org.xbib.netty.http.common; + requires org.xbib.net.url; + requires io.netty.transport; } diff --git a/netty-http-client-rest/build.gradle b/netty-http-client-rest/build.gradle index 31341a1..ee52696 100644 --- a/netty-http-client-rest/build.gradle +++ b/netty-http-client-rest/build.gradle @@ -1,3 +1,5 @@ dependencies { api project(':netty-http-client') + api project(':netty-http-client-api') + api project(':netty-http-common') } diff --git a/netty-http-client-rest/src/main/java/module-info.java b/netty-http-client-rest/src/main/java/module-info.java index 86e941e..67e48b3 100644 --- a/netty-http-client-rest/src/main/java/module-info.java +++ b/netty-http-client-rest/src/main/java/module-info.java @@ -1,4 +1,9 @@ module org.xbib.netty.http.client.rest { exports org.xbib.netty.http.client.rest; - requires transitive org.xbib.netty.http.client; + requires org.xbib.netty.http.common; + requires org.xbib.netty.http.client; + requires org.xbib.netty.http.client.api; + requires io.netty.buffer; + requires io.netty.codec.http; + requires org.xbib.net.url; } diff --git a/netty-http-client/build.gradle b/netty-http-client/build.gradle index 3f92b9f..f140f86 100644 --- a/netty-http-client/build.gradle +++ b/netty-http-client/build.gradle @@ -1,6 +1,7 @@ dependencies { api project(":netty-http-client-api") + api project(":netty-http-common") api "io.netty:netty-handler-proxy:${project.property('netty.version')}" testImplementation "com.fasterxml.jackson.core:jackson-databind:${project.property('jackson.version')}" testImplementation "org.conscrypt:conscrypt-openjdk-uber:${project.property('conscrypt.version')}" diff --git a/netty-http-client/src/main/java/module-info.java b/netty-http-client/src/main/java/module-info.java index e4598fb..ab734b8 100644 --- a/netty-http-client/src/main/java/module-info.java +++ b/netty-http-client/src/main/java/module-info.java @@ -11,8 +11,16 @@ module org.xbib.netty.http.client { exports org.xbib.netty.http.client.pool; exports org.xbib.netty.http.client.retry; exports org.xbib.netty.http.client.transport; - requires transitive org.xbib.netty.http.client.api; + requires org.xbib.netty.http.client.api; + requires org.xbib.netty.http.common; + requires org.xbib.net.url; requires io.netty.handler.proxy; requires java.logging; + requires io.netty.transport; + requires io.netty.buffer; + requires io.netty.codec.http; + requires io.netty.codec.http2; + requires io.netty.handler; + requires io.netty.common; provides org.xbib.netty.http.client.api.ClientProtocolProvider with Http1, Http2; } diff --git a/netty-http-client/src/test/java/org/xbib/netty/http/client/test/pool/PoolTest.java b/netty-http-client/src/test/java/org/xbib/netty/http/client/test/pool/PoolTest.java index f0beac3..e05dbff 100644 --- a/netty-http-client/src/test/java/org/xbib/netty/http/client/test/pool/PoolTest.java +++ b/netty-http-client/src/test/java/org/xbib/netty/http/client/test/pool/PoolTest.java @@ -36,7 +36,7 @@ class PoolTest { private static final int TEST_STEP_TIME_SECONDS = 50; - private static final int BATCH_SIZE = 0x1000; + private static final int BATCH_SIZE = 0x100; @ParameterizedTest @ValueSource(ints = {1,10,100}) diff --git a/netty-http-common/src/main/java/module-info.java b/netty-http-common/src/main/java/module-info.java index d380c85..20e2672 100644 --- a/netty-http-common/src/main/java/module-info.java +++ b/netty-http-common/src/main/java/module-info.java @@ -4,13 +4,13 @@ module org.xbib.netty.http.common { exports org.xbib.netty.http.common.mime; exports org.xbib.netty.http.common.security; exports org.xbib.netty.http.common.util; - requires transitive org.xbib.net.url; - requires transitive io.netty.buffer; - requires transitive io.netty.common; - requires transitive io.netty.transport; - requires transitive io.netty.handler; - requires transitive io.netty.codec; - requires transitive io.netty.codec.http; - requires transitive io.netty.codec.http2; + requires org.xbib.net.url; + requires io.netty.buffer; + requires io.netty.common; + requires io.netty.transport; + requires io.netty.handler; + requires io.netty.codec; + requires io.netty.codec.http; + requires io.netty.codec.http2; requires java.logging; } diff --git a/netty-http-server-api/src/main/java/module-info.java b/netty-http-server-api/src/main/java/module-info.java index 7acd0d6..63c4052 100644 --- a/netty-http-server-api/src/main/java/module-info.java +++ b/netty-http-server-api/src/main/java/module-info.java @@ -2,5 +2,8 @@ module org.xbib.netty.http.server.api { exports org.xbib.netty.http.server.api; exports org.xbib.netty.http.server.api.annotation; exports org.xbib.netty.http.server.api.security; - requires transitive org.xbib.netty.http.common; + requires org.xbib.netty.http.common; + requires org.xbib.net.url; + requires io.netty.buffer; + requires io.netty.codec.http; } diff --git a/netty-http-server-rest/src/main/java/module-info.java b/netty-http-server-rest/src/main/java/module-info.java index 94e44e4..c9b1810 100644 --- a/netty-http-server-rest/src/main/java/module-info.java +++ b/netty-http-server-rest/src/main/java/module-info.java @@ -1,5 +1,6 @@ module org.xbib.netty.http.server.rest { exports org.xbib.netty.http.server.rest; exports org.xbib.netty.http.server.rest.util; - requires transitive org.xbib.netty.http.server; + requires org.xbib.netty.http.server; + requires io.netty.transport; } diff --git a/netty-http-server/build.gradle b/netty-http-server/build.gradle index e887bcf..db603ee 100644 --- a/netty-http-server/build.gradle +++ b/netty-http-server/build.gradle @@ -1,6 +1,7 @@ dependencies { api project(":netty-http-server-api") + api project(":netty-http-common") testImplementation project(":netty-http-client") testImplementation project(":netty-http-bouncycastle") testRuntimeOnly "org.javassist:javassist:${project.property('javassist.version')}" diff --git a/netty-http-server/src/main/java/module-info.java b/netty-http-server/src/main/java/module-info.java index 540ec10..b9da18d 100644 --- a/netty-http-server/src/main/java/module-info.java +++ b/netty-http-server/src/main/java/module-info.java @@ -13,7 +13,10 @@ module org.xbib.netty.http.server { exports org.xbib.netty.http.server.protocol.http1; exports org.xbib.netty.http.server.protocol.http2; exports org.xbib.netty.http.server.util; - requires transitive org.xbib.netty.http.server.api; + requires org.xbib.netty.http.server.api; + requires org.xbib.netty.http.common; + requires org.xbib.net.url; requires java.logging; + requires io.netty.transport; provides org.xbib.netty.http.server.api.ServerProtocolProvider with Http1, Http2; }