From 197e1669e20125fb93b9f699e87dcc69cabe9d33 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Mon, 25 Mar 2019 09:01:13 +0100
Subject: [PATCH] Polish

---
 .../boot/autoconfigure/SpringBootApplication.java             | 2 +-
 .../ConfigurationPropertiesBeanDefinitionRegistrar.java       | 4 ++--
 .../boot/context/properties/ConfigurationPropertiesScan.java  | 1 -
 .../main/java/sample/actuator/SampleActuatorApplication.java  | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/SpringBootApplication.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/SpringBootApplication.java
index d226d04493..db0aa575cc 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/SpringBootApplication.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/SpringBootApplication.java
@@ -53,10 +53,10 @@ import org.springframework.core.annotation.AliasFor;
 @Inherited
 @SpringBootConfiguration
 @EnableAutoConfiguration
-@ConfigurationPropertiesScan
 @ComponentScan(excludeFilters = {
 		@Filter(type = FilterType.CUSTOM, classes = TypeExcludeFilter.class),
 		@Filter(type = FilterType.CUSTOM, classes = AutoConfigurationExcludeFilter.class) })
+@ConfigurationPropertiesScan
 public @interface SpringBootApplication {
 
 	/**
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanDefinitionRegistrar.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanDefinitionRegistrar.java
index 7327f8d741..ccf4c28581 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanDefinitionRegistrar.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanDefinitionRegistrar.java
@@ -39,11 +39,11 @@ import org.springframework.util.StringUtils;
  */
 final class ConfigurationPropertiesBeanDefinitionRegistrar {
 
+	private static final boolean KOTLIN_PRESENT = KotlinDetector.isKotlinPresent();
+
 	private ConfigurationPropertiesBeanDefinitionRegistrar() {
 	}
 
-	private static final boolean KOTLIN_PRESENT = KotlinDetector.isKotlinPresent();
-
 	public static void register(BeanDefinitionRegistry registry,
 			ConfigurableListableBeanFactory beanFactory, Class<?> type) {
 		String name = getName(type);
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesScan.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesScan.java
index f7d158eef1..c4d7ef4b63 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesScan.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesScan.java
@@ -33,7 +33,6 @@ import org.springframework.core.annotation.AliasFor;
  *
  * @author Madhura Bhave
  * @since 2.2.0
- * @see ConfigurationPropertiesScanRegistrar
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleActuatorApplication.java b/spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleActuatorApplication.java
index 53854ac15e..f114d86ac3 100644
--- a/spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleActuatorApplication.java
+++ b/spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleActuatorApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.