Merge pull request #12236 from igor-suhorukov:master

* pr/12236:
  Polish contribution
  Polish

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java

@@ -56,10 +56,9 @@ public class BackgroundPreinitializer
 
 	@Override
 	public void onApplicationEvent(SpringApplicationEvent event) {
-		if (event instanceof ApplicationStartingEvent) {
-			if (preinitializationStarted.compareAndSet(false, true)) {
-				performPreinitialization();
-			}
+		if (event instanceof ApplicationStartingEvent
+				&& preinitializationStarted.compareAndSet(false, true)) {
+			performPreinitialization();
 		}
 		if ((event instanceof ApplicationReadyEvent
 				|| event instanceof ApplicationFailedEvent)

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfiguration.java

@@ -218,13 +218,12 @@ public class EmbeddedLdapAutoConfiguration {
 				AnnotatedTypeMetadata metadata) {
 			Builder message = ConditionMessage.forCondition("Embedded LDAP");
 			Environment environment = context.getEnvironment();
-			if (environment != null) {
-				if (!Binder.get(environment)
+			if (environment != null
+					&& !Binder.get(environment)
 						.bind("spring.ldap.embedded.base-dn", STRING_LIST)
 						.orElseGet(Collections::emptyList).isEmpty()) {
-					return ConditionOutcome
-							.match(message.because("Found base-dn property"));
-				}
+				return ConditionOutcome
+						.match(message.because("Found base-dn property"));
 			}
 			return ConditionOutcome.noMatch(message.because("No base-dn property found"));
 		}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListener.java

@@ -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.
@@ -74,11 +74,10 @@ public class ConditionEvaluationReportLoggingListener
 				logAutoConfigurationReport();
 			}
 		}
-		else if (event instanceof ApplicationFailedEvent) {
-			if (((ApplicationFailedEvent) event)
+		else if (event instanceof ApplicationFailedEvent
+					&& ((ApplicationFailedEvent) event)
 					.getApplicationContext() == initializerApplicationContext) {
-				logAutoConfigurationReport(true);
-			}
+			logAutoConfigurationReport(true);
 		}
 	}
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java

@@ -248,14 +248,13 @@ public class SessionAutoConfiguration {
 		public void checkSessionRepository() {
 			StoreType storeType = this.sessionProperties.getStoreType();
 			if (storeType != StoreType.NONE
-					&& this.sessionRepositoryProvider.getIfAvailable() == null) {
-				if (storeType != null) {
-					throw new SessionRepositoryUnavailableException(
-							"No session repository could be auto-configured, check your "
-									+ "configuration (session store type is '"
-									+ storeType.name().toLowerCase(Locale.ENGLISH) + "')",
-							storeType);
-				}
+					&& this.sessionRepositoryProvider.getIfAvailable() == null
+					&& storeType != null) {
+				throw new SessionRepositoryUnavailableException(
+						"No session repository could be auto-configured, check your "
+								+ "configuration (session store type is '"
+								+ storeType.name().toLowerCase(Locale.ENGLISH) + "')",
+						storeType);
 			}
 		}
 

spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/install/Installer.java

@@ -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.
@@ -147,11 +147,9 @@ class Installer {
 		String home = SystemPropertyUtils
 				.resolvePlaceholders("${spring.home:${SPRING_HOME:.}}");
 		File extDirectory = new File(new File(home, "lib"), "ext");
-		if (!extDirectory.isDirectory()) {
-			if (!extDirectory.mkdirs()) {
-				throw new IllegalStateException(
-						"Failed to create ext directory " + extDirectory);
-			}
+		if (!extDirectory.isDirectory() && !extDirectory.mkdirs()) {
+			throw new IllegalStateException(
+					"Failed to create ext directory " + extDirectory);
 		}
 		return extDirectory;
 	}

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

@@ -179,11 +179,10 @@ public abstract class AstUtils {
 	private static ClosureExpression getClosure(String name,
 			MethodCallExpression expression) {
 		Expression method = expression.getMethod();
-		if (method instanceof ConstantExpression) {
-			if (name.equals(((ConstantExpression) method).getValue())) {
-				return (ClosureExpression) ((ArgumentListExpression) expression
-						.getArguments()).getExpression(0);
-			}
+		if (method instanceof ConstantExpression
+				&& name.equals(((ConstantExpression) method).getValue())) {
+			return (ClosureExpression) ((ArgumentListExpression) expression
+					.getArguments()).getExpression(0);
 		}
 		return null;
 	}

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

@@ -103,11 +103,10 @@ public abstract class ResourceUtils {
 		List<String> result = new ArrayList<>();
 		for (Resource resource : resources) {
 			if (resource.exists()) {
-				if (resource.getURI().getScheme().equals("file")) {
-					if (resource.getFile().isDirectory()) {
-						result.addAll(getChildFiles(resource));
-						continue;
-					}
+				if (resource.getURI().getScheme().equals("file")
+						&& resource.getFile().isDirectory()) {
+					result.addAll(getChildFiles(resource));
+					continue;
 				}
 				result.add(absolutePath(resource));
 			}

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/Tree.java

@@ -63,15 +63,13 @@ class Tree extends ReflectionWrapper {
 		@SuppressWarnings("rawtypes")
 		public Object invoke(Object proxy, Method method, Object[] args)
 				throws Throwable {
-			if (method.getName().equals("visitClass")) {
-				if ((Integer) args[1] == 0) {
-					Iterable members = (Iterable) Tree.this.getClassTreeMembers
-							.invoke(args[0]);
-					for (Object member : members) {
-						if (member != null) {
-							Tree.this.acceptMethod.invoke(member, proxy,
-									((Integer) args[1]) + 1);
-						}
+			if (method.getName().equals("visitClass") && (Integer) args[1] == 0) {
+				Iterable members = (Iterable) Tree.this.getClassTreeMembers
+						.invoke(args[0]);
+				for (Object member : members) {
+					if (member != null) {
+						Tree.this.acceptMethod.invoke(member, proxy,
+								((Integer) args[1]) + 1);
 					}
 				}
 			}

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarURLConnection.java

@@ -266,11 +266,10 @@ final class JarURLConnection extends java.net.JarURLConnection {
 			index = separator + SEPARATOR.length();
 		}
 		JarEntryName jarEntryName = JarEntryName.get(spec, index);
-		if (Boolean.TRUE.equals(useFastExceptions.get())) {
-			if (!jarEntryName.isEmpty()
-					&& !jarFile.containsEntry(jarEntryName.toString())) {
-				return NOT_FOUND_CONNECTION;
-			}
+		if (Boolean.TRUE.equals(useFastExceptions.get())
+				&& !jarEntryName.isEmpty()
+				&& !jarFile.containsEntry(jarEntryName.toString())) {
+			return NOT_FOUND_CONNECTION;
 		}
 		return new JarURLConnection(url, jarFile, jarEntryName);
 	}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java

@@ -147,13 +147,12 @@ class BeanDefinitionLoader {
 	}
 
 	private int load(Class<?> source) {
-		if (isGroovyPresent()) {
+		if (isGroovyPresent()
+				&& GroovyBeanDefinitionSource.class.isAssignableFrom(source)) {
 			// Any GroovyLoaders added in beans{} DSL can contribute beans here
-			if (GroovyBeanDefinitionSource.class.isAssignableFrom(source)) {
-				GroovyBeanDefinitionSource loader = BeanUtils.instantiateClass(source,
-						GroovyBeanDefinitionSource.class);
-				load(loader);
-			}
+			GroovyBeanDefinitionSource loader = BeanUtils.instantiateClass(source,
+					GroovyBeanDefinitionSource.class);
+			load(loader);
 		}
 		if (isComponent(source)) {
 			this.annotatedReader.register(source);

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/ParentContextCloserApplicationListener.java

@@ -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.
@@ -60,12 +60,11 @@ public class ParentContextCloserApplicationListener
 	}
 
 	private void maybeInstallListenerInParent(ConfigurableApplicationContext child) {
-		if (child == this.context) {
-			if (child.getParent() instanceof ConfigurableApplicationContext) {
-				ConfigurableApplicationContext parent = (ConfigurableApplicationContext) child
-						.getParent();
-				parent.addApplicationListener(createContextCloserListener(child));
-			}
+		if (child == this.context
+				&& child.getParent() instanceof ConfigurableApplicationContext) {
+			ConfigurableApplicationContext parent = (ConfigurableApplicationContext) child
+					.getParent();
+			parent.addApplicationListener(createContextCloserListener(child));
 		}
 	}
 

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

@@ -136,19 +136,18 @@ public class ApplicationPidFileWriter
 
 	@Override
 	public void onApplicationEvent(SpringApplicationEvent event) {
-		if (this.triggerEventType.isInstance(event)) {
-			if (created.compareAndSet(false, true)) {
-				try {
-					writePidFile(event);
-				}
-				catch (Exception ex) {
-					String message = String.format("Cannot create pid file %s",
-							this.file);
-					if (failOnWriteError(event)) {
-						throw new IllegalStateException(message, ex);
-					}
-					logger.warn(message, ex);
+		if (this.triggerEventType.isInstance(event)
+				&& created.compareAndSet(false, true)) {
+			try {
+				writePidFile(event);
+			}
+			catch (Exception ex) {
+				String message = String.format("Cannot create pid file %s",
+						this.file);
+				if (failOnWriteError(event)) {
+					throw new IllegalStateException(message, ex);
 				}
+				logger.warn(message, ex);
 			}
 		}
 	}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/SpringBootConfigurationFactory.java

@@ -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.
@@ -51,10 +51,9 @@ public class SpringBootConfigurationFactory extends ConfigurationFactory {
 	@Override
 	public Configuration getConfiguration(LoggerContext loggerContext,
 			ConfigurationSource source) {
-		if (source != null && source != ConfigurationSource.NULL_SOURCE) {
-			if (LoggingSystem.get(loggerContext.getClass().getClassLoader()) != null) {
-				return new DefaultConfiguration();
-			}
+		if (source != null && source != ConfigurationSource.NULL_SOURCE
+				&& LoggingSystem.get(loggerContext.getClass().getClassLoader()) != null) {
+			return new DefaultConfiguration();
 		}
 		return null;
 	}