Upgrade to Spring Javaformat 0.0.47.

See gh-935

Author: mp911de

pom.xml

@@ -350,7 +350,7 @@
 			<plugin>
 				<groupId>io.spring.javaformat</groupId>
 				<artifactId>spring-javaformat-maven-plugin</artifactId>
-				<version>0.0.38</version>
+				<version>0.0.47</version>
 				<executions>
 					<execution>
 						<phase>validate</phase>

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

@@ -58,8 +58,7 @@ public class AppRoleAuthenticationOptions {
 	/**
 	 * Role name used to get roleId and secretID
 	 */
-	@Nullable
-	private final String appRole;
+	private final @Nullable String appRole;
 
 	/**
 	 * Unwrapping endpoint to cater for functionality across various Vault versions.
@@ -108,8 +107,7 @@ public SecretId getSecretId() {
 	 * @return the bound AppRole.
 	 * @since 1.1
 	 */
-	@Nullable
-	public String getAppRole() {
+	public @Nullable String getAppRole() {
 		return this.appRole;
 	}
 

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

@@ -293,17 +293,13 @@ public static class HttpRequestBuilder {
 
 		HttpMethod method;
 
-		@Nullable
-		URI uri;
+		@Nullable URI uri;
 
-		@Nullable
-		String uriTemplate;
+		@Nullable String uriTemplate;
 
-		@Nullable
-		String[] urlVariables = new String[0];
+		@Nullable String[] urlVariables = new String[0];
 
-		@Nullable
-		HttpEntity<?> entity;
+		@Nullable HttpEntity<?> entity;
 
 		/**
 		 * Builder entry point to {@code GET} from {@code uriTemplate}.
@@ -443,16 +439,13 @@ public static class HttpRequest<T> {
 
 		final HttpMethod method;
 
-		@Nullable
-		final URI uri;
+		@Nullable final URI uri;
 
-		@Nullable
-		final String uriTemplate;
+		@Nullable final String uriTemplate;
 
 		final @Nullable String[] urlVariables;
 
-		@Nullable
-		final HttpEntity<?> entity;
+		@Nullable final HttpEntity<?> entity;
 
 		final Class<T> responseType;
 
@@ -475,23 +468,19 @@ HttpMethod getMethod() {
 			return this.method;
 		}
 
-		@Nullable
-		URI getUri() {
+		@Nullable URI getUri() {
 			return this.uri;
 		}
 
-		@Nullable
-		String getUriTemplate() {
+		@Nullable String getUriTemplate() {
 			return this.uriTemplate;
 		}
 
-		@Nullable
-		String[] getUrlVariables() {
+		@Nullable String[] getUrlVariables() {
 			return this.urlVariables;
 		}
 
-		@Nullable
-		HttpEntity<?> getEntity() {
+		@Nullable HttpEntity<?> getEntity() {
 			return this.entity;
 		}
 

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

@@ -69,8 +69,7 @@ public class AwsEc2AuthenticationOptions {
 	/**
 	 * EC2 instance role name. May be {@literal null} if none.
 	 */
-	@Nullable
-	private final String role;
+	private final @Nullable String role;
 
 	/**
 	 * Authentication nonce.
@@ -136,8 +135,7 @@ public URI getIdentityDocumentUri() {
 	/**
 	 * @return the role, may be {@literal null} if none.
 	 */
-	@Nullable
-	public String getRole() {
+	public @Nullable String getRole() {
 		return this.role;
 	}
 
@@ -181,8 +179,7 @@ public static class AwsEc2AuthenticationOptionsBuilder {
 
 		private URI identityDocumentUri = DEFAULT_PKCS7_IDENTITY_DOCUMENT_URI;
 
-		@Nullable
-		private String role;
+		private @Nullable String role;
 
 		private Nonce nonce = Nonce.generated();
 

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

@@ -64,15 +64,13 @@ public class AwsIamAuthenticationOptions {
 	 * specified, the friendly name (i.e., role name or username) of the IAM principal
 	 * authenticated. If a matching role is not found, login fails.
 	 */
-	@Nullable
-	private final String role;
+	private final @Nullable String role;
 
 	/**
 	 * Server name to mitigate risk of replay attacks, preferably set to Vault server's
 	 * DNS name. Used for {@literal Vault-AWS-IAM-Server-ID} header.
 	 */
-	@Nullable
-	private final String serverId;
+	private final @Nullable String serverId;
 
 	/**
 	 * STS server URI.
@@ -123,8 +121,7 @@ public AwsRegionProvider getRegionProvider() {
 	/**
 	 * @return the role, may be {@literal null} if none.
 	 */
-	@Nullable
-	public String getRole() {
+	public @Nullable String getRole() {
 		return this.role;
 	}
 
@@ -134,8 +131,7 @@ public String getRole() {
 	 * {@literal Vault-AWS-IAM-Server-ID} header.
 	 * @since 2.0
 	 */
-	@Nullable
-	public String getServerId() {
+	public @Nullable String getServerId() {
 		return this.serverId;
 	}
 
@@ -153,16 +149,13 @@ public static class AwsIamAuthenticationOptionsBuilder {
 
 		private String path = DEFAULT_AWS_AUTHENTICATION_PATH;
 
-		@Nullable
-		private AwsCredentialsProvider credentialsProvider;
+		private @Nullable AwsCredentialsProvider credentialsProvider;
 
 		private AwsRegionProvider regionProvider = DefaultAwsRegionProviderChain.builder().build();
 
-		@Nullable
-		private String role;
+		private @Nullable String role;
 
-		@Nullable
-		private String serverId;
+		private @Nullable String serverId;
 
 		private URI endpointUri = URI.create("https://sts.amazonaws.com/");
 

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

@@ -67,8 +67,7 @@ public class AzureMsiAuthenticationOptions {
 	/**
 	 * Optional {@link AzureVmEnvironment}.
 	 */
-	@Nullable
-	private final AzureVmEnvironment vmEnvironment;
+	private final @Nullable AzureVmEnvironment vmEnvironment;
 
 	private AzureMsiAuthenticationOptions(String path, String role, URI instanceMetadataServiceUri,
 			URI identityTokenServiceUri, @Nullable AzureVmEnvironment vmEnvironment) {
@@ -106,8 +105,7 @@ public String getRole() {
 	 * retrieved from the {@link #getInstanceMetadataServiceUri() VM instance metadata
 	 * service}.
 	 */
-	@Nullable
-	public AzureVmEnvironment getVmEnvironment() {
+	public @Nullable AzureVmEnvironment getVmEnvironment() {
 		return this.vmEnvironment;
 	}
 
@@ -132,11 +130,9 @@ public static class AzureMsiAuthenticationOptionsBuilder {
 
 		private String path = DEFAULT_AZURE_AUTHENTICATION_PATH;
 
-		@Nullable
-		private String role;
+		private @Nullable String role;
 
-		@Nullable
-		private AzureVmEnvironment vmEnvironment;
+		private @Nullable AzureVmEnvironment vmEnvironment;
 
 		private URI instanceMetadataServiceUri = DEFAULT_INSTANCE_METADATA_SERVICE_URI;
 

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

@@ -44,8 +44,7 @@ public class ClientCertificateAuthenticationOptions {
 	/**
 	 * Named certificate role to authenticate against. Can be {@literal null}.
 	 */
-	@Nullable
-	private final String role;
+	private final @Nullable String role;
 
 	private ClientCertificateAuthenticationOptions(String path, @Nullable String role) {
 		this.path = path;
@@ -70,8 +69,7 @@ public String getPath() {
 	 * @return the optional named certificate role to authenticate against.
 	 * @since 2.3.4
 	 */
-	@Nullable
-	public String getRole() {
+	public @Nullable String getRole() {
 		return this.role;
 	}
 
@@ -82,8 +80,7 @@ public static class ClientCertificateAuthenticationOptionsBuilder {
 
 		private String path = DEFAULT_CERT_PATH;
 
-		@Nullable
-		private String role;
+		private @Nullable String role;
 
 		ClientCertificateAuthenticationOptionsBuilder() {
 		}

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

@@ -122,11 +122,9 @@ public boolean isSelfLookup() {
 	 */
 	public static class CubbyholeAuthenticationOptionsBuilder {
 
-		@Nullable
-		private VaultToken initialToken;
+		private @Nullable VaultToken initialToken;
 
-		@Nullable
-		private String path;
+		private @Nullable String path;
 
 		private UnwrappingEndpoints endpoints = UnwrappingEndpoints.SysWrapping;
 

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

@@ -93,8 +93,7 @@ public static class GcpComputeAuthenticationOptionsBuilder {
 
 		private String path = DEFAULT_GCP_AUTHENTICATION_PATH;
 
-		@Nullable
-		private String role;
+		private @Nullable String role;
 
 		private String serviceAccount = "default";
 

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

@@ -88,11 +88,9 @@ public static class GcpIamCredentialsAuthenticationOptionsBuilder {
 
 		private String path = DEFAULT_GCP_AUTHENTICATION_PATH;
 
-		@Nullable
-		private String role;
+		private @Nullable String role;
 
-		@Nullable
-		private GoogleCredentialsSupplier credentialsSupplier;
+		private @Nullable GoogleCredentialsSupplier credentialsSupplier;
 
 		private Duration jwtValidity = Duration.ofMinutes(15);