Skip to content

Commit 6d01bc9

Browse files
committed
Make intermediate classes of public classes public
Backport gh-12590 to 1.5.x and also pick up a few classes that were missed. This commit also makes a few properties bound classes public. Closes gh-17337
1 parent 1ee8c53 commit 6d01bc9

File tree

7 files changed

+21
-11
lines changed

7 files changed

+21
-11
lines changed

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/Token.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@
2828
* The JSON web token provided with each request that originates from Cloud Foundry.
2929
*
3030
* @author Madhura Bhave
31+
* @since 1.5.22
3132
*/
32-
class Token {
33+
public class Token {
3334

3435
private static final Charset UTF_8 = Charset.forName("UTF-8");
3536

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/Buffer.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2016 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -22,8 +22,9 @@
2222
* @param <T> the value type
2323
* @author Dave Syer
2424
* @author Phillip Webb
25+
* @since 1.5.22
2526
*/
26-
abstract class Buffer<T extends Number> {
27+
public abstract class Buffer<T extends Number> {
2728

2829
private volatile long timestamp;
2930

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/Buffers.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,16 @@
3030
* @author Dave Syer
3131
* @author Phillip Webb
3232
* @param <B> the buffer type
33+
* @since 1.5.22
3334
*/
3435
@UsesJava8
35-
abstract class Buffers<B extends Buffer<?>> {
36+
public abstract class Buffers<B extends Buffer<?>> {
3637

3738
private final ConcurrentHashMap<String, B> buffers = new ConcurrentHashMap<String, B>();
3839

40+
Buffers() {
41+
}
42+
3943
public void forEach(final Predicate<String> predicate, final BiConsumer<String, B> consumer) {
4044
this.buffers.forEach(new BiConsumer<String, B>() {
4145

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/MetricMessage.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2015 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -24,8 +24,9 @@
2424
* A metric message sent via Spring Integration.
2525
*
2626
* @author Phillip Webb
27+
* @since 1.5.22
2728
*/
28-
class MetricMessage {
29+
public class MetricMessage {
2930

3031
private static final String METRIC_NAME = "metricName";
3132

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@
4040
* Abstract base class for nested conditions.
4141
*
4242
* @author Phillip Webb
43+
* @since 1.5.22
4344
*/
44-
abstract class AbstractNestedCondition extends SpringBootCondition implements ConfigurationCondition {
45+
public abstract class AbstractNestedCondition extends SpringBootCondition implements ConfigurationCondition {
4546

4647
private final ConfigurationPhase configurationPhase;
4748

spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsMockMvcBuilderCustomizer.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2016 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -27,8 +27,9 @@
2727
* A {@link MockMvcBuilderCustomizer} that configures Spring REST Docs.
2828
*
2929
* @author Andy Wilkinson
30+
* @since 1.5.22
3031
*/
31-
class RestDocsMockMvcBuilderCustomizer implements InitializingBean, MockMvcBuilderCustomizer {
32+
public class RestDocsMockMvcBuilderCustomizer implements InitializingBean, MockMvcBuilderCustomizer {
3233

3334
private final MockMvcRestDocumentationConfigurer delegate;
3435

spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -39,8 +39,9 @@
3939
* Servlet 3.0+ container.
4040
*
4141
* @author Phillip Webb
42+
* @since 1.5.22
4243
*/
43-
abstract class AbstractFilterRegistrationBean extends RegistrationBean {
44+
public abstract class AbstractFilterRegistrationBean extends RegistrationBean {
4445

4546
/**
4647
* Filters that wrap the servlet request should be ordered less than or equal to this.

0 commit comments

Comments
 (0)