Formatting

philwebb · philwebb · commit 0a0247975c11 · 2018-05-04T12:00:50.000-07:00
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpoint.java
@@ -344,6 +344,7 @@ public void serializeAsField(Object pojo, JsonGenerator jgen,
 			}
 			super.serializeAsField(pojo, jgen, provider, writer);
 		}
+
 	}
 
 	/**
@@ -395,4 +396,5 @@ private AnnotatedMethod findSetter(BeanDescription beanDesc,
 		}
 
 	}
+
 }
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DataSourcePublicMetrics.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DataSourcePublicMetrics.java
@@ -104,8 +104,8 @@ protected String createPrefix(String name, DataSource dataSource, boolean primar
 		if (primary) {
 			return "datasource.primary";
 		}
-		if (name.length() > DATASOURCE_SUFFIX.length()
-				&& name.toLowerCase(Locale.ENGLISH).endsWith(DATASOURCE_SUFFIX.toLowerCase())) {
+		if (name.length() > DATASOURCE_SUFFIX.length() && name.toLowerCase(Locale.ENGLISH)
+				.endsWith(DATASOURCE_SUFFIX.toLowerCase())) {
 			name = name.substring(0, name.length() - DATASOURCE_SUFFIX.length());
 		}
 		return "datasource." + name;
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/FlywayEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/FlywayEndpoint.java
@@ -73,6 +73,7 @@ public List<FlywayReport> invoke() {
 	public static class FlywayReport {
 
 		private final String name;
+
 		private final List<FlywayMigration> migrations;
 
 		public FlywayReport(String name, List<FlywayMigration> migrations) {
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointSecurityInterceptor.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointSecurityInterceptor.java
@@ -142,6 +142,7 @@ private boolean hasAuthority(String role) {
 			}
 			return false;
 		}
+
 	}
 
 }
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfigurationTests.java
@@ -325,20 +325,23 @@ static class TestMetricsMvcEndpoint extends MetricsMvcEndpoint {
 		TestMetricsMvcEndpoint(MetricsEndpoint delegate) {
 			super(delegate);
 		}
+
 	}
 
 	static class TestAuditEventsMvcEndpoint extends AuditEventsMvcEndpoint {
 
 		TestAuditEventsMvcEndpoint(AuditEventRepository auditEventRepository) {
 			super(auditEventRepository);
 		}
+
 	}
 
 	static class TestShutdownMvcEndpoint extends ShutdownMvcEndpoint {
 
 		TestShutdownMvcEndpoint(ShutdownEndpoint delegate) {
 			super(delegate);
 		}
+
 	}
 
 }
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java
@@ -277,4 +277,5 @@ public void newValueIsReturnedOnceTtlExpires() throws InterruptedException {
 		Health health = ((ResponseEntity<Health>) result).getBody();
 		assertThat(health.getStatus() == Status.DOWN).isTrue();
 	}
+
 }
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java
@@ -75,8 +75,7 @@ public CacheManagerCustomizers cacheManagerCustomizers(
 
 	@Bean
 	public CacheManagerValidator cacheAutoConfigurationValidator(
-			CacheProperties cacheProperties,
-			ObjectProvider<CacheManager> cacheManager) {
+			CacheProperties cacheProperties, ObjectProvider<CacheManager> cacheManager) {
 		return new CacheManagerValidator(cacheProperties, cacheManager);
 	}
 
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java
@@ -115,8 +115,8 @@ public CassandraSessionFactoryBean session(CassandraConverter converter)
 		session.setKeyspaceName(this.properties.getKeyspaceName());
 		String name = this.propertyResolver.getProperty("schemaAction",
 				SchemaAction.NONE.name());
-		SchemaAction schemaAction = SchemaAction.valueOf(
-				name.toUpperCase(Locale.ENGLISH));
+		SchemaAction schemaAction = SchemaAction
+				.valueOf(name.toUpperCase(Locale.ENGLISH));
 		session.setSchemaAction(schemaAction);
 		return session;
 	}
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java
@@ -120,6 +120,7 @@ protected static class IntegrationManagementConfiguration {
 		@Configuration
 		@EnableIntegrationManagement(defaultCountsEnabled = "true", defaultStatsEnabled = "true")
 		protected static class EnableIntegrationManagementConfiguration {
+
 		}
 
 	}
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationScanRegistrar.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationScanRegistrar.java
@@ -77,6 +77,7 @@ public Map<String, Object> getAnnotationAttributes(String annotationName) {
 			}
 			return attributes;
 		}
+
 	}
 
 	@IntegrationComponentScan
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java
@@ -185,6 +185,7 @@ static class NoClientCredentialsCondition extends NoneNestedConditions {
 
 		@Conditional(ClientCredentialsCondition.class)
 		static class ClientCredentialsActivated {
+
 		}
 
 	}
@@ -200,10 +201,12 @@ static class ClientCredentialsCondition extends AnyNestedCondition {
 
 		@ConditionalOnProperty(prefix = "security.oauth2.client", name = "grant-type", havingValue = "client_credentials", matchIfMissing = false)
 		static class ClientCredentialsConfigured {
+
 		}
 
 		@ConditionalOnNotWebApplication
 		static class NoWebApplication {
+
 		}
 
 	}
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerProperties.java
@@ -292,6 +292,7 @@ public String getKeySetUri() {
 		public void setKeySetUri(String keySetUri) {
 			this.keySetUri = keySetUri;
 		}
+
 	}
 
 }
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfiguration.java
@@ -234,6 +234,7 @@ public DefaultTokenServices jwkTokenServices(TokenStore jwkTokenStore) {
 		public TokenStore jwkTokenStore() {
 			return new JwkTokenStore(this.resource.getJwk().getKeySetUri());
 		}
+
 	}
 
 	@Configuration
@@ -415,6 +416,7 @@ static class HasJwtConfiguration {
 		static class HasJwkConfiguration {
 
 		}
+
 	}
 
 	static class AcceptJsonRequestInterceptor implements ClientHttpRequestInterceptor {
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfiguration.java
@@ -75,6 +75,7 @@ public TransactionTemplateConfiguration(
 		public TransactionTemplate transactionTemplate() {
 			return new TransactionTemplate(this.transactionManager);
 		}
+
 	}
 
 	@Configuration
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java
@@ -776,8 +776,8 @@ public void caffeineCacheExplicitWithSpecString() {
 	public void autoConfiguredCacheManagerCanBeSwapped() {
 		load(CacheManagerPostProcessorConfiguration.class, "spring.cache.type=caffeine");
 		validateCacheManager(SimpleCacheManager.class);
-		CacheManagerPostProcessor postProcessor = this.context.getBean(
-				CacheManagerPostProcessor.class);
+		CacheManagerPostProcessor postProcessor = this.context
+				.getBean(CacheManagerPostProcessor.class);
 		assertThat(postProcessor.cacheManagers).hasSize(1);
 		assertThat(postProcessor.cacheManagers.get(0))
 				.isInstanceOf(CaffeineCacheManager.class);
@@ -1193,14 +1193,14 @@ private static class CacheManagerPostProcessor implements BeanPostProcessor {
 		private final List<CacheManager> cacheManagers = new ArrayList<CacheManager>();
 
 		@Override
-		public Object postProcessBeforeInitialization(Object bean,
-				String beanName) throws BeansException {
+		public Object postProcessBeforeInitialization(Object bean, String beanName)
+				throws BeansException {
 			return bean;
 		}
 
 		@Override
-		public Object postProcessAfterInitialization(Object bean,
-				String beanName) throws BeansException {
+		public Object postProcessAfterInitialization(Object bean, String beanName)
+				throws BeansException {
 			if (bean instanceof CacheManager) {
 				this.cacheManagers.add((CacheManager) bean);
 				return new SimpleCacheManager();
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfigurationTests.java
@@ -185,6 +185,7 @@ static class MyConverter implements Converter<CouchbaseProperties, Boolean> {
 		public Boolean convert(CouchbaseProperties value) {
 			return true;
 		}
+
 	}
 
 }
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfigurationTests.java
@@ -203,6 +203,7 @@ public TransactionalService transactionalService() {
 		public AnotherServiceImpl anotherService() {
 			return new AnotherServiceImpl();
 		}
+
 	}
 
 	@Configuration
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java
@@ -304,6 +304,7 @@ public void doSomething(@Size(min = 3, max = 10) String name) {
 	interface AnotherSampleService {
 
 		void doSomething(@Min(42) Integer counter);
+
 	}
 
 	@Validated
@@ -313,6 +314,7 @@ static class DefaultAnotherSampleService implements AnotherSampleService {
 		public void doSomething(Integer counter) {
 
 		}
+
 	}
 
 	@Configuration
@@ -382,6 +384,7 @@ public Object postProcessBeforeInitialization(Object bean, String name) {
 			}
 
 		}
+
 	}
 
 }
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ArchiveCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ArchiveCommand.java
@@ -131,9 +131,10 @@ protected ExitStatus run(OptionSet options) throws Exception {
 
 			File output = new File((String) nonOptionArguments.remove(0));
 			Assert.isTrue(
-					output.getName().toLowerCase(Locale.ENGLISH).endsWith("." + this.type),
-					"The output '" + output + "' is not a " + this.type.toUpperCase(
-							Locale.ENGLISH) + " file.");
+					output.getName().toLowerCase(Locale.ENGLISH)
+							.endsWith("." + this.type),
+					"The output '" + output + "' is not a "
+							+ this.type.toUpperCase(Locale.ENGLISH) + " file.");
 			deleteIfExists(output);
 
 			GroovyCompiler compiler = createCompiler(options);
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java
@@ -360,7 +360,8 @@ URI generateUrl(InitializrServiceMetadata metadata) {
 			return builder.build();
 		}
 		catch (URISyntaxException ex) {
-			throw new ReportableException("Invalid service URL (" + ex.getMessage() + ")");
+			throw new ReportableException(
+					"Invalid service URL (" + ex.getMessage() + ")");
 		}
 	}
 
diff --git a/spring-boot-docs/src/main/java/org/springframework/boot/elasticsearch/jest/JestClientCustomizationExample.java b/spring-boot-docs/src/main/java/org/springframework/boot/elasticsearch/jest/JestClientCustomizationExample.java
@@ -42,4 +42,5 @@ public void customize(HttpClientConfig.Builder builder) {
 
 	}
 	// end::customizer[]
+
 }
diff --git a/spring-boot-docs/src/test/java/org/springframework/boot/web/client/SampleWebClientTests.java b/spring-boot-docs/src/test/java/org/springframework/boot/web/client/SampleWebClientTests.java
@@ -55,9 +55,7 @@ static class Config {
 
 		@Bean
 		public RestTemplateBuilder restTemplateBuilder() {
-			return new RestTemplateBuilder()
-					.setConnectTimeout(1000)
-					.setReadTimeout(1000);
+			return new RestTemplateBuilder().setConnectTimeout(1000).setReadTimeout(1000);
 		}
 
 	}
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java b/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java
@@ -354,6 +354,7 @@ public boolean equals(Object obj) {
 		public String toString() {
 			return this.key.toString();
 		}
+
 	}
 
 	/**
diff --git a/spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/TestMethodConfiguration.java b/spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/TestMethodConfiguration.java
@@ -30,4 +30,5 @@ public class TestMethodConfiguration {
 	public Object method() {
 		return null;
 	}
+
 }
diff --git a/spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/TestOrderedClassConfiguration.java b/spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/TestOrderedClassConfiguration.java
@@ -29,4 +29,5 @@
 @TestConditionalOnClass(name = "java.io.InputStream", value = OutputStream.class)
 @TestAutoConfigureOrder(123)
 public class TestOrderedClassConfiguration {
+
 }
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java
@@ -549,8 +549,8 @@ public void mergingOfAdditionalPropertyMatchingGroup() throws Exception {
 				"java.lang.String", null, null, null, null, null);
 		writeAdditionalMetadata(property);
 		ConfigurationMetadata metadata = compile(SimpleProperties.class);
-		assertThat(metadata).has(Metadata.withGroup("simple")
-				.fromSource(SimpleProperties.class));
+		assertThat(metadata)
+				.has(Metadata.withGroup("simple").fromSource(SimpleProperties.class));
 		assertThat(metadata).has(Metadata.withProperty("simple", String.class));
 	}
 
diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java
@@ -160,6 +160,7 @@ public boolean isExecutable() {
 
 	/**
 	 * Module layout (designed to be used as a "plug-in").
+	 * 
 	 * @deprecated as of 1.5 in favor of a custom {@link LayoutFactory}
 	 */
 	@Deprecated
diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java
@@ -108,7 +108,7 @@ private JarFile(RandomAccessDataFile rootFile, String pathFromRoot,
 
 	private JarFile(RandomAccessDataFile rootFile, String pathFromRoot,
 			RandomAccessData data, JarEntryFilter filter, JarFileType type)
-					throws IOException {
+			throws IOException {
 		super(rootFile.getFile());
 		this.rootFile = rootFile;
 		this.pathFromRoot = pathFromRoot;
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java b/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java
@@ -54,8 +54,8 @@
  * @param <T> the target type
  * @author Dave Syer
  */
-public class PropertiesConfigurationFactory<T>
-		implements FactoryBean<T>, ApplicationContextAware, MessageSourceAware, InitializingBean {
+public class PropertiesConfigurationFactory<T> implements FactoryBean<T>,
+		ApplicationContextAware, MessageSourceAware, InitializingBean {
 
 	private static final char[] EXACT_DELIMITERS = { '_', '.', '[' };
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/config/AnsiOutputApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/context/config/AnsiOutputApplicationListener.java
@@ -42,8 +42,8 @@ public void onApplicationEvent(ApplicationEnvironmentPreparedEvent event) {
 				event.getEnvironment(), "spring.output.ansi.");
 		if (resolver.containsProperty("enabled")) {
 			String enabled = resolver.getProperty("enabled");
-			AnsiOutput.setEnabled(Enum.valueOf(Enabled.class,
-					enabled.toUpperCase(Locale.ENGLISH)));
+			AnsiOutput.setEnabled(
+					Enum.valueOf(Enabled.class, enabled.toUpperCase(Locale.ENGLISH)));
 		}
 
 		if (resolver.containsProperty("console-available")) {
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java
@@ -130,7 +130,6 @@ && isResourcesJar((JarURLConnection) connection)) {
 
 	/**
 	 * Converts the given {@code url} into a decoded file path.
-	 *
 	 * @param url the url to convert
 	 * @return the file path
 	 * @deprecated Since 1.5.13 in favor of {@link File#File(java.net.URI)}
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
@@ -102,7 +102,6 @@
  * @author Venil Noronha
  * @author Henri Kerola
  * @author Henrich Krämer
- *
  * @see #setPort(int)
  * @see #setConfigurations(Collection)
  * @see JettyEmbeddedServletContainer
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java
@@ -701,6 +701,7 @@ private URLResource getMetaInfResource(URL resourceJar, String path) {
 				return null;
 			}
 		}
+
 	}
 
 	/**
@@ -722,6 +723,7 @@ public void onStartup(Set<Class<?>> classes, ServletContext servletContext)
 				initializer.onStartup(servletContext);
 			}
 		}
+
 	}
 
 	/**
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/Jetty8JettyEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/Jetty8JettyEmbeddedServletContainerFactoryTests.java
@@ -112,6 +112,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 			resp.getWriter().print("An error occurred");
 			resp.flushBuffer();
 		}
+
 	}
 
 }
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorTests.java
@@ -554,6 +554,7 @@ public ValidatedPropertiesImpl testProperties() {
 	interface ValidatedProperties {
 
 		String getFoo();
+
 	}
 
 	@ConfigurationProperties("test")
@@ -890,6 +891,7 @@ public Resource resolve(String location, ResourceLoader resourceLoader) {
 			}
 			return null;
 		}
+
 	}
 
 }
diff --git a/spring-boot/src/test/java/org/springframework/boot/jackson/JsonComponentModuleTests.java b/spring-boot/src/test/java/org/springframework/boot/jackson/JsonComponentModuleTests.java

Original file line number	Diff line number	Diff line change
`@@ -344,6 +344,7 @@ public void serializeAsField(Object pojo, JsonGenerator jgen,`
`344`	`344`	`}`
`345`	`345`	`super.serializeAsField(pojo, jgen, provider, writer);`
`346`	`346`	`}`
	`347`	`+`
`347`	`348`	`}`
`348`	`349`
`349`	`350`	`/**`
`@@ -395,4 +396,5 @@ private AnnotatedMethod findSetter(BeanDescription beanDesc,`
`395`	`396`	`}`
`396`	`397`
`397`	`398`	`}`
	`399`	`+`
`398`	`400`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,8 @@ protected String createPrefix(String name, DataSource dataSource, boolean primar`
`104`	`104`	`if (primary) {`
`105`	`105`	`return "datasource.primary";`
`106`	`106`	`}`
`107`		`- if (name.length() > DATASOURCE_SUFFIX.length()`
`108`		`- && name.toLowerCase(Locale.ENGLISH).endsWith(DATASOURCE_SUFFIX.toLowerCase())) {`
	`107`	`+ if (name.length() > DATASOURCE_SUFFIX.length() && name.toLowerCase(Locale.ENGLISH)`
	`108`	`+ .endsWith(DATASOURCE_SUFFIX.toLowerCase())) {`
`109`	`109`	`name = name.substring(0, name.length() - DATASOURCE_SUFFIX.length());`
`110`	`110`	`}`
`111`	`111`	`return "datasource." + name;`
Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,7 @@ private boolean hasAuthority(String role) {`
`142`	`142`	`}`
`143`	`143`	`return false;`
`144`	`144`	`}`
	`145`	`+`
`145`	`146`	`}`
`146`	`147`
`147`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -325,20 +325,23 @@ static class TestMetricsMvcEndpoint extends MetricsMvcEndpoint {`
`325`	`325`	`TestMetricsMvcEndpoint(MetricsEndpoint delegate) {`
`326`	`326`	`super(delegate);`
`327`	`327`	`}`
	`328`	`+`
`328`	`329`	`}`
`329`	`330`
`330`	`331`	`static class TestAuditEventsMvcEndpoint extends AuditEventsMvcEndpoint {`
`331`	`332`
`332`	`333`	`TestAuditEventsMvcEndpoint(AuditEventRepository auditEventRepository) {`
`333`	`334`	`super(auditEventRepository);`
`334`	`335`	`}`
	`336`	`+`
`335`	`337`	`}`
`336`	`338`
`337`	`339`	`static class TestShutdownMvcEndpoint extends ShutdownMvcEndpoint {`
`338`	`340`
`339`	`341`	`TestShutdownMvcEndpoint(ShutdownEndpoint delegate) {`
`340`	`342`	`super(delegate);`
`341`	`343`	`}`
	`344`	`+`
`342`	`345`	`}`
`343`	`346`
`344`	`347`	`}`
Original file line number	Diff line number	Diff line change
`@@ -277,4 +277,5 @@ public void newValueIsReturnedOnceTtlExpires() throws InterruptedException {`
`277`	`277`	`Health health = ((ResponseEntity<Health>) result).getBody();`
`278`	`278`	`assertThat(health.getStatus() == Status.DOWN).isTrue();`
`279`	`279`	`}`
	`280`	`+`
`280`	`281`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,7 @@ public CacheManagerCustomizers cacheManagerCustomizers(`
`75`	`75`
`76`	`76`	`@Bean`
`77`	`77`	`public CacheManagerValidator cacheAutoConfigurationValidator(`
`78`		`- CacheProperties cacheProperties,`
`79`		`- ObjectProvider<CacheManager> cacheManager) {`
	`78`	`+ CacheProperties cacheProperties, ObjectProvider<CacheManager> cacheManager) {`
`80`	`79`	`return new CacheManagerValidator(cacheProperties, cacheManager);`
`81`	`80`	`}`
`82`	`81`
Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,7 @@ protected static class IntegrationManagementConfiguration {`
`120`	`120`	`@Configuration`
`121`	`121`	`@EnableIntegrationManagement(defaultCountsEnabled = "true", defaultStatsEnabled = "true")`
`122`	`122`	`protected static class EnableIntegrationManagementConfiguration {`
	`123`	`+`
`123`	`124`	`}`
`124`	`125`
`125`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ public Map<String, Object> getAnnotationAttributes(String annotationName) {`
`77`	`77`	`}`
`78`	`78`	`return attributes;`
`79`	`79`	`}`
	`80`	`+`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`@IntegrationComponentScan`