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

Merge pull request #11783 from rajadilipkolli:patch-2

Browse Source 
* pr/11783:
  Polish contribution
  Polish
This commit is contained in:
Stephane Nicoll
2018-01-26 10:04:29 +01:00
parent fe7d7e2fc9 3f1aaa1f7e
commit 777cbe3c54
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/ldap/DataLdapTestIntegrationTests.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");
* you may not use this file except in compliance with the License.
@@ -62,7 +62,7 @@ public class DataLdapTestIntegrationTests {
public void testRepository() {
LdapQuery ldapQuery = LdapQueryBuilder.query().where("cn").is("Bob Smith");
Optional<ExampleEntry> entry = this.exampleRepository.findOne(ldapQuery);
assertThat(entry.isPresent());
assertThat(entry.isPresent()).isTrue();
assertThat(entry.get().getDn()).isEqualTo(LdapUtils
.newLdapName("cn=Bob Smith,ou=company1,c=Sweden,dc=spring,dc=org"));
assertThat(this.ldapTemplate.findOne(ldapQuery, ExampleEntry.class).getDn())

15
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/StaticResourceJars.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");
* you may not use this file except in compliance with the License.
@@ -79,19 +79,16 @@ class StaticResourceJars {
}
private void addUrlFile(List<URL> urls, URL url, File file) {
if (file.isDirectory() && new File(file, "META-INF/resources").isDirectory()) {
urls.add(url);
}
else if (isResourcesJar(file)) {
if ((file.isDirectory() && new File(file, "META-INF/resources").isDirectory())
|| isResourcesJar(file)) {
urls.add(url);
}
}
private void addUrlConnection(List<URL> urls, URL url, URLConnection connection) {
if (connection instanceof JarURLConnection) {
if (isResourcesJar((JarURLConnection) connection)) {
urls.add(url);
}
if (connection instanceof JarURLConnection
&& isResourcesJar((JarURLConnection) connection)) {
urls.add(url);
}
}

9
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/InvalidConfigurationPropertyValueFailureAnalyzerTests.java
View File

@@ -58,6 +58,8 @@ public class InvalidConfigurationPropertyValueFailureAnalyzerTests {
"test.property", "invalid", "This is not valid.");
FailureAnalysis analysis = performAnalysis(failure);
assertCommonParts(failure, analysis);
assertThat(analysis.getAction())
.contains("Review the value of the property with the provided reason.");
assertThat(analysis.getDescription())
.contains("Validation failed for the following reason")
.contains("This is not valid.")
@@ -73,7 +75,8 @@ public class InvalidConfigurationPropertyValueFailureAnalyzerTests {
InvalidConfigurationPropertyValueException failure = new InvalidConfigurationPropertyValueException(
"test.property", "invalid", null);
FailureAnalysis analysis = performAnalysis(failure);
assertCommonParts(failure, analysis);
assertThat(analysis.getAction())
.contains("Review the value of the property.");
assertThat(analysis.getDescription()).contains("No reason was provided.")
.doesNotContain("Additionally, this property is also set");
}
@@ -95,6 +98,8 @@ public class InvalidConfigurationPropertyValueFailureAnalyzerTests {
"test.property", "invalid", "This is not valid.");
FailureAnalysis analysis = performAnalysis(failure);
assertCommonParts(failure, analysis);
assertThat(analysis.getAction())
.contains("Review the value of the property with the provided reason.");
assertThat(analysis.getDescription())
.contains("Additionally, this property is also set in the following "
+ "property sources:")
@@ -113,8 +118,6 @@ public class InvalidConfigurationPropertyValueFailureAnalyzerTests {
FailureAnalysis analysis) {
assertThat(analysis.getDescription()).contains("test.property")
.contains("invalid").contains("TestOrigin test.property");
assertThat(analysis.getAction()
.contains("Review the value of the property with the provided reason."));
assertThat(analysis.getCause()).isSameAs(failure);
}