Rename IdentityDocumentService -> IdentityDocumentClient

4 files changed, 10 insertions, 10 deletions

diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzCredentialsService.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzCredentialsService.java
index 4278e641166..554d50f296b 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzCredentialsService.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzCredentialsService.java
@@ -34,23 +34,23 @@ class AthenzCredentialsService {
     private static final ObjectMapper mapper = new ObjectMapper();
 
     private final IdentityConfig identityConfig;
-    private final IdentityDocumentService identityDocumentService;
+    private final IdentityDocumentClient identityDocumentClient;
     private final ZtsClient ztsClient;
     private final File trustStoreJks;
 
     AthenzCredentialsService(IdentityConfig identityConfig,
-                             IdentityDocumentService identityDocumentService,
+                             IdentityDocumentClient identityDocumentClient,
                              ZtsClient ztsClient,
                              File trustStoreJks) {
         this.identityConfig = identityConfig;
-        this.identityDocumentService = identityDocumentService;
+        this.identityDocumentClient = identityDocumentClient;
         this.ztsClient = ztsClient;
         this.trustStoreJks = trustStoreJks;
     }
 
     AthenzCredentials registerInstance() {
         KeyPair keyPair = KeyUtils.generateKeypair(KeyAlgorithm.RSA);
-        String rawDocument = identityDocumentService.getSignedIdentityDocument();
+        String rawDocument = identityDocumentClient.getSignedIdentityDocument();
         SignedIdentityDocument document = parseSignedIdentityDocument(rawDocument);
         Pkcs10Csr csr = createCSR(identityConfig.domain(),
                                   identityConfig.service(),
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java
index 3817774cf06..9c7f6cc8efb 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java
@@ -58,7 +58,7 @@ public final class AthenzIdentityProviderImpl extends AbstractComponent implemen
         this(config,
              metric,
              new AthenzCredentialsService(config,
-                                          new IdentityDocumentService(config.loadBalancerAddress()),
+                                          new IdentityDocumentClient(config.loadBalancerAddress()),
                                           new ZtsClient(),
                                           getDefaultTrustStoreLocation()),
              new ScheduledThreadPoolExecutor(1),
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/IdentityDocumentService.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/IdentityDocumentClient.java
index 0d82bb29edd..1ec2984a167 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/IdentityDocumentService.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/IdentityDocumentClient.java
@@ -24,11 +24,11 @@ import java.security.NoSuchAlgorithmException;
  * @author mortent
  * @author bjorncs
  */
-public class IdentityDocumentService {
+public class IdentityDocumentClient {
 
     private final URI identityDocumentApiUri;
 
-    public IdentityDocumentService(String loadBalancerName) {
+    public IdentityDocumentClient(String loadBalancerName) {
         this.identityDocumentApiUri = createIdentityDocumentApiUri(loadBalancerName);
     }
 
diff --git a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImplTest.java b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImplTest.java
index 91c68702e87..f2988956233 100644
--- a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImplTest.java
+++ b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImplTest.java
@@ -57,12 +57,12 @@ public class AthenzIdentityProviderImplTest {
 
     @Test
     public void metrics_updated_on_refresh() throws IOException {
-        IdentityDocumentService identityDocumentService = mock(IdentityDocumentService.class);
+        IdentityDocumentClient identityDocumentClient = mock(IdentityDocumentClient.class);
         ZtsClient ztsClient = mock(ZtsClient.class);
         ManualClock clock = new ManualClock(Instant.EPOCH);
         Metric metric = mock(Metric.class);
 
-        when(identityDocumentService.getSignedIdentityDocument()).thenReturn(getIdentityDocument());
+        when(identityDocumentClient.getSignedIdentityDocument()).thenReturn(getIdentityDocument());
         when(ztsClient.sendInstanceRegisterRequest(any(), any())).then(new Answer<InstanceIdentity>() {
             @Override
             public InstanceIdentity answer(InvocationOnMock invocationOnMock) throws Throwable {
@@ -76,7 +76,7 @@ public class AthenzIdentityProviderImplTest {
                 .thenReturn(new InstanceIdentity(getCertificate(getExpirationSupplier(clock)), "TOKEN"));
 
         AthenzCredentialsService credentialService =
-                new AthenzCredentialsService(IDENTITY_CONFIG, identityDocumentService, ztsClient, createDummyTrustStore());
+                new AthenzCredentialsService(IDENTITY_CONFIG, identityDocumentClient, ztsClient, createDummyTrustStore());
 
         AthenzIdentityProviderImpl identityProvider =
                 new AthenzIdentityProviderImpl(IDENTITY_CONFIG, metric, credentialService, mock(ScheduledExecutorService.class), clock);