JPMS support (#87)

* Repackage src/test/classes to avoid split package with src/main/java

* Avoid using vertx-core impl packages

* JPMS descriptors for src/main and src/test

* Fix incorrect assertEquals method usage

* Remove useless dependencies

Author: vietj

pom.xml

@@ -52,15 +52,6 @@
       <artifactId>vertx-core</artifactId>
     </dependency>
 
-    <!-- Only for fatjar -->
-    <dependency>
-      <!-- declare this dependency to force shiro to use this one. It is the version used by vert.x -->
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.16</version>
-      <optional>true</optional>
-    </dependency>
-
     <dependency>
       <groupId>io.vertx</groupId>
       <artifactId>vertx-docgen</artifactId>
@@ -72,14 +63,6 @@
       <scope>provided</scope>
     </dependency>
 
-<!--
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <version>1.0.13</version>
-    </dependency>
--->
-
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -94,7 +77,7 @@
     <dependency>
       <groupId>com.github.tomakehurst</groupId>
       <artifactId>wiremock-standalone</artifactId>
-      <version>2.6.0</version>
+      <version>3.0.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -114,6 +97,16 @@
                   <annotationProcessor>io.vertx.codegen.CodeGenProcessor</annotationProcessor>
                   <annotationProcessor>io.vertx.docgen.JavaDocGenProcessor</annotationProcessor>
                 </annotationProcessors>
+                <annotationProcessorPaths>
+                  <annotationProcessorPath>
+                    <groupId>io.vertx</groupId>
+                    <artifactId>vertx-codegen</artifactId>
+                  </annotationProcessorPath>
+                  <annotationProcessorPath>
+                    <groupId>io.vertx</groupId>
+                    <artifactId>vertx-docgen</artifactId>
+                  </annotationProcessorPath>
+                </annotationProcessorPaths>
               </configuration>
             </execution>
           </executions>

src/main/java/io/vertx/httpproxy/cache/CacheOptions.java

@@ -2,7 +2,6 @@
 
 import io.vertx.codegen.annotations.DataObject;
 import io.vertx.codegen.json.annotations.JsonGen;
-import io.vertx.core.impl.Arguments;
 import io.vertx.core.json.JsonObject;
 import io.vertx.httpproxy.impl.CacheImpl;
 import io.vertx.httpproxy.spi.cache.Cache;
@@ -39,7 +38,9 @@ public int getMaxSize() {
    * @return a reference to this, so the API can be used fluently
    */
   public CacheOptions setMaxSize(int maxSize) {
-    Arguments.require(maxSize > 0, "Max size must be > 0");
+    if (maxSize <= 0) {
+      throw new IllegalArgumentException("Max size must be > 0");
+    }
     this.maxSize = maxSize;
     return this;
   }

src/main/java/io/vertx/httpproxy/impl/ReverseProxy.java

@@ -65,7 +65,7 @@ public void handle(HttpServerRequest request) {
     }
 
     // WebSocket upgrade tunneling
-    if (supportWebSocket && io.vertx.core.http.impl.HttpUtils.canUpgradeToWebSocket(request)) {
+    if (supportWebSocket && request.canUpgradeToWebSocket()) {
       handleWebSocketUpgrade(proxyRequest);
       return;
     }

src/main/java/module-info.java

@@ -0,0 +1,11 @@
+module io.vertx.httpproxy {
+  requires transitive io.vertx.core;
+  requires io.vertx.core.logging;
+  requires static io.vertx.codegen.api;
+  requires static io.vertx.codegen.json;
+  requires static vertx.docgen;
+  exports io.vertx.httpproxy;
+  exports io.vertx.httpproxy.cache;
+  exports io.vertx.httpproxy.spi.cache;
+  exports io.vertx.httpproxy.impl to io.vertx.tests;
+}

src/main/resources/META-INF/MANIFEST.MF

@@ -1,2 +0,0 @@
-Automatic-Module-Name: io.vertx.httpproxy
-

src/test/java/io/vertx/httpproxy/BackendTest.java renamed to src/test/java/io/vertx/tests/BackendTest.java

@@ -1,11 +1,12 @@
-package io.vertx.httpproxy;
+package io.vertx.tests;
 
 import io.vertx.core.http.Cookie;
 import io.vertx.core.http.HttpClient;
 import io.vertx.core.http.HttpMethod;
 import io.vertx.core.net.SocketAddress;
 import io.vertx.ext.unit.Async;
 import io.vertx.ext.unit.TestContext;
+import io.vertx.httpproxy.ProxyOptions;
 import org.junit.Test;
 
 /**

src/test/java/io/vertx/httpproxy/ProxyClientKeepAliveTest.java renamed to src/test/java/io/vertx/tests/ProxyClientKeepAliveTest.java

@@ -8,7 +8,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  */
-package io.vertx.httpproxy;
+package io.vertx.tests;
 
 import io.vertx.core.Future;
 import io.vertx.core.Promise;
@@ -20,6 +20,7 @@
 import io.vertx.core.streams.WriteStream;
 import io.vertx.ext.unit.Async;
 import io.vertx.ext.unit.TestContext;
+import io.vertx.httpproxy.*;
 import org.junit.Test;
 
 import java.io.Closeable;

src/test/java/io/vertx/httpproxy/ProxyClientNotPersistentTest.java renamed to src/test/java/io/vertx/tests/ProxyClientNotPersistentTest.java

@@ -8,9 +8,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  */
-package io.vertx.httpproxy;
+package io.vertx.tests;
 
 import io.vertx.ext.unit.TestContext;
+import io.vertx.httpproxy.ProxyOptions;
 
 /**
  * @author <a href="mailto:julien@julienviet.com">Julien Viet</a>

src/test/java/io/vertx/httpproxy/ProxyClientPipelinedTest.java renamed to src/test/java/io/vertx/tests/ProxyClientPipelinedTest.java

@@ -8,7 +8,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  */
-package io.vertx.httpproxy;
+package io.vertx.tests;
+
+import io.vertx.httpproxy.ProxyOptions;
 
 /**
  * @author <a href="mailto:julien@julienviet.com">Julien Viet</a>

src/test/java/io/vertx/httpproxy/ProxyRequestTest.java renamed to src/test/java/io/vertx/tests/ProxyRequestTest.java

@@ -8,7 +8,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  */
-package io.vertx.httpproxy;
+package io.vertx.tests;
 
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Future;
@@ -18,7 +18,6 @@
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.HttpClient;
 import io.vertx.core.http.HttpClientOptions;
-import io.vertx.core.http.HttpClientRequest;
 import io.vertx.core.http.HttpClientResponse;
 import io.vertx.core.http.HttpHeaders;
 import io.vertx.core.http.HttpMethod;
@@ -32,6 +31,7 @@
 import io.vertx.core.streams.ReadStream;
 import io.vertx.ext.unit.Async;
 import io.vertx.ext.unit.TestContext;
+import io.vertx.httpproxy.*;
 import org.junit.Ignore;
 import org.junit.Test;