diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2017-11-07 13:08:30 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@oath.com> | 2017-11-07 13:08:30 +0100 |
commit | ecd0ea6f36e886946e283ce4f9430126bcdee226 (patch) | |
tree | fb91fd6380b7f03e55b070ba6e28389160f31ded /container-disc/src/main/java/com/yahoo/container/jdisc/athenz | |
parent | 0920c48797d4b7a2fe5a3e3b7156fa305abf7c17 (diff) |
Rename ServiceProviderApi -> IdentityDocumentService
Diffstat (limited to 'container-disc/src/main/java/com/yahoo/container/jdisc/athenz')
-rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzCredentialsService.java | 8 | ||||
-rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImpl.java | 2 | ||||
-rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/IdentityDocumentService.java (renamed from container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/ServiceProviderApi.java) | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzCredentialsService.java b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzCredentialsService.java index ea9e50cbb95..3d46ab1d35d 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzCredentialsService.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzCredentialsService.java @@ -19,23 +19,23 @@ class AthenzCredentialsService { private static final ObjectMapper mapper = new ObjectMapper(); private final IdentityConfig identityConfig; - private final ServiceProviderApi serviceProviderApi; + private final IdentityDocumentService identityDocumentService; private final AthenzService athenzService; private final Clock clock; AthenzCredentialsService(IdentityConfig identityConfig, - ServiceProviderApi serviceProviderApi, + IdentityDocumentService identityDocumentService, AthenzService athenzService, Clock clock) { this.identityConfig = identityConfig; - this.serviceProviderApi = serviceProviderApi; + this.identityDocumentService = identityDocumentService; this.athenzService = athenzService; this.clock = clock; } AthenzCredentials registerInstance() { KeyPair keyPair = CryptoUtils.createKeyPair(); - String rawDocument = serviceProviderApi.getSignedIdentityDocument(); + String rawDocument = identityDocumentService.getSignedIdentityDocument(); SignedIdentityDocument document = parseSignedIdentityDocument(rawDocument); PKCS10CertificationRequest csr = CryptoUtils.createCSR(identityConfig.domain(), identityConfig.service(), diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImpl.java b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImpl.java index 2f98d852a95..21028b862ab 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImpl.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImpl.java @@ -57,7 +57,7 @@ public final class AthenzIdentityProviderImpl extends AbstractComponent implemen public AthenzIdentityProviderImpl(IdentityConfig config) { this(config, new AthenzCredentialsService(config, - new ServiceProviderApi(config.loadBalancerAddress()), + new IdentityDocumentService(config.loadBalancerAddress()), new AthenzService(), Clock.systemUTC()), new ThreadPoolScheduler(), diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/ServiceProviderApi.java b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/IdentityDocumentService.java index 3bd0cae71eb..1a0fef10fba 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/ServiceProviderApi.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/IdentityDocumentService.java @@ -24,11 +24,11 @@ import java.security.NoSuchAlgorithmException; * @author mortent * @author bjorncs */ -public class ServiceProviderApi { +public class IdentityDocumentService { private final URI identityDocumentApiUri; - public ServiceProviderApi(String configServerHostname) { + public IdentityDocumentService(String configServerHostname) { this.identityDocumentApiUri = createIdentityDocumentApiUri(configServerHostname); } |