From 542b50b741ce7671ec5ff57016307aa85b31c3d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20K=C3=B6rber?= Date: Sun, 24 Mar 2019 13:52:45 +0100 Subject: [PATCH] Code cleanup --- .../org/shredzone/acme4j/challenge/Dns01Challenge.java | 3 ++- .../src/main/java/org/shredzone/acme4j/toolbox/JSON.java | 6 ++---- .../src/test/java/org/shredzone/acme4j/AccountTest.java | 6 ++++-- .../java/org/shredzone/acme4j/AcmeJsonResourceTest.java | 3 ++- .../test/java/org/shredzone/acme4j/AcmeResourceTest.java | 3 ++- .../java/org/shredzone/acme4j/AuthorizationTest.java | 6 ++++-- .../test/java/org/shredzone/acme4j/CertificateTest.java | 6 ++++-- .../test/java/org/shredzone/acme4j/IdentifierTest.java | 3 ++- .../test/java/org/shredzone/acme4j/OrderBuilderTest.java | 6 ++++-- .../src/test/java/org/shredzone/acme4j/OrderTest.java | 3 ++- .../src/test/java/org/shredzone/acme4j/SessionTest.java | 7 ++++--- .../org/shredzone/acme4j/challenge/ChallengeTest.java | 9 ++++++--- .../shredzone/acme4j/connector/HttpConnectorTest.java | 3 ++- .../shredzone/acme4j/exception/AcmeExceptionTest.java | 3 ++- .../acme4j/exception/AcmeNetworkExceptionTest.java | 3 ++- .../acme4j/exception/AcmeRateLimitedExceptionTest.java | 3 ++- .../exception/AcmeUserActionRequiredExceptionTest.java | 3 ++- .../acme4j/provider/AbstractAcmeProviderTest.java | 3 ++- .../letsencrypt/LetsEncryptAcmeProviderTest.java | 3 ++- .../acme4j/provider/pebble/PebbleAcmeProviderTest.java | 3 ++- .../test/java/org/shredzone/acme4j/toolbox/JSONTest.java | 3 ++- 21 files changed, 56 insertions(+), 32 deletions(-) diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/Dns01Challenge.java b/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/Dns01Challenge.java index 7b43f694..1e6d05af 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/Dns01Challenge.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/Dns01Challenge.java @@ -13,7 +13,8 @@ */ package org.shredzone.acme4j.challenge; -import static org.shredzone.acme4j.toolbox.AcmeUtils.*; +import static org.shredzone.acme4j.toolbox.AcmeUtils.base64UrlEncode; +import static org.shredzone.acme4j.toolbox.AcmeUtils.sha256hash; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/toolbox/JSON.java b/acme4j-client/src/main/java/org/shredzone/acme4j/toolbox/JSON.java index 2db9e905..801d8125 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/toolbox/JSON.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/toolbox/JSON.java @@ -47,6 +47,7 @@ import javax.annotation.ParametersAreNonnullByDefault; import javax.annotation.WillClose; import javax.annotation.concurrent.Immutable; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.jose4j.json.JsonUtil; import org.jose4j.lang.JoseException; import org.shredzone.acme4j.Identifier; @@ -54,18 +55,15 @@ import org.shredzone.acme4j.Problem; import org.shredzone.acme4j.Status; import org.shredzone.acme4j.exception.AcmeProtocolException; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - /** * A model containing a JSON result. The content is immutable. */ -@SuppressWarnings("unchecked") @ParametersAreNonnullByDefault @Immutable public final class JSON implements Serializable { private static final long serialVersionUID = 3091273044605709204L; - private static final JSON EMPTY_JSON = new JSON(new HashMap()); + private static final JSON EMPTY_JSON = new JSON(new HashMap<>()); private final String path; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/AccountTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/AccountTest.java index 779934bd..b74a229b 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/AccountTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/AccountTest.java @@ -14,8 +14,10 @@ package org.shredzone.acme4j; import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; -import static org.shredzone.acme4j.toolbox.TestUtils.*; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; +import static org.shredzone.acme4j.toolbox.TestUtils.getJSON; +import static org.shredzone.acme4j.toolbox.TestUtils.url; import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs; import java.io.IOException; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/AcmeJsonResourceTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/AcmeJsonResourceTest.java index bd778188..8307682d 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/AcmeJsonResourceTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/AcmeJsonResourceTest.java @@ -15,7 +15,8 @@ package org.shredzone.acme4j; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; -import static org.shredzone.acme4j.toolbox.TestUtils.*; +import static org.shredzone.acme4j.toolbox.TestUtils.getJSON; +import static org.shredzone.acme4j.toolbox.TestUtils.url; import java.net.URL; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/AcmeResourceTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/AcmeResourceTest.java index aebe7af1..cd64dfac 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/AcmeResourceTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/AcmeResourceTest.java @@ -14,7 +14,8 @@ package org.shredzone.acme4j; import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/AuthorizationTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/AuthorizationTest.java index 051261c1..4c9a3c59 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/AuthorizationTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/AuthorizationTest.java @@ -14,9 +14,11 @@ package org.shredzone.acme4j; import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; import static org.shredzone.acme4j.toolbox.AcmeUtils.parseTimestamp; -import static org.shredzone.acme4j.toolbox.TestUtils.*; +import static org.shredzone.acme4j.toolbox.TestUtils.getJSON; +import static org.shredzone.acme4j.toolbox.TestUtils.url; import java.io.IOException; import java.net.HttpURLConnection; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/CertificateTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/CertificateTest.java index 128f5f24..2c4c04d7 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/CertificateTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/CertificateTest.java @@ -13,9 +13,11 @@ */ package org.shredzone.acme4j; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertThat; -import static org.shredzone.acme4j.toolbox.TestUtils.*; +import static org.shredzone.acme4j.toolbox.TestUtils.getJSON; +import static org.shredzone.acme4j.toolbox.TestUtils.url; import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs; import java.io.ByteArrayOutputStream; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/IdentifierTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/IdentifierTest.java index 59e2ecf1..214b2c87 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/IdentifierTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/IdentifierTest.java @@ -14,7 +14,8 @@ package org.shredzone.acme4j; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/OrderBuilderTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/OrderBuilderTest.java index 892a6547..1e05ff40 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/OrderBuilderTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/OrderBuilderTest.java @@ -14,9 +14,11 @@ package org.shredzone.acme4j; import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; import static org.shredzone.acme4j.toolbox.AcmeUtils.parseTimestamp; -import static org.shredzone.acme4j.toolbox.TestUtils.*; +import static org.shredzone.acme4j.toolbox.TestUtils.getJSON; +import static org.shredzone.acme4j.toolbox.TestUtils.url; import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs; import java.net.HttpURLConnection; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/OrderTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/OrderTest.java index f240791e..851ff78f 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/OrderTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/OrderTest.java @@ -16,7 +16,8 @@ package org.shredzone.acme4j; import static org.hamcrest.Matchers.*; import static org.junit.Assert.assertThat; import static org.shredzone.acme4j.toolbox.AcmeUtils.parseTimestamp; -import static org.shredzone.acme4j.toolbox.TestUtils.*; +import static org.shredzone.acme4j.toolbox.TestUtils.getJSON; +import static org.shredzone.acme4j.toolbox.TestUtils.url; import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs; import java.net.HttpURLConnection; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/SessionTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/SessionTest.java index 94dc260b..38aa539e 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/SessionTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/SessionTest.java @@ -14,7 +14,8 @@ package org.shredzone.acme4j; import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; import static org.mockito.Mockito.*; import static org.shredzone.acme4j.toolbox.TestUtils.*; @@ -128,7 +129,7 @@ public class SessionTest { @Override public AcmeProvider provider() { return mockProvider; - }; + } }; assertSession(session); @@ -165,7 +166,7 @@ public class SessionTest { @Override public AcmeProvider provider() { return mockProvider; - }; + } }; assertThat(session.resourceUrl(Resource.NEW_ACCOUNT), diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/ChallengeTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/ChallengeTest.java index 605c52af..f46bece8 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/ChallengeTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/ChallengeTest.java @@ -13,10 +13,13 @@ */ package org.shredzone.acme4j.challenge; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; import static org.shredzone.acme4j.toolbox.AcmeUtils.parseTimestamp; -import static org.shredzone.acme4j.toolbox.TestUtils.*; +import static org.shredzone.acme4j.toolbox.TestUtils.getJSON; +import static org.shredzone.acme4j.toolbox.TestUtils.url; import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs; import java.net.HttpURLConnection; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/connector/HttpConnectorTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/connector/HttpConnectorTest.java index 9182c934..202cb223 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/connector/HttpConnectorTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/connector/HttpConnectorTest.java @@ -16,7 +16,8 @@ package org.shredzone.acme4j.connector; import static org.hamcrest.Matchers.*; import static org.junit.Assert.assertThat; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; import java.io.IOException; import java.net.HttpURLConnection; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/exception/AcmeExceptionTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/exception/AcmeExceptionTest.java index 477a88c8..ce6c825e 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/exception/AcmeExceptionTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/exception/AcmeExceptionTest.java @@ -13,7 +13,8 @@ */ package org.shredzone.acme4j.exception; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertThat; import java.io.IOException; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/exception/AcmeNetworkExceptionTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/exception/AcmeNetworkExceptionTest.java index da168c07..be6c7ba9 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/exception/AcmeNetworkExceptionTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/exception/AcmeNetworkExceptionTest.java @@ -13,7 +13,8 @@ */ package org.shredzone.acme4j.exception; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertThat; import java.io.IOException; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/exception/AcmeRateLimitedExceptionTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/exception/AcmeRateLimitedExceptionTest.java index 379b1fbb..94cbe9cb 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/exception/AcmeRateLimitedExceptionTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/exception/AcmeRateLimitedExceptionTest.java @@ -15,7 +15,8 @@ package org.shredzone.acme4j.exception; import static org.hamcrest.Matchers.*; import static org.junit.Assert.assertThat; -import static org.shredzone.acme4j.toolbox.TestUtils.*; +import static org.shredzone.acme4j.toolbox.TestUtils.createProblem; +import static org.shredzone.acme4j.toolbox.TestUtils.url; import java.net.URI; import java.net.URL; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/exception/AcmeUserActionRequiredExceptionTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/exception/AcmeUserActionRequiredExceptionTest.java index 4d0415cb..3ff7b7ba 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/exception/AcmeUserActionRequiredExceptionTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/exception/AcmeUserActionRequiredExceptionTest.java @@ -13,7 +13,8 @@ */ package org.shredzone.acme4j.exception; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertThat; import static org.shredzone.acme4j.toolbox.TestUtils.createProblem; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/provider/AbstractAcmeProviderTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/provider/AbstractAcmeProviderTest.java index 41bf5f44..e1a2fece 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/provider/AbstractAcmeProviderTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/provider/AbstractAcmeProviderTest.java @@ -14,7 +14,8 @@ package org.shredzone.acme4j.provider; import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; import static org.mockito.Mockito.*; import static org.shredzone.acme4j.toolbox.TestUtils.getJSON; import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/provider/letsencrypt/LetsEncryptAcmeProviderTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/provider/letsencrypt/LetsEncryptAcmeProviderTest.java index 19dd32b6..6685e4e7 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/provider/letsencrypt/LetsEncryptAcmeProviderTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/provider/letsencrypt/LetsEncryptAcmeProviderTest.java @@ -14,7 +14,8 @@ package org.shredzone.acme4j.provider.letsencrypt; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; import static org.shredzone.acme4j.toolbox.TestUtils.url; import java.net.URI; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/provider/pebble/PebbleAcmeProviderTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/provider/pebble/PebbleAcmeProviderTest.java index ac30ca70..a73ca4d6 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/provider/pebble/PebbleAcmeProviderTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/provider/pebble/PebbleAcmeProviderTest.java @@ -14,7 +14,8 @@ package org.shredzone.acme4j.provider.pebble; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; import static org.shredzone.acme4j.toolbox.TestUtils.url; import java.net.URI; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/toolbox/JSONTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/toolbox/JSONTest.java index 541a35e4..b6a831f9 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/toolbox/JSONTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/toolbox/JSONTest.java @@ -14,7 +14,8 @@ package org.shredzone.acme4j.toolbox; import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; import static org.shredzone.acme4j.toolbox.TestUtils.url; import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs;