Merge pull request #12211 from igor-suhorukov:master

* pr/12211:
  Polish

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseyManagementChildContextConfiguration.java

@@ -55,9 +55,8 @@ public class JerseyManagementChildContextConfiguration {
 
 	@Bean
 	public ServletRegistrationBean<ServletContainer> jerseyServletRegistration() {
-		ServletRegistrationBean<ServletContainer> registration = new ServletRegistrationBean<>(
+		return new ServletRegistrationBean<>(
 				new ServletContainer(endpointResourceConfig()), "/*");
-		return registration;
 	}
 
 	@Bean

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfiguration.java

@@ -57,8 +57,7 @@ public class ElasticsearchAutoConfiguration {
 		factory.setClusterNodes(this.properties.getClusterNodes());
 		factory.setProperties(createProperties());
 		factory.afterPropertiesSet();
-		TransportClient client = factory.getObject();
-		return client;
+		return factory.getObject();
 	}
 
 	private Properties createProperties() {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfiguration.java

@@ -64,9 +64,7 @@ public class Neo4jDataAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	public org.neo4j.ogm.config.Configuration configuration(Neo4jProperties properties) {
-		org.neo4j.ogm.config.Configuration configuration = properties
-				.createConfiguration();
-		return configuration;
+		return properties.createConfiguration();
 	}
 
 	@Bean

spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/app/SpringApplicationWebApplicationInitializer.java

@@ -64,8 +64,7 @@ public class SpringApplicationWebApplicationInitializer
 
 	private Manifest getManifest(ServletContext servletContext) throws IOException {
 		InputStream stream = servletContext.getResourceAsStream("/META-INF/MANIFEST.MF");
-		Manifest manifest = (stream == null ? null : new Manifest(stream));
-		return manifest;
+		return (stream == null ? null : new Manifest(stream));
 	}
 
 	@Override

spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java

@@ -235,8 +235,7 @@ public class GroovyCompiler {
 		try {
 			Field field = CompilationUnit.class.getDeclaredField("phaseOperations");
 			field.setAccessible(true);
-			LinkedList[] phaseOperations = (LinkedList[]) field.get(compilationUnit);
-			return phaseOperations;
+			return (LinkedList[]) field.get(compilationUnit);
 		}
 		catch (Exception ex) {
 			throw new IllegalStateException(

spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java

@@ -324,10 +324,9 @@ public class AetherGrapeEngine implements GrapeEngine {
 	}
 
 	private DependencyRequest getDependencyRequest(CollectRequest collectRequest) {
-		DependencyRequest dependencyRequest = new DependencyRequest(collectRequest,
+		return new DependencyRequest(collectRequest,
 				DependencyFilterUtils.classpathFilter(JavaScopes.COMPILE,
 						JavaScopes.RUNTIME));
-		return dependencyRequest;
 	}
 
 	private void addManagedDependencies(DependencyResult result) {

spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/util/ResourceUtils.java

@@ -160,8 +160,7 @@ public abstract class ResourceUtils {
 			}
 			else {
 				if (location.startsWith(FILE_URL_PREFIX)) {
-					Resource resource = this.files.getResource(location);
-					return resource;
+					return this.files.getResource(location);
 				}
 				try {
 					// Try to parse the location as a URL...

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java

@@ -112,8 +112,7 @@ class ImportsContextCustomizer implements ContextCustomizer {
 	private BeanDefinition registerBean(BeanDefinitionRegistry registry,
 			AnnotatedBeanDefinitionReader reader, String beanName, Class<?> type) {
 		reader.registerBean(type, beanName);
-		BeanDefinition definition = registry.getBeanDefinition(beanName);
-		return definition;
+		return registry.getBeanDefinition(beanName);
 	}
 
 	@Override

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java

@@ -135,8 +135,7 @@ public class SpringBootContextLoader extends AbstractContextLoader {
 			application.setWebApplicationType(WebApplicationType.NONE);
 		}
 		application.setInitializers(initializers);
-		ConfigurableApplicationContext context = application.run();
-		return context;
+		return application.run();
 	}
 
 	/**

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/MetadataStore.java

@@ -95,15 +95,13 @@ public class MetadataStore {
 	}
 
 	private FileObject getMetadataResource() throws IOException {
-		FileObject resource = this.environment.getFiler()
+		return this.environment.getFiler()
 				.getResource(StandardLocation.CLASS_OUTPUT, "", METADATA_PATH);
-		return resource;
 	}
 
 	private FileObject createMetadataResource() throws IOException {
-		FileObject resource = this.environment.getFiler()
+		return this.environment.getFiler()
 				.createResource(StandardLocation.CLASS_OUTPUT, "", METADATA_PATH);
-		return resource;
 	}
 
 	private InputStream getAdditionalMetadataStream() throws IOException {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/liquibase/SpringPackageScanClassResolver.java

@@ -68,8 +68,7 @@ public class SpringPackageScanClassResolver extends DefaultPackageScanClassResol
 				loader);
 		String pattern = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX
 				+ ClassUtils.convertClassNameToResourcePath(packageName) + "/**/*.class";
-		Resource[] resources = resolver.getResources(pattern);
-		return resources;
+		return resolver.getResources(pattern);
 	}
 
 	private Class<?> loadClass(ClassLoader loader, MetadataReaderFactory readerFactory,