From 7a1136ec2a57ca4c380a7937e54171a9a663e559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20K=C3=B6rber?= Date: Tue, 27 Mar 2018 22:17:27 +0200 Subject: [PATCH] Use GenericProvider without ClassLoader --- .../src/main/java/org/shredzone/acme4j/Session.java | 9 +++++++++ .../services/org.shredzone.acme4j.provider.AcmeProvider | 2 -- 2 files changed, 9 insertions(+), 2 deletions(-) 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 63bdd7e5..9fe8c01b 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/Session.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Session.java @@ -35,6 +35,7 @@ import javax.annotation.concurrent.ThreadSafe; import org.shredzone.acme4j.connector.Resource; import org.shredzone.acme4j.exception.AcmeException; import org.shredzone.acme4j.provider.AcmeProvider; +import org.shredzone.acme4j.provider.GenericAcmeProvider; import org.shredzone.acme4j.toolbox.JSON; import org.shredzone.acme4j.toolbox.JSON.Value; @@ -44,6 +45,9 @@ import org.shredzone.acme4j.toolbox.JSON.Value; @ParametersAreNonnullByDefault @ThreadSafe public class Session { + + private static final GenericAcmeProvider GENERIC_PROVIDER = new GenericAcmeProvider(); + private final AtomicReference> resourceMap = new AtomicReference<>(); private final AtomicReference metadata = new AtomicReference<>(); private final URI serverUri; @@ -75,6 +79,11 @@ public class Session { public Session(URI serverUri) { this.serverUri = Objects.requireNonNull(serverUri, "serverUri"); + if (GENERIC_PROVIDER.accepts(serverUri)) { + provider = GENERIC_PROVIDER; + return; + } + final URI localServerUri = serverUri; Iterable providers = ServiceLoader.load(AcmeProvider.class); diff --git a/acme4j-client/src/main/resources/META-INF/services/org.shredzone.acme4j.provider.AcmeProvider b/acme4j-client/src/main/resources/META-INF/services/org.shredzone.acme4j.provider.AcmeProvider index 57713718..b4662ed0 100644 --- a/acme4j-client/src/main/resources/META-INF/services/org.shredzone.acme4j.provider.AcmeProvider +++ b/acme4j-client/src/main/resources/META-INF/services/org.shredzone.acme4j.provider.AcmeProvider @@ -1,5 +1,3 @@ -# Generic -org.shredzone.acme4j.provider.GenericAcmeProvider # Let's Encrypt: https://letsencrypt.org org.shredzone.acme4j.provider.letsencrypt.LetsEncryptAcmeProvider