1 files changed, 3 insertions, 38 deletions

diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/bindings/SignedIdentityDocumentEntity.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/bindings/SignedIdentityDocumentEntity.java
index aa514b3caf3..e397b81ef9e 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/bindings/SignedIdentityDocumentEntity.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/bindings/SignedIdentityDocumentEntity.java
@@ -11,10 +11,8 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.URI;
-import java.time.Instant;
 import java.util.Base64;
 import java.util.Objects;
-import java.util.Set;
 
 /**
  * @author bjorncs
@@ -33,11 +31,6 @@ public class SignedIdentityDocumentEntity {
     @JsonProperty("provider-service") public final String providerService;
     @JsonProperty("zts-endpoint") public final URI ztsEndpoint;
     @JsonProperty("document-version") public final int documentVersion;
-    @JsonProperty("configserver-hostname") public final String configServerHostname;
-    @JsonProperty("instance-hostname") public final String instanceHostname;
-    @JsonProperty("created-at") public final Instant createdAt;
-    @JsonProperty("ip-addresses") public final Set<String> ipAddresses;
-    @JsonProperty("identity-type") public final String identityType;
 
     @JsonCreator
     public SignedIdentityDocumentEntity(@JsonProperty("identity-document") String rawIdentityDocument,
@@ -47,12 +40,7 @@ public class SignedIdentityDocumentEntity {
                                         @JsonProperty("dns-suffix") String dnsSuffix,
                                         @JsonProperty("provider-service") String providerService,
                                         @JsonProperty("zts-endpoint") URI ztsEndpoint,
-                                        @JsonProperty("document-version") int documentVersion,
-                                        @JsonProperty("configserver-hostname") String configServerHostname,
-                                        @JsonProperty("instance-hostname") String instanceHostname,
-                                        @JsonProperty("created-at") Instant createdAt,
-                                        @JsonProperty("ip-addresses") Set<String> ipAddresses,
-                                        @JsonProperty("identity-type") String identityType) {
+                                        @JsonProperty("document-version") int documentVersion) {
         this.rawIdentityDocument = rawIdentityDocument;
         this.identityDocument = parseIdentityDocument(rawIdentityDocument);
         this.signature = signature;
@@ -62,11 +50,6 @@ public class SignedIdentityDocumentEntity {
         this.providerService = providerService;
         this.ztsEndpoint = ztsEndpoint;
         this.documentVersion = documentVersion;
-        this.configServerHostname = configServerHostname;
-        this.instanceHostname = instanceHostname;
-        this.createdAt = createdAt;
-        this.ipAddresses = ipAddresses;
-        this.identityType = identityType;
     }
 
     private static IdentityDocumentEntity parseIdentityDocument(String rawIdentityDocument) {
@@ -90,16 +73,7 @@ public class SignedIdentityDocumentEntity {
                 ", identityDocument=" + identityDocument +
                 ", signature='" + signature + '\'' +
                 ", signingKeyVersion=" + signingKeyVersion +
-                ", providerUniqueId='" + providerUniqueId + '\'' +
-                ", dnsSuffix='" + dnsSuffix + '\'' +
-                ", providerService='" + providerService + '\'' +
-                ", ztsEndpoint=" + ztsEndpoint +
                 ", documentVersion=" + documentVersion +
-                ", configServerHostname='" + configServerHostname + '\'' +
-                ", instanceHostname='" + instanceHostname + '\'' +
-                ", createdAt=" + createdAt +
-                ", ipAddresses=" + ipAddresses +
-                ", identityType=" + identityType +
                 '}';
     }
 
@@ -112,20 +86,11 @@ public class SignedIdentityDocumentEntity {
                 documentVersion == that.documentVersion &&
                 Objects.equals(rawIdentityDocument, that.rawIdentityDocument) &&
                 Objects.equals(identityDocument, that.identityDocument) &&
-                Objects.equals(signature, that.signature) &&
-                Objects.equals(providerUniqueId, that.providerUniqueId) &&
-                Objects.equals(dnsSuffix, that.dnsSuffix) &&
-                Objects.equals(providerService, that.providerService) &&
-                Objects.equals(ztsEndpoint, that.ztsEndpoint) &&
-                Objects.equals(configServerHostname, that.configServerHostname) &&
-                Objects.equals(instanceHostname, that.instanceHostname) &&
-                Objects.equals(createdAt, that.createdAt) &&
-                Objects.equals(ipAddresses, that.ipAddresses) &&
-                Objects.equals(identityType, identityType);
+                Objects.equals(signature, that.signature);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(rawIdentityDocument, identityDocument, signature, signingKeyVersion, providerUniqueId, dnsSuffix, providerService, ztsEndpoint, documentVersion, configServerHostname, instanceHostname, createdAt, ipAddresses, identityType);
+        return Objects.hash(rawIdentityDocument, identityDocument, signature, signingKeyVersion, documentVersion);
     }
 }