Code cleanup

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;
 

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<String, Object>());
+    private static final JSON EMPTY_JSON = new JSON(new HashMap<>());
 
     private final String path;
 

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.junit.Assert.assertThat;
-import static org.shredzone.acme4j.toolbox.TestUtils.*;
+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;

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;
 

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;

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;

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;

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;

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;

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;

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),

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.hamcrest.Matchers.is;
-import static org.junit.Assert.*;
+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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;