Merge branch '2.6.x' into 2.7.x

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvoker.java

@@ -193,7 +193,7 @@ public class CachingOperationInvoker implements OperationInvoker {
 
 	private static final class CacheKey {
 
-		public static final Class<?>[] CACHEABLE_TYPES = new Class[] { ApiVersion.class, SecurityContext.class,
+		private static final Class<?>[] CACHEABLE_TYPES = new Class<?>[] { ApiVersion.class, SecurityContext.class,
 				WebServerNamespace.class };
 
 		private final ApiVersion apiVersion;
@@ -208,7 +208,7 @@ public class CachingOperationInvoker implements OperationInvoker {
 			this.serverNamespace = serverNamespace;
 		}
 
-		public static boolean containsType(Class<?> type) {
+		static boolean containsType(Class<?> type) {
 			return Arrays.stream(CacheKey.CACHEABLE_TYPES).anyMatch((c) -> c.isAssignableFrom(type));
 		}
 

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvokerTests.java

@@ -243,7 +243,7 @@ class CachingOperationInvokerTests {
 	}
 
 	@Test
-	public void targetInvokedWithDifferentWebServerNamespace() {
+	void targetInvokedWithDifferentWebServerNamespace() {
 		OperationInvoker target = mock(OperationInvoker.class);
 		Object expectedV2 = new Object();
 		Object expectedV3 = new Object();