Polish

philwebb · philwebb · commit 5703fb151518 · 2017-01-23T16:03:59.000-08:00
diff --git a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.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.
diff --git a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HealthEndpointDocumentation.java b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HealthEndpointDocumentation.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.
diff --git a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HypermediaEndpointDocumentation.java b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HypermediaEndpointDocumentation.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.
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcHypermediaManagementContextConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcHypermediaManagementContextConfiguration.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.
@@ -240,18 +240,22 @@ public void configureHttpMessageConverters() {
 			for (RequestMappingHandlerAdapter handlerAdapter : this.handlerAdapters) {
 				for (HttpMessageConverter<?> messageConverter : handlerAdapter
 						.getMessageConverters()) {
-					if (messageConverter instanceof TypeConstrainedMappingJackson2HttpMessageConverter) {
-						List<MediaType> supportedMediaTypes = new ArrayList<MediaType>(
-								messageConverter.getSupportedMediaTypes());
-						supportedMediaTypes
-								.add(ActuatorMediaTypes.APPLICATION_ACTUATOR_V1_JSON);
-						((AbstractHttpMessageConverter<?>) messageConverter)
-								.setSupportedMediaTypes(supportedMediaTypes);
-					}
+					configureHttpMessageConverter(messageConverter);
 				}
 			}
 		}
 
