Polish

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcHypermediaManagementContextConfiguration.java

@@ -177,66 +177,67 @@ public class EndpointWebMvcHypermediaManagementContextConfiguration {
 		private static class NotSpringDataRestHomePageCondition extends
 				SpringBootCondition {
 
+			private static final String REST_CONFIGURATION_CLASS = "org.springframework."
+					+ "data.rest.core.config.RepositoryRestConfiguration";
+
 			@Override
 			public ConditionOutcome getMatchOutcome(ConditionContext context,
 					AnnotatedTypeMetadata metadata) {
-				if (!ClassUtils
+				if (!ClassUtils.isPresent(REST_CONFIGURATION_CLASS, null)) {
-						.isPresent(
-								"org.springframework.data.rest.core.config.RepositoryRestConfiguration",
-								null)) {
 					return ConditionOutcome.match("Spring Data REST is not present");
 				}
-				Class<?> type = ClassUtils
+				return getMatchOutcome(context,
-						.resolveClassName(
+						ClassUtils.resolveClassName(REST_CONFIGURATION_CLASS, null));
-								"org.springframework.data.rest.core.config.RepositoryRestConfiguration",
+			}
-								null);
+
+			private ConditionOutcome getMatchOutcome(ConditionContext context,
+					Class<?> configurationClass) {
 				ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
-				if (beanFactory.getBeanNamesForType(type, true, false).length == 0) {
+				if (beanFactory.getBeanNamesForType(configurationClass, true, false).length == 0) {
 					return ConditionOutcome.match("Spring Data REST is not configured");
 				}
 				Environment environment = context.getEnvironment();
+				String path = getManagementContextPath(beanFactory, environment);
+				if (isHome(path)) {
+					path = getProperty(environment, "endpoints.links.", "path");
+					if (isHome(path)) {
+						return ConditionOutcome.noMatch("Management context path "
+								+ "is home and so is links path");
+					}
+					return ConditionOutcome.match("Management context path "
+							+ "is home but links path is not: '" + path + "'");
+				}
+				// N.B. we don't cover the case where the user has Spring Data REST
+				// but changes *its* home page - you'd have to instantiate the
+				// RepositoryRestConfiguration and look at it's basePath for that.
+				return ConditionOutcome.match("Management context path "
+						+ "is not home: '" + path + "'");
+			}
+
+			private String getManagementContextPath(
+					ConfigurableListableBeanFactory beanFactory, Environment environment) {
 				String path = getProperty(environment, "management.", "contextPath");
 				if (path == null
 						&& hasCustomBeanDefinition(beanFactory,
 								ManagementServerProperties.class,
 								ManagementServerPropertiesAutoConfiguration.class)) {
-					ManagementServerProperties bean = beanFactory
+					path = beanFactory.getBean(ManagementServerProperties.class)
-							.getBean(ManagementServerProperties.class);
+							.getContextPath();
-					path = bean.getContextPath();
-				}
-				if (isHome(path)) {
-					path = getProperty(environment, "endpoints.links.", "path");
-					if (isHome(path)) {
-						return ConditionOutcome
-								.noMatch("Management context path is home and so is links path");
-					}
-					else {
-						return ConditionOutcome
-								.match("Management context path is home but links path is not: '"
-										+ path + "'");
-					}
-				}
-				else {
-					// N.B. we don't cover the case where the user has Spring Data REST
-					// but changes *its* home page - you'd have to instantiate the
-					// RepositoryRestConfiguration and look at it's basePath for that.
-					return ConditionOutcome
-							.match("Management context path is not home: '" + path + "'");
 				}
+				return path;
 			}
 
-			private static boolean isHome(String path) {
+			private boolean isHome(String path) {
 				return path == null || "".equals(path) || "/".equals(path);
 			}
 
-			private static String getProperty(Environment environment, String prefix,
+			private String getProperty(Environment environment, String prefix, String name) {
-					String name) {
 				RelaxedPropertyResolver resolver = new RelaxedPropertyResolver(
 						environment, prefix);
 				return resolver.getProperty(name, String.class);
 			}
 
-			private static <T> boolean hasCustomBeanDefinition(
+			private <T> boolean hasCustomBeanDefinition(
 					ConfigurableListableBeanFactory beanFactory, Class<T> type,
 					Class<?> configClass) {
 				String[] names = beanFactory.getBeanNamesForType(type, true, false);

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMapping.java

@@ -50,7 +50,7 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl
  * @author Dave Syer
  */
 public class EndpointHandlerMapping extends RequestMappingHandlerMapping implements
-ApplicationContextAware {
+		ApplicationContextAware {
 
 	private final Set<MvcEndpoint> endpoints;
 

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointMvcIntegrationTests.java

@@ -16,9 +16,6 @@
 
 package org.springframework.boot.actuate.autoconfigure;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -66,6 +63,9 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 /**
  * Integration tests for MVC {@link Endpoint}s.
  *

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonProperties.java

@@ -154,4 +154,5 @@ public class JacksonProperties {
 	public void setTimeZone(TimeZone timeZone) {
 		this.timeZone = timeZone;
 	}
+
 }

spring-boot-docs/src/main/asciidoc/production-ready-features.adoc

@@ -13,6 +13,7 @@ particular, it will not work with Jersey unless you enable Spring MVC as well.
 --
 
 
+
 [[production-ready-enabling]]
 == Enabling production-ready features
 The {github-code}/spring-boot-actuator[`spring-boot-actuator`] module provides all of

spring-boot-samples/spring-boot-sample-hypermedia-jpa/src/test/java/sample/hypermedia/jpa/SampleHypermediaJpaApplicationCustomLinksPathIntegrationTests.java

@@ -16,10 +16,6 @@
 
 package sample.hypermedia.jpa;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -36,12 +32,16 @@ import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @SpringApplicationConfiguration(classes = SampleHypermediaJpaApplication.class)
 @DirtiesContext
 @TestPropertySource(properties = { "debug=true", "management.contextPath=",
-"endpoints.docs.curies.enabled=false" })
+		"endpoints.docs.curies.enabled=false" })
 public class SampleHypermediaJpaApplicationCustomLinksPathIntegrationTests {
 
 	@Autowired

spring-boot-samples/spring-boot-sample-hypermedia-jpa/src/test/java/sample/hypermedia/jpa/SampleHypermediaJpaApplicationSharedRootIntegrationTests.java

@@ -16,10 +16,6 @@
 
 package sample.hypermedia.jpa;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -36,12 +32,16 @@ import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @SpringApplicationConfiguration(classes = SampleHypermediaJpaApplication.class)
 @DirtiesContext
-@TestPropertySource(properties = { "endpoints.links.path=/admin", "management.contextPath=",
+@TestPropertySource(properties = { "endpoints.links.path=/admin",
-"endpoints.docs.curies.enabled=false" })
+		"management.contextPath=", "endpoints.docs.curies.enabled=false" })
 public class SampleHypermediaJpaApplicationSharedRootIntegrationTests {
 
 	@Autowired

spring-boot-samples/spring-boot-sample-hypermedia-jpa/src/test/java/sample/hypermedia/jpa/SampleHypermediaJpaApplicationTests.java

@@ -22,8 +22,6 @@ import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
-import sample.hypermedia.jpa.SampleHypermediaJpaApplication;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = SampleHypermediaJpaApplication.class)
 @WebAppConfiguration

spring-boot-samples/spring-boot-sample-hypermedia-jpa/src/test/java/sample/hypermedia/jpa/SampleHypermediaJpaApplicationVanillaIntegrationTests.java

@@ -31,7 +31,6 @@ import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
-import sample.hypermedia.jpa.SampleHypermediaJpaApplication;
 import static org.junit.Assert.assertEquals;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;

spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataProperty.java

@@ -160,7 +160,7 @@ public class ConfigurationMetadataProperty {
 	 * @see #isDeprecated()
 	 */
 	public Deprecation getDeprecation() {
-		return deprecation;
+		return this.deprecation;
 	}
 
 	public void setDeprecation(Deprecation deprecation) {

spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/Deprecation.java

@@ -34,7 +34,7 @@ public class Deprecation {
 	 * @return the deprecation reason
 	 */
 	public String getReason() {
-		return reason;
+		return this.reason;
 	}
 
 	public void setReason(String reason) {
@@ -42,11 +42,12 @@ public class Deprecation {
 	}
 
 	/**
-	 * The full name of the property that replaces the related deprecated property, if any.
+	 * The full name of the property that replaces the related deprecated property, if
+	 * any.
 	 * @return the replacement property name
 	 */
 	public String getReplacement() {
-		return replacement;
+		return this.replacement;
 	}
 
 	public void setReplacement(String replacement) {
@@ -55,7 +56,8 @@ public class Deprecation {
 
 	@Override
 	public String toString() {
-		return "Deprecation{" + "reason='" + reason + '\'' + ", replacement='" + replacement + '\'' + '}';
+		return "Deprecation{" + "reason='" + this.reason + '\'' + ", replacement='"
+				+ this.replacement + '\'' + '}';
 	}
 
 }

spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/JsonReader.java

@@ -157,7 +157,8 @@ class JsonReader {
 			JSONObject deprecationJsonObject = object.getJSONObject("deprecation");
 			Deprecation deprecation = new Deprecation();
 			deprecation.setReason(deprecationJsonObject.optString("reason", null));
-			deprecation.setReplacement(deprecationJsonObject.optString("replacement", null));
+			deprecation.setReplacement(deprecationJsonObject.optString("replacement",
+					null));
 			return deprecation;
 		}
 		return (object.optBoolean("deprecated") ? new Deprecation() : null);

spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/JsonReaderTests.java

@@ -141,17 +141,20 @@ public class JsonReaderTests extends AbstractConfigurationMetadataTests {
 		ConfigurationMetadataItem item = items.get(0);
 		assertProperty(item, "server.port", "server.port", Integer.class, null);
 		assertTrue(item.isDeprecated());
-		assertEquals("Server namespace has moved to spring.server", item.getDeprecation().getReason());
+		assertEquals("Server namespace has moved to spring.server", item.getDeprecation()
+				.getReason());
 		assertEquals("server.spring.port", item.getDeprecation().getReplacement());
 
 		ConfigurationMetadataItem item2 = items.get(1);
-		assertProperty(item2, "server.cluster-name", "server.cluster-name", String.class, null);
+		assertProperty(item2, "server.cluster-name", "server.cluster-name", String.class,
+				null);
 		assertTrue(item2.isDeprecated());
 		assertEquals(null, item2.getDeprecation().getReason());
 		assertEquals(null, item2.getDeprecation().getReplacement());
 
 		ConfigurationMetadataItem item3 = items.get(2);
-		assertProperty(item3, "spring.server.name", "spring.server.name", String.class, null);
+		assertProperty(item3, "spring.server.name", "spring.server.name", String.class,
+				null);
 		assertFalse(item3.isDeprecated());
 		assertEquals(null, item3.getDeprecation());
 	}

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

@@ -210,10 +210,9 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor
 				boolean deprecated = hasDeprecateAnnotation(getter)
 						|| hasDeprecateAnnotation(setter)
 						|| hasDeprecateAnnotation(element);
-				this.metadataCollector.add(ItemMetadata
+				this.metadataCollector.add(ItemMetadata.newProperty(prefix, name,
-						.newProperty(prefix, name, dataType, sourceType, null,
+						dataType, sourceType, null, description, defaultValue,
-								description, defaultValue,
+						(deprecated ? new ItemDeprecation() : null)));
-								deprecated ? new ItemDeprecation() : null));
 			}
 		}
 	}
@@ -240,10 +239,9 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor
 				Object defaultValue = fieldValues.get(name);
 				boolean deprecated = hasDeprecateAnnotation(field)
 						|| hasDeprecateAnnotation(element);
-				this.metadataCollector.add(ItemMetadata
+				this.metadataCollector.add(ItemMetadata.newProperty(prefix, name,
-						.newProperty(prefix, name, dataType, sourceType, null,
+						dataType, sourceType, null, description, defaultValue,
-								description, defaultValue,
+						(deprecated ? new ItemDeprecation() : null)));
-								deprecated ? new ItemDeprecation() : null));
 			}
 		}
 	}

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

@@ -37,7 +37,7 @@ public class ItemDeprecation {
 	}
 
 	public String getReason() {
-		return reason;
+		return this.reason;
 	}
 
 	public void setReason(String reason) {
@@ -45,7 +45,7 @@ public class ItemDeprecation {
 	}
 
 	public String getReplacement() {
-		return replacement;
+		return this.replacement;
 	}
 
 	public void setReplacement(String replacement) {
@@ -54,26 +54,42 @@ public class ItemDeprecation {
 
 	@Override
 	public String toString() {
-		return "ItemDeprecation{" + "reason='" + this.reason + '\'' + ", " +
+		return "ItemDeprecation{" + "reason='" + this.reason + '\'' + ", "
-				"replacement='" + this.replacement + '\'' + '}';
+				+ "replacement='" + this.replacement + '\'' + '}';
 	}
 
 	@Override
 	public boolean equals(Object o) {
-		if (this == o) return true;
+		if (this == o) {
-		if (o == null || getClass() != o.getClass()) return false;
+			return true;
-
+		}
-		ItemDeprecation that = (ItemDeprecation) o;
+		if (o == null || getClass() != o.getClass()) {
-
+			return false;
-		if (reason != null ? !reason.equals(that.reason) : that.reason != null) return false;
+		}
-		return !(replacement != null ? !replacement.equals(that.replacement) : that.replacement != null);
+		ItemDeprecation other = (ItemDeprecation) o;
-
+		return nullSafeEquals(this.reason, other.reason)
+				&& nullSafeEquals(this.replacement, other.replacement);
 	}
 
 	@Override
 	public int hashCode() {
-		int result = reason != null ? reason.hashCode() : 0;
+		int result = nullSafeHashCode(this.reason);
-		result = 31 * result + (replacement != null ? replacement.hashCode() : 0);
+		result = 31 * result + nullSafeHashCode(this.replacement);
 		return result;
 	}
+
+	private boolean nullSafeEquals(Object o1, Object o2) {
+		if (o1 == o2) {
+			return true;
+		}
+		if (o1 == null || o2 == null) {
+			return false;
+		}
+		return o1.equals(o2);
+	}
+
+	private int nullSafeHashCode(Object o) {
+		return (o == null ? 0 : o.hashCode());
+	}
+
 }

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

@@ -97,7 +97,7 @@ public class ItemMetadata implements Comparable<ItemMetadata> {
 	}
 
 	public ItemDeprecation getDeprecation() {
-		return deprecation;
+		return this.deprecation;
 	}
 
 	@Override

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

@@ -221,7 +221,8 @@ public class JsonMarshaller {
 			JSONObject deprecationJsonObject = object.getJSONObject("deprecation");
 			ItemDeprecation deprecation = new ItemDeprecation();
 			deprecation.setReason(deprecationJsonObject.optString("reason", null));
-			deprecation.setReplacement(deprecationJsonObject.optString("replacement", null));
+			deprecation.setReplacement(deprecationJsonObject.optString("replacement",
+					null));
 			return deprecation;
 		}
 		return (object.optBoolean("deprecated") ? new ItemDeprecation() : null);

spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java

@@ -416,12 +416,11 @@ public class ConfigurationMetadataAnnotationProcessorTests {
 
 	@Test
 	public void mergingOfAdditionalDeprecation() throws Exception {
-		writePropertyDeprecation(ItemMetadata.newProperty("simple", "wrongName", "java.lang.String",
+		writePropertyDeprecation(ItemMetadata.newProperty("simple", "wrongName",
-				null, null, null, null, new ItemDeprecation("Lame name.", "simple.the-name")));
+				"java.lang.String", null, null, null, null, new ItemDeprecation(
+						"Lame name.", "simple.the-name")));
 		ConfigurationMetadata metadata = compile(SimpleProperties.class);
-		assertThat(
+		assertThat(metadata, containsProperty("simple.wrong-name", String.class)
-				metadata,
-				containsProperty("simple.wrong-name", String.class)
 				.withDeprecation("Lame name.", "simple.the-name"));
 	}
 

spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataMatchers.java

@@ -165,12 +165,14 @@ public class ConfigurationMetadataMatchers {
 
 		public ContainsItemMatcher ofType(Class<?> dataType) {
 			return new ContainsItemMatcher(this.itemType, this.name, dataType.getName(),
-					this.sourceType, this.description, this.defaultValue, this.deprecation);
+					this.sourceType, this.description, this.defaultValue,
+					this.deprecation);
 		}
 
 		public ContainsItemMatcher ofType(String dataType) {
 			return new ContainsItemMatcher(this.itemType, this.name, dataType,
-					this.sourceType, this.description, this.defaultValue, this.deprecation);
+					this.sourceType, this.description, this.defaultValue,
+					this.deprecation);
 		}
 
 		public ContainsItemMatcher fromSource(Class<?> sourceType) {
@@ -190,7 +192,8 @@ public class ConfigurationMetadataMatchers {
 
 		public ContainsItemMatcher withDeprecation(String reason, String replacement) {
 			return new ContainsItemMatcher(this.itemType, this.name, this.type,
-					this.sourceType, this.description, this.defaultValue, new ItemDeprecation(reason, replacement));
+					this.sourceType, this.description, this.defaultValue,
+					new ItemDeprecation(reason, replacement));
 		}
 
 		private ItemMetadata getFirstItemWithName(ConfigurationMetadata metadata,