From 74f9a84ea9679e743f44a5a743b235c3266958e3 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Thu, 22 Mar 2018 16:59:35 +0900 Subject: [PATCH 1/2] Make intermediate classes in type hierarchy of public class public See gh-12590 --- .../boot/autoconfigure/condition/AbstractNestedCondition.java | 3 ++- .../freemarker/FreeMarkerNonWebConfiguration.java | 4 ++-- .../org/springframework/boot/json/AbstractJsonParser.java | 3 ++- .../boot/web/servlet/AbstractFilterRegistrationBean.java | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java index 9fe5b3b9f9b..dd9372d499c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java @@ -40,8 +40,9 @@ import org.springframework.util.MultiValueMap; * Abstract base class for nested conditions. * * @author Phillip Webb + * @since 2.0.1 */ -abstract class AbstractNestedCondition extends SpringBootCondition +public abstract class AbstractNestedCondition extends SpringBootCondition implements ConfigurationCondition { private final ConfigurationPhase configurationPhase; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerNonWebConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerNonWebConfiguration.java index edc3e15c8ca..d11d89dbedc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerNonWebConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerNonWebConfiguration.java @@ -30,9 +30,9 @@ import org.springframework.ui.freemarker.FreeMarkerConfigurationFactoryBean; */ @Configuration @ConditionalOnNotWebApplication -public class FreeMarkerNonWebConfiguration extends AbstractFreeMarkerConfiguration { +class FreeMarkerNonWebConfiguration extends AbstractFreeMarkerConfiguration { - public FreeMarkerNonWebConfiguration(FreeMarkerProperties properties) { + FreeMarkerNonWebConfiguration(FreeMarkerProperties properties) { super(properties); } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/AbstractJsonParser.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/AbstractJsonParser.java index c7541292c39..830d3986736 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/AbstractJsonParser.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/AbstractJsonParser.java @@ -28,8 +28,9 @@ import org.springframework.util.ReflectionUtils; * * @author Anton Telechev * @author Phillip Webb + * @since 2.0.1 */ -abstract class AbstractJsonParser implements JsonParser { +public abstract class AbstractJsonParser implements JsonParser { protected final Map parseMap(String json, Function> parser) { diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java index 733eb59792f..7df7dd8aa88 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java @@ -41,8 +41,9 @@ import org.springframework.util.StringUtils; * * @param the type of {@link Filter} to register * @author Phillip Webb + * @since 2.0.1 */ -abstract class AbstractFilterRegistrationBean +public abstract class AbstractFilterRegistrationBean extends DynamicRegistrationBean { /** From d456e1de494fe057fec8eefd6fdad789c3ffb191 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 29 Mar 2018 08:53:17 +0200 Subject: [PATCH 2/2] Polish contribution Closes gh-12590 --- .../boot/autoconfigure/condition/AbstractNestedCondition.java | 2 +- .../autoconfigure/freemarker/FreeMarkerNonWebConfiguration.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java index dd9372d499c..7e487fad9e5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java @@ -1,5 +1,5 @@ /* - * 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. diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerNonWebConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerNonWebConfiguration.java index d11d89dbedc..22b1dcebd2e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerNonWebConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerNonWebConfiguration.java @@ -1,5 +1,5 @@ /* - * 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.