Skip to content

Commit 747ed7f

Browse files
mp911demp911de
committed
Upgrade to Spring Javaformat 0.38.
Closes gh-781
1 parent 281338a commit 747ed7f

File tree

147 files changed

+2292
-1409
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+2292
-1409
lines changed

‎etc/ide/org.eclipse.core.jdt.prefs‎

Lines changed: 355 additions & 0 deletions
Large diffs are not rendered by default.

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@
333333
<plugin>
334334
<groupId>io.spring.javaformat</groupId>
335335
<artifactId>spring-javaformat-maven-plugin</artifactId>
336-
<version>0.0.29</version>
336+
<version>0.0.38</version>
337337
<executions>
338338
<execution>
339339
<phase>validate</phase>

‎spring-vault-core/src/main/java/org/springframework/vault/annotation/VaultPropertySourceRegistrar.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,9 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
7676
beanFactory.getBeansOfType(org.springframework.vault.core.env.VaultPropertySource.class).values(),
7777
propertySources);
7878

79-
registerPropertySources(beanFactory
80-
.getBeansOfType(org.springframework.vault.core.env.LeaseAwareVaultPropertySource.class).values(),
79+
registerPropertySources(
80+
beanFactory.getBeansOfType(org.springframework.vault.core.env.LeaseAwareVaultPropertySource.class)
81+
.values(),
8182
propertySources);
8283
}
8384

@@ -102,9 +103,9 @@ public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanD
102103

103104
if (!registry.isBeanNameInUse("VaultPropertySourceRegistrar")) {
104105
registry.registerBeanDefinition("VaultPropertySourceRegistrar", BeanDefinitionBuilder //
105-
.rootBeanDefinition(VaultPropertySourceRegistrar.class) //
106-
.setRole(BeanDefinition.ROLE_INFRASTRUCTURE) //
107-
.getBeanDefinition());
106+
.rootBeanDefinition(VaultPropertySourceRegistrar.class) //
107+
.setRole(BeanDefinition.ROLE_INFRASTRUCTURE) //
108+
.getBeanDefinition());
108109
}
109110

