From 42cb053d498e12d13609f2f04e1082ab7c547f19 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 24 Jan 2017 11:01:35 +0000 Subject: [PATCH] Replace and remove deprecated API usage --- .../hypermedia/SpringBootHypermediaApplication.java | 4 +--- .../boot/validation/MessageInterpolatorFactory.java | 2 +- .../jetty/JettyEmbeddedServletContainerFactoryTests.java | 8 ++++---- .../TomcatEmbeddedServletContainerFactoryTests.java | 7 +++---- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/SpringBootHypermediaApplication.java b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/SpringBootHypermediaApplication.java index 7229802deb..34bbb92348 100644 --- a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/SpringBootHypermediaApplication.java +++ b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/SpringBootHypermediaApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,7 +34,6 @@ import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration; import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; -import org.springframework.lang.UsesJava8; // Flyway must go first @SpringBootApplication @@ -66,7 +65,6 @@ public class SpringBootHypermediaApplication implements CommandLineRunner { createEvent("2016-11-01T12:00:00Z", "admin", "AUTHENTICATION_SUCCESS")); } - @UsesJava8 private AuditEvent createEvent(String instant, String principal, String type) { return new AuditEvent(Date.from(Instant.parse(instant)), principal, type, Collections.emptyMap()); diff --git a/spring-boot/src/main/java/org/springframework/boot/validation/MessageInterpolatorFactory.java b/spring-boot/src/main/java/org/springframework/boot/validation/MessageInterpolatorFactory.java index f35f3f89c1..c9c2ed9155 100644 --- a/spring-boot/src/main/java/org/springframework/boot/validation/MessageInterpolatorFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/validation/MessageInterpolatorFactory.java @@ -76,7 +76,7 @@ public class MessageInterpolatorFactory implements ObjectFactory interpolatorClass = ClassUtils.resolveClassName(fallback, null); - Object interpolator = BeanUtils.instantiate(interpolatorClass); + Object interpolator = BeanUtils.instantiateClass(interpolatorClass); return (MessageInterpolator) interpolator; } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java index a7729c890e..d5b94a4dc9 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.http.HttpHeaders; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; @@ -84,7 +84,7 @@ public class JettyEmbeddedServletContainerFactoryTests this.container = factory.getEmbeddedServletContainer(); InOrder ordered = inOrder((Object[]) configurations); for (Configuration configuration : configurations) { - ordered.verify(configuration).configure((WebAppContext) anyObject()); + ordered.verify(configuration).configure(any(WebAppContext.class)); } } @@ -100,7 +100,7 @@ public class JettyEmbeddedServletContainerFactoryTests this.container = factory.getEmbeddedServletContainer(); InOrder ordered = inOrder((Object[]) configurations); for (JettyServerCustomizer configuration : configurations) { - ordered.verify(configuration).customize((Server) anyObject()); + ordered.verify(configuration).customize(any(Server.class)); } } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java index 0053e8d6b8..cb4fff0da8 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java @@ -59,7 +59,6 @@ import org.springframework.util.SocketUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyObject; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; @@ -119,7 +118,7 @@ public class TomcatEmbeddedServletContainerFactoryTests this.container = factory.getEmbeddedServletContainer(); InOrder ordered = inOrder((Object[]) listeners); for (LifecycleListener listener : listeners) { - ordered.verify(listener).lifecycleEvent((LifecycleEvent) anyObject()); + ordered.verify(listener).lifecycleEvent(any(LifecycleEvent.class)); } } @@ -135,7 +134,7 @@ public class TomcatEmbeddedServletContainerFactoryTests this.container = factory.getEmbeddedServletContainer(); InOrder ordered = inOrder((Object[]) listeners); for (TomcatContextCustomizer listener : listeners) { - ordered.verify(listener).customize((Context) anyObject()); + ordered.verify(listener).customize(any(Context.class)); } } @@ -151,7 +150,7 @@ public class TomcatEmbeddedServletContainerFactoryTests this.container = factory.getEmbeddedServletContainer(); InOrder ordered = inOrder((Object[]) listeners); for (TomcatConnectorCustomizer listener : listeners) { - ordered.verify(listener).customize((Connector) anyObject()); + ordered.verify(listener).customize(any(Connector.class)); } }