Skip to content

Commit ad415e7

Browse files
jonasrutishauserjonasrutishauser
committed
Address review suggestions
1 parent bf81bb3 commit ad415e7

File tree

4 files changed

+140
-18
lines changed

4 files changed

+140
-18
lines changed

‎log4j-1.2-api/src/main/java/org/apache/log4j/Level.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@ protected Level(
115115
final String levelStr,
116116
final int syslogEquivalent,
117117
final org.apache.logging.log4j.Level version2Equivalent) {
118-
super(level, levelStr, syslogEquivalent);
119-
this.version2Level = version2Equivalent != null ? version2Equivalent : OptionConverter.createLevel(this);
118+
super(level, levelStr, syslogEquivalent, version2Equivalent);
120119
}
121120

122121
/**
@@ -222,6 +221,7 @@ private void readObject(final ObjectInputStream s) throws IOException, ClassNotF
222221
if (levelStr == null) {
223222
levelStr = Strings.EMPTY;
224223
}
224+
version2Level = OptionConverter.createLevel(this);
225225
}
226226

227227
/**

‎log4j-1.2-api/src/main/java/org/apache/log4j/Priority.java‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
*/
1717
package org.apache.log4j;
1818

19+
import org.apache.log4j.helpers.OptionConverter;
20+
1921
/**
2022
* <em style="color:#A44">Refrain from using this class directly, use
2123
* the {@link Level} class instead.</em>
@@ -64,31 +66,31 @@ public class Priority {
6466
* @deprecated Use {@link Level#FATAL} instead.
6567
*/
6668
@Deprecated
67-
public static final Priority FATAL = new Level(FATAL_INT, "FATAL", 0, org.apache.logging.log4j.Level.FATAL);
69+
public static final Priority FATAL = new Priority(FATAL_INT, "FATAL", 0, org.apache.logging.log4j.Level.FATAL);
6870

6971
/**
7072
* @deprecated Use {@link Level#ERROR} instead.
7173
*/
7274
@Deprecated
73-
public static final Priority ERROR = new Level(ERROR_INT, "ERROR", 3, org.apache.logging.log4j.Level.ERROR);
75+
public static final Priority ERROR = new Priority(ERROR_INT, "ERROR", 3, org.apache.logging.log4j.Level.ERROR);
7476

7577
/**
7678
* @deprecated Use {@link Level#WARN} instead.
7779
*/
7880
@Deprecated
79-
public static final Priority WARN = new Level(WARN_INT, "WARN", 4, org.apache.logging.log4j.Level.WARN);
81+
public static final Priority WARN = new Priority(WARN_INT, "WARN", 4, org.apache.logging.log4j.Level.WARN);
8082

8183
/**
8284
* @deprecated Use {@link Level#INFO} instead.
8385
*/
8486
@Deprecated
85-
public static final Priority INFO = new Level(INFO_INT, "INFO", 6, org.apache.logging.log4j.Level.INFO);
87+
public static final Priority INFO = new Priority(INFO_INT, "INFO", 6, org.apache.logging.log4j.Level.INFO);
8688

8789
/**
8890
* @deprecated Use {@link Level#DEBUG} instead.
8991
*/
9092
@Deprecated
91-
public static final Priority DEBUG = new Level(DEBUG_INT, "DEBUG", 7, org.apache.logging.log4j.Level.DEBUG);
93+
public static final Priority DEBUG = new Priority(DEBUG_INT, "DEBUG", 7, org.apache.logging.log4j.Level.DEBUG);
9294

9395
/*
9496
* These variables should be private but were not in Log4j 1.2 so are left the same way here.
@@ -102,9 +104,7 @@ public class Priority {
102104
* Default constructor for deserialization.
103105
*/
104106
protected Priority() {
105-
level = DEBUG_INT;
106-
levelStr = "DEBUG";
107-
syslogEquivalent = 7;
107+
this(DEBUG_INT, "DEBUG", 7, org.apache.logging.log4j.Level.DEBUG);
108108
}
109109

