github
/
acme4j
mirror of https://github.com/shred/acme4j
1
0
Fork 0
Code Issues Releases Wiki Activity

Use GenericProvider without ClassLoader

pull/61/head
Richard Körber 2018-03-27 22:17:27 +02:00
parent 6d3a9ef63c
commit 7a1136ec2a
No known key found for this signature in database
GPG Key ID: AAB9FD19C78AA3E0
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
acme4j-client/src/main/java/org/shredzone/acme4j/Session.java
View File

@ -35,6 +35,7 @@ import javax.annotation.concurrent.ThreadSafe;
import org.shredzone.acme4j.connector.Resource; import org.shredzone.acme4j.connector.Resource;
import org.shredzone.acme4j.exception.AcmeException; import org.shredzone.acme4j.exception.AcmeException;
import org.shredzone.acme4j.provider.AcmeProvider; import org.shredzone.acme4j.provider.AcmeProvider;
import org.shredzone.acme4j.provider.GenericAcmeProvider;
import org.shredzone.acme4j.toolbox.JSON; import org.shredzone.acme4j.toolbox.JSON;
import org.shredzone.acme4j.toolbox.JSON.Value; import org.shredzone.acme4j.toolbox.JSON.Value;
@ -44,6 +45,9 @@ import org.shredzone.acme4j.toolbox.JSON.Value;
@ParametersAreNonnullByDefault @ParametersAreNonnullByDefault
@ThreadSafe @ThreadSafe
public class Session { public class Session {
private static final GenericAcmeProvider GENERIC_PROVIDER = new GenericAcmeProvider();
private final AtomicReference<Map<Resource, URL>> resourceMap = new AtomicReference<>(); private final AtomicReference<Map<Resource, URL>> resourceMap = new AtomicReference<>();
private final AtomicReference<Metadata> metadata = new AtomicReference<>(); private final AtomicReference<Metadata> metadata = new AtomicReference<>();
private final URI serverUri; private final URI serverUri;
@ -75,6 +79,11 @@ public class Session {
public Session(URI serverUri) { public Session(URI serverUri) {
this.serverUri = Objects.requireNonNull(serverUri, "serverUri"); this.serverUri = Objects.requireNonNull(serverUri, "serverUri");
if (GENERIC_PROVIDER.accepts(serverUri)) {
provider = GENERIC_PROVIDER;
return;
}
final URI localServerUri = serverUri; final URI localServerUri = serverUri;
Iterable<AcmeProvider> providers = ServiceLoader.load(AcmeProvider.class); Iterable<AcmeProvider> providers = ServiceLoader.load(AcmeProvider.class);

2
acme4j-client/src/main/resources/META-INF/services/org.shredzone.acme4j.provider.AcmeProvider
View File

@ -1,5 +1,3 @@
# Generic
org.shredzone.acme4j.provider.GenericAcmeProvider
# Let's Encrypt: https://letsencrypt.org # Let's Encrypt: https://letsencrypt.org
org.shredzone.acme4j.provider.letsencrypt.LetsEncryptAcmeProvider org.shredzone.acme4j.provider.letsencrypt.LetsEncryptAcmeProvider