From f36294eabd60a5d934158d3918b66077ceaf55f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20K=C3=B6rber?= Date: Sat, 7 Oct 2017 18:08:16 +0200 Subject: [PATCH] Rename internal util package in client module Avoids a split package in Java 9. --- .../src/main/java/org/shredzone/acme4j/Account.java | 6 +++--- .../main/java/org/shredzone/acme4j/AccountBuilder.java | 6 +++--- .../main/java/org/shredzone/acme4j/Authorization.java | 6 +++--- .../main/java/org/shredzone/acme4j/Certificate.java | 4 ++-- .../src/main/java/org/shredzone/acme4j/Metadata.java | 4 ++-- .../src/main/java/org/shredzone/acme4j/Order.java | 2 +- .../src/main/java/org/shredzone/acme4j/Problem.java | 2 +- .../src/main/java/org/shredzone/acme4j/Session.java | 2 +- .../java/org/shredzone/acme4j/challenge/Challenge.java | 6 +++--- .../org/shredzone/acme4j/challenge/Dns01Challenge.java | 2 +- .../shredzone/acme4j/challenge/TlsSni02Challenge.java | 2 +- .../org/shredzone/acme4j/challenge/TokenChallenge.java | 4 ++-- .../org/shredzone/acme4j/connector/Connection.java | 4 ++-- .../shredzone/acme4j/connector/DefaultConnection.java | 8 ++++---- .../shredzone/acme4j/connector/ResourceIterator.java | 2 +- .../acme4j/provider/AbstractAcmeProvider.java | 2 +- .../org/shredzone/acme4j/provider/AcmeProvider.java | 2 +- .../shredzone/acme4j/{util => toolbox}/AcmeUtils.java | 2 +- .../org/shredzone/acme4j/{util => toolbox}/JSON.java | 4 ++-- .../acme4j/{util => toolbox}/JSONBuilder.java | 4 ++-- .../java/org/shredzone/acme4j/AccountBuilderTest.java | 10 +++++----- .../test/java/org/shredzone/acme4j/AccountTest.java | 10 +++++----- .../java/org/shredzone/acme4j/AcmeResourceTest.java | 2 +- .../java/org/shredzone/acme4j/AuthorizationTest.java | 8 ++++---- .../java/org/shredzone/acme4j/CertificateTest.java | 6 +++--- .../src/test/java/org/shredzone/acme4j/OrderTest.java | 8 ++++---- .../test/java/org/shredzone/acme4j/ProblemTest.java | 4 ++-- .../test/java/org/shredzone/acme4j/SessionTest.java | 8 ++++---- .../org/shredzone/acme4j/challenge/ChallengeTest.java | 10 +++++----- .../shredzone/acme4j/challenge/DnsChallengeTest.java | 6 +++--- .../shredzone/acme4j/challenge/HttpChallengeTest.java | 6 +++--- .../acme4j/challenge/OutOfBandChallengeTest.java | 6 +++--- .../acme4j/challenge/TlsSni02ChallengeTest.java | 6 +++--- .../acme4j/connector/DefaultConnectionTest.java | 10 +++++----- .../shredzone/acme4j/connector/DummyConnection.java | 4 ++-- .../acme4j/connector/ResourceIteratorTest.java | 6 +++--- .../acme4j/connector/SessionProviderTest.java | 4 ++-- .../acme4j/exception/AcmeLazyLoadingExceptionTest.java | 2 +- .../acme4j/exception/AcmeRateLimitedExceptionTest.java | 2 +- .../exception/AcmeUserActionRequiredExceptionTest.java | 2 +- .../acme4j/provider/AbstractAcmeProviderTest.java | 6 +++--- .../acme4j/provider/TestableConnectionProvider.java | 6 +++--- .../letsencrypt/LetsEncryptAcmeProviderTest.java | 2 +- .../acme4j/provider/pebble/PebbleAcmeProviderTest.java | 2 +- .../acme4j/{util => toolbox}/AcmeUtilsTest.java | 4 ++-- .../acme4j/{util => toolbox}/JSONBuilderTest.java | 2 +- .../shredzone/acme4j/{util => toolbox}/JSONTest.java | 4 ++-- .../shredzone/acme4j/{util => toolbox}/TestUtils.java | 2 +- .../src/main/java/org/shredzone/acme4j/ClientTest.java | 9 ++++----- .../java/org/shredzone/acme4j/util/CSRBuilder.java | 2 +- 50 files changed, 116 insertions(+), 117 deletions(-) rename acme4j-client/src/main/java/org/shredzone/acme4j/{util => toolbox}/AcmeUtils.java (99%) rename acme4j-client/src/main/java/org/shredzone/acme4j/{util => toolbox}/JSON.java (99%) rename acme4j-client/src/main/java/org/shredzone/acme4j/{util => toolbox}/JSONBuilder.java (97%) rename acme4j-client/src/test/java/org/shredzone/acme4j/{util => toolbox}/AcmeUtilsTest.java (99%) rename acme4j-client/src/test/java/org/shredzone/acme4j/{util => toolbox}/JSONBuilderTest.java (99%) rename acme4j-client/src/test/java/org/shredzone/acme4j/{util => toolbox}/JSONTest.java (99%) rename acme4j-client/src/test/java/org/shredzone/acme4j/{util => toolbox}/TestUtils.java (99%) diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/Account.java b/acme4j-client/src/main/java/org/shredzone/acme4j/Account.java index 098c21d5..adec80ee 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/Account.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Account.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; @@ -38,8 +38,8 @@ import org.shredzone.acme4j.exception.AcmeLazyLoadingException; 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.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/AccountBuilder.java b/acme4j-client/src/main/java/org/shredzone/acme4j/AccountBuilder.java index e9a39bbd..c1370901 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/AccountBuilder.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/AccountBuilder.java @@ -14,7 +14,7 @@ package org.shredzone.acme4j; import static java.util.Objects.requireNonNull; -import static org.shredzone.acme4j.util.AcmeUtils.macKeyAlgorithm; +import static org.shredzone.acme4j.toolbox.AcmeUtils.macKeyAlgorithm; import java.net.HttpURLConnection; import java.net.URI; @@ -33,8 +33,8 @@ import org.jose4j.lang.JoseException; import org.shredzone.acme4j.connector.Connection; import org.shredzone.acme4j.connector.Resource; import org.shredzone.acme4j.exception.AcmeException; -import org.shredzone.acme4j.util.AcmeUtils; -import org.shredzone.acme4j.util.JSONBuilder; +import org.shredzone.acme4j.toolbox.AcmeUtils; +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/Authorization.java b/acme4j-client/src/main/java/org/shredzone/acme4j/Authorization.java index d84d257a..b621804e 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.URL; @@ -28,8 +28,8 @@ import org.shredzone.acme4j.exception.AcmeException; import org.shredzone.acme4j.exception.AcmeLazyLoadingException; 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 90e7dd5f..ce2fdf3d 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/Certificate.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Certificate.java @@ -35,8 +35,8 @@ import org.shredzone.acme4j.connector.Resource; import org.shredzone.acme4j.exception.AcmeException; import org.shredzone.acme4j.exception.AcmeLazyLoadingException; import org.shredzone.acme4j.exception.AcmeProtocolException; -import org.shredzone.acme4j.util.AcmeUtils; -import org.shredzone.acme4j.util.JSONBuilder; +import org.shredzone.acme4j.toolbox.AcmeUtils; +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 46bc2cd1..5cead3f3 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/Metadata.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Metadata.java @@ -19,8 +19,8 @@ import java.net.URI; import java.net.URL; import java.util.Collection; -import org.shredzone.acme4j.util.JSON; -import org.shredzone.acme4j.util.JSON.Value; +import org.shredzone.acme4j.toolbox.JSON; +import org.shredzone.acme4j.toolbox.JSON.Value; /** * Contains metadata related to the provider. diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/Order.java b/acme4j-client/src/main/java/org/shredzone/acme4j/Order.java index aaee9efd..ac757ead 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/Order.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Order.java @@ -23,7 +23,7 @@ import java.util.List; import org.shredzone.acme4j.connector.Connection; import org.shredzone.acme4j.exception.AcmeException; import org.shredzone.acme4j.exception.AcmeLazyLoadingException; -import org.shredzone.acme4j.util.JSON; +import org.shredzone.acme4j.toolbox.JSON; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 bf4daa44..0e04cb02 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/Session.java b/acme4j-client/src/main/java/org/shredzone/acme4j/Session.java index 4a0db2bc..5a539cbf 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/Session.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Session.java @@ -31,7 +31,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 c0ad9752..5c235ed1 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 @@ -30,9 +30,9 @@ 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.JSON.Array; -import org.shredzone.acme4j.util.JSONBuilder; +import org.shredzone.acme4j.toolbox.JSON; +import org.shredzone.acme4j.toolbox.JSON.Array; +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/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 2765db50..5e80ebc8 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 a4c37291..41db8a70 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 @@ -22,8 +22,8 @@ import java.util.List; 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 7a53c6c8..26d755f2 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 @@ -14,7 +14,7 @@ package org.shredzone.acme4j.connector; import static java.util.stream.Collectors.toList; -import static org.shredzone.acme4j.util.AcmeUtils.*; +import static org.shredzone.acme4j.toolbox.AcmeUtils.*; import java.io.IOException; import java.io.InputStream; @@ -52,9 +52,9 @@ import org.shredzone.acme4j.exception.AcmeRetryAfterException; import org.shredzone.acme4j.exception.AcmeServerException; import org.shredzone.acme4j.exception.AcmeUnauthorizedException; import org.shredzone.acme4j.exception.AcmeUserActionRequiredException; -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 a7a69694..df4ec7aa 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 URLs from the ACME server, and generates 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 4df84ec8..7184383e 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 fdc7d3be..e4c3f640 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 @@ -21,7 +21,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 bfa5915a..a7d651a6 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.IOException; import java.io.UnsupportedEncodingException; 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 15c3611e..a495e9b7 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 d8cdab69..210800b0 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/AccountBuilderTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/AccountBuilderTest.java index 81c92718..3bfb9614 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/AccountBuilderTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/AccountBuilderTest.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.net.HttpURLConnection; @@ -30,10 +30,10 @@ 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.AcmeUtils; -import org.shredzone.acme4j.util.JSON; -import org.shredzone.acme4j.util.JSONBuilder; -import org.shredzone.acme4j.util.TestUtils; +import org.shredzone.acme4j.toolbox.AcmeUtils; +import org.shredzone.acme4j.toolbox.JSON; +import org.shredzone.acme4j.toolbox.JSONBuilder; +import org.shredzone.acme4j.toolbox.TestUtils; /** * Unit tests for {@link AccountBuilder}. 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 4f49a1e7..34f07d3e 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/AccountTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/AccountTest.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 static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs; import java.io.IOException; @@ -44,9 +44,9 @@ import org.shredzone.acme4j.exception.AcmeException; import org.shredzone.acme4j.exception.AcmeServerException; 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 Account}. 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 dec17baf..16497629 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.URL; 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 5897c393..3bbb2cb2 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.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.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 9de6a113..99d9fdd7 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.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.io.ByteArrayOutputStream; @@ -35,8 +35,8 @@ 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.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/OrderTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/OrderTest.java index 2353a81f..90bedf0d 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/OrderTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/OrderTest.java @@ -15,8 +15,8 @@ package org.shredzone.acme4j; import static org.hamcrest.Matchers.*; import static org.junit.Assert.assertThat; -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.net.HttpURLConnection; import java.net.URI; @@ -27,8 +27,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.junit.Test; import org.shredzone.acme4j.exception.AcmeException; import org.shredzone.acme4j.provider.TestableConnectionProvider; -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 Order}. 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 29cd4126..32d59d1e 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/SessionTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/SessionTest.java index 9cdf844b..95ee0165 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.*; +import static org.shredzone.acme4j.toolbox.TestUtils.*; import java.io.IOException; import java.net.URI; @@ -31,9 +31,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 70e3f478..07f1ecfb 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; @@ -38,9 +38,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 881e5da3..f41cba97 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.getJSON; +import static org.shredzone.acme4j.toolbox.TestUtils.getJSON; 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 b0355d05..d3f5fbb5 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.getJSON; +import static org.shredzone.acme4j.toolbox.TestUtils.getJSON; 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 ff343dbe..bbb88de0 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.getJSON; +import static org.shredzone.acme4j.toolbox.TestUtils.getJSON; 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/TlsSni02ChallengeTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/TlsSni02ChallengeTest.java index ce7fbc96..eb69367b 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.getJSON; +import static org.shredzone.acme4j.toolbox.TestUtils.getJSON; 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 b89720c7..78a2120b 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 @@ -16,7 +16,7 @@ package org.shredzone.acme4j.connector; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; import static org.mockito.Mockito.*; -import static org.shredzone.acme4j.util.TestUtils.url; +import static org.shredzone.acme4j.toolbox.TestUtils.url; import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs; import java.io.ByteArrayInputStream; @@ -53,10 +53,10 @@ import org.shredzone.acme4j.exception.AcmeServerException; import org.shredzone.acme4j.exception.AcmeUnauthorizedException; import org.shredzone.acme4j.exception.AcmeUserActionRequiredException; import org.shredzone.acme4j.provider.AcmeProvider; -import org.shredzone.acme4j.util.AcmeUtils; -import org.shredzone.acme4j.util.JSON; -import org.shredzone.acme4j.util.JSONBuilder; -import org.shredzone.acme4j.util.TestUtils; +import org.shredzone.acme4j.toolbox.AcmeUtils; +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 f9383a47..b6f935c2 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 @@ -21,8 +21,8 @@ import java.util.List; 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 2e512f07..82205fe1 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.*; +import static org.shredzone.acme4j.toolbox.TestUtils.*; 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 52435122..0c6e8004 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 @@ -28,8 +28,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/exception/AcmeLazyLoadingExceptionTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/exception/AcmeLazyLoadingExceptionTest.java index 8d9cc23b..787e5025 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/exception/AcmeLazyLoadingExceptionTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/exception/AcmeLazyLoadingExceptionTest.java @@ -22,7 +22,7 @@ import java.net.URL; import org.junit.Test; import org.shredzone.acme4j.AcmeResource; import org.shredzone.acme4j.Session; -import org.shredzone.acme4j.util.TestUtils; +import org.shredzone.acme4j.toolbox.TestUtils; /** * Unit tests for {@link AcmeLazyLoadingException}. 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 f04d6784..fd11440f 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,7 @@ package org.shredzone.acme4j.exception; import static org.hamcrest.Matchers.*; import static org.junit.Assert.assertThat; -import static org.shredzone.acme4j.util.TestUtils.createProblem; +import static org.shredzone.acme4j.toolbox.TestUtils.createProblem; import java.net.URI; import java.time.Duration; 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 db615314..8dc398a5 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 @@ -15,7 +15,7 @@ package org.shredzone.acme4j.exception; import static org.hamcrest.Matchers.*; import static org.junit.Assert.assertThat; -import static org.shredzone.acme4j.util.TestUtils.createProblem; +import static org.shredzone.acme4j.toolbox.TestUtils.createProblem; import java.net.MalformedURLException; import java.net.URI; 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 40eeef70..06049d7d 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.getJSON; +import static org.shredzone.acme4j.toolbox.TestUtils.getJSON; import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs; import java.net.HttpURLConnection; @@ -36,8 +36,8 @@ 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.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 ab0688f0..b80f2117 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 @@ -25,9 +25,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.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; /** * Test implementation of {@link AcmeProvider}. It also implements a dummy implementation 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 2727c308..973f8930 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 @@ -15,7 +15,7 @@ package org.shredzone.acme4j.provider.letsencrypt; import static org.hamcrest.Matchers.is; import static org.junit.Assert.*; -import static org.shredzone.acme4j.util.TestUtils.url; +import static org.shredzone.acme4j.toolbox.TestUtils.url; import java.net.URI; import java.net.URISyntaxException; 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 9d2b69fd..1298bdf4 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 @@ -15,7 +15,7 @@ package org.shredzone.acme4j.provider.pebble; import static org.hamcrest.Matchers.is; import static org.junit.Assert.*; -import static org.shredzone.acme4j.util.TestUtils.url; +import static org.shredzone.acme4j.toolbox.TestUtils.url; import java.net.URI; import java.net.URISyntaxException; 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 d8325d85..4ac316d1 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.io.ByteArrayOutputStream; import java.io.IOException; 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 49f7ba76..7a0fb783 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 0dfeaf28..4e85646d 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,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.TestUtils.url; +import static org.shredzone.acme4j.toolbox.TestUtils.url; import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs; import java.io.ByteArrayInputStream; 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 38115a2c..d8158d78 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 static java.util.Collections.unmodifiableList; import static java.util.stream.Collectors.toList; diff --git a/acme4j-example/src/main/java/org/shredzone/acme4j/ClientTest.java b/acme4j-example/src/main/java/org/shredzone/acme4j/ClientTest.java index 6c5e21e7..91995572 100644 --- a/acme4j-example/src/main/java/org/shredzone/acme4j/ClientTest.java +++ b/acme4j-example/src/main/java/org/shredzone/acme4j/ClientTest.java @@ -21,7 +21,6 @@ import java.io.Writer; import java.net.URI; import java.security.KeyPair; import java.security.Security; -import java.security.cert.CertificateEncodingException; import java.security.cert.X509Certificate; import java.util.Arrays; import java.util.Collection; @@ -29,12 +28,12 @@ import java.util.Collection; import javax.swing.JOptionPane; import org.bouncycastle.jce.provider.BouncyCastleProvider; +import org.bouncycastle.openssl.jcajce.JcaPEMWriter; import org.shredzone.acme4j.challenge.Challenge; import org.shredzone.acme4j.challenge.Dns01Challenge; import org.shredzone.acme4j.challenge.Http01Challenge; import org.shredzone.acme4j.challenge.TlsSni02Challenge; import org.shredzone.acme4j.exception.AcmeException; -import org.shredzone.acme4j.util.AcmeUtils; import org.shredzone.acme4j.util.CSRBuilder; import org.shredzone.acme4j.util.CertificateUtils; import org.shredzone.acme4j.util.KeyPairUtils; @@ -369,10 +368,10 @@ public class ClientTest { } // Create a validation certificate - try (FileWriter fw = new FileWriter("tlssni.crt")) { + try (JcaPEMWriter pw = new JcaPEMWriter(new FileWriter("tlssni.crt"))) { X509Certificate cert = CertificateUtils.createTlsSni02Certificate(domainKeyPair, subject, sanB); - AcmeUtils.writeToPem(cert.getEncoded(), AcmeUtils.PemLabel.CERTIFICATE, fw); - } catch (IOException | CertificateEncodingException ex) { + pw.writeObject(cert); + } catch (IOException ex) { throw new AcmeException("Could not write certificate", ex); } 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;