From 05688c5b9eacf599416cbaec8fce1d8cc7bf1592 Mon Sep 17 00:00:00 2001 From: tkledkov Date: Mon, 10 Oct 2022 11:46:16 +0300 Subject: [PATCH 01/15] vjd-7 Upgrade tests dependencies --- build.gradle | 10 +++++----- .../jopenlibs/vault/vault/VaultTestUtils.java | 2 +- .../vault/vault/api/AuthBackendAwsTests.java | 2 +- .../vault/mock/AuthRequestValidatingMockVault.java | 6 +++--- .../vault/vault/mock/EchoInputMockVault.java | 5 +++-- .../jopenlibs/vault/vault/mock/MockVault.java | 6 +++--- .../vault/vault/mock/OpenTimeoutsMockVault.java | 14 +++++++------- .../vault/vault/mock/ReadTimeoutsMockVault.java | 12 ++++++------ .../vault/vault/mock/RetriesMockVault.java | 10 +++++----- 9 files changed, 34 insertions(+), 33 deletions(-) diff --git a/build.gradle b/build.gradle index 6d601a3a..4d2d2e11 100644 --- a/build.gradle +++ b/build.gradle @@ -16,16 +16,16 @@ repositories { } dependencies { - testCompile('junit:junit:4.12') + testCompile('junit:junit:4.13.2') 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.eclipse.jetty:jetty-server:11.0.12') testCompile('org.slf4j:slf4j-api:1.7.26') - testCompile('org.bouncycastle:bcprov-jdk15on:1.62') - testCompile('org.bouncycastle:bcpkix-jdk15on:1.62') + 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/test/java/io/github/jopenlibs/vault/vault/VaultTestUtils.java b/src/test/java/io/github/jopenlibs/vault/vault/VaultTestUtils.java index 6d7f656f..0bb874a0 100644 --- 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 index 5e576730..72c0be52 100644 --- 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 index 32acbf9a..d6970d97 100644 --- 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 validator; + private final Predicate validator; public AuthRequestValidatingMockVault(Predicate 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 index 2e3ce031..cc5fd778 100644 --- 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 index 1678b66b..465df3df 100644 --- 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 index 36b2153b..bd7ed6a5 100644 --- 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 index 8002f259..8af24a37 100644 --- 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 index 3401f259..756b6037 100644 --- 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; From 52cea3e0b3a2a04a4c7ce873145d638ee0cbbe35 Mon Sep 17 00:00:00 2001 From: tkledkov Date: Mon, 10 Oct 2022 11:51:26 +0300 Subject: [PATCH 02/15] vjd-7 fix javadoc --- .../github/jopenlibs/vault/response/WrapResponse.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/github/jopenlibs/vault/response/WrapResponse.java b/src/main/java/io/github/jopenlibs/vault/response/WrapResponse.java index 74698e91..15b5946e 100644 --- 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; } From 7266f135e84c724850566c1ee7933afd3dfce706 Mon Sep 17 00:00:00 2001 From: tledkov Date: Mon, 10 Oct 2022 22:38:38 +0300 Subject: [PATCH 03/15] upgrade testcontainers and mockito --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 4d2d2e11..9f0709ac 100644 --- a/build.gradle +++ b/build.gradle @@ -17,10 +17,10 @@ repositories { dependencies { testCompile('junit:junit:4.13.2') - testCompile('org.mockito:mockito-core:2.28.2') - testCompile('org.testcontainers:testcontainers:1.12.3') + 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:1.7.26') + 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') From 51bce19b6fe7946a527e3f608b7654716b184a7f Mon Sep 17 00:00:00 2001 From: tledkov Date: Mon, 10 Oct 2022 22:45:18 +0300 Subject: [PATCH 04/15] drop jdk9 tests --- .github/workflows/gradle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 5f78b4f8..9d8dab27 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -1,6 +1,6 @@ name: CI -on: [push, pull_request] +on: [push] jobs: build: @@ -8,7 +8,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - java: [9, 11, 12] + java: [11, 12] os: [ubuntu-latest, windows-latest] include: # TODO(casz) remove once https://github.com/testcontainers/testcontainers-java/pull/1780 is available From ef0622e2615a6ab76272a23cf0e283f05e8297b9 Mon Sep 17 00:00:00 2001 From: tledkov Date: Mon, 10 Oct 2022 23:01:13 +0300 Subject: [PATCH 05/15] add gradle opts --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 9d8dab27..f4962803 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -22,4 +22,4 @@ jobs: with: java-version: ${{ matrix.java }} - name: Build with Gradle - run: ./gradlew build ${{ matrix.tasks }} -s --info + run: ./gradlew build ${{ matrix.tasks }} -s --info GRADLE_OPTS="-Djdk.tls.client.protocols=TLSv1.2" From a3c252659b91523d137ab430dd9dbd2a5456fd46 Mon Sep 17 00:00:00 2001 From: tledkov Date: Mon, 10 Oct 2022 23:02:20 +0300 Subject: [PATCH 06/15] disable tls 1.3 --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index f4962803..586a7b52 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -22,4 +22,4 @@ jobs: with: java-version: ${{ matrix.java }} - name: Build with Gradle - run: ./gradlew build ${{ matrix.tasks }} -s --info GRADLE_OPTS="-Djdk.tls.client.protocols=TLSv1.2" + run: ./gradlew build ${{ matrix.tasks }} -s --info -Djdk.tls.client.protocols=TLSv1.2 From 48336b0d420ba4d2381675ad34ac9ae83db70190 Mon Sep 17 00:00:00 2001 From: tledkov Date: Mon, 10 Oct 2022 23:06:32 +0300 Subject: [PATCH 07/15] fix --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 586a7b52..b0829efe 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -22,4 +22,4 @@ jobs: with: java-version: ${{ matrix.java }} - name: Build with Gradle - run: ./gradlew build ${{ matrix.tasks }} -s --info -Djdk.tls.client.protocols=TLSv1.2 + run: ./gradlew -Djdk.tls.client.protocols=TLSv1.2 build ${{ matrix.tasks }} -s --info From b6e8ac6cc8a5da0b6053aae0dcaeacdfbaafc5d2 Mon Sep 17 00:00:00 2001 From: tledkov Date: Mon, 10 Oct 2022 23:13:43 +0300 Subject: [PATCH 08/15] =?UTF-8?q?fix=20=E2=84=962?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index b0829efe..17748454 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -22,4 +22,4 @@ jobs: with: java-version: ${{ matrix.java }} - name: Build with Gradle - run: ./gradlew -Djdk.tls.client.protocols=TLSv1.2 build ${{ matrix.tasks }} -s --info + run: ./gradlew build ${{ matrix.tasks }} -s --info -Porg.gradle.jvmargs="-Djdk.tls.client.protocols=TLSv1.2" From d4fe0628fbb1f92423dc07adde02d4212bebd386 Mon Sep 17 00:00:00 2001 From: tledkov Date: Mon, 10 Oct 2022 23:24:31 +0300 Subject: [PATCH 09/15] rollback --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 17748454..e172b221 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -22,4 +22,4 @@ jobs: with: java-version: ${{ matrix.java }} - name: Build with Gradle - run: ./gradlew build ${{ matrix.tasks }} -s --info -Porg.gradle.jvmargs="-Djdk.tls.client.protocols=TLSv1.2" + run: ./gradlew build ${{ matrix.tasks }} -s --info From b8436fa1ab35fc1dc55229868de808b5733fe468 Mon Sep 17 00:00:00 2001 From: tledkov Date: Mon, 10 Oct 2022 23:31:22 +0300 Subject: [PATCH 10/15] dbg summary --- .github/workflows/gradle.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index e172b221..9ddf02cc 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -23,3 +23,10 @@ jobs: java-version: ${{ matrix.java }} - name: Build with Gradle run: ./gradlew build ${{ matrix.tasks }} -s --info + - name: Generate list using Markdown + run: | + echo "This is the lead in sentence for the list" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY # this is a blank line + echo "- Lets add a bullet point" >> $GITHUB_STEP_SUMMARY + echo "- Lets add a second bullet point" >> $GITHUB_STEP_SUMMARY + echo "- How about a third one?" >> $GITHUB_STEP_SUMMARY From 1bb056372a6d08ace7e084615383e010c132d560 Mon Sep 17 00:00:00 2001 From: tledkov Date: Mon, 10 Oct 2022 23:43:06 +0300 Subject: [PATCH 11/15] try gradle-build-action@v2 --- .github/workflows/gradle.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 9ddf02cc..433051b0 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -22,11 +22,11 @@ jobs: with: java-version: ${{ matrix.java }} - name: Build with Gradle - run: ./gradlew build ${{ matrix.tasks }} -s --info - - name: Generate list using Markdown - run: | - echo "This is the lead in sentence for the list" >> $GITHUB_STEP_SUMMARY - echo "" >> $GITHUB_STEP_SUMMARY # this is a blank line - echo "- Lets add a bullet point" >> $GITHUB_STEP_SUMMARY - echo "- Lets add a second bullet point" >> $GITHUB_STEP_SUMMARY - echo "- How about a third one?" >> $GITHUB_STEP_SUMMARY + uses: gradle/gradle-build-action@v2 + with: + arguments: | + build + ${{ matrix.tasks }} + -s + --info + -Porg.gradle.jvmargs="-Djdk.tls.client.protocols=TLSv1.2" From 9e52813aba6de9d3438befb2f84e38af01d011f9 Mon Sep 17 00:00:00 2001 From: tledkov Date: Mon, 10 Oct 2022 23:50:30 +0300 Subject: [PATCH 12/15] drop jdk12 --- .github/workflows/gradle.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 433051b0..be55e413 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -8,7 +8,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - java: [11, 12] + java: [11, 18] os: [ubuntu-latest, windows-latest] include: # TODO(casz) remove once https://github.com/testcontainers/testcontainers-java/pull/1780 is available @@ -29,4 +29,3 @@ jobs: ${{ matrix.tasks }} -s --info - -Porg.gradle.jvmargs="-Djdk.tls.client.protocols=TLSv1.2" From daade1a1217cdbb64fa762ba96e9ae18ba5eb4d2 Mon Sep 17 00:00:00 2001 From: tledkov Date: Mon, 10 Oct 2022 23:51:53 +0300 Subject: [PATCH 13/15] jdk19 --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index be55e413..e96306e0 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -8,7 +8,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - java: [11, 18] + java: [11, 19] os: [ubuntu-latest, windows-latest] include: # TODO(casz) remove once https://github.com/testcontainers/testcontainers-java/pull/1780 is available From dacb567beec22abc8941a37c3a07e0c6cf9effc6 Mon Sep 17 00:00:00 2001 From: tledkov Date: Mon, 10 Oct 2022 23:55:44 +0300 Subject: [PATCH 14/15] jdk15 --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index e96306e0..4f789fa9 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -8,7 +8,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - java: [11, 19] + java: [11] os: [ubuntu-latest, windows-latest] include: # TODO(casz) remove once https://github.com/testcontainers/testcontainers-java/pull/1780 is available From 5788a946a6a25eb5878dec44c84f37f376207420 Mon Sep 17 00:00:00 2001 From: tledkov Date: Tue, 11 Oct 2022 00:04:56 +0300 Subject: [PATCH 15/15] fix style --- .../jopenlibs/vault/vault/mock/ReadTimeoutsMockVault.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index 8af24a37..773e44ff 100644 --- a/src/test/java/io/github/jopenlibs/vault/vault/mock/ReadTimeoutsMockVault.java +++ b/src/test/java/io/github/jopenlibs/vault/vault/mock/ReadTimeoutsMockVault.java @@ -56,8 +56,8 @@ public class ReadTimeoutsMockVault extends MockVault { private final int delaySeconds; - private final int mockStatus; - private final String mockResponse; + private final int mockStatus; + private final String mockResponse; public ReadTimeoutsMockVault(final int delaySeconds, final int mockStatus, final String mockResponse) { this.delaySeconds = delaySeconds;