110110
/**
@@ -114,9 +114,18 @@ protected Priority() {
114114
* @param syslogEquivalent The equivalent syslog value.
115115
*/
116116
protected Priority(final int level, final String levelStr, final int syslogEquivalent) {
117+
this(level, levelStr, syslogEquivalent, null);
118+
}
119+
120+
Priority(
121+
final int level,
122+
final String levelStr,
123+
final int syslogEquivalent,
124+
final org.apache.logging.log4j.Level version2Equivalent) {
117125
this.level = level;
118126
this.levelStr = levelStr;
119127
this.syslogEquivalent = syslogEquivalent;
128+
this.version2Level = version2Equivalent != null ? version2Equivalent : OptionConverter.createLevel(this);
120129
}
121130

122131
/**
@@ -229,7 +238,8 @@ public static Priority toPriority(final int val) {
229238
*/
230239
@Deprecated
231240
public static Priority toPriority(final int val, final Priority defaultPriority) {
232-
return Level.toLevel(val, (Level) defaultPriority);
241+
Level result = Level.toLevel(val, null);
242+
return result == null ? defaultPriority : result;
233243
}
234244

235245
/**
@@ -240,6 +250,7 @@ public static Priority toPriority(final int val, final Priority defaultPriority)
240250
*/
241251
@Deprecated
242252
public static Priority toPriority(final String sArg, final Priority defaultPriority) {
243-
return Level.toLevel(sArg, (Level) defaultPriority);
253+
Level result = Level.toLevel(sArg, null);
254+
return result == null ? defaultPriority : result;
244255
}
245256
}

‎log4j-1.2-api/src/test/java/org/apache/log4j/LevelTest.java‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static org.junit.Assert.assertTrue;
2121

2222
import java.util.Locale;
23+
import org.apache.log4j.helpers.OptionConverter;
2324
import org.apache.log4j.util.SerializationTestHelper;
2425
import org.junit.Test;
2526

@@ -77,6 +78,7 @@ public void testCustomLevelSerialization() throws Exception {
7778
assertEquals(Level.INFO.level, clone.level);
7879
assertEquals(Level.INFO.levelStr, clone.levelStr);
7980
assertEquals(Level.INFO.syslogEquivalent, clone.syslogEquivalent);
81+
assertEquals(OptionConverter.createLevel(custom), clone.version2Level);
8082
}
8183

8284
/**
@@ -205,6 +207,70 @@ public void testALL() {
205207
assertTrue(Level.ALL instanceof Level);
206208
}
207209

210+
/**
211+
* Tests Level.OFF version2Level.
212+
*/
213+
@Test
214+
public void testOffVersion2Level() {
215+
assertEquals(org.apache.logging.log4j.Level.OFF, Level.OFF.getVersion2Level());
216+
}
217+
218+
/**
219+
* Tests Level.FATAL version2Level.
220+
*/
221+
@Test
222+
public void testFatalVersion2Level() {
223+
assertEquals(org.apache.logging.log4j.Level.FATAL, Level.FATAL.getVersion2Level());
224+
}
225+
226+
/**
227+
* Tests Level.ERROR version2Level.
228+
*/
229+
@Test
230+
public void testErrorVersion2Level() {
231+
assertEquals(org.apache.logging.log4j.Level.ERROR, Level.ERROR.getVersion2Level());
232+
}
233+
234+
/**
235+
* Tests Level.WARN version2Level.
236+
*/
237+
@Test
238+
public void testWarnVersion2Level() {
239+
assertEquals(org.apache.logging.log4j.Level.WARN, Level.WARN.getVersion2Level());
240+
}
241+
242+
/**
243+
* Tests Level.INFO version2Level.
244+
*/
245+
@Test
246+
public void testInfoVersion2Level() {
247+
assertEquals(org.apache.logging.log4j.Level.INFO, Level.INFO.getVersion2Level());
248+
}
249+
250+
/**
251+
* Tests Level.DEBUG version2Level.
252+
*/
253+
@Test
254+
public void testDebugVersion2Level() {
255+
assertEquals(org.apache.logging.log4j.Level.DEBUG, Level.DEBUG.getVersion2Level());
256+
}
257+
258+
/**
259+
* Tests Level.TRACE version2Level.
260+
*/
261+
@Test
262+
public void testTraceVersion2Level() {
263+
assertEquals(org.apache.logging.log4j.Level.TRACE, Level.TRACE.getVersion2Level());
264+
}
265+
266+
/**
267+
* Tests Level.ALL version2Level.
268+
*/
269+
@Test
270+
public void testAllVersion2Level() {
271+
assertEquals(org.apache.logging.log4j.Level.ALL, Level.ALL.getVersion2Level());
272+
}
273+
208274
/**
209275
* Tests Level.toLevel(Level.All_INT).
210276
*/

