diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-03-21 10:58:54 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-03-21 10:58:54 +0100 |
commit | bb6b524f9409020979ab42ad0caf95a56e5175b7 (patch) | |
tree | 7eae4e864b9f307d9419ebe09d4a9f2b5ae05d4d /vespa-athenz | |
parent | 35e483cde7a1188ca6fc08d655036854e0b0add8 (diff) |
Change return type of getBasicContraints() to Optional<Boolean>
Diffstat (limited to 'vespa-athenz')
-rw-r--r-- | vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/Pkcs10Csr.java | 8 | ||||
-rw-r--r-- | vespa-athenz/src/test/java/com/yahoo/vespa/athenz/tls/Pkcs10CsrTest.java | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/Pkcs10Csr.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/Pkcs10Csr.java index 061a70872f4..da603f77980 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/Pkcs10Csr.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/Pkcs10Csr.java @@ -17,6 +17,7 @@ import javax.security.auth.x500.X500Principal; import java.util.Arrays; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Stream; import static java.util.stream.Collectors.toList; @@ -50,14 +51,13 @@ public class Pkcs10Csr { } /** - * @return true if CA certificate + * @return If basic constraints extension is present: returns true if CA cert, false otherwise. Returns empty if the extension is not present. */ - public boolean getBasicConstraints() { + public Optional<Boolean> getBasicConstraints() { return getExtensions() .map(BasicConstraints::fromExtensions) .findAny() - .map(BasicConstraints::isCA) - .orElse(false); + .map(BasicConstraints::isCA); } public List<String> getExtensionOIds() { diff --git a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/tls/Pkcs10CsrTest.java b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/tls/Pkcs10CsrTest.java index 9586906668d..bb2e80ba705 100644 --- a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/tls/Pkcs10CsrTest.java +++ b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/tls/Pkcs10CsrTest.java @@ -35,7 +35,8 @@ public class Pkcs10CsrTest { Pkcs10Csr csr = Pkcs10CsrBuilder.fromKeypair(subject, keypair, SignatureAlgorithm.SHA256_WITH_RSA) .setBasicConstraints(true, true) .build(); - assertTrue(csr.getBasicConstraints()); + assertTrue(csr.getBasicConstraints().isPresent()); + assertTrue(csr.getBasicConstraints().get()); } @Test |