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

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2017-02-16 16:24:13 +01:00
parent 8d707eb530
commit 0da8dee289
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java
View File

@@ -53,7 +53,7 @@ public class PropertyComparatorTests {
} }
@Test @Test
public void testCompoundComparator() { public void testChainedComparators() {
Comparator<Dog> c = new PropertyComparator<>("lastName", false, true); Comparator<Dog> c = new PropertyComparator<>("lastName", false, true);
Dog dog1 = new Dog(); Dog dog1 = new Dog();
@@ -74,9 +74,10 @@ public class PropertyComparatorTests {
} }
@Test @Test
public void testCompoundComparatorInvert() { public void testChainedComparatorsReversed() {
Comparator<Dog> c = (new PropertyComparator<Dog>("lastName", false, true)). Comparator<Dog> c = (new PropertyComparator<Dog>("lastName", false, true)).
thenComparing(new PropertyComparator<>("firstName", false, true)); thenComparing(new PropertyComparator<>("firstName", false, true));
Dog dog1 = new Dog(); Dog dog1 = new Dog();
dog1.setFirstName("macy"); dog1.setFirstName("macy");
dog1.setLastName("grayspots"); dog1.setLastName("grayspots");
@@ -91,7 +92,6 @@ public class PropertyComparatorTests {
} }
@SuppressWarnings("unused")
private static class Dog implements Comparable<Object> { private static class Dog implements Comparable<Object> {
private String nickName; private String nickName;

4
spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java
View File

@@ -117,7 +117,9 @@ public class OracleTableMetaDataProvider extends GenericTableMetaDataProvider {
con = (Connection) con.unwrap(oracleConClass); con = (Connection) con.unwrap(oracleConClass);
} }
catch (ClassNotFoundException | SQLException ex) { catch (ClassNotFoundException | SQLException ex) {
logger.warn("Unable to include synonyms in table metadata lookup - no Oracle Connection: " + ex); if (logger.isWarnEnabled()) {
logger.warn("Unable to include synonyms in table metadata lookup - no Oracle Connection: " + ex);
}
super.initializeWithTableColumnMetaData(databaseMetaData, catalogName, schemaName, tableName); super.initializeWithTableColumnMetaData(databaseMetaData, catalogName, schemaName, tableName);
return; return;
} }