Skip to content

Commit c795c1b

Browse files
committed
Polishing
1 parent 70b0b97 commit c795c1b

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

spring-core/src/main/java/org/springframework/core/SpringFactoriesLoader.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
* from a given file location. If a location is not given, the {@linkplain
4242
* #DEFAULT_FACTORIES_LOCATION default location} is used.
4343
*
44-
* <p>The file should be in {@link Properties} format, where the keys is the fully
44+
* <p>The file should be in {@link Properties} format, where the key is the fully
4545
* qualified interface or abstract class name, and the value is a comma separated list of
4646
* implementations. For instance:
4747
* <pre class="code">
@@ -119,15 +119,15 @@ public static <T> List<T> loadFactories(Class<T> factoryClass,
119119
return result;
120120
}
121121

122-
private static List<String> loadFactoryNames(Class factoryClass,
122+
private static List<String> loadFactoryNames(Class<?> factoryClass,
123123
ClassLoader classLoader,
124124
String factoriesLocation) {
125125

126126
String factoryClassName = factoryClass.getName();
127127

128128
try {
129129
List<String> result = new ArrayList<String>();
130-
Enumeration urls = classLoader.getResources(factoriesLocation);
130+
Enumeration<URL> urls = classLoader.getResources(factoriesLocation);
131131
while (urls.hasMoreElements()) {
132132
URL url = (URL) urls.nextElement();
133133
Properties properties =

spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,8 @@ public boolean isWrapperFor(Class<?> iface) throws SQLException {
204204
return this.dataSource.isWrapperFor(iface);
205205
}
206206

207+
// getParentLogger() is required for JDBC 4.1 compatibility
208+
@SuppressWarnings("unused")
207209
public Logger getParentLogger() {
208210
return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
209211
}

0 commit comments

Comments
 (0)