Remove unused fields

2 files changed, 3 insertions, 28 deletions

diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/InstanceIdentity.java b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/InstanceIdentity.java
index ccb9b12c61a..f64b2c765a5 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/InstanceIdentity.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/InstanceIdentity.java
@@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import java.util.Map;
-
 /**
  * Used for deserializing response from ZTS
  *
@@ -15,34 +13,12 @@ import java.util.Map;
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class InstanceIdentity {
-    @JsonProperty("attributes") private final Map<String, String> attributes;
-    @JsonProperty("provider") private final String provider;
-    @JsonProperty("name") private final String name;
-    @JsonProperty("instanceId") private final String instanceId;
     @JsonProperty("x509Certificate") private final String x509Certificate;
-    @JsonProperty("x509CertificateSigner") private final String x509CertificateSigner;
-    @JsonProperty("sshCertificate") private final String sshCertificate;
-    @JsonProperty("sshCertificateSigner") private final String sshCertificateSigner;
     @JsonProperty("serviceToken") private final String serviceToken;
 
-    public InstanceIdentity(
-            @JsonProperty("attributes") Map<String, String> attributes,
-            @JsonProperty("provider") String provider,
-            @JsonProperty("name") String name,
-            @JsonProperty("instanceId") String instanceId,
-            @JsonProperty("x509Certificate") String x509Certificate,
-            @JsonProperty("x509CertificateSigner") String x509CertificateSigner,
-            @JsonProperty("sshCertificate") String sshCertificate,
-            @JsonProperty("sshCertificateSigner") String sshCertificateSigner,
-            @JsonProperty("serviceToken") String serviceToken) {
-        this.attributes = attributes;
-        this.provider = provider;
-        this.name = name;
-        this.instanceId = instanceId;
+    public InstanceIdentity(@JsonProperty("x509Certificate") String x509Certificate,
+                            @JsonProperty("serviceToken") String serviceToken) {
         this.x509Certificate = x509Certificate;
-        this.x509CertificateSigner = x509CertificateSigner;
-        this.sshCertificate = sshCertificate;
-        this.sshCertificateSigner = sshCertificateSigner;
         this.serviceToken = serviceToken;
     }
 
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 f315e602ab8..b1c7699364d 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
@@ -24,8 +24,7 @@ public class AthenzIdentityProviderImplTest {
         AthenzService athenzService = mock(AthenzService.class);
 
         when(serviceProviderApi.getSignedIdentityDocument()).thenReturn(getIdentityDocument());
-        when(athenzService.sendInstanceRegisterRequest(any(), any())).thenReturn(
-                new InstanceIdentity(null, null, null, null, null, null, null, null, "TOKEN"));
+        when(athenzService.sendInstanceRegisterRequest(any(), any())).thenReturn(new InstanceIdentity(null, "TOKEN"));
 
         AthenzIdentityProvider identityProvider = new AthenzIdentityProviderImpl(config, serviceProviderApi, athenzService);