Polish

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java

@@ -115,10 +115,9 @@ public class JerseyAutoConfiguration implements ServletContextAware {
 	private void resolveApplicationPath() {
 		if (StringUtils.hasLength(this.jersey.getApplicationPath())) {
 			this.path = parseApplicationPath(this.jersey.getApplicationPath());
-		}
-		else {
-			this.path = findApplicationPath(AnnotationUtils.findAnnotation(
-					this.config.getApplication().getClass(), ApplicationPath.class));
+		} else {
+			this.path = findApplicationPath(
+					AnnotationUtils.findAnnotation(this.config.getApplication().getClass(), ApplicationPath.class));
 		}
 	}
 
@@ -149,8 +148,7 @@ public class JerseyAutoConfiguration implements ServletContextAware {
 		registration.setFilter(new ServletContainer(this.config));
 		registration.setUrlPatterns(Arrays.asList(this.path));
 		registration.setOrder(this.jersey.getFilter().getOrder());
-		registration.addInitParameter(ServletProperties.FILTER_CONTEXT_PATH,
-				stripPattern(this.path));
+		registration.addInitParameter(ServletProperties.FILTER_CONTEXT_PATH, stripPattern(this.path));
 		addInitParameters(registration);
 		registration.setName("jerseyFilter");
 		registration.setDispatcherTypes(EnumSet.allOf(DispatcherType.class));
@@ -168,8 +166,8 @@ public class JerseyAutoConfiguration implements ServletContextAware {
 	@ConditionalOnMissingBean(name = "jerseyServletRegistration")
 	@ConditionalOnProperty(prefix = "spring.jersey", name = "type", havingValue = "servlet", matchIfMissing = true)
 	public ServletRegistrationBean jerseyServletRegistration() {
-		ServletRegistrationBean registration = new ServletRegistrationBean(
-				new ServletContainer(this.config), this.path);
+		ServletRegistrationBean registration = new ServletRegistrationBean(new ServletContainer(this.config),
+				this.path);
 		addInitParameters(registration);
 		registration.setName(getServletRegistrationName());
 		registration.setLoadOnStartup(this.jersey.getServlet().getLoadOnStartup());
@@ -204,23 +202,18 @@ public class JerseyAutoConfiguration implements ServletContextAware {
 	@Override
 	public void setServletContext(ServletContext servletContext) {
 		String servletRegistrationName = getServletRegistrationName();
-		ServletRegistration registration = servletContext
-				.getServletRegistration(servletRegistrationName);
+		ServletRegistration registration = servletContext.getServletRegistration(servletRegistrationName);
 		if (registration != null) {
 			if (logger.isInfoEnabled()) {
-				logger.info("Configuring existing registration for Jersey servlet '"
-						+ servletRegistrationName + "'");
+				logger.info("Configuring existing registration for Jersey servlet '" + servletRegistrationName + "'");
 			}
 			registration.setInitParameters(this.jersey.getInit());
-			registration.setInitParameter(
-					CommonProperties.METAINF_SERVICES_LOOKUP_DISABLE,
-					Boolean.TRUE.toString());
+			registration.setInitParameter(CommonProperties.METAINF_SERVICES_LOOKUP_DISABLE, Boolean.TRUE.toString());
 		}
 	}
 
 	@Order(Ordered.HIGHEST_PRECEDENCE)
-	public static final class JerseyWebApplicationInitializer
-			implements WebApplicationInitializer {
+	public static final class JerseyWebApplicationInitializer implements WebApplicationInitializer {
 
 		@Override
 		public void onStartup(ServletContext servletContext) throws ServletException {
@@ -239,22 +232,19 @@ public class JerseyAutoConfiguration implements ServletContextAware {
 		private static final String JAXB_ANNOTATION_INTROSPECTOR_CLASS_NAME = "com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector";
 
 		@Bean
-		public ResourceConfigCustomizer resourceConfigCustomizer(
-				final ObjectMapper objectMapper) {
+		public ResourceConfigCustomizer resourceConfigCustomizer(final ObjectMapper objectMapper) {
 			addJaxbAnnotationIntrospectorIfPresent(objectMapper);
 			return new ResourceConfigCustomizer() {
 				@Override
 				public void customize(ResourceConfig config) {
 					config.register(JacksonFeature.class);
-					config.register(new ObjectMapperContextResolver(objectMapper),
-							ContextResolver.class);
+					config.register(new ObjectMapperContextResolver(objectMapper), ContextResolver.class);
 				}
 			};
 		}
 
 		private void addJaxbAnnotationIntrospectorIfPresent(ObjectMapper objectMapper) {
-			if (ClassUtils.isPresent(JAXB_ANNOTATION_INTROSPECTOR_CLASS_NAME,
-					getClass().getClassLoader())) {
+			if (ClassUtils.isPresent(JAXB_ANNOTATION_INTROSPECTOR_CLASS_NAME, getClass().getClassLoader())) {
 				new ObjectMapperCustomizer().addJaxbAnnotationIntrospector(objectMapper);
 			}
 		}
@@ -265,22 +255,18 @@ public class JerseyAutoConfiguration implements ServletContextAware {
 				JaxbAnnotationIntrospector jaxbAnnotationIntrospector = new JaxbAnnotationIntrospector(
 						objectMapper.getTypeFactory());
 				objectMapper.setAnnotationIntrospectors(
-						createPair(objectMapper.getSerializationConfig(),
-								jaxbAnnotationIntrospector),
-						createPair(objectMapper.getDeserializationConfig(),
-								jaxbAnnotationIntrospector));
+						createPair(objectMapper.getSerializationConfig(), jaxbAnnotationIntrospector),
+						createPair(objectMapper.getDeserializationConfig(), jaxbAnnotationIntrospector));
 			}
 
 			private AnnotationIntrospector createPair(MapperConfig<?> config,
 					JaxbAnnotationIntrospector jaxbAnnotationIntrospector) {
-				return AnnotationIntrospector.pair(config.getAnnotationIntrospector(),
-						jaxbAnnotationIntrospector);
+				return AnnotationIntrospector.pair(config.getAnnotationIntrospector(), jaxbAnnotationIntrospector);
 			}
 
 		}
 
-		private static final class ObjectMapperContextResolver
-				implements ContextResolver<ObjectMapper> {
+		private static final class ObjectMapperContextResolver implements ContextResolver<ObjectMapper> {
 
 			private final ObjectMapper objectMapper;
 

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomApplicationTests.java

@@ -43,7 +43,8 @@ import org.springframework.test.context.junit4.SpringRunner;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link JerseyAutoConfiguration} when using a custom {@link Application}.
+ * Tests for {@link JerseyAutoConfiguration} when using a custom
+ * {@link Application}.
  *
  * @author Stephane Nicoll
  */
@@ -52,14 +53,12 @@ import static org.assertj.core.api.Assertions.assertThat;
 @DirtiesContext
 public class JerseyAutoConfigurationCustomApplicationTests {
 
-
 	@Autowired
 	private TestRestTemplate restTemplate;
 
 	@Test
 	public void contextLoads() {
-		ResponseEntity<String> entity = this.restTemplate.getForEntity("/test/hello",
-				String.class);
+		ResponseEntity<String> entity = this.restTemplate.getForEntity("/test/hello", String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 	}
 
@@ -79,9 +78,8 @@ public class JerseyAutoConfigurationCustomApplicationTests {
 	}
 
 	@Configuration
-	@Import({ EmbeddedServletContainerAutoConfiguration.class,
-			ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class,
-			PropertyPlaceholderAutoConfiguration.class })
+	@Import({ EmbeddedServletContainerAutoConfiguration.class, ServerPropertiesAutoConfiguration.class,
+			JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class })
 	static class TestConfiguration {
 
 		@Configuration

spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/WarPackagingTests.java

 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.

spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java

@@ -338,7 +338,6 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor
 		return hasAnnotation(element, LOMBOK_DATA_ANNOTATION);
 	}
 
-
 	private boolean isAccessLevelPublic(AnnotationMirror lombokAnnotation) {
 		Map<String, Object> values = getAnnotationElementValues(lombokAnnotation);
 		Object value = values.get("value");

spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteDataProperties.java

 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -31,6 +31,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
  */
 @Data
 @ConfigurationProperties(prefix = "accesslevel.overwrite.data")
+@SuppressWarnings("unused")
 public class LombokAccessLevelOverwriteDataProperties {
 
 	private String name0;

spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteExplicitProperties.java

@@ -31,6 +31,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
 @Getter(AccessLevel.PUBLIC)
 @Setter(AccessLevel.PUBLIC)
 @ConfigurationProperties(prefix = "accesslevel.overwrite.explicit")
+@SuppressWarnings("unused")
 public class LombokAccessLevelOverwriteExplicitProperties {
 
 	private String name0;

spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokExplicitProperties.java

 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2018 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.