Browse Source

Align abstract method signatures with original Commons Logging API

Closes gh-31166
pull/31496/head
Juergen Hoeller 2 years ago
parent
commit
268043e9c9
  1. 40
      spring-jcl/src/main/java/org/apache/commons/logging/LogFactory.java
  2. 4
      spring-jcl/src/main/java/org/apache/commons/logging/LogFactoryService.java

40
spring-jcl/src/main/java/org/apache/commons/logging/LogFactory.java

@ -77,7 +77,25 @@ public abstract class LogFactory {
*/ */
@Deprecated @Deprecated
public static LogFactory getFactory() { public static LogFactory getFactory() {
return new LogFactory() {}; return new LogFactory() {
@Override
public Object getAttribute(String name) {
return null;
}
@Override
public String[] getAttributeNames() {
return new String[0];
}
@Override
public void removeAttribute(String name) {
}
@Override
public void setAttribute(String name, Object value) {
}
@Override
public void release() {
}
};
} }
/** /**
@ -106,29 +124,19 @@ public abstract class LogFactory {
// Just in case some code happens to call uncommon Commons Logging methods... // Just in case some code happens to call uncommon Commons Logging methods...
@Deprecated @Deprecated
public Object getAttribute(String name) { public abstract Object getAttribute(String name);
return null;
}
@Deprecated @Deprecated
public String[] getAttributeNames() { public abstract String[] getAttributeNames();
return new String[0];
}
@Deprecated @Deprecated
public void removeAttribute(String name) { public abstract void removeAttribute(String name);
// do nothing
}
@Deprecated @Deprecated
public void setAttribute(String name, Object value) { public abstract void setAttribute(String name, Object value);
// do nothing
}
@Deprecated @Deprecated
public void release() { public abstract void release();
// do nothing
}
@Deprecated @Deprecated
public static void release(ClassLoader classLoader) { public static void release(ClassLoader classLoader) {

4
spring-jcl/src/main/java/org/apache/commons/logging/LogFactoryService.java

@ -80,4 +80,8 @@ public class LogFactoryService extends LogFactory {
return this.attributes.keySet().toArray(new String[0]); return this.attributes.keySet().toArray(new String[0]);
} }
@Override
public void release() {
}
} }

Loading…
Cancel
Save