diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2017-12-15 13:11:13 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@oath.com> | 2017-12-18 10:58:34 +0100 |
commit | a3f4d5abd57f0085da74f9489e7d5317d9f10b4e (patch) | |
tree | 8e559280745ae99f1d7d68a06f3dfe9e37601c64 /controller-api | |
parent | f139b83f27db5912090868addef4c028d9ce1baa (diff) |
Make NToken optional in AthenzPrincipal
Diffstat (limited to 'controller-api')
-rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzPrincipal.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzPrincipal.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzPrincipal.java index 8279edcd8e6..b31cb4a26bb 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzPrincipal.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzPrincipal.java @@ -5,6 +5,7 @@ import com.yahoo.vespa.hosted.controller.api.identifiers.AthenzDomain; import java.security.Principal; import java.util.Objects; +import java.util.Optional; /** * @author bjorncs @@ -14,6 +15,10 @@ public class AthenzPrincipal implements Principal { private final AthenzIdentity athenzIdentity; private final NToken nToken; + public AthenzPrincipal(AthenzIdentity athenzIdentity) { + this(athenzIdentity, null); + } + public AthenzPrincipal(AthenzIdentity athenzIdentity, NToken nToken) { this.athenzIdentity = athenzIdentity; @@ -33,8 +38,8 @@ public class AthenzPrincipal implements Principal { return athenzIdentity.getDomain(); } - public NToken getNToken() { - return nToken; + public Optional<NToken> getNToken() { + return Optional.ofNullable(nToken); } @Override |