root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge pull request #12590 from izeye:public 

* pr/12590:
  Polish contribution
  Make intermediate classes in type hierarchy of public class public
This commit is contained in:
Stephane Nicoll 2018-03-29 08:54:00 +02:00
parent da77cbaf7e d456e1de49
commit 3cf2913580
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java
View File

@ -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.
@ -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;

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerNonWebConfiguration.java
View File

@ -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.
@ -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);
}

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/AbstractJsonParser.java
View File

@ -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<String, Object> parseMap(String json,
Function<String, Map<String, Object>> parser) {

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java
View File

@ -41,8 +41,9 @@ import org.springframework.util.StringUtils;
*
* @param <T> the type of {@link Filter} to register
* @author Phillip Webb
* @since 2.0.1
*/
abstract class AbstractFilterRegistrationBean<T extends Filter>
public abstract class AbstractFilterRegistrationBean<T extends Filter>
extends DynamicRegistrationBean<Dynamic> {
/**