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

Polish

Browse Source 
See gh-11783
This commit is contained in:
Raja Kolli
2018-01-26 01:30:43 +05:30
committed by Stephane Nicoll
parent fe7d7e2fc9
commit 64c324612e
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/ldap/DataLdapTestIntegrationTests.java
View File

@@ -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())

13
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/StaticResourceJars.java
View File

@@ -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);
}
}

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

@@ -113,8 +113,8 @@ 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.getAction())
.contains("Review the value of the property with the provided reason.");
assertThat(analysis.getCause()).isSameAs(failure);
}