diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java index 252ea2c2e84..bf6a000ddad 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java @@ -31,7 +31,6 @@ import javax.ws.rs.ext.ContextResolver; import javax.ws.rs.ext.Provider; import com.fasterxml.jackson.databind.ObjectMapper; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.glassfish.jersey.CommonProperties; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomObjectMapperProviderTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomObjectMapperProviderTests.java index ec2b55812a8..864a35e91b9 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomObjectMapperProviderTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomObjectMapperProviderTests.java @@ -49,8 +49,9 @@ import org.springframework.web.client.RestTemplate; import static org.assertj.core.api.Assertions.assertThat; - /** + * Tests for {@link JerseyAutoConfiguration} when using custom ObjectMapper. + * * @author Eddú Meléndez */ @RunWith(SpringJUnit4ClassRunner.class) @@ -98,10 +99,6 @@ public class JerseyAutoConfigurationCustomObjectMapperProviderTests { private String body; - public Message() { - - } - public Message(String subject, String body) { this.subject = subject; this.body = body; @@ -122,6 +119,7 @@ public class JerseyAutoConfigurationCustomObjectMapperProviderTests { public void setBody(String body) { this.body = body; } + } @Target(ElementType.TYPE) @@ -131,6 +129,7 @@ public class JerseyAutoConfigurationCustomObjectMapperProviderTests { JacksonAutoConfiguration.class, ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationObjectMapperProviderTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationObjectMapperProviderTests.java index 87234ee25a7..2380cc7146b 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationObjectMapperProviderTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationObjectMapperProviderTests.java @@ -50,6 +50,8 @@ import org.springframework.web.client.RestTemplate; import static org.assertj.core.api.Assertions.assertThat; /** + * Tests for {@link JerseyAutoConfiguration} with a ObjectMapper. + * * @author Eddú Meléndez */ @RunWith(SpringJUnit4ClassRunner.class) @@ -68,7 +70,8 @@ public class JerseyAutoConfigurationObjectMapperProviderTests { ResponseEntity response = this.restTemplate.getForEntity( "http://localhost:" + this.port + "/rest/message", String.class); assertThat(HttpStatus.OK).isEqualTo(response.getStatusCode()); - assertThat("{\"subject\":\"Jersey\",\"body\":null}").isEqualTo(response.getBody()); + assertThat("{\"subject\":\"Jersey\",\"body\":null}") + .isEqualTo(response.getBody()); } @MinimalWebConfiguration @@ -121,6 +124,7 @@ public class JerseyAutoConfigurationObjectMapperProviderTests { public void setBody(String body) { this.body = body; } + } @Target(ElementType.TYPE) @@ -130,6 +134,7 @@ public class JerseyAutoConfigurationObjectMapperProviderTests { JacksonAutoConfiguration.class, ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } } diff --git a/spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/SampleSimpleApplication.java b/spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/SampleSimpleApplication.java index cbde5e3fa21..4cb18d8a6d5 100644 --- a/spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/SampleSimpleApplication.java +++ b/spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/SampleSimpleApplication.java @@ -22,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; @SpringBootApplication public class SampleSimpleApplication implements CommandLineRunner { @@ -43,9 +42,6 @@ public class SampleSimpleApplication implements CommandLineRunner { } public static void main(String[] args) throws Exception { - SpringApplication application = new SpringApplication( - SampleSimpleApplication.class); - application.setApplicationContextClass(AnnotationConfigApplicationContext.class); SpringApplication.run(SampleSimpleApplication.class, args); }