Merge pull request #12236 from igor-suhorukov:master

* pr/12236:
  Polish contribution
  Polish
pull/12269/merge
Stephane Nicoll 7 years ago
commit 0bbdcfde30

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

@ -218,14 +218,13 @@ 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.noMatch(message.because("No base-dn property found"));
}

@ -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,13 +74,12 @@ public class ConditionEvaluationReportLoggingListener
logAutoConfigurationReport();
}
}
else if (event instanceof ApplicationFailedEvent) {
if (((ApplicationFailedEvent) event)
else if (event instanceof ApplicationFailedEvent
&& ((ApplicationFailedEvent) event)
.getApplicationContext() == initializerApplicationContext) {
logAutoConfigurationReport(true);
}
}
}
private void logAutoConfigurationReport() {
logAutoConfigurationReport(!this.applicationContext.isActive());

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

@ -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,12 +147,10 @@ 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()) {
if (!extDirectory.isDirectory() && !extDirectory.mkdirs()) {
throw new IllegalStateException(
"Failed to create ext directory " + extDirectory);
}
}
return extDirectory;
}

@ -179,12 +179,11 @@ 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())) {
if (method instanceof ConstantExpression
&& name.equals(((ConstantExpression) method).getValue())) {
return (ClosureExpression) ((ArgumentListExpression) expression
.getArguments()).getExpression(0);
}
}
return null;
}

@ -103,12 +103,11 @@ 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()) {
if (resource.getURI().getScheme().equals("file")
&& resource.getFile().isDirectory()) {
result.addAll(getChildFiles(resource));
continue;
}
}
result.add(absolutePath(resource));
}
}

@ -63,8 +63,7 @@ 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) {
if (method.getName().equals("visitClass") && (Integer) args[1] == 0) {
Iterable members = (Iterable) Tree.this.getClassTreeMembers
.invoke(args[0]);
for (Object member : members) {
@ -74,7 +73,6 @@ class Tree extends ReflectionWrapper {
}
}
}
}
if (method.getName().equals("visitVariable")) {
this.treeVisitor.visitVariable(new VariableTree(args[0]));
}

@ -266,12 +266,11 @@ 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()
if (Boolean.TRUE.equals(useFastExceptions.get())
&& !jarEntryName.isEmpty()
&& !jarFile.containsEntry(jarEntryName.toString())) {
return NOT_FOUND_CONNECTION;
}
}
return new JarURLConnection(url, jarFile, jarEntryName);
}

@ -147,14 +147,13 @@ 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);
}
}
if (isComponent(source)) {
this.annotatedReader.register(source);
return 1;

@ -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,14 +60,13 @@ public class ParentContextCloserApplicationListener
}
private void maybeInstallListenerInParent(ConfigurableApplicationContext child) {
if (child == this.context) {
if (child.getParent() instanceof ConfigurableApplicationContext) {
if (child == this.context
&& child.getParent() instanceof ConfigurableApplicationContext) {
ConfigurableApplicationContext parent = (ConfigurableApplicationContext) child
.getParent();
parent.addApplicationListener(createContextCloserListener(child));
}
}
}
/**
* Subclasses may override to create their own subclass of ContextCloserListener. This

@ -136,8 +136,8 @@ public class ApplicationPidFileWriter
@Override
public void onApplicationEvent(SpringApplicationEvent event) {
if (this.triggerEventType.isInstance(event)) {
if (created.compareAndSet(false, true)) {
if (this.triggerEventType.isInstance(event)
&& created.compareAndSet(false, true)) {
try {
writePidFile(event);
}
@ -151,7 +151,6 @@ public class ApplicationPidFileWriter
}
}
}
}
private void writePidFile(SpringApplicationEvent event) throws IOException {
File pidFile = this.file;

@ -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,11 +51,10 @@ 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) {
if (source != null && source != ConfigurationSource.NULL_SOURCE
&& LoggingSystem.get(loggerContext.getClass().getClassLoader()) != null) {
return new DefaultConfiguration();
}
}
return null;
}

Loading…
Cancel
Save