Browse Source

Remove usage of deprecated code

pull/123/head
Dave Syer 9 years ago
parent
commit
6f3cb2f132
  1. 13
      spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfiguration.java
  2. 9
      spring-cloud-context/src/main/java/org/springframework/cloud/context/restart/RestartEndpoint.java

13
spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfiguration.java

@ -64,11 +64,12 @@ public class EncryptionBootstrapConfiguration { @@ -64,11 +64,12 @@ public class EncryptionBootstrapConfiguration {
KeyStore keyStore = this.key.getKeyStore();
if (keyStore.getLocation() != null && keyStore.getLocation().exists()) {
return new RsaSecretEncryptor(
new KeyStoreKeyFactory(keyStore.getLocation(), keyStore
.getPassword().toCharArray()).getKeyPair(
keyStore.getAlias(), keyStore.getSecret().toCharArray()),
this.key.getRsa().getAlgorithm(), this.key.getRsa().getSalt(), this.key.getRsa()
.isStrong());
new KeyStoreKeyFactory(keyStore.getLocation(),
keyStore.getPassword().toCharArray()).getKeyPair(
keyStore.getAlias(),
keyStore.getSecret().toCharArray()),
this.key.getRsa().getAlgorithm(), this.key.getRsa().getSalt(),
this.key.getRsa().isStrong());
}
return new EncryptorFactory().create(this.key.getKey());
}
@ -77,7 +78,7 @@ public class EncryptionBootstrapConfiguration { @@ -77,7 +78,7 @@ public class EncryptionBootstrapConfiguration {
@Configuration
@Conditional(KeyCondition.class)
@ConditionalOnMissingClass(name = "org.springframework.security.rsa.crypto.RsaSecretEncryptor")
@ConditionalOnMissingClass("org.springframework.security.rsa.crypto.RsaSecretEncryptor")
protected static class VanillaEncryptionConfiguration {
@Autowired

9
spring-cloud-context/src/main/java/org/springframework/cloud/context/restart/RestartEndpoint.java

@ -20,7 +20,6 @@ import org.apache.commons.logging.Log; @@ -20,7 +20,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.actuate.endpoint.AbstractEndpoint;
import org.springframework.boot.actuate.endpoint.Endpoint;
import org.springframework.boot.context.event.ApplicationPreparedEvent;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.ApplicationEvent;
@ -43,8 +42,8 @@ import org.springframework.util.ClassUtils; @@ -43,8 +42,8 @@ import org.springframework.util.ClassUtils;
*/
@ConfigurationProperties("endpoints.restart")
@ManagedResource
public class RestartEndpoint extends AbstractEndpoint<Boolean> implements
ApplicationListener<ApplicationPreparedEvent> {
public class RestartEndpoint extends AbstractEndpoint<Boolean>
implements ApplicationListener<ApplicationPreparedEvent> {
private static Log logger = LogFactory.getLog(RestartEndpoint.class);
@ -186,8 +185,8 @@ public class RestartEndpoint extends AbstractEndpoint<Boolean> implements @@ -186,8 +185,8 @@ public class RestartEndpoint extends AbstractEndpoint<Boolean> implements
}
private void overrideClassLoaderForRestart() {
ClassUtils.overrideThreadContextClassLoader(this.application.getClass()
.getClassLoader());
ClassUtils.overrideThreadContextClassLoader(
this.application.getClass().getClassLoader());
}
private class IntegrationShutdown {

Loading…
Cancel
Save