Rename ServiceProviderApi -> IdentityDocumentService

4 files changed, 13 insertions, 13 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);
     }
 
diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImplTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImplTest.java
index fd38e589d10..1c0efef2089 100644
--- a/container-disc/src/test/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImplTest.java
+++ b/container-disc/src/test/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImplTest.java
@@ -44,16 +44,16 @@ public class AthenzIdentityProviderImplTest {
 
     @Test
     public void athenz_credentials_are_retrieved_after_component_contruction_completed() {
-        ServiceProviderApi serviceProviderApi = mock(ServiceProviderApi.class);
+        IdentityDocumentService identityDocumentService = mock(IdentityDocumentService.class);
         AthenzService athenzService = mock(AthenzService.class);
         ManualClock clock = new ManualClock(Instant.EPOCH);
         MockScheduler scheduler = new MockScheduler(clock);
 
-        when(serviceProviderApi.getSignedIdentityDocument()).thenReturn(getIdentityDocument());
+        when(identityDocumentService.getSignedIdentityDocument()).thenReturn(getIdentityDocument());
         when(athenzService.sendInstanceRegisterRequest(any(), any())).thenReturn(
                 new InstanceIdentity(null, "TOKEN"));
         AthenzCredentialsService credentialService =
-                new AthenzCredentialsService(IDENTITY_CONFIG, serviceProviderApi, athenzService, clock);
+                new AthenzCredentialsService(IDENTITY_CONFIG, identityDocumentService, athenzService, clock);
 
         AthenzIdentityProvider identityProvider =
                 new AthenzIdentityProviderImpl(IDENTITY_CONFIG, credentialService, scheduler, clock);
@@ -103,12 +103,12 @@ public class AthenzIdentityProviderImplTest {
 
     @Test
     public void failed_credentials_updates_will_schedule_retries() {
-        ServiceProviderApi serviceProviderApi = mock(ServiceProviderApi.class);
+        IdentityDocumentService identityDocumentService = mock(IdentityDocumentService.class);
         AthenzService athenzService = mock(AthenzService.class);
         ManualClock clock = new ManualClock(Instant.EPOCH);
         MockScheduler scheduler = new MockScheduler(clock);
 
-        when(serviceProviderApi.getSignedIdentityDocument()).thenReturn(getIdentityDocument());
+        when(identityDocumentService.getSignedIdentityDocument()).thenReturn(getIdentityDocument());
         when(athenzService.sendInstanceRegisterRequest(any(), any())).thenReturn(
                 new InstanceIdentity(null, "TOKEN"));
         when(athenzService.sendInstanceRefreshRequest(anyString(), anyString(), anyString(),
@@ -118,7 +118,7 @@ public class AthenzIdentityProviderImplTest {
                 .thenThrow(new RuntimeException("#3"))
                 .thenReturn(new InstanceIdentity(null, "TOKEN"));
         AthenzCredentialsService credentialService =
-                new AthenzCredentialsService(IDENTITY_CONFIG, serviceProviderApi, athenzService, clock);
+                new AthenzCredentialsService(IDENTITY_CONFIG, identityDocumentService, athenzService, clock);
 
         AthenzIdentityProvider identityProvider =
                 new AthenzIdentityProviderImpl(IDENTITY_CONFIG, credentialService, scheduler, clock);