110111
Set<AnnotationAttributes> propertySources = attributesForRepeatable(annotationMetadata,
@@ -163,7 +164,7 @@ private AbstractBeanDefinition createBeanDefinition(String ref, Renewal renewal,
163164

164165
if (isRenewable(renewal)) {
165166
builder = BeanDefinitionBuilder
166-
.rootBeanDefinition(org.springframework.vault.core.env.LeaseAwareVaultPropertySource.class);
167+
.rootBeanDefinition(org.springframework.vault.core.env.LeaseAwareVaultPropertySource.class);
167168

168169
RequestedSecret requestedSecret = renewal == Renewal.ROTATE ? RequestedSecret.rotating(propertyPath)
169170
: RequestedSecret.renewable(propertyPath);
@@ -174,7 +175,7 @@ private AbstractBeanDefinition createBeanDefinition(String ref, Renewal renewal,
174175
}
175176
else {
176177
builder = BeanDefinitionBuilder
177-
.rootBeanDefinition(org.springframework.vault.core.env.VaultPropertySource.class);
178+
.rootBeanDefinition(org.springframework.vault.core.env.VaultPropertySource.class);
178179

179180
builder.addConstructorArgValue(propertyPath);
180181
builder.addConstructorArgReference(ref);

‎spring-vault-core/src/main/java/org/springframework/vault/aot/VaultRuntimeHints.java‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -69,24 +69,25 @@ public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
6969
throw new RuntimeException(e);
7070
}
7171

72-
Stream.of("org.springframework.vault.core.VaultSysTemplate$GetMounts$VaultMountsResponse",
73-
"org.springframework.vault.core.VaultVersionedKeyValueTemplate$VersionedResponse",
74-
"org.springframework.vault.core.ReactiveVaultTemplate$VaultListResponse",
75-
"org.springframework.vault.core.VaultListResponse",
76-
77-
"org.springframework.vault.core.VaultTransitTemplate$RawTransitKeyImpl",
78-
"org.springframework.vault.core.VaultTransitTemplate$VaultTransitKeyImpl",
79-
80-
"org.springframework.vault.core.VaultSysTemplate$GetMounts",
81-
"org.springframework.vault.core.VaultSysTemplate$GetUnsealStatus",
82-
"org.springframework.vault.core.VaultSysTemplate$Health",
83-
"org.springframework.vault.core.VaultSysTemplate$Seal",
84-
"org.springframework.vault.core.VaultSysTemplate$VaultHealthImpl",
85-
"org.springframework.vault.core.VaultSysTemplate$VaultInitializationResponseImpl",
86-
"org.springframework.vault.core.VaultSysTemplate$VaultUnsealStatusImpl",
87-
88-
"org.springframework.vault.core.VaultVersionedKeyValueTemplate$VersionedResponse")
89-
.forEach(cls -> reflection.registerType(TypeReference.of(cls), dataObjectCategories));
72+
Stream
73+
.of("org.springframework.vault.core.VaultSysTemplate$GetMounts$VaultMountsResponse",
74+
"org.springframework.vault.core.VaultVersionedKeyValueTemplate$VersionedResponse",
75+
"org.springframework.vault.core.ReactiveVaultTemplate$VaultListResponse",
76+
"org.springframework.vault.core.VaultListResponse",
77+
78+
"org.springframework.vault.core.VaultTransitTemplate$RawTransitKeyImpl",
79+
"org.springframework.vault.core.VaultTransitTemplate$VaultTransitKeyImpl",
80+
81+
"org.springframework.vault.core.VaultSysTemplate$GetMounts",
82+
"org.springframework.vault.core.VaultSysTemplate$GetUnsealStatus",
83+
"org.springframework.vault.core.VaultSysTemplate$Health",
84+
"org.springframework.vault.core.VaultSysTemplate$Seal",
85+
"org.springframework.vault.core.VaultSysTemplate$VaultHealthImpl",
86+
"org.springframework.vault.core.VaultSysTemplate$VaultInitializationResponseImpl",
87+
"org.springframework.vault.core.VaultSysTemplate$VaultUnsealStatusImpl",
88+
89+
"org.springframework.vault.core.VaultVersionedKeyValueTemplate$VersionedResponse")
90+
.forEach(cls -> reflection.registerType(TypeReference.of(cls), dataObjectCategories));
9091

9192
reflection.registerTypeIfPresent(classLoader, "com.google.api.client.json.jackson2.JacksonFactory",
9293
MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS);

‎spring-vault-core/src/main/java/org/springframework/vault/authentication/AppIdAuthentication.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ public static AuthenticationSteps createAuthenticationSteps(AppIdAuthenticationO
7575
Assert.notNull(options, "AppIdAuthenticationOptions must not be null");
7676

7777
return AuthenticationSteps
78-
.fromSupplier(() -> getAppIdLogin(options.getAppId(), options.getUserIdMechanism().createUserId())) //
79-
.login(AuthenticationUtil.getLoginPath(options.getPath()));
78+
.fromSupplier(() -> getAppIdLogin(options.getAppId(), options.getUserIdMechanism().createUserId())) //
79+
.login(AuthenticationUtil.getLoginPath(options.getPath()));
8080
}
8181

8282
@Override
@@ -96,7 +96,7 @@ private VaultToken createTokenUsingAppId() {
9696

9797
try {
9898
VaultResponse response = this.restOperations
99-
.postForObject(AuthenticationUtil.getLoginPath(this.options.getPath()), login, VaultResponse.class);
99+
.postForObject(AuthenticationUtil.getLoginPath(this.options.getPath()), login, VaultResponse.class);
100100

101101
Assert.state(response != null && response.getAuth() != null, "Auth field must not be null");
102102

‎spring-vault-core/src/main/java/org/springframework/vault/authentication/AppRoleAuthentication.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,13 @@ private static Node<String> getRoleIdSteps(AppRoleAuthenticationOptions options,
126126
HttpHeaders headers = createHttpHeaders(((Pull) roleId).getInitialToken());
127127

128128
return AuthenticationSteps
129-
.fromHttpRequest(get(getRoleIdIdPath(options)).with(headers).as(VaultResponse.class))
130-
.map(vaultResponse -> (String) vaultResponse.getRequiredData().get("role_id"));
129+
.fromHttpRequest(get(getRoleIdIdPath(options)).with(headers).as(VaultResponse.class))
130+
.map(vaultResponse -> (String) vaultResponse.getRequiredData().get("role_id"));
131131
}
132132

133133
if (roleId instanceof Wrapped) {
134134
return unwrapResponse(options.getUnwrappingEndpoints(), ((Wrapped) roleId).getInitialToken())
135-
.map(vaultResponse -> (String) vaultResponse.getRequiredData().get("role_id"));
135+
.map(vaultResponse -> (String) vaultResponse.getRequiredData().get("role_id"));
136136
}
137137

138138
throw new IllegalArgumentException("Unknown RoleId configuration: " + roleId);
@@ -148,14 +148,14 @@ private static Node<String> getSecretIdSteps(AppRoleAuthenticationOptions option
148148
HttpHeaders headers = createHttpHeaders(((Pull) secretId).getInitialToken());
149149

150150
return AuthenticationSteps
151-
.fromHttpRequest(post(getSecretIdPath(options)).with(headers).as(VaultResponse.class))
152-
.map(vaultResponse -> (String) vaultResponse.getRequiredData().get("secret_id"));
151+
.fromHttpRequest(post(getSecretIdPath(options)).with(headers).as(VaultResponse.class))
152+
.map(vaultResponse -> (String) vaultResponse.getRequiredData().get("secret_id"));
153153
}
154154

155155
if (secretId instanceof Wrapped) {
156156

157157
return unwrapResponse(options.getUnwrappingEndpoints(), ((Wrapped) secretId).getInitialToken())
158-
.map(vaultResponse -> (String) vaultResponse.getRequiredData().get("secret_id"));
158+
.map(vaultResponse -> (String) vaultResponse.getRequiredData().get("secret_id"));
159159
}
160160

161161
throw new IllegalArgumentException("Unknown SecretId configuration: " + secretId);
@@ -165,9 +165,10 @@ private static Node<String> getSecretIdSteps(AppRoleAuthenticationOptions option
165165
private static Node<VaultResponse> unwrapResponse(UnwrappingEndpoints unwrappingEndpoints, VaultToken token) {
166166

167167
return AuthenticationSteps
168-
.fromHttpRequest(method(unwrappingEndpoints.getUnwrapRequestMethod(), unwrappingEndpoints.getPath())
169-
.with(createHttpHeaders(token)).as(VaultResponse.class))
170-
.map(unwrappingEndpoints::unwrap);
168+
.fromHttpRequest(method(unwrappingEndpoints.getUnwrapRequestMethod(), unwrappingEndpoints.getPath())
169+
.with(createHttpHeaders(token))
170+
.as(VaultResponse.class))
171+
.map(unwrappingEndpoints::unwrap);
171172
}
172173

173174
@Override

‎spring-vault-core/src/main/java/org/springframework/vault/authentication/AuthenticationStepsOperator.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ private Mono<Object> createMono(Iterable<Node<?>> steps) {
136136

137137
if (o instanceof ZipStep) {
138138
state = state.zipWith(doZipStep((ZipStep<Object, Object>) o))
139-
.map(it -> Pair.of(it.getT1(), it.getT2()));
139+
.map(it -> Pair.of(it.getT1(), it.getT2()));
140140
}
141141

142142
if (o instanceof OnNextStep) {
@@ -166,8 +166,8 @@ private Mono<Object> doHttpRequest(HttpRequestNode<Object> step, Object state) {
166166
RequestBodySpec spec;
167167
if (definition.getUri() == null) {
168168

169-
spec = this.webClient.method(definition.getMethod()).uri(definition.getUriTemplate(),
170-
definition.getUrlVariables());
169+
spec = this.webClient.method(definition.getMethod())
170+
.uri(definition.getUriTemplate(), definition.getUrlVariables());
171171
}
172172
else {
173173
spec = this.webClient.method(definition.getMethod()).uri(definition.getUri());
@@ -224,14 +224,13 @@ private Mono<Object> doSupplierStepLater(SupplierStep<Object> supplierStep) {
224224
ResourceCredentialSupplier resourceSupplier = (ResourceCredentialSupplier) supplier;
225225

226226
return DataBufferUtils.join(DataBufferUtils.read(resourceSupplier.getResource(), this.factory, 4096))
227-
.map(dataBuffer -> {
228-
String result = dataBuffer.toString(ResourceCredentialSupplier.CHARSET);
229-
DataBufferUtils.release(dataBuffer);
230-
return (Object) result;
231-
}).onErrorMap(IOException.class,
232-
e -> new VaultException(
233-
String.format("Credential retrieval from %s failed", resourceSupplier.getResource()),
234-
e));
227+
.map(dataBuffer -> {
228+
String result = dataBuffer.toString(ResourceCredentialSupplier.CHARSET);
229+
DataBufferUtils.release(dataBuffer);
230+
return (Object) result;
231+
})
232+
.onErrorMap(IOException.class, e -> new VaultException(
233+
String.format("Credential retrieval from %s failed", resourceSupplier.getResource()), e));
235234
}
236235

237236
enum Undefinded {

‎spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsEc2Authentication.java‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -108,26 +108,27 @@ protected static AuthenticationSteps createAuthenticationSteps(AwsEc2Authenticat
108108
AtomicReference<char[]> nonce, Supplier<char[]> nonceSupplier) {
109109

110110
return AuthenticationSteps
111-
.fromHttpRequest(HttpRequestBuilder.get(options.getIdentityDocumentUri().toString()).as(String.class)) //
112-
.map(pkcs7 -> pkcs7.replaceAll("\\r", "")) //
113-
.map(pkcs7 -> pkcs7.replaceAll("\\n", "")) //
114-
.map(pkcs7 -> {
111+
.fromHttpRequest(HttpRequestBuilder.get(options.getIdentityDocumentUri().toString()).as(String.class)) //
112+
.map(pkcs7 -> pkcs7.replaceAll("\\r", "")) //
113+
.map(pkcs7 -> pkcs7.replaceAll("\\n", "")) //
114+
.map(pkcs7 -> {
115115

116-
Map<String, String> login = new HashMap<>();
116+
Map<String, String> login = new HashMap<>();
117117

118-
if (StringUtils.hasText(options.getRole())) {
119-
login.put("role", options.getRole());
120-
}
118+
if (StringUtils.hasText(options.getRole())) {
119+
login.put("role", options.getRole());
120+
}
121121

122-
if (Objects.equals(nonce.get(), EMPTY)) {
123-
nonce.compareAndSet(EMPTY, nonceSupplier.get());
124-
}
122+
if (Objects.equals(nonce.get(), EMPTY)) {
123+
nonce.compareAndSet(EMPTY, nonceSupplier.get());
124+
}
125125

126-
login.put("nonce", new String(nonce.get()));
127-
login.put("pkcs7", pkcs7);
126+
login.put("nonce", new String(nonce.get()));
127+
login.put("pkcs7", pkcs7);
128128

129-
return login;
130-
}).login(AuthenticationUtil.getLoginPath(options.getPath()));
129+
return login;
130+
})
131+
.login(AuthenticationUtil.getLoginPath(options.getPath()));
131132
}
132133

133134
@Override
@@ -148,7 +149,7 @@ private VaultToken createTokenUsingAwsEc2() {
148149
try {
149150

150151
VaultResponse response = this.vaultRestOperations
151-
.postForObject(AuthenticationUtil.getLoginPath(this.options.getPath()), login, VaultResponse.class);
152+
.postForObject(AuthenticationUtil.getLoginPath(this.options.getPath()), login, VaultResponse.class);
152153

153154
Assert.state(response != null && response.getAuth() != null, "Auth field must not be null");
154155

‎spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsEc2AuthenticationOptions.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
public class AwsEc2AuthenticationOptions {
3737

3838
public static final URI DEFAULT_PKCS7_IDENTITY_DOCUMENT_URI = URI
39-
.create("http://169.254.169.254/latest/dynamic/instance-identity/pkcs7");
39+
.create("http://169.254.169.254/latest/dynamic/instance-identity/pkcs7");
4040

4141
public static final String DEFAULT_AWS_AUTHENTICATION_PATH = "aws-ec2";
4242

‎spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsIamAuthentication.java‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ protected static AuthenticationSteps createAuthenticationSteps(AwsIamAuthenticat
125125
AwsCredentials credentials, Region region) {
126126

127127
return AuthenticationSteps.fromSupplier(() -> createRequestBody(options, credentials, region)) //
128-
.login(AuthenticationUtil.getLoginPath(options.getPath()));
128+
.login(AuthenticationUtil.getLoginPath(options.getPath()));
129129
}
130130

131131
@Override
@@ -147,7 +147,7 @@ private VaultToken createTokenUsingAwsIam() {
147147
try {
148148

149149
VaultResponse response = this.vaultRestOperations
150-
.postForObject(AuthenticationUtil.getLoginPath(this.options.getPath()), login, VaultResponse.class);
150+
.postForObject(AuthenticationUtil.getLoginPath(this.options.getPath()), login, VaultResponse.class);
151151

152152
Assert.state(response != null && response.getAuth() != null, "Auth field must not be null");
153153

@@ -214,13 +214,18 @@ private static String getSignedHeaders(AwsIamAuthenticationOptions options, AwsC
214214
Map<String, List<String>> headers = createIamRequestHeaders(options);
215215

216216
SdkHttpFullRequest.Builder builder = SdkHttpFullRequest.builder()
217-
.contentStreamProvider(() -> new ByteArrayInputStream(REQUEST_BODY.getBytes())).headers(headers)
218-
.method(SdkHttpMethod.POST).uri(options.getEndpointUri());
217+
.contentStreamProvider(() -> new ByteArrayInputStream(REQUEST_BODY.getBytes()))
218+
.headers(headers)
219+
.method(SdkHttpMethod.POST)
220+
.uri(options.getEndpointUri());
219221
SdkHttpFullRequest request = builder.build();
220222

221223
Aws4Signer signer = Aws4Signer.create();
222-
Aws4SignerParams signerParams = Aws4SignerParams.builder().awsCredentials(credentials).signingName("sts")
223-
.signingRegion(region).build();
224+
Aws4SignerParams signerParams = Aws4SignerParams.builder()
225+
.awsCredentials(credentials)
226+
.signingName("sts")
227+
.signingRegion(region)
228+
.build();
224229
SdkHttpFullRequest signedRequest = signer.sign(request, signerParams);
225230

226231
Map<String, Object> map = new LinkedHashMap<>();

0 commit comments

Comments
 (0)