From 26829f5b30f70b4e9417c8cf11686295b6923117 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 30 Sep 2019 14:48:52 +0200 Subject: [PATCH] Polishing. Add author tags. Update test. Original pull request: gh-476. --- .../vault/core/VaultPkiTemplate.java | 1 + .../vault/core/util/PropertyTransformers.java | 1 + .../support/VaultCertificateRequest.java | 29 ++++++++++--------- .../VaultCertificateRequestUnitTests.java | 4 ++- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultPkiTemplate.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultPkiTemplate.java index a71dbbb5..b2ee734e 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultPkiTemplate.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultPkiTemplate.java @@ -36,6 +36,7 @@ import org.springframework.web.client.HttpStatusCodeException; * Default implementation of {@link VaultPkiOperations}. * * @author Mark Paluch + * @author Alex Antonov */ public class VaultPkiTemplate implements VaultPkiOperations { diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/util/PropertyTransformers.java b/spring-vault-core/src/main/java/org/springframework/vault/core/util/PropertyTransformers.java index 022687d0..64a71de4 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/util/PropertyTransformers.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/util/PropertyTransformers.java @@ -72,6 +72,7 @@ public abstract class PropertyTransformers { } @Override + @SuppressWarnings("unchecked") public Map transformProperties( Map input) { return (Map) input; diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultCertificateRequest.java b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultCertificateRequest.java index 88580b07..b38e70d2 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultCertificateRequest.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultCertificateRequest.java @@ -27,6 +27,7 @@ import org.springframework.util.Assert; * Request for a Certificate. * * @author Mark Paluch + * @author Alex Antonov */ public class VaultCertificateRequest { @@ -63,9 +64,9 @@ public class VaultCertificateRequest { */ private final boolean excludeCommonNameFromSubjectAltNames; - VaultCertificateRequest(String commonName, List altNames, - List ipSubjectAltNames, List uriSubjectAltNames, @Nullable Duration ttl, - boolean excludeCommonNameFromSubjectAltNames) { + private VaultCertificateRequest(String commonName, List altNames, + List ipSubjectAltNames, List uriSubjectAltNames, + @Nullable Duration ttl, boolean excludeCommonNameFromSubjectAltNames) { this.commonName = commonName; this.altNames = altNames; @@ -215,6 +216,7 @@ public class VaultCertificateRequest { * * @param uriSubjectAltNames must not be {@literal null}. * @return {@code this} {@link VaultCertificateRequestBuilder}. + * @since 2.2 */ public VaultCertificateRequestBuilder uriSubjectAltNames( Iterable uriSubjectAltNames) { @@ -230,6 +232,7 @@ public class VaultCertificateRequest { * * @param uriSubjectAltName must not be empty or {@literal null}. * @return {@code this} {@link VaultCertificateRequestBuilder}. + * @since 2.2 */ public VaultCertificateRequestBuilder withUriSubjectAltName( String uriSubjectAltName) { @@ -341,16 +344,16 @@ public class VaultCertificateRequest { List uriSubjectAltNames; switch (this.uriSubjectAltNames.size()) { - case 0: - uriSubjectAltNames = java.util.Collections.emptyList(); - break; - case 1: - uriSubjectAltNames = java.util.Collections - .singletonList(this.uriSubjectAltNames.get(0)); - break; - default: - uriSubjectAltNames = java.util.Collections - .unmodifiableList(new ArrayList<>(this.uriSubjectAltNames)); + case 0: + uriSubjectAltNames = java.util.Collections.emptyList(); + break; + case 1: + uriSubjectAltNames = java.util.Collections + .singletonList(this.uriSubjectAltNames.get(0)); + break; + default: + uriSubjectAltNames = java.util.Collections + .unmodifiableList(new ArrayList<>(this.uriSubjectAltNames)); } return new VaultCertificateRequest(commonName, altNames, ipSubjectAltNames, diff --git a/spring-vault-core/src/test/java/org/springframework/vault/support/VaultCertificateRequestUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/support/VaultCertificateRequestUnitTests.java index ad21adb5..91819c68 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/support/VaultCertificateRequestUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/support/VaultCertificateRequestUnitTests.java @@ -49,12 +49,14 @@ class VaultCertificateRequestUnitTests { .commonName("hello.com") // .withAltName("alt") // .withIpSubjectAltName("127.0.0.1") // + .withUriSubjectAltName("hello.world") // .excludeCommonNameFromSubjectAltNames() // .build(); assertThat(request.getCommonName()).isEqualTo("hello.com"); assertThat(request.getAltNames()).hasSize(1).contains("alt"); - assertThat(request.getIpSubjectAltNames()).hasSize(1).contains("127.0.0.1"); + assertThat(request.getIpSubjectAltNames()).containsOnly("127.0.0.1"); + assertThat(request.getUriSubjectAltNames()).containsOnly("hello.world"); assertThat(request.isExcludeCommonNameFromSubjectAltNames()).isTrue(); assertThat(request.getCommonName()).isEqualTo("hello.com"); }