Skip to content

Commit fb324a7

Browse files
committed
Upgrade to Spring Javaformat 0.0.29.
Closes gh-698
1 parent 75f5cf9 commit fb324a7

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
<plugin>
237237
<groupId>io.spring.javaformat</groupId>
238238
<artifactId>spring-javaformat-maven-plugin</artifactId>
239-
<version>0.0.22</version>
239+
<version>0.0.29</version>
240240
<executions>
241241
<execution>
242242
<phase>validate</phase>

spring-vault-core/src/main/java/org/springframework/vault/support/VaultCertificateRequest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,8 @@ public class VaultCertificateRequest {
9696
private final boolean excludeCommonNameFromSubjectAltNames;
9797

9898
private VaultCertificateRequest(String commonName, List<String> altNames, List<String> ipSubjectAltNames,
99-
List<String> uriSubjectAltNames, List<String> otherSans, @Nullable Duration ttl,
100-
String format, @Nullable String privateKeyFormat,
101-
boolean excludeCommonNameFromSubjectAltNames) {
99+
List<String> uriSubjectAltNames, List<String> otherSans, @Nullable Duration ttl, String format,
100+
@Nullable String privateKeyFormat, boolean excludeCommonNameFromSubjectAltNames) {
102101

103102
this.commonName = commonName;
104103
this.altNames = altNames;

spring-vault-core/src/test/java/org/springframework/vault/core/VaultPkiTemplateIntegrationTests.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,7 @@ void issueCertificateUsingFormat(KeyFixture keyFixture) throws Exception {
160160

161161
VaultCertificateRequest request = VaultCertificateRequest.builder()
162162
.commonName(keyFixture.format.replace('_', '-') + ".hello.example.com")
163-
.privateKeyFormat(keyFixture.privateKeyFormat)
164-
.format(keyFixture.format)
165-
.build();
163+
.privateKeyFormat(keyFixture.privateKeyFormat).format(keyFixture.format).build();
166164

167165
VaultCertificateResponse certificateResponse = this.pkiOperations
168166
.issueCertificate("testrole-" + keyFixture.keyType.name(), request);

spring-vault-core/src/test/java/org/springframework/vault/support/VaultCertificateRequestUnitTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,5 @@ void shouldBuildFullyConfiguredRequest() {
6464
assertThat(request.getFormat()).isEqualTo("pem");
6565
assertThat(request.getPrivateKeyFormat()).isEqualTo("der");
6666
}
67+
6768
}

0 commit comments

Comments
 (0)