diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/Authorization.java b/acme4j-client/src/main/java/org/shredzone/acme4j/Authorization.java index 74e95002..0cd7af81 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/Authorization.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Authorization.java @@ -14,7 +14,7 @@ package org.shredzone.acme4j; import static java.util.stream.Collectors.toList; -import static org.shredzone.acme4j.util.AcmeUtils.parseTimestamp; +import static org.shredzone.acme4j.toolbox.AcmeUtils.parseTimestamp; import java.net.HttpURLConnection; import java.net.URI; @@ -30,8 +30,8 @@ import org.shredzone.acme4j.connector.Connection; import org.shredzone.acme4j.exception.AcmeException; import org.shredzone.acme4j.exception.AcmeProtocolException; import org.shredzone.acme4j.exception.AcmeRetryAfterException; -import org.shredzone.acme4j.util.JSON; -import org.shredzone.acme4j.util.JSONBuilder; +import org.shredzone.acme4j.toolbox.JSON; +import org.shredzone.acme4j.toolbox.JSONBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/Certificate.java b/acme4j-client/src/main/java/org/shredzone/acme4j/Certificate.java index 028404fc..d7caf6cd 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/Certificate.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Certificate.java @@ -25,7 +25,7 @@ import org.shredzone.acme4j.connector.Resource; import org.shredzone.acme4j.exception.AcmeException; import org.shredzone.acme4j.exception.AcmeProtocolException; import org.shredzone.acme4j.exception.AcmeRetryAfterException; -import org.shredzone.acme4j.util.JSONBuilder; +import org.shredzone.acme4j.toolbox.JSONBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/Metadata.java b/acme4j-client/src/main/java/org/shredzone/acme4j/Metadata.java index 6448fb86..297e0ec5 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/Metadata.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Metadata.java @@ -19,9 +19,9 @@ import java.net.URI; import java.util.Collection; import java.util.Collections; -import org.shredzone.acme4j.util.JSON; -import org.shredzone.acme4j.util.JSON.Array; -import org.shredzone.acme4j.util.JSON.Value; +import org.shredzone.acme4j.toolbox.JSON; +import org.shredzone.acme4j.toolbox.JSON.Array; +import org.shredzone.acme4j.toolbox.JSON.Value; /** * Contains metadata related to the provider. diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/Problem.java b/acme4j-client/src/main/java/org/shredzone/acme4j/Problem.java index dc869226..b9bbe8b9 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/Problem.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Problem.java @@ -16,7 +16,7 @@ package org.shredzone.acme4j; import java.io.Serializable; import java.net.URI; -import org.shredzone.acme4j.util.JSON; +import org.shredzone.acme4j.toolbox.JSON; /** * Represents a JSON Problem. diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/Registration.java b/acme4j-client/src/main/java/org/shredzone/acme4j/Registration.java index dc50897e..2a6b7eea 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/Registration.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Registration.java @@ -13,7 +13,7 @@ */ package org.shredzone.acme4j; -import static org.shredzone.acme4j.util.AcmeUtils.*; +import static org.shredzone.acme4j.toolbox.AcmeUtils.*; import java.net.HttpURLConnection; import java.net.URI; @@ -36,8 +36,8 @@ import org.shredzone.acme4j.connector.ResourceIterator; import org.shredzone.acme4j.exception.AcmeException; import org.shredzone.acme4j.exception.AcmeProtocolException; import org.shredzone.acme4j.exception.AcmeRetryAfterException; -import org.shredzone.acme4j.util.JSON; -import org.shredzone.acme4j.util.JSONBuilder; +import org.shredzone.acme4j.toolbox.JSON; +import org.shredzone.acme4j.toolbox.JSONBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/RegistrationBuilder.java b/acme4j-client/src/main/java/org/shredzone/acme4j/RegistrationBuilder.java index 1acf1171..93dceff4 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/RegistrationBuilder.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/RegistrationBuilder.java @@ -22,7 +22,7 @@ import org.shredzone.acme4j.connector.Connection; import org.shredzone.acme4j.connector.Resource; import org.shredzone.acme4j.exception.AcmeConflictException; import org.shredzone.acme4j.exception.AcmeException; -import org.shredzone.acme4j.util.JSONBuilder; +import org.shredzone.acme4j.toolbox.JSONBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/Session.java b/acme4j-client/src/main/java/org/shredzone/acme4j/Session.java index e0843107..2984be37 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/Session.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Session.java @@ -30,7 +30,7 @@ import org.shredzone.acme4j.challenge.TokenChallenge; import org.shredzone.acme4j.connector.Resource; import org.shredzone.acme4j.exception.AcmeException; import org.shredzone.acme4j.provider.AcmeProvider; -import org.shredzone.acme4j.util.JSON; +import org.shredzone.acme4j.toolbox.JSON; /** * A session stores the ACME server URI and the account's key pair. It also tracks diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/Challenge.java b/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/Challenge.java index ec0dcb4b..8534174c 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/Challenge.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/Challenge.java @@ -26,8 +26,8 @@ import org.shredzone.acme4j.connector.Connection; import org.shredzone.acme4j.exception.AcmeException; import org.shredzone.acme4j.exception.AcmeProtocolException; import org.shredzone.acme4j.exception.AcmeRetryAfterException; -import org.shredzone.acme4j.util.JSON; -import org.shredzone.acme4j.util.JSONBuilder; +import org.shredzone.acme4j.toolbox.JSON; +import org.shredzone.acme4j.toolbox.JSONBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 ae2f84d7..1925b6ea 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,7 @@ */ package org.shredzone.acme4j.challenge; -import static org.shredzone.acme4j.util.AcmeUtils.*; +import static org.shredzone.acme4j.toolbox.AcmeUtils.*; import org.shredzone.acme4j.Session; diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/TlsSni01Challenge.java b/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/TlsSni01Challenge.java index 6ab04f5f..cbb88814 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/TlsSni01Challenge.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/TlsSni01Challenge.java @@ -13,7 +13,7 @@ */ package org.shredzone.acme4j.challenge; -import static org.shredzone.acme4j.util.AcmeUtils.*; +import static org.shredzone.acme4j.toolbox.AcmeUtils.*; import org.shredzone.acme4j.Session; diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/TlsSni02Challenge.java b/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/TlsSni02Challenge.java index 63cc5852..03404655 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/TlsSni02Challenge.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/TlsSni02Challenge.java @@ -13,7 +13,7 @@ */ package org.shredzone.acme4j.challenge; -import static org.shredzone.acme4j.util.AcmeUtils.*; +import static org.shredzone.acme4j.toolbox.AcmeUtils.*; import org.shredzone.acme4j.Session; diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/TokenChallenge.java b/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/TokenChallenge.java index 2e9d9bed..f751282d 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/TokenChallenge.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/TokenChallenge.java @@ -13,7 +13,7 @@ */ package org.shredzone.acme4j.challenge; -import static org.shredzone.acme4j.util.AcmeUtils.base64UrlEncode; +import static org.shredzone.acme4j.toolbox.AcmeUtils.base64UrlEncode; import java.security.PublicKey; @@ -21,7 +21,7 @@ import org.jose4j.jwk.PublicJsonWebKey; import org.jose4j.lang.JoseException; import org.shredzone.acme4j.Session; import org.shredzone.acme4j.exception.AcmeProtocolException; -import org.shredzone.acme4j.util.JSONBuilder; +import org.shredzone.acme4j.toolbox.JSONBuilder; /** * An extension of {@link Challenge} that handles challenges with a {@code token} and diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/connector/Connection.java b/acme4j-client/src/main/java/org/shredzone/acme4j/connector/Connection.java index 7de36424..c1240675 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/connector/Connection.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/connector/Connection.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.shredzone.acme4j.Session; import org.shredzone.acme4j.exception.AcmeException; import org.shredzone.acme4j.exception.AcmeRetryAfterException; -import org.shredzone.acme4j.util.JSON; -import org.shredzone.acme4j.util.JSONBuilder; +import org.shredzone.acme4j.toolbox.JSON; +import org.shredzone.acme4j.toolbox.JSONBuilder; /** * Connects to the ACME server and offers different methods for invoking the API. diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/connector/DefaultConnection.java b/acme4j-client/src/main/java/org/shredzone/acme4j/connector/DefaultConnection.java index 31f423a5..5e1e8f9e 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/connector/DefaultConnection.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/connector/DefaultConnection.java @@ -13,7 +13,7 @@ */ package org.shredzone.acme4j.connector; -import static org.shredzone.acme4j.util.AcmeUtils.keyAlgorithm; +import static org.shredzone.acme4j.toolbox.AcmeUtils.keyAlgorithm; import java.io.IOException; import java.io.InputStream; @@ -52,9 +52,9 @@ import org.shredzone.acme4j.exception.AcmeRateLimitExceededException; import org.shredzone.acme4j.exception.AcmeRetryAfterException; import org.shredzone.acme4j.exception.AcmeServerException; import org.shredzone.acme4j.exception.AcmeUnauthorizedException; -import org.shredzone.acme4j.util.AcmeUtils; -import org.shredzone.acme4j.util.JSON; -import org.shredzone.acme4j.util.JSONBuilder; +import org.shredzone.acme4j.toolbox.AcmeUtils; +import org.shredzone.acme4j.toolbox.JSON; +import org.shredzone.acme4j.toolbox.JSONBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/connector/ResourceIterator.java b/acme4j-client/src/main/java/org/shredzone/acme4j/connector/ResourceIterator.java index 0ef74d32..71f37f54 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/connector/ResourceIterator.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/connector/ResourceIterator.java @@ -26,7 +26,7 @@ import org.shredzone.acme4j.AcmeResource; import org.shredzone.acme4j.Session; import org.shredzone.acme4j.exception.AcmeException; import org.shredzone.acme4j.exception.AcmeProtocolException; -import org.shredzone.acme4j.util.JSON; +import org.shredzone.acme4j.toolbox.JSON; /** * An {@link Iterator} that fetches a batch of URIs from the ACME server, and generates diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/exception/AcmeServerException.java b/acme4j-client/src/main/java/org/shredzone/acme4j/exception/AcmeServerException.java index 3adc4f14..f00dd3f8 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/exception/AcmeServerException.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/exception/AcmeServerException.java @@ -15,7 +15,7 @@ package org.shredzone.acme4j.exception; import java.util.Objects; -import org.shredzone.acme4j.util.AcmeUtils; +import org.shredzone.acme4j.toolbox.AcmeUtils; /** * An exception that is thrown when the ACME server returned an error. It contains diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/provider/AbstractAcmeProvider.java b/acme4j-client/src/main/java/org/shredzone/acme4j/provider/AbstractAcmeProvider.java index 1d1d224e..cbc9e7a3 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/provider/AbstractAcmeProvider.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/provider/AbstractAcmeProvider.java @@ -31,7 +31,7 @@ import org.shredzone.acme4j.connector.Connection; import org.shredzone.acme4j.connector.DefaultConnection; import org.shredzone.acme4j.connector.HttpConnector; import org.shredzone.acme4j.exception.AcmeException; -import org.shredzone.acme4j.util.JSON; +import org.shredzone.acme4j.toolbox.JSON; /** * Abstract implementation of {@link AcmeProvider}. It consists of a challenge diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/provider/AcmeProvider.java b/acme4j-client/src/main/java/org/shredzone/acme4j/provider/AcmeProvider.java index 529de286..c563ad2a 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/provider/AcmeProvider.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/provider/AcmeProvider.java @@ -20,7 +20,7 @@ import org.shredzone.acme4j.Session; import org.shredzone.acme4j.challenge.Challenge; import org.shredzone.acme4j.connector.Connection; import org.shredzone.acme4j.exception.AcmeException; -import org.shredzone.acme4j.util.JSON; +import org.shredzone.acme4j.toolbox.JSON; /** * An {@link AcmeProvider} provides methods to be used for communicating with the ACME diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/util/AcmeUtils.java b/acme4j-client/src/main/java/org/shredzone/acme4j/toolbox/AcmeUtils.java similarity index 99% rename from acme4j-client/src/main/java/org/shredzone/acme4j/util/AcmeUtils.java rename to acme4j-client/src/main/java/org/shredzone/acme4j/toolbox/AcmeUtils.java index dedd9d9a..6e574f32 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/util/AcmeUtils.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/toolbox/AcmeUtils.java @@ -11,7 +11,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ -package org.shredzone.acme4j.util; +package org.shredzone.acme4j.toolbox; import java.io.UnsupportedEncodingException; import java.net.IDN; diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/util/JSON.java b/acme4j-client/src/main/java/org/shredzone/acme4j/toolbox/JSON.java similarity index 99% rename from acme4j-client/src/main/java/org/shredzone/acme4j/util/JSON.java rename to acme4j-client/src/main/java/org/shredzone/acme4j/toolbox/JSON.java index c0a57b7c..1b925672 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/util/JSON.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/toolbox/JSON.java @@ -11,10 +11,10 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ -package org.shredzone.acme4j.util; +package org.shredzone.acme4j.toolbox; import static java.util.stream.Collectors.joining; -import static org.shredzone.acme4j.util.AcmeUtils.parseTimestamp; +import static org.shredzone.acme4j.toolbox.AcmeUtils.parseTimestamp; import java.io.BufferedReader; import java.io.IOException; diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/util/JSONBuilder.java b/acme4j-client/src/main/java/org/shredzone/acme4j/toolbox/JSONBuilder.java similarity index 97% rename from acme4j-client/src/main/java/org/shredzone/acme4j/util/JSONBuilder.java rename to acme4j-client/src/main/java/org/shredzone/acme4j/toolbox/JSONBuilder.java index f4a3874e..9534e3b2 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/util/JSONBuilder.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/toolbox/JSONBuilder.java @@ -11,9 +11,9 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ -package org.shredzone.acme4j.util; +package org.shredzone.acme4j.toolbox; -import static org.shredzone.acme4j.util.AcmeUtils.base64UrlEncode; +import static org.shredzone.acme4j.toolbox.AcmeUtils.base64UrlEncode; import java.security.Key; import java.security.PublicKey; 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 fa4155a9..27c32987 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/AcmeResourceTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/AcmeResourceTest.java @@ -23,7 +23,7 @@ import java.io.ObjectOutputStream; import java.net.URI; import org.junit.Test; -import org.shredzone.acme4j.util.TestUtils; +import org.shredzone.acme4j.toolbox.TestUtils; /** * Unit tests for {@link AcmeResource}. 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 09db84b7..182b7597 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/AuthorizationTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/AuthorizationTest.java @@ -15,8 +15,8 @@ package org.shredzone.acme4j; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; -import static org.shredzone.acme4j.util.AcmeUtils.parseTimestamp; -import static org.shredzone.acme4j.util.TestUtils.*; +import static org.shredzone.acme4j.toolbox.AcmeUtils.parseTimestamp; +import static org.shredzone.acme4j.toolbox.TestUtils.*; import java.io.IOException; import java.net.HttpURLConnection; @@ -34,8 +34,8 @@ import org.shredzone.acme4j.challenge.TlsSni02Challenge; import org.shredzone.acme4j.exception.AcmeException; import org.shredzone.acme4j.exception.AcmeRetryAfterException; import org.shredzone.acme4j.provider.TestableConnectionProvider; -import org.shredzone.acme4j.util.JSON; -import org.shredzone.acme4j.util.JSONBuilder; +import org.shredzone.acme4j.toolbox.JSON; +import org.shredzone.acme4j.toolbox.JSONBuilder; /** * Unit tests for {@link Authorization}. 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 f5b7ee40..7d391f1f 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/CertificateTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/CertificateTest.java @@ -15,7 +15,7 @@ package org.shredzone.acme4j; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; -import static org.shredzone.acme4j.util.TestUtils.*; +import static org.shredzone.acme4j.toolbox.TestUtils.*; import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs; import java.io.IOException; @@ -31,8 +31,8 @@ import org.shredzone.acme4j.connector.Resource; import org.shredzone.acme4j.exception.AcmeException; import org.shredzone.acme4j.exception.AcmeRetryAfterException; import org.shredzone.acme4j.provider.TestableConnectionProvider; -import org.shredzone.acme4j.util.JSONBuilder; -import org.shredzone.acme4j.util.TestUtils; +import org.shredzone.acme4j.toolbox.JSONBuilder; +import org.shredzone.acme4j.toolbox.TestUtils; /** * Unit tests for {@link Certificate}. diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/ProblemTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/ProblemTest.java index 7edb467c..15fa82f2 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/ProblemTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/ProblemTest.java @@ -20,8 +20,8 @@ import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs; import java.net.URI; import org.junit.Test; -import org.shredzone.acme4j.util.JSON; -import org.shredzone.acme4j.util.TestUtils; +import org.shredzone.acme4j.toolbox.JSON; +import org.shredzone.acme4j.toolbox.TestUtils; /** * Unit tests for {@link Problem}. diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationBuilderTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationBuilderTest.java index ddc841cc..e60fbb0c 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationBuilderTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationBuilderTest.java @@ -15,7 +15,7 @@ package org.shredzone.acme4j; import static org.hamcrest.Matchers.*; import static org.junit.Assert.assertThat; -import static org.shredzone.acme4j.util.TestUtils.*; +import static org.shredzone.acme4j.toolbox.TestUtils.*; import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs; import java.net.HttpURLConnection; @@ -25,7 +25,7 @@ import org.junit.Test; import org.shredzone.acme4j.connector.Resource; import org.shredzone.acme4j.exception.AcmeException; import org.shredzone.acme4j.provider.TestableConnectionProvider; -import org.shredzone.acme4j.util.JSONBuilder; +import org.shredzone.acme4j.toolbox.JSONBuilder; /** * Unit tests for {@link RegistrationBuilder}. diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationTest.java index b4508b74..5663218c 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationTest.java @@ -15,7 +15,7 @@ package org.shredzone.acme4j; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; -import static org.shredzone.acme4j.util.TestUtils.*; +import static org.shredzone.acme4j.toolbox.TestUtils.*; import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs; import java.io.IOException; @@ -42,9 +42,9 @@ import org.shredzone.acme4j.exception.AcmeException; import org.shredzone.acme4j.exception.AcmeProtocolException; import org.shredzone.acme4j.provider.AcmeProvider; import org.shredzone.acme4j.provider.TestableConnectionProvider; -import org.shredzone.acme4j.util.JSON; -import org.shredzone.acme4j.util.JSONBuilder; -import org.shredzone.acme4j.util.TestUtils; +import org.shredzone.acme4j.toolbox.JSON; +import org.shredzone.acme4j.toolbox.JSONBuilder; +import org.shredzone.acme4j.toolbox.TestUtils; /** * Unit tests for {@link Registration}. 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 46311ad6..02591044 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/SessionTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/SessionTest.java @@ -16,7 +16,7 @@ package org.shredzone.acme4j; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; import static org.mockito.Mockito.*; -import static org.shredzone.acme4j.util.TestUtils.getJsonAsObject; +import static org.shredzone.acme4j.toolbox.TestUtils.getJsonAsObject; import java.io.IOException; import java.net.URI; @@ -30,9 +30,9 @@ import org.shredzone.acme4j.challenge.Http01Challenge; import org.shredzone.acme4j.connector.Resource; import org.shredzone.acme4j.exception.AcmeException; import org.shredzone.acme4j.provider.AcmeProvider; -import org.shredzone.acme4j.util.JSON; -import org.shredzone.acme4j.util.JSONBuilder; -import org.shredzone.acme4j.util.TestUtils; +import org.shredzone.acme4j.toolbox.JSON; +import org.shredzone.acme4j.toolbox.JSONBuilder; +import org.shredzone.acme4j.toolbox.TestUtils; /** * Unit test for {@link Session}. 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 68340ec7..5c6ec946 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 @@ -15,8 +15,8 @@ package org.shredzone.acme4j.challenge; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; -import static org.shredzone.acme4j.util.AcmeUtils.parseTimestamp; -import static org.shredzone.acme4j.util.TestUtils.*; +import static org.shredzone.acme4j.toolbox.AcmeUtils.parseTimestamp; +import static org.shredzone.acme4j.toolbox.TestUtils.*; import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs; import java.io.IOException; @@ -37,9 +37,9 @@ import org.shredzone.acme4j.exception.AcmeException; import org.shredzone.acme4j.exception.AcmeProtocolException; import org.shredzone.acme4j.exception.AcmeRetryAfterException; import org.shredzone.acme4j.provider.TestableConnectionProvider; -import org.shredzone.acme4j.util.JSON; -import org.shredzone.acme4j.util.JSONBuilder; -import org.shredzone.acme4j.util.TestUtils; +import org.shredzone.acme4j.toolbox.JSON; +import org.shredzone.acme4j.toolbox.JSONBuilder; +import org.shredzone.acme4j.toolbox.TestUtils; /** * Unit tests for {@link Challenge}. diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/DnsChallengeTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/DnsChallengeTest.java index 5c36bf9c..c1ae33e5 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/DnsChallengeTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/DnsChallengeTest.java @@ -15,7 +15,7 @@ package org.shredzone.acme4j.challenge; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; -import static org.shredzone.acme4j.util.TestUtils.getJsonAsObject; +import static org.shredzone.acme4j.toolbox.TestUtils.getJsonAsObject; import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs; import java.io.IOException; @@ -24,8 +24,8 @@ import org.junit.BeforeClass; import org.junit.Test; import org.shredzone.acme4j.Session; import org.shredzone.acme4j.Status; -import org.shredzone.acme4j.util.JSONBuilder; -import org.shredzone.acme4j.util.TestUtils; +import org.shredzone.acme4j.toolbox.JSONBuilder; +import org.shredzone.acme4j.toolbox.TestUtils; /** * Unit tests for {@link Dns01Challenge}. diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/HttpChallengeTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/HttpChallengeTest.java index 0e048069..c244ece3 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/HttpChallengeTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/HttpChallengeTest.java @@ -15,7 +15,7 @@ package org.shredzone.acme4j.challenge; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; -import static org.shredzone.acme4j.util.TestUtils.getJsonAsObject; +import static org.shredzone.acme4j.toolbox.TestUtils.getJsonAsObject; import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs; import java.io.IOException; @@ -25,8 +25,8 @@ import org.junit.Test; import org.shredzone.acme4j.Session; import org.shredzone.acme4j.Status; import org.shredzone.acme4j.exception.AcmeProtocolException; -import org.shredzone.acme4j.util.JSONBuilder; -import org.shredzone.acme4j.util.TestUtils; +import org.shredzone.acme4j.toolbox.JSONBuilder; +import org.shredzone.acme4j.toolbox.TestUtils; /** * Unit tests for {@link Http01Challenge}. diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/OutOfBandChallengeTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/OutOfBandChallengeTest.java index dd98d2b2..d4604b66 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/OutOfBandChallengeTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/OutOfBandChallengeTest.java @@ -15,7 +15,7 @@ package org.shredzone.acme4j.challenge; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; -import static org.shredzone.acme4j.util.TestUtils.getJsonAsObject; +import static org.shredzone.acme4j.toolbox.TestUtils.getJsonAsObject; import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs; import java.io.IOException; @@ -25,8 +25,8 @@ import org.junit.BeforeClass; import org.junit.Test; import org.shredzone.acme4j.Session; import org.shredzone.acme4j.Status; -import org.shredzone.acme4j.util.JSONBuilder; -import org.shredzone.acme4j.util.TestUtils; +import org.shredzone.acme4j.toolbox.JSONBuilder; +import org.shredzone.acme4j.toolbox.TestUtils; /** * Unit tests for {@link OutOfBand01Challenge}. diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/TlsSni01ChallengeTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/TlsSni01ChallengeTest.java index ace8014d..f317bb84 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/TlsSni01ChallengeTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/TlsSni01ChallengeTest.java @@ -15,7 +15,7 @@ package org.shredzone.acme4j.challenge; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; -import static org.shredzone.acme4j.util.TestUtils.getJsonAsObject; +import static org.shredzone.acme4j.toolbox.TestUtils.getJsonAsObject; import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs; import java.io.IOException; @@ -24,8 +24,8 @@ import org.junit.BeforeClass; import org.junit.Test; import org.shredzone.acme4j.Session; import org.shredzone.acme4j.Status; -import org.shredzone.acme4j.util.JSONBuilder; -import org.shredzone.acme4j.util.TestUtils; +import org.shredzone.acme4j.toolbox.JSONBuilder; +import org.shredzone.acme4j.toolbox.TestUtils; /** * Unit tests for {@link TlsSni01Challenge}. diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/TlsSni02ChallengeTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/TlsSni02ChallengeTest.java index e04b201a..759a495c 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/TlsSni02ChallengeTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/TlsSni02ChallengeTest.java @@ -15,7 +15,7 @@ package org.shredzone.acme4j.challenge; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; -import static org.shredzone.acme4j.util.TestUtils.getJsonAsObject; +import static org.shredzone.acme4j.toolbox.TestUtils.getJsonAsObject; import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs; import java.io.IOException; @@ -24,8 +24,8 @@ import org.junit.BeforeClass; import org.junit.Test; import org.shredzone.acme4j.Session; import org.shredzone.acme4j.Status; -import org.shredzone.acme4j.util.JSONBuilder; -import org.shredzone.acme4j.util.TestUtils; +import org.shredzone.acme4j.toolbox.JSONBuilder; +import org.shredzone.acme4j.toolbox.TestUtils; /** * Unit tests for {@link TlsSni02Challenge}. diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/connector/DefaultConnectionTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/connector/DefaultConnectionTest.java index a204b373..13ba9c3a 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/connector/DefaultConnectionTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/connector/DefaultConnectionTest.java @@ -47,9 +47,9 @@ import org.shredzone.acme4j.exception.AcmeNetworkException; import org.shredzone.acme4j.exception.AcmeProtocolException; import org.shredzone.acme4j.exception.AcmeRetryAfterException; import org.shredzone.acme4j.exception.AcmeServerException; -import org.shredzone.acme4j.util.JSON; -import org.shredzone.acme4j.util.JSONBuilder; -import org.shredzone.acme4j.util.TestUtils; +import org.shredzone.acme4j.toolbox.JSON; +import org.shredzone.acme4j.toolbox.JSONBuilder; +import org.shredzone.acme4j.toolbox.TestUtils; /** * Unit tests for {@link DefaultConnection}. diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/connector/DummyConnection.java b/acme4j-client/src/test/java/org/shredzone/acme4j/connector/DummyConnection.java index 9349fea0..e58574d7 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/connector/DummyConnection.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/connector/DummyConnection.java @@ -19,8 +19,8 @@ import java.util.Collection; import org.shredzone.acme4j.Session; import org.shredzone.acme4j.exception.AcmeException; -import org.shredzone.acme4j.util.JSON; -import org.shredzone.acme4j.util.JSONBuilder; +import org.shredzone.acme4j.toolbox.JSON; +import org.shredzone.acme4j.toolbox.JSONBuilder; /** * Dummy implementation of {@link Connection} that always fails. Single methods are diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/connector/ResourceIteratorTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/connector/ResourceIteratorTest.java index 8a87b193..1bb6059f 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/connector/ResourceIteratorTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/connector/ResourceIteratorTest.java @@ -15,7 +15,7 @@ package org.shredzone.acme4j.connector; import static org.hamcrest.Matchers.*; import static org.junit.Assert.assertThat; -import static org.shredzone.acme4j.util.TestUtils.isIntArrayContainingInAnyOrder; +import static org.shredzone.acme4j.toolbox.TestUtils.isIntArrayContainingInAnyOrder; import java.io.IOException; import java.net.HttpURLConnection; @@ -31,8 +31,8 @@ import org.shredzone.acme4j.Authorization; import org.shredzone.acme4j.Session; import org.shredzone.acme4j.exception.AcmeException; import org.shredzone.acme4j.provider.TestableConnectionProvider; -import org.shredzone.acme4j.util.JSON; -import org.shredzone.acme4j.util.JSONBuilder; +import org.shredzone.acme4j.toolbox.JSON; +import org.shredzone.acme4j.toolbox.JSONBuilder; /** * Unit test for {@link ResourceIterator}. diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/connector/SessionProviderTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/connector/SessionProviderTest.java index ae66b5d2..694af22d 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/connector/SessionProviderTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/connector/SessionProviderTest.java @@ -27,8 +27,8 @@ import org.shredzone.acme4j.Session; import org.shredzone.acme4j.challenge.Challenge; import org.shredzone.acme4j.exception.AcmeException; import org.shredzone.acme4j.provider.AcmeProvider; -import org.shredzone.acme4j.util.JSON; -import org.shredzone.acme4j.util.TestUtils; +import org.shredzone.acme4j.toolbox.JSON; +import org.shredzone.acme4j.toolbox.TestUtils; /** * Unit tests for {@link Session#provider()}. Requires that both enclosed 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 83be73a3..b233d4c1 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 @@ -17,7 +17,7 @@ import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -import static org.shredzone.acme4j.util.TestUtils.getJsonAsObject; +import static org.shredzone.acme4j.toolbox.TestUtils.getJsonAsObject; import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs; import java.net.HttpURLConnection; @@ -34,8 +34,8 @@ import org.shredzone.acme4j.challenge.TlsSni02Challenge; import org.shredzone.acme4j.connector.Connection; import org.shredzone.acme4j.connector.DefaultConnection; import org.shredzone.acme4j.connector.HttpConnector; -import org.shredzone.acme4j.util.JSON; -import org.shredzone.acme4j.util.TestUtils; +import org.shredzone.acme4j.toolbox.JSON; +import org.shredzone.acme4j.toolbox.TestUtils; /** * Unit tests for {@link AbstractAcmeProvider}. diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/provider/TestableConnectionProvider.java b/acme4j-client/src/test/java/org/shredzone/acme4j/provider/TestableConnectionProvider.java index 590d71a6..f0d7566b 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/provider/TestableConnectionProvider.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/provider/TestableConnectionProvider.java @@ -24,9 +24,9 @@ import org.shredzone.acme4j.connector.Connection; import org.shredzone.acme4j.connector.DummyConnection; import org.shredzone.acme4j.connector.Resource; import org.shredzone.acme4j.exception.AcmeException; -import org.shredzone.acme4j.util.JSONBuilder; -import org.shredzone.acme4j.util.JSON; -import org.shredzone.acme4j.util.TestUtils; +import org.shredzone.acme4j.toolbox.JSON; +import org.shredzone.acme4j.toolbox.JSONBuilder; +import org.shredzone.acme4j.toolbox.TestUtils; /** * Test implementation of {@link AcmeProvider}. It also implements a dummy implementation diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/util/AcmeUtilsTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/toolbox/AcmeUtilsTest.java similarity index 99% rename from acme4j-client/src/test/java/org/shredzone/acme4j/util/AcmeUtilsTest.java rename to acme4j-client/src/test/java/org/shredzone/acme4j/toolbox/AcmeUtilsTest.java index 2cf59b60..70c338e3 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/util/AcmeUtilsTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/toolbox/AcmeUtilsTest.java @@ -11,11 +11,11 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ -package org.shredzone.acme4j.util; +package org.shredzone.acme4j.toolbox; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; -import static org.shredzone.acme4j.util.AcmeUtils.*; +import static org.shredzone.acme4j.toolbox.AcmeUtils.*; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/util/JSONBuilderTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/toolbox/JSONBuilderTest.java similarity index 99% rename from acme4j-client/src/test/java/org/shredzone/acme4j/util/JSONBuilderTest.java rename to acme4j-client/src/test/java/org/shredzone/acme4j/toolbox/JSONBuilderTest.java index 0457338e..d984f05c 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/util/JSONBuilderTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/toolbox/JSONBuilderTest.java @@ -11,7 +11,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ -package org.shredzone.acme4j.util; +package org.shredzone.acme4j.toolbox; import static org.hamcrest.Matchers.*; import static org.junit.Assert.assertThat; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/util/JSONTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/toolbox/JSONTest.java similarity index 99% rename from acme4j-client/src/test/java/org/shredzone/acme4j/util/JSONTest.java rename to acme4j-client/src/test/java/org/shredzone/acme4j/toolbox/JSONTest.java index 2ea4f57c..8cf444a5 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/util/JSONTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/toolbox/JSONTest.java @@ -11,7 +11,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ -package org.shredzone.acme4j.util; +package org.shredzone.acme4j.toolbox; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/util/TestUtils.java b/acme4j-client/src/test/java/org/shredzone/acme4j/toolbox/TestUtils.java similarity index 99% rename from acme4j-client/src/test/java/org/shredzone/acme4j/util/TestUtils.java rename to acme4j-client/src/test/java/org/shredzone/acme4j/toolbox/TestUtils.java index 1a36e977..560a600c 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/util/TestUtils.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/toolbox/TestUtils.java @@ -11,7 +11,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ -package org.shredzone.acme4j.util; +package org.shredzone.acme4j.toolbox; import java.io.ByteArrayOutputStream; import java.io.FileOutputStream; diff --git a/acme4j-utils/src/main/java/org/shredzone/acme4j/util/CSRBuilder.java b/acme4j-utils/src/main/java/org/shredzone/acme4j/util/CSRBuilder.java index 2f790343..f8ab0126 100644 --- a/acme4j-utils/src/main/java/org/shredzone/acme4j/util/CSRBuilder.java +++ b/acme4j-utils/src/main/java/org/shredzone/acme4j/util/CSRBuilder.java @@ -14,7 +14,7 @@ package org.shredzone.acme4j.util; import static java.util.stream.Collectors.joining; -import static org.shredzone.acme4j.util.AcmeUtils.toAce; +import static org.shredzone.acme4j.toolbox.AcmeUtils.toAce; import java.io.IOException; import java.io.OutputStream;