diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-04-19 15:56:29 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-04-19 15:56:29 +0200 |
commit | 97b5dc407f526da94405cd3a3cde88d617f7685b (patch) | |
tree | b0d0c73bdb35e5b71b9f81d85cd046dab0903d35 /vespa-athenz/src/main/java/com/yahoo | |
parent | ca7e9491725b8dd7cb511e12d2ea25034e8171ce (diff) |
Remove duplicate type for signed identity document
Diffstat (limited to 'vespa-athenz/src/main/java/com/yahoo')
3 files changed, 3 insertions, 33 deletions
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzCredentials.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzCredentials.java index 8b1efbc7899..e423139d776 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzCredentials.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzCredentials.java @@ -1,6 +1,8 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.athenz.identityprovider.client; +import com.yahoo.vespa.athenz.identityprovider.api.bindings.SignedIdentityDocument; + import java.security.KeyPair; import java.security.cert.X509Certificate; 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 0b647f6174d..e221ad792b3 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 @@ -3,6 +3,7 @@ package com.yahoo.vespa.athenz.identityprovider.client; import com.fasterxml.jackson.databind.ObjectMapper; import com.yahoo.container.core.identity.IdentityConfig; +import com.yahoo.vespa.athenz.identityprovider.api.bindings.SignedIdentityDocument; import com.yahoo.vespa.athenz.tls.KeyAlgorithm; import com.yahoo.vespa.athenz.tls.KeyUtils; import com.yahoo.vespa.athenz.tls.Pkcs10Csr; diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/SignedIdentityDocument.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/SignedIdentityDocument.java deleted file mode 100644 index 6e6a9eaee75..00000000000 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/SignedIdentityDocument.java +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.athenz.identityprovider.client; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; - -import java.net.URI; - -/** - * @author bjorncs - */ -// TODO Most of these value should ideally be config provided by config-model -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) -class SignedIdentityDocument { - public final String providerUniqueId; - public final String dnsSuffix; - public final String providerService; - public final URI ztsEndpoint; - - public SignedIdentityDocument(@JsonProperty("provider-unique-id") String providerUniqueId, - @JsonProperty("dns-suffix") String dnsSuffix, - @JsonProperty("provider-service") String providerService, - @JsonProperty("zts-endpoint") URI ztsEndpoint) { - this.providerUniqueId = providerUniqueId; - this.dnsSuffix = dnsSuffix; - this.providerService = providerService; - this.ztsEndpoint = ztsEndpoint; - } - -} - |