From fd45c1430fe043448d997c18614310874f291e69 Mon Sep 17 00:00:00 2001 From: Oleksandr Porunov Date: Mon, 23 Apr 2018 19:42:54 +0300 Subject: [PATCH] Update acme4j to v1.0 --- build.gradle | 4 ++-- .../command/authorization/AuthorizationCommand.java | 10 +++++----- .../command/certificate/CertificateCommand.java | 11 +++++------ .../acme_client/manager/AuthorizationManager.java | 6 +++--- .../jblur/acme_client/manager/CertificateManager.java | 6 +++--- .../jblur/acme_client/manager/ChallengeManager.java | 6 +++--- .../acme_client/manager/RegistrationManager.java | 5 +++-- src/main/resources/application.properties | 2 +- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/build.gradle b/build.gradle index f92cf09..8f39b60 100644 --- a/build.gradle +++ b/build.gradle @@ -32,8 +32,8 @@ targetCompatibility = 1.8 dependencies { compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3' - compile group: 'org.shredzone.acme4j', name: 'acme4j-client', version: '0.13' - compile group: 'org.shredzone.acme4j', name: 'acme4j-utils', version: '0.13' + compile group: 'org.shredzone.acme4j', name: 'acme4j-client', version: '1.0' + compile group: 'org.shredzone.acme4j', name: 'acme4j-utils', version: '1.0' compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.56' compile group: 'com.google.code.gson', name: 'gson', version: '2.8.0' compile group: 'com.beust', name: 'jcommander', version: '1.64' diff --git a/src/main/java/com/jblur/acme_client/command/authorization/AuthorizationCommand.java b/src/main/java/com/jblur/acme_client/command/authorization/AuthorizationCommand.java index 5c16557..af51556 100644 --- a/src/main/java/com/jblur/acme_client/command/authorization/AuthorizationCommand.java +++ b/src/main/java/com/jblur/acme_client/command/authorization/AuthorizationCommand.java @@ -14,8 +14,8 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.lang.reflect.Type; -import java.net.URI; -import java.net.URISyntaxException; +import java.net.MalformedURLException; +import java.net.URL; import java.nio.file.Paths; import java.time.Instant; import java.util.HashSet; @@ -55,9 +55,9 @@ List getNotExpiredAuthorizations() { for(String authorizationLocation : authorizationLocationList){ try { - oldAuthorizationList.add(Authorization.bind(getSession(), new URI(authorizationLocation))); - } catch (URISyntaxException e) { - LOG.warn("URI isn't correct: "+authorizationLocation, e); + oldAuthorizationList.add(Authorization.bind(getSession(), new URL(authorizationLocation))); + } catch (MalformedURLException e) { + LOG.warn("URL isn't correct: "+authorizationLocation, e); } catch (Exception e){ LOG.warn("Cannot retrieve authorization: "+authorizationLocation, e); } diff --git a/src/main/java/com/jblur/acme_client/command/certificate/CertificateCommand.java b/src/main/java/com/jblur/acme_client/command/certificate/CertificateCommand.java index 2fe62be..8804700 100644 --- a/src/main/java/com/jblur/acme_client/command/certificate/CertificateCommand.java +++ b/src/main/java/com/jblur/acme_client/command/certificate/CertificateCommand.java @@ -6,15 +6,14 @@ import com.jblur.acme_client.command.ACMECommand; import com.jblur.acme_client.command.AccountKeyNotFoundException; import com.jblur.acme_client.manager.CertificateManager; -import org.shredzone.acme4j.Authorization; import org.shredzone.acme4j.Certificate; import org.shredzone.acme4j.exception.AcmeException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; import java.lang.reflect.Type; -import java.net.URI; -import java.net.URISyntaxException; +import java.net.MalformedURLException; +import java.net.URL; import java.nio.file.Paths; import java.security.cert.CertificateEncodingException; import java.util.LinkedList; @@ -91,9 +90,9 @@ List getNotExpiredCertificates() { for(String certificateLocation : certificateLocationList){ try { - oldCertificateList.add(Certificate.bind(getSession(), new URI(certificateLocation))); - } catch (URISyntaxException e) { - LOG.warn("URI isn't correct: "+certificateLocation, e); + oldCertificateList.add(Certificate.bind(getSession(), new URL(certificateLocation))); + } catch (MalformedURLException e) { + LOG.warn("URL isn't correct: "+certificateLocation, e); } catch (Exception e){ LOG.warn("Cannot retrieve certificate: "+certificateLocation, e); } diff --git a/src/main/java/com/jblur/acme_client/manager/AuthorizationManager.java b/src/main/java/com/jblur/acme_client/manager/AuthorizationManager.java index b2f8174..951746a 100644 --- a/src/main/java/com/jblur/acme_client/manager/AuthorizationManager.java +++ b/src/main/java/com/jblur/acme_client/manager/AuthorizationManager.java @@ -9,7 +9,7 @@ import org.shredzone.acme4j.exception.AcmeException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.net.URI; +import java.net.URL; import java.util.Collection; public class AuthorizationManager { @@ -22,8 +22,8 @@ public AuthorizationManager(Registration registration, String domainName) throws this.authorization = registration.authorizeDomain(domainName); } - public AuthorizationManager(Session session, URI authUri) { - this.authorization = Authorization.bind(session, authUri); + public AuthorizationManager(Session session, URL authUrl) { + this.authorization = Authorization.bind(session, authUrl); } public AuthorizationManager(Authorization authorization) { diff --git a/src/main/java/com/jblur/acme_client/manager/CertificateManager.java b/src/main/java/com/jblur/acme_client/manager/CertificateManager.java index 8526c0f..ece616f 100644 --- a/src/main/java/com/jblur/acme_client/manager/CertificateManager.java +++ b/src/main/java/com/jblur/acme_client/manager/CertificateManager.java @@ -7,7 +7,7 @@ import org.shredzone.acme4j.exception.AcmeException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.net.URI; +import java.net.URL; import java.security.cert.X509Certificate; public class CertificateManager { @@ -22,8 +22,8 @@ public CertificateManager(byte[] csr, Registration registration) throws AcmeExce } //For existing certificate - public CertificateManager(Session session, URI certificateLocationUri) { - this.certificate = Certificate.bind(session, certificateLocationUri); + public CertificateManager(Session session, URL certificateLocationUrl) { + this.certificate = Certificate.bind(session, certificateLocationUrl); } public CertificateManager(Certificate certificate) { diff --git a/src/main/java/com/jblur/acme_client/manager/ChallengeManager.java b/src/main/java/com/jblur/acme_client/manager/ChallengeManager.java index 624e903..56fbd0e 100644 --- a/src/main/java/com/jblur/acme_client/manager/ChallengeManager.java +++ b/src/main/java/com/jblur/acme_client/manager/ChallengeManager.java @@ -7,7 +7,7 @@ import org.shredzone.acme4j.exception.AcmeException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.net.URI; +import java.net.URL; import java.util.concurrent.TimeoutException; public class ChallengeManager { @@ -46,8 +46,8 @@ public ChallengeManager(Authorization authorization, String type, Session sessio } } - public ChallengeManager(Session session, URI challengeURI) throws AcmeException { - this.challenge = Challenge.bind(session, challengeURI); + public ChallengeManager(Session session, URL challengeURL) throws AcmeException { + this.challenge = Challenge.bind(session, challengeURL); } public Challenge getChallenge() { diff --git a/src/main/java/com/jblur/acme_client/manager/RegistrationManager.java b/src/main/java/com/jblur/acme_client/manager/RegistrationManager.java index d203c15..a53e16a 100644 --- a/src/main/java/com/jblur/acme_client/manager/RegistrationManager.java +++ b/src/main/java/com/jblur/acme_client/manager/RegistrationManager.java @@ -9,6 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.net.URI; +import java.net.URL; import java.security.KeyPair; public class RegistrationManager { @@ -48,9 +49,9 @@ public RegistrationManager(Session session, String email) throws AcmeException { } } - public RegistrationManager(Session session, URI accountLocationUri) { + public RegistrationManager(Session session, URL accountLocationUrl) { this.session = session; - this.registration = Registration.bind(session, accountLocationUri); + this.registration = Registration.bind(session, accountLocationUrl); } public Registration getRegistration() { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 832ea42..98152da 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1 +1 @@ -version=Porunov Java ACME Client (PJAC) v2.1.2 rev58 \ No newline at end of file +version=Porunov Java ACME Client (PJAC) v2.1.3 rev59 \ No newline at end of file