Polishing.

Move off deprecated API.

See gh-829

Author: mp911de

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

@@ -20,6 +20,7 @@
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -239,7 +240,7 @@ private static String resolveEnvVariable(String name) {
 
 			String value = System.getenv(name);
 
-			if (StringUtils.isEmpty(value)) {
+			if (ObjectUtils.isEmpty(value)) {
 				throw new IllegalStateException(String.format("Environment variable %s not set", name));
 			}
 

spring-vault-core/src/main/java/org/springframework/vault/client/ReactiveVaultClients.java

@@ -111,12 +111,12 @@ static WebClient.Builder createWebClientBuilder(ReactiveVaultEndpointProvider en
 
 			CustomCodecs cc = configurer.customCodecs();
 
-			cc.decoder(new ByteArrayDecoder());
-			cc.decoder(new Jackson2JsonDecoder());
-			cc.decoder(StringDecoder.allMimeTypes());
+			cc.register(new ByteArrayDecoder());
+			cc.register(new Jackson2JsonDecoder());
+			cc.register(StringDecoder.allMimeTypes());
 
-			cc.encoder(new ByteArrayEncoder());
-			cc.encoder(new Jackson2JsonEncoder());
+			cc.register(new ByteArrayEncoder());
+			cc.register(new Jackson2JsonEncoder());
 
 		}).build();
 

spring-vault-core/src/main/java/org/springframework/vault/core/VaultSysTemplate.java

@@ -38,6 +38,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.vault.VaultException;
 import org.springframework.vault.client.VaultHttpHeaders;
@@ -237,7 +238,7 @@ public Policy getPolicy(String name) throws VaultException {
 
 			String rules = (String) response.getBody().getRequiredData().get("rules");
 
-			if (StringUtils.isEmpty(rules)) {
+			if (ObjectUtils.isEmpty(rules)) {
 				return Policy.empty();
 			}
 

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

@@ -23,6 +23,7 @@
 import java.util.regex.Pattern;
 
 import org.springframework.lang.Nullable;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -47,7 +48,7 @@ public class DurationParser {
 	@Nullable
 	public static Duration parseDuration(String duration) {
 
-		if (StringUtils.isEmpty(duration)) {
+		if (ObjectUtils.isEmpty(duration)) {
 			return null;
 		}
 

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

@@ -16,6 +16,7 @@
 package org.springframework.vault.support;
 
 import java.nio.charset.Charset;
+import java.util.Arrays;
 
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
@@ -150,7 +151,7 @@ public boolean equals(Object o) {
 
 	@Override
 	public int hashCode() {
-		int result = ObjectUtils.nullSafeHashCode(this.plaintext);
+		int result = Arrays.hashCode(this.plaintext);
 		result = 31 * result + ObjectUtils.nullSafeHashCode(this.context);
 		return result;
 	}

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

@@ -82,7 +82,7 @@ public static VaultTransformContext fromTweak(byte[] tweak) {
 	 * @return {@code true} if this object is empty.
 	 */
 	public boolean isEmpty() {
-		return StringUtils.isEmpty(this.transformation) && ObjectUtils.isEmpty(this.tweak);
+		return ObjectUtils.isEmpty(this.transformation) && ObjectUtils.isEmpty(this.tweak);
 	}
 
 	/**

spring-vault-core/src/test/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerUnitTests.java

@@ -382,8 +382,8 @@ void shouldUseTaskScheduler() {
 		this.sessionManager.getSessionToken();
 		verify(this.taskScheduler).schedule(any(Runnable.class), triggerCaptor.capture());
 
-		assertThat(triggerCaptor.getValue().nextExecutionTime(null)).isNotNull();
-		assertThat(triggerCaptor.getValue().nextExecutionTime(null)).isNull();
+		assertThat(triggerCaptor.getValue().nextExecution(null)).isNotNull();
+		assertThat(triggerCaptor.getValue().nextExecution(null)).isNull();
 	}
 
 	@Test

spring-vault-core/src/test/java/org/springframework/vault/core/lease/SecretLeaseContainerUnitTests.java

@@ -16,6 +16,7 @@
 package org.springframework.vault.core.lease;
 
 import java.time.Duration;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
@@ -488,9 +489,8 @@ void scheduleRenewalShouldApplyExpiryThreshold() {
 		ArgumentCaptor<Trigger> captor = ArgumentCaptor.forClass(Trigger.class);
 		verify(this.taskScheduler).schedule(any(Runnable.class), captor.capture());
 
-		Date nextExecutionTime = captor.getValue().nextExecutionTime(null);
-		assertThat(nextExecutionTime).isBetween(new Date(System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(35)),
-				new Date(System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(41)));
+		Instant nextExecutionTime = captor.getValue().nextExecution(null);
+		assertThat(nextExecutionTime).isBetween(Instant.now().plusSeconds(35), Instant.now().plusSeconds(41));
 	}
 
 	@Test
@@ -536,13 +536,11 @@ void subsequentScheduleRenewalShouldApplyExpiryThreshold() {
 		ArgumentCaptor<Trigger> captor = ArgumentCaptor.forClass(Trigger.class);
 		verify(this.taskScheduler, times(2)).schedule(any(Runnable.class), captor.capture());
 
-		assertThat(captor.getAllValues().get(0).nextExecutionTime(null)).isBetween(
-				new Date(System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(35)),
-				new Date(System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(41)));
+		assertThat(captor.getAllValues().get(0).nextExecution(null)).isBetween(Instant.now().plusSeconds(31),
+				Instant.now().plusSeconds(41));
 
-		assertThat(captor.getAllValues().get(1).nextExecutionTime(null)).isBetween(
-				new Date(System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(9)),
-				new Date(System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(11)));
+		assertThat(captor.getAllValues().get(1).nextExecution(null)).isBetween(Instant.now().plusSeconds(9),
+				Instant.now().plusSeconds(11));
 	}
 
 	@Test
@@ -557,8 +555,8 @@ void scheduleRenewalShouldTriggerOnlyOnce() {
 
 		Trigger trigger = captor.getValue();
 
-		assertThat(trigger.nextExecutionTime(null)).isNotNull();
-		assertThat(trigger.nextExecutionTime(null)).isNull();
+		assertThat(trigger.nextExecution(null)).isNotNull();
+		assertThat(trigger.nextExecution(null)).isNull();
 	}
 
 	@Test

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

@@ -24,6 +24,8 @@
 import java.security.spec.RSAPrivateCrtKeySpec;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
+import org.bouncycastle.asn1.ASN1Object;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1Primitive;
 import org.bouncycastle.asn1.sec.ECPrivateKey;
@@ -58,7 +60,7 @@ void shouldCreateEcKey() throws IOException, GeneralSecurityException {
 
 		// Verify against BouncyCastle parser
 		ECPrivateKey ecPrivateKey = ECPrivateKey.getInstance(key.getContent());
-		ASN1Primitive parameters = ecPrivateKey.getParameters();
+		ASN1Object parameters = ecPrivateKey.getParametersObject();
 
 		X9ECParameters curveParameter = X962NamedCurves.getByOID((ASN1ObjectIdentifier) parameters);