Add @FunctionalInterface to remaining public and protected interfaces

See gh-6857
2017-01-27 16:39:44 +00:00 · 2017-01-27 16:39:44 +00:00 · 31b0e81765
parent 3d52c86a21
commit 31b0e81765
21 changed files with 33 additions and 20 deletions
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HeapdumpMvcEndpoint.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HeapdumpMvcEndpoint.java
@ -168,6 +168,7 @@ public class HeapdumpMvcEndpoint extends AbstractNamedMvcEndpoint {
 	/**
 	 * Strategy interface used to dump the heap to a file.
 	 */
+	@FunctionalInterface
 	protected interface HeapDumper {

 		/**
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/NamePatternFilter.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/NamePatternFilter.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.
@ -76,7 +76,7 @@ abstract class NamePatternFilter<T> {
 	/**
 	 * Callback used to add a name.
 	 */
-	protected interface NameCallback {
+	interface NameCallback {

 		void addName(String name);

--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/dropwizard/ReservoirFactory.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/dropwizard/ReservoirFactory.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.
@ -26,6 +26,7 @@ import com.codahale.metrics.Reservoir;
 * @author Phillip Webb
 * @since 1.5.0
 */
+@FunctionalInterface
 public interface ReservoirFactory {

 	/**
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/util/SimpleInMemoryRepository.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/util/SimpleInMemoryRepository.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.
@ -102,6 +102,7 @@ public class SimpleInMemoryRepository<T> {
 	 *
 	 * @param <T> the value type
 	 */
+	@FunctionalInterface
 	public interface Callback<T> {

 		/**
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationImportFilter.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationImportFilter.java
@ -39,6 +39,7 @@ import org.springframework.context.ResourceLoaderAware;
 * @author Phillip Webb
 * @since 1.5.0
 */
+@FunctionalInterface
 public interface AutoConfigurationImportFilter {

 	/**
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationImportListener.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationImportListener.java
@ -41,6 +41,7 @@ import org.springframework.context.ResourceLoaderAware;
 * @author Phillip Webb
 * @since 1.5.0
 */
+@FunctionalInterface
 public interface AutoConfigurationImportListener extends EventListener {

 	/**
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/ClusterBuilderCustomizer.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/ClusterBuilderCustomizer.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.
@ -27,6 +27,7 @@ import com.datastax.driver.core.Cluster.Builder;
 * @author Eddú Meléndez
 * @since 1.5.0
 */
+@FunctionalInterface
 public interface ClusterBuilderCustomizer {

 	/**
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/HttpClientConfigBuilderCustomizer.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/HttpClientConfigBuilderCustomizer.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.
@ -27,6 +27,7 @@ import io.searchbox.client.config.HttpClientConfig.Builder;
 * @author Stephane Nicoll
 * @since 1.5.0
 */
+@FunctionalInterface
 public interface HttpClientConfigBuilderCustomizer {

 	/**
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/IgnoredRequestCustomizer.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/IgnoredRequestCustomizer.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.
@ -25,6 +25,7 @@ import org.springframework.security.config.annotation.web.builders.WebSecurity.I
 * @author Madhura Bhave
 * @since 1.5.0
 */
+@FunctionalInterface
 public interface IgnoredRequestCustomizer {

 	/**
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoRestTemplateFactory.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoRestTemplateFactory.java
@ -26,6 +26,7 @@ import org.springframework.security.oauth2.client.OAuth2RestTemplate;
 * @author Stephane Nicoll
 * @since 1.4.0
 */
+@FunctionalInterface
 public interface UserInfoRestTemplateFactory {

 	/**
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/PlatformTransactionManagerCustomizer.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/PlatformTransactionManagerCustomizer.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.
@ -27,6 +27,7 @@ import org.springframework.transaction.PlatformTransactionManager;
 * @author Phillip Webb
 * @since 1.5.0
 */
+@FunctionalInterface
 public interface PlatformTransactionManagerCustomizer<T extends PlatformTransactionManager> {

 	/**
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/context/DefaultTestExecutionListenersPostProcessor.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/context/DefaultTestExecutionListenersPostProcessor.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,6 +29,7 @@ import org.springframework.test.context.TestExecutionListener;
 * @since 1.4.1
 * @see SpringBootTest
 */
+@FunctionalInterface
 public interface DefaultTestExecutionListenersPostProcessor {

 	/**
--- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/TreeVisitor.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/TreeVisitor.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 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.
@ -22,7 +22,6 @@ package org.springframework.boot.configurationprocessor.fieldvalues.javac;
 * @author Phillip Webb
 * @since 1.2.0
 */
-@FunctionalInterface
 interface TreeVisitor {

 	void visitVariable(VariableTree variable) throws Exception;
--- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/CustomLoaderLayout.java
+++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/CustomLoaderLayout.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.
@ -25,6 +25,7 @@ import java.io.IOException;
 * @author Phillip Webb
 * @since 1.5.0
 */
+@FunctionalInterface
 public interface CustomLoaderLayout {

 	/**
--- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LayoutFactory.java
+++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LayoutFactory.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.
@ -24,6 +24,7 @@ import java.io.File;
 * @author Dave Syer
 * @author Phillip Webb
 */
+@FunctionalInterface
 public interface LayoutFactory {

 	/**
--- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java
+++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java
@ -404,6 +404,7 @@ public class Repackager {
 	 * Callback interface used to present a warning when finding the main class takes too
 	 * long.
 	 */
+	@FunctionalInterface
 	public interface MainClassTimeoutWarningListener {

 		/**
--- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryFilter.java
+++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryFilter.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,6 @@ package org.springframework.boot.loader.jar;
 *
 * @author Phillip Webb
 */
-@FunctionalInterface
 interface JarEntryFilter {

 	/**
--- a/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java
+++ b/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.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.
@ -326,7 +326,7 @@ class BeanDefinitionLoader {
 	/**
 	 * Source for Bean definitions defined in Groovy.
 	 */
-	protected interface GroovyBeanDefinitionSource {
+	interface GroovyBeanDefinitionSource {

 		Closure<?> getBeans();

--- a/spring-boot/src/main/java/org/springframework/boot/bind/PropertyNamePatternsMatcher.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/PropertyNamePatternsMatcher.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 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.
@ -22,7 +22,6 @@ package org.springframework.boot.bind;
 * @author Phillip Webb
 * @since 1.2.0
 */
-@FunctionalInterface
 interface PropertyNamePatternsMatcher {

 	PropertyNamePatternsMatcher ALL = new PropertyNamePatternsMatcher() {
--- a/spring-boot/src/main/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializer.java
@ -114,6 +114,7 @@ public class ConfigurationWarningsApplicationContextInitializer
 	/**
 	 * A single check that can be applied.
 	 */
+	@FunctionalInterface
 	protected interface Check {

 		/**
--- a/spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityManagerFactoryBuilder.java
+++ b/spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityManagerFactoryBuilder.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.
@ -220,6 +220,7 @@ public class EntityManagerFactoryBuilder {
 	/**
 	 * A callback for new entity manager factory beans created by a Builder.
 	 */
+	@FunctionalInterface
 	public interface EntityManagerFactoryBeanCallback {

 		void execute(LocalContainerEntityManagerFactoryBean factory);