Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12236 from igor-suhorukov:master

Browse Source 
* pr/12236:
  Polish contribution
  Polish
This commit is contained in:
Stephane Nicoll
2018-02-28 09:02:16 +01:00
parent a93052f380 4180762d6d
commit 0bbdcfde30
13 changed files with 67 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

9
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListener.java
View 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -74,11 +74,10 @@ public class ConditionEvaluationReportLoggingListener
logAutoConfigurationReport(); logAutoConfigurationReport();
} }
} }
else if (event instanceof ApplicationFailedEvent) { else if (event instanceof ApplicationFailedEvent
if (((ApplicationFailedEvent) event) && ((ApplicationFailedEvent) event)
.getApplicationContext() == initializerApplicationContext) { .getApplicationContext() == initializerApplicationContext) {
logAutoConfigurationReport(true); logAutoConfigurationReport(true);
}
} }
} }

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

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

10
spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/install/Installer.java
View 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -147,11 +147,9 @@ class Installer {
String home = SystemPropertyUtils String home = SystemPropertyUtils
.resolvePlaceholders("${spring.home:${SPRING_HOME:.}}"); .resolvePlaceholders("${spring.home:${SPRING_HOME:.}}");
File extDirectory = new File(new File(home, "lib"), "ext"); File extDirectory = new File(new File(home, "lib"), "ext");
if (!extDirectory.isDirectory()) { if (!extDirectory.isDirectory() && !extDirectory.mkdirs()) {
if (!extDirectory.mkdirs()) { throw new IllegalStateException(
throw new IllegalStateException( "Failed to create ext directory " + extDirectory);
"Failed to create ext directory " + extDirectory);
}
} }
return extDirectory; return extDirectory;
} }

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

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

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

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

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

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

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

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

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

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

13
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/ParentContextCloserApplicationListener.java
View 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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) { private void maybeInstallListenerInParent(ConfigurableApplicationContext child) {
if (child == this.context) { if (child == this.context
if (child.getParent() instanceof ConfigurableApplicationContext) { && child.getParent() instanceof ConfigurableApplicationContext) {
ConfigurableApplicationContext parent = (ConfigurableApplicationContext) child ConfigurableApplicationContext parent = (ConfigurableApplicationContext) child
.getParent(); .getParent();
parent.addApplicationListener(createContextCloserListener(child)); parent.addApplicationListener(createContextCloserListener(child));
}
} }
} }

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

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

9
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/SpringBootConfigurationFactory.java
View 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -51,10 +51,9 @@ public class SpringBootConfigurationFactory extends ConfigurationFactory {
@Override @Override
public Configuration getConfiguration(LoggerContext loggerContext, public Configuration getConfiguration(LoggerContext loggerContext,
ConfigurationSource source) { ConfigurationSource source) {
if (source != null && source != ConfigurationSource.NULL_SOURCE) { if (source != null && source != ConfigurationSource.NULL_SOURCE
if (LoggingSystem.get(loggerContext.getClass().getClassLoader()) != null) { && LoggingSystem.get(loggerContext.getClass().getClassLoader()) != null) {
return new DefaultConfiguration(); return new DefaultConfiguration();
}
} }
return null; return null;
} }