Skip to content

Commit 0c3d8d7

Browse files
committed
Align abstract method signatures with original Commons Logging API
Closes gh-31166 (cherry picked from commit 268043e)
1 parent ddcae04 commit 0c3d8d7

File tree

2 files changed

+28
-16
lines changed

2 files changed

+28
-16
lines changed

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

+24-16
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,25 @@ public static Log getLog(String name) {
7777
*/
7878
@Deprecated
7979
public static LogFactory getFactory() {
80-
return new LogFactory() {};
80+
return new LogFactory() {
81+
@Override
82+
public Object getAttribute(String name) {
83+
return null;
84+
}
85+
@Override
86+
public String[] getAttributeNames() {
87+
return new String[0];
88+
}
89+
@Override
90+
public void removeAttribute(String name) {
91+
}
92+
@Override
93+
public void setAttribute(String name, Object value) {
94+
}
95+
@Override
96+
public void release() {
97+
}
98+
};
8199
}
82100

83101
/**
@@ -106,29 +124,19 @@ public Log getInstance(String name) {
106124
// Just in case some code happens to call uncommon Commons Logging methods...
107125

108126
@Deprecated
109-
public Object getAttribute(String name) {
110-
return null;
111-
}
127+
public abstract Object getAttribute(String name);
112128

113129
@Deprecated
114-
public String[] getAttributeNames() {
115-
return new String[0];
116-
}
130+
public abstract String[] getAttributeNames();
117131

118132
@Deprecated
119-
public void removeAttribute(String name) {
120-
// do nothing
121-
}
133+
public abstract void removeAttribute(String name);
122134

123135
@Deprecated
124-
public void setAttribute(String name, Object value) {
125-
// do nothing
126-
}
136+
public abstract void setAttribute(String name, Object value);
127137

128138
@Deprecated
129-
public void release() {
130-
// do nothing
131-
}
139+
public abstract void release();
132140

133141
@Deprecated
134142
public static void release(ClassLoader classLoader) {

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

+4
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,8 @@ public String[] getAttributeNames() {
7474
return this.attributes.keySet().toArray(new String[0]);
7575
}
7676

77+
@Override
78+
public void release() {
79+
}
80+
7781
}

0 commit comments

Comments
 (0)