vjd-7 Upgrade tests dependencies (#11)

tledkov · web-flow · commit e797cad7a97b · 2022-10-11T00:18:23.000+03:00
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -1,14 +1,14 @@
 name: CI
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   build:
     name: Build on JDK ${{ matrix.java }} and ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [9, 11, 12]
+        java: [11]
         os: [ubuntu-latest, windows-latest]
         include:
           # TODO(casz) remove once https://github.com/testcontainers/testcontainers-java/pull/1780 is available
@@ -22,4 +22,10 @@ jobs:
         with:
           java-version: ${{ matrix.java }}
       - name: Build with Gradle
-        run: ./gradlew build ${{ matrix.tasks }} -s --info
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: |
+            build
+            ${{ matrix.tasks }}
+            -s
+            --info
diff --git a/build.gradle b/build.gradle
@@ -16,16 +16,16 @@ repositories {
 }
 
 dependencies {
-    testCompile('junit:junit:4.12')
-    testCompile('org.mockito:mockito-core:2.28.2')
-    testCompile('org.testcontainers:testcontainers:1.12.3')
-    testCompile('org.eclipse.jetty:jetty-server:9.4.19.v20190610')
-    testCompile('org.slf4j:slf4j-api:1.7.26')
-    testCompile('org.bouncycastle:bcprov-jdk15on:1.62')
-    testCompile('org.bouncycastle:bcpkix-jdk15on:1.62')
+    testCompile('junit:junit:4.13.2')
+    testCompile('org.mockito:mockito-core:4.8.0')
+    testCompile('org.testcontainers:testcontainers:1.17.5')
+    testCompile('org.eclipse.jetty:jetty-server:11.0.12')
+    testCompile('org.slf4j:slf4j-api:2.0.3')
+    testCompile('org.bouncycastle:bcprov-jdk15on:1.70')
+    testCompile('org.bouncycastle:bcpkix-jdk15on:1.70')
     testCompile('org.apache.commons:commons-io:1.3.2')
 
-    testRuntime('org.slf4j:slf4j-simple:1.7.26')
+    testRuntime('ch.qos.reload4j:reload4j:1.2.22')
 }
 
 // Beginning of Java 9 compatibility config
diff --git a/src/main/java/io/github/jopenlibs/vault/response/WrapResponse.java b/src/main/java/io/github/jopenlibs/vault/response/WrapResponse.java
@@ -52,9 +52,9 @@ public Boolean getRenewable() {
     }
 
     /**
-     * Get response-wrapped token
+     * Get response-wrapped token.
      *
-     * @return response-wrapped token
+     * @return response-wrapped token.
      */
     public String getToken() {
         return token;
@@ -73,7 +73,11 @@ public String getAccessor() {
         return accessor;
     }
 
-    /** */
+    /**
+     * Get wrapped token TTL.
+     *
+     * @return Wrapped token TTL.
+     */
     public int getTtl() {
         return ttl;
     }
diff --git a/src/test/java/io/github/jopenlibs/vault/vault/VaultTestUtils.java b/src/test/java/io/github/jopenlibs/vault/vault/VaultTestUtils.java
@@ -3,11 +3,11 @@
 import io.github.jopenlibs.vault.json.Json;
 import io.github.jopenlibs.vault.json.JsonObject;
 import io.github.jopenlibs.vault.vault.mock.MockVault;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.io.IOUtils;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.HttpConfiguration;
diff --git a/src/test/java/io/github/jopenlibs/vault/vault/api/AuthBackendAwsTests.java b/src/test/java/io/github/jopenlibs/vault/vault/api/AuthBackendAwsTests.java
@@ -7,8 +7,8 @@
 import io.github.jopenlibs.vault.response.AuthResponse;
 import io.github.jopenlibs.vault.vault.VaultTestUtils;
 import io.github.jopenlibs.vault.vault.mock.AuthRequestValidatingMockVault;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.function.Predicate;
-import javax.servlet.http.HttpServletRequest;
 import org.eclipse.jetty.server.Server;
 import org.junit.Test;
 
diff --git a/src/test/java/io/github/jopenlibs/vault/vault/mock/AuthRequestValidatingMockVault.java b/src/test/java/io/github/jopenlibs/vault/vault/mock/AuthRequestValidatingMockVault.java
@@ -1,13 +1,13 @@
 package io.github.jopenlibs.vault.vault.mock;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.function.Predicate;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.server.Request;
 
 public class AuthRequestValidatingMockVault extends MockVault {
-    private Predicate<HttpServletRequest> validator;
+    private final Predicate<HttpServletRequest> validator;
 
 
     public AuthRequestValidatingMockVault(Predicate<HttpServletRequest> validator) {
diff --git a/src/test/java/io/github/jopenlibs/vault/vault/mock/EchoInputMockVault.java b/src/test/java/io/github/jopenlibs/vault/vault/mock/EchoInputMockVault.java
@@ -2,10 +2,10 @@
 
 import io.github.jopenlibs.vault.json.Json;
 import io.github.jopenlibs.vault.json.JsonObject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Enumeration;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.server.Request;
 
 /**
@@ -52,6 +52,7 @@ public void handle(
                 .append(request.getRequestURI())
                 .append(request.getQueryString() == null || request.getQueryString().isEmpty() ? "" : "?" +
                         request.getQueryString());
+
         final String mockResponse = Json.object()
                 .add("method", request.getMethod())
                 .add("URL", url.toString())
diff --git a/src/test/java/io/github/jopenlibs/vault/vault/mock/MockVault.java b/src/test/java/io/github/jopenlibs/vault/vault/mock/MockVault.java
@@ -1,12 +1,12 @@
 package io.github.jopenlibs.vault.vault.mock;
 
 import io.github.jopenlibs.vault.json.JsonObject;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 import java.util.Optional;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 
diff --git a/src/test/java/io/github/jopenlibs/vault/vault/mock/OpenTimeoutsMockVault.java b/src/test/java/io/github/jopenlibs/vault/vault/mock/OpenTimeoutsMockVault.java
@@ -1,9 +1,9 @@
 package io.github.jopenlibs.vault.vault.mock;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.server.Request;
 
 /**
@@ -52,9 +52,9 @@
  */
 public class OpenTimeoutsMockVault extends MockVault {
 
-    private int delaySeconds;
-    private int mockStatus;
-    private String mockResponse;
+    private final int delaySeconds;
+    private final int mockStatus;
+    private final String mockResponse;
 
     public OpenTimeoutsMockVault(final int delaySeconds, final int mockStatus, final String mockResponse) {
         this.delaySeconds = delaySeconds;
@@ -70,7 +70,7 @@ public void handle(
             final HttpServletResponse response
     ) throws IOException, ServletException {
         try {
-            Thread.sleep(delaySeconds * 1000);
+            Thread.sleep((long) delaySeconds * 1000);
             response.setContentType("application/json");
             baseRequest.setHandled(true);
             System.out.println("OpenTimeoutsMockVault is sending an HTTP " + mockStatus + " code, with expected" +
diff --git a/src/test/java/io/github/jopenlibs/vault/vault/mock/ReadTimeoutsMockVault.java b/src/test/java/io/github/jopenlibs/vault/vault/mock/ReadTimeoutsMockVault.java
@@ -1,9 +1,9 @@
 package io.github.jopenlibs.vault.vault.mock;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.server.Request;
 
 /**
@@ -55,9 +55,9 @@
  */
 public class ReadTimeoutsMockVault extends MockVault {
 
-    private int delaySeconds;
-    private int mockStatus;
-    private String mockResponse;
+    private final int delaySeconds;
+    private final int mockStatus;
+    private final String mockResponse;
 
     public ReadTimeoutsMockVault(final int delaySeconds, final int mockStatus, final String mockResponse) {
         this.delaySeconds = delaySeconds;
diff --git a/src/test/java/io/github/jopenlibs/vault/vault/mock/RetriesMockVault.java b/src/test/java/io/github/jopenlibs/vault/vault/mock/RetriesMockVault.java
@@ -1,8 +1,8 @@
 package io.github.jopenlibs.vault.vault.mock;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.server.Request;
 
 /**
@@ -43,9 +43,9 @@
  */
 public class RetriesMockVault extends MockVault {
 
-    private int failureCount ;
-    private int mockStatus;
-    private String mockResponse;
+    private final int mockStatus;
+    private final String mockResponse;
+    private int failureCount;
 
     public RetriesMockVault(final int failureCount, final int mockStatus, final String mockResponse) {
         this.failureCount = failureCount;

Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,9 @@ public Boolean getRenewable() {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`/**`
`55`		`- * Get response-wrapped token`
	`55`	`+ * Get response-wrapped token.`
`56`	`56`	`*`
`57`		`- * @return response-wrapped token`
	`57`	`+ * @return response-wrapped token.`
`58`	`58`	`*/`
`59`	`59`	`public String getToken() {`
`60`	`60`	`return token;`
`@@ -73,7 +73,11 @@ public String getAccessor() {`
`73`	`73`	`return accessor;`
`74`	`74`	`}`
`75`	`75`
`76`		`- /** */`
	`76`	`+ /**`
	`77`	`+ * Get wrapped token TTL.`
	`78`	`+ *`
	`79`	`+ * @return Wrapped token TTL.`
	`80`	`+ */`
`77`	`81`	`public int getTtl() {`
`78`	`82`	`return ttl;`
`79`	`83`	`}`