+		private void configureHttpMessageConverter(
+				HttpMessageConverter<?> messageConverter) {
+			if (messageConverter instanceof TypeConstrainedMappingJackson2HttpMessageConverter) {
+				List<MediaType> supportedMediaTypes = new ArrayList<MediaType>(
+						messageConverter.getSupportedMediaTypes());
+				supportedMediaTypes.add(ActuatorMediaTypes.APPLICATION_ACTUATOR_V1_JSON);
+				((AbstractHttpMessageConverter<?>) messageConverter)
+						.setSupportedMediaTypes(supportedMediaTypes);
+			}
+		}
+
 		@Override
 		public boolean supports(MethodParameter returnType,
 				Class<? extends HttpMessageConverter<?>> converterType) {
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/ActuatorGetMapping.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/ActuatorGetMapping.java
@@ -44,7 +44,6 @@
 
 	/**
 	 * Alias for {@link RequestMapping#value}.
-	 *
 	 * @return the value
 	 */
 	@AliasFor(annotation = RequestMapping.class)
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/ActuatorMediaTypes.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/ActuatorMediaTypes.java
@@ -22,6 +22,7 @@
  * {@link MediaType MediaTypes} that can be consumed and produced by Actuator endpoints.
  *
  * @author Andy Wilkinson
+ * @since 1.5.0
  */
 public final class ActuatorMediaTypes {
 
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/ActuatorPostMapping.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/ActuatorPostMapping.java
@@ -48,7 +48,6 @@
 
 	/**
 	 * Alias for {@link RequestMapping#value}.
-	 *
 	 * @return the value
 	 */
 	@AliasFor(annotation = RequestMapping.class)
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpoint.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.
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EnvironmentMvcEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EnvironmentMvcEndpointTests.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.
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaHttpMessageConverterConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaHttpMessageConverterConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 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.
@@ -17,9 +17,8 @@
 package org.springframework.boot.autoconfigure.hateoas;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
 
 import javax.annotation.PostConstruct;
 
@@ -63,28 +62,32 @@ private static class HalMessageConverterSupportedMediaTypesCustomizer
 		private volatile BeanFactory beanFactory;
 
 		@PostConstruct
-		public void customizedSupportedMediaTypes() {
+		public void configureHttpMessageConverters() {
 			if (this.beanFactory instanceof ListableBeanFactory) {
-				Map<String, RequestMappingHandlerAdapter> handlerAdapters = ((ListableBeanFactory) this.beanFactory)
-						.getBeansOfType(RequestMappingHandlerAdapter.class);
-				for (Entry<String, RequestMappingHandlerAdapter> entry : handlerAdapters
-						.entrySet()) {
-					RequestMappingHandlerAdapter handlerAdapter = entry.getValue();
-					for (HttpMessageConverter<?> converter : handlerAdapter
-							.getMessageConverters()) {
-						if (converter instanceof TypeConstrainedMappingJackson2HttpMessageConverter) {
-							List<MediaType> supportedMediaTypes = new ArrayList<MediaType>(
-									converter.getSupportedMediaTypes());
-							if (!supportedMediaTypes
-									.contains(MediaType.APPLICATION_JSON)) {
-								supportedMediaTypes.add(MediaType.APPLICATION_JSON);
-							}
-							((AbstractHttpMessageConverter<?>) converter)
-									.setSupportedMediaTypes(supportedMediaTypes);
-						}
-					}
+				configureHttpMessageConverters(((ListableBeanFactory) this.beanFactory)
+						.getBeansOfType(RequestMappingHandlerAdapter.class).values());
+			}
+		}
+
+		private void configureHttpMessageConverters(
+				Collection<RequestMappingHandlerAdapter> handlerAdapters) {
+			for (RequestMappingHandlerAdapter handlerAdapter : handlerAdapters) {
+				for (HttpMessageConverter<?> messageConverter : handlerAdapter
+						.getMessageConverters()) {
+					configureHttpMessageConverter(messageConverter);
+				}
+			}
+		}
 
+		private void configureHttpMessageConverter(HttpMessageConverter<?> converter) {
+			if (converter instanceof TypeConstrainedMappingJackson2HttpMessageConverter) {
+				List<MediaType> supportedMediaTypes = new ArrayList<MediaType>(
+						converter.getSupportedMediaTypes());
+				if (!supportedMediaTypes.contains(MediaType.APPLICATION_JSON)) {
+					supportedMediaTypes.add(MediaType.APPLICATION_JSON);
 				}
+				((AbstractHttpMessageConverter<?>) converter)
+						.setSupportedMediaTypes(supportedMediaTypes);
 			}
 		}
 
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java
@@ -82,8 +82,8 @@ public void useRandomPortByDefault() {
 		load();
 		assertThat(this.context.getBeansOfType(MongoClient.class)).hasSize(1);
 		MongoClient client = this.context.getBean(MongoClient.class);
-		Integer mongoPort = Integer.valueOf(
-				this.context.getEnvironment().getProperty("local.mongo.port"));
+		Integer mongoPort = Integer
+				.valueOf(this.context.getEnvironment().getProperty("local.mongo.port"));
 		assertThat(client.getAddress().getPort()).isEqualTo(mongoPort);
 	}
 
@@ -92,17 +92,17 @@ public void specifyPortToZeroAllocateRandomPort() {
 		load("spring.data.mongodb.port=0");
 		assertThat(this.context.getBeansOfType(MongoClient.class)).hasSize(1);
 		MongoClient client = this.context.getBean(MongoClient.class);
-		Integer mongoPort = Integer.valueOf(
-				this.context.getEnvironment().getProperty("local.mongo.port"));
+		Integer mongoPort = Integer
+				.valueOf(this.context.getEnvironment().getProperty("local.mongo.port"));
 		assertThat(client.getAddress().getPort()).isEqualTo(mongoPort);
 	}
 
 	@Test
 	public void randomlyAllocatedPortIsAvailableWhenCreatingMongoClient() {
 		load(MongoClientConfiguration.class);
 		MongoClient client = this.context.getBean(MongoClient.class);
-		Integer mongoPort = Integer.valueOf(
-				this.context.getEnvironment().getProperty("local.mongo.port"));
+		Integer mongoPort = Integer
+				.valueOf(this.context.getEnvironment().getProperty("local.mongo.port"));
 		assertThat(client.getAddress().getPort()).isEqualTo(mongoPort);
 	}
 
@@ -187,8 +187,7 @@ private void load(Class<?> config, String... environment) {
 			ctx.register(config);
 		}
 		EnvironmentTestUtils.addEnvironment(ctx, environment);
-		ctx.register(EmbeddedMongoAutoConfiguration.class,
-				MongoAutoConfiguration.class,
+		ctx.register(EmbeddedMongoAutoConfiguration.class, MongoAutoConfiguration.class,
 				PropertyPlaceholderAutoConfiguration.class);
 		ctx.refresh();
 		this.context = ctx;
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.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.
diff --git a/spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/sample/data/mongo/CustomerRepository.java b/spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/sample/data/mongo/CustomerRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 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.
diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/mongo/AutoConfigureDataMongo.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/mongo/AutoConfigureDataMongo.java
@@ -30,7 +30,7 @@
  * tests. Most tests should consider using {@link DataMongoTest @DataMongoTest} rather
  * than using this annotation directly.
  *
- * @author Michael J. Simons
+ * @author Michael Simons
  * @since 1.5.0
  * @see DataMongoTest
  */
@@ -40,4 +40,5 @@
 @Inherited
 @ImportAutoConfiguration
 public @interface AutoConfigureDataMongo {
+
 }
diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTest.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTest.java
@@ -35,16 +35,16 @@
 
 /**
  * Annotation that can be used in combination with {@code @RunWith(SpringRunner.class)}
- * for a typical MongoDB test. Can be used when a test focuses
- * <strong>only</strong> on MongoDB components.
+ * for a typical MongoDB test. Can be used when a test focuses <strong>only</strong> on
+ * MongoDB components.
  * <p>
  * Using this annotation will disable full auto-configuration and instead apply only
  * configuration relevant to MongoDB tests.
  * <p>
  * By default, tests annotated with {@code @DataMongoTest} will use an embedded in-memory
  * MongoDB process (if available).
  *
- * @author Michael J. Simons
+ * @author Michael Simons
  * @author Stephane Nicoll
  * @since 1.5.0
  */
@@ -62,27 +62,24 @@
 
 	/**
 	 * Determines if default filtering should be used with
-	 * {@link SpringBootApplication @SpringBootApplication}. By default no beans
-	 * are included.
-	 *
+	 * {@link SpringBootApplication @SpringBootApplication}. By default no beans are
+	 * included.
 	 * @see #includeFilters()
 	 * @see #excludeFilters()
 	 * @return if default filters should be used
 	 */
 	boolean useDefaultFilters() default true;
 
 	/**
-	 * A set of include filters which can be used to add otherwise filtered
-	 * beans to the application context.
-	 *
+	 * A set of include filters which can be used to add otherwise filtered beans to the
+	 * application context.
 	 * @return include filters to apply
 	 */
 	Filter[] includeFilters() default {};
 
 	/**
-	 * A set of exclude filters which can be used to filter beans that would
-	 * otherwise be added to the application context.
-	 *
+	 * A set of exclude filters which can be used to filter beans that would otherwise be
+	 * added to the application context.
 	 * @return exclude filters to apply
 	 */
 	Filter[] excludeFilters() default {};
@@ -93,4 +90,5 @@
 	 */
 	@AliasFor(annotation = ImportAutoConfiguration.class, attribute = "exclude")
 	Class<?>[] excludeAutoConfiguration() default {};
+
 }
diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTypeExcludeFilter.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTypeExcludeFilter.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.
@@ -30,7 +30,7 @@
 /**
  * {@link TypeExcludeFilter} for {@link DataMongoTest @DataMongoTest}.
  *
- * @author Michael J. Simons
+ * @author Michael Simons
  */
 class DataMongoTypeExcludeFilter extends AnnotationCustomizableTypeExcludeFilter {
 
@@ -49,12 +49,12 @@ protected boolean hasAnnotation() {
 	@Override
 	protected Filter[] getFilters(final FilterType type) {
 		switch (type) {
-			case INCLUDE:
-				return this.annotation.includeFilters();
-			case EXCLUDE:
-				return this.annotation.excludeFilters();
-			default:
-				throw new IllegalStateException("Unsupported type " + type);
+		case INCLUDE:
+			return this.annotation.includeFilters();
+		case EXCLUDE:
+			return this.annotation.excludeFilters();
+		default:
+			throw new IllegalStateException("Unsupported type " + type);
 		}
 	}
 
diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestIntegrationTests.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.
@@ -32,7 +32,7 @@
 /**
  * Sample test for {@link DataMongoTest @DataMongoTest}
  *
- * @author Michael J. Simons
+ * @author Michael Simons
  */
 @RunWith(SpringRunner.class)
 @DataMongoTest
@@ -54,10 +54,8 @@ public class DataMongoTestIntegrationTests {
 	public void testRepository() {
 		ExampleDocument exampleDocument = new ExampleDocument();
 		exampleDocument.setText("Look, new @DataMongoTest!");
-
 		exampleDocument = this.exampleRepository.save(exampleDocument);
 		assertThat(exampleDocument.getId()).isNotNull();
-
 		assertThat(this.mongoTemplate.collectionExists("exampleDocuments")).isTrue();
 	}
 
diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestWithIncludeFilterIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestWithIncludeFilterIntegrationTests.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.
@@ -29,7 +29,7 @@
 /**
  * Integration test with custom include filter for {@link DataMongoTest}.
  *
- * @author Michael J. Simons
+ * @author Michael Simons
  */
 @RunWith(SpringRunner.class)
 @DataMongoTest(includeFilters = @Filter(Service.class))
diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleDocument.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleDocument.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.
@@ -21,7 +21,7 @@
 /**
  * Example document used with {@link DataMongoTest} tests.
  *
- * @author Michael J. Simons
+ * @author Michael Simons
  */
 @Document(collection = "exampleDocuments")
 public class ExampleDocument {
diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleMongoApplication.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleMongoApplication.java
diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleRepository.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleRepository.java
diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleService.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleService.java
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2012-2016 the original author or authors.`
	`2`	`+ * Copyright 2012-2017 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`* {@link MediaType MediaTypes} that can be consumed and produced by Actuator endpoints.`
`23`	`23`	`*`
`24`	`24`	`* @author Andy Wilkinson`
	`25`	`+ * @since 1.5.0`
`25`	`26`	`*/`
`26`	`27`	`public final class ActuatorMediaTypes {`
`27`	`28`