‎log4j-1.2-api/src/test/java/org/apache/log4j/PriorityTest.java‎

Lines changed: 51 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,58 @@ public void testAllInt() {
8585
assertEquals(Integer.MIN_VALUE, Priority.ALL_INT);
8686
}
8787

88+
/**
89+
* Tests Priority.FATAL version2Level.
90+
*/
91+
@Test
92+
@SuppressWarnings("deprecation")
93+
public void testFatalVersion2Level() {
94+
assertEquals(org.apache.logging.log4j.Level.FATAL, Priority.FATAL.getVersion2Level());
95+
}
96+
97+
/**
98+
* Tests Priority.ERROR version2Level.
99+
*/
100+
@Test
101+
@SuppressWarnings("deprecation")
102+
public void testErrorVersion2Level() {
103+
assertEquals(org.apache.logging.log4j.Level.ERROR, Priority.ERROR.getVersion2Level());
104+
}
105+
106+
/**
107+
* Tests Priority.WARN version2Level.
108+
*/
109+
@Test
110+
@SuppressWarnings("deprecation")
111+
public void testWarnVersion2Level() {
112+
assertEquals(org.apache.logging.log4j.Level.WARN, Priority.WARN.getVersion2Level());
113+
}
114+
115+
/**
116+
* Tests Priority.INFO version2Level.
117+
*/
118+
@Test
119+
@SuppressWarnings("deprecation")
120+
public void testInfoVersion2Level() {
121+
assertEquals(org.apache.logging.log4j.Level.INFO, Priority.INFO.getVersion2Level());
122+
}
123+
124+
/**
125+
* Tests Priority.DEBUG version2Level.
126+
*/
127+
@Test
128+
@SuppressWarnings("deprecation")
129+
public void testDebugVersion2Level() {
130+
assertEquals(org.apache.logging.log4j.Level.DEBUG, Priority.DEBUG.getVersion2Level());
131+
}
132+
88133
/**
89134
* Tests Priority.FATAL.
90135
*/
91136
@Test
92137
@SuppressWarnings("deprecation")
93-
public void testFatal() {
94-
assertTrue(Priority.FATAL instanceof Level);
138+
public void testFATAL() {
139+
assertFalse(Priority.FATAL instanceof Level);
95140
}
96141

97142
/**
@@ -100,7 +145,7 @@ public void testFatal() {
100145
@Test
101146
@SuppressWarnings("deprecation")
102147
public void testERROR() {
103-
assertTrue(Priority.ERROR instanceof Level);
148+
assertFalse(Priority.ERROR instanceof Level);
104149
}
105150

106151
/**
@@ -109,7 +154,7 @@ public void testERROR() {
109154
@Test
110155
@SuppressWarnings("deprecation")
111156
public void testWARN() {
112-
assertTrue(Priority.WARN instanceof Level);
157+
assertFalse(Priority.WARN instanceof Level);
113158
}
114159

115160
/**
@@ -118,7 +163,7 @@ public void testWARN() {
118163
@Test
119164
@SuppressWarnings("deprecation")
120165
public void testINFO() {
121-
assertTrue(Priority.INFO instanceof Level);
166+
assertFalse(Priority.INFO instanceof Level);
122167
}
123168

124169
/**
@@ -127,7 +172,7 @@ public void testINFO() {
127172
@Test
128173
@SuppressWarnings("deprecation")
129174
public void testDEBUG() {
130-
assertTrue(Priority.DEBUG instanceof Level);
175+
assertFalse(Priority.DEBUG instanceof Level);
131176
}
132177

133178
/**

0 commit comments

Comments
 (0)