Skip to content

Commit f9766bb

Browse files
committed
Removed unused FastDateParser (LOG4J2-3672, #1848)
1 parent 72c7d73 commit f9766bb

File tree

8 files changed

+30
-1910
lines changed

8 files changed

+30
-1910
lines changed

log4j-core-test/src/test/java/org/apache/logging/log4j/core/util/datetime/FastDateParserTest.java

Lines changed: 0 additions & 724 deletions
This file was deleted.

log4j-core/pom.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,21 @@
296296
</executions>
297297
</plugin>
298298

299+
<!-- Remove this override after `2.22.0` release!
300+
In `2.22.0`, we have removed *unused* `FastDateParser` due to LOG4J2-3672 and #1848.
301+
Though `bnd-baseline-m-p` doesn't allow such breaking changes in non-major version upgrades.
302+
Hence, we suppress it until `2.22.0` gets released. -->
303+
<plugin>
304+
<groupId>biz.aQute.bnd</groupId>
305+
<artifactId>bnd-baseline-maven-plugin</artifactId>
306+
<configuration>
307+
<diffpackages>
308+
<diffpackage>!org.apache.logging.log4j.core.util.datetime</diffpackage>
309+
<diffpackage>*</diffpackage>
310+
</diffpackages>
311+
</configuration>
312+
</plugin>
313+
299314
</plugins>
300315
</build>
301316
</project>

log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/DateParser.java

Lines changed: 0 additions & 131 deletions
This file was deleted.

log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDateFormat.java

Lines changed: 2 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
import java.text.DateFormat;
2020
import java.text.FieldPosition;
21-
import java.text.ParseException;
22-
import java.text.ParsePosition;
2321
import java.util.Calendar;
2422
import java.util.Date;
2523
import java.util.Locale;
@@ -72,15 +70,7 @@
7270
*
7371
* @since Apache Commons Lang 2.0
7472
*/
75-
public class FastDateFormat extends Format implements DateParser, DatePrinter {
76-
77-
/**
78-
* Required for serialization support.
79-
*
80-
* @see java.io.Serializable
81-
*/
82-
@SuppressWarnings("unused")
83-
private static final long serialVersionUID = 2L;
73+
public class FastDateFormat extends Format implements DatePrinter {
8474

8575
/**
8676
* FULL locale dependent date or time style.
@@ -110,7 +100,6 @@ protected FastDateFormat createInstance(final String pattern, final TimeZone tim
110100
};
111101

112102
private final FastDatePrinter printer;
113-
private final FastDateParser parser;
114103

115104
//-----------------------------------------------------------------------
116105
/**
@@ -399,7 +388,6 @@ protected FastDateFormat(final String pattern, final TimeZone timeZone, final Lo
399388
*/
400389
protected FastDateFormat(final String pattern, final TimeZone timeZone, final Locale locale, final Date centuryStart) {
401390
printer= new FastDatePrinter(pattern, timeZone, locale);
402-
parser= new FastDateParser(pattern, timeZone, locale, centuryStart);
403391
}
404392

405393
// Format methods
@@ -495,43 +483,6 @@ public <B extends Appendable> B format(final Calendar calendar, final B buf) {
495483
return printer.format(calendar, buf);
496484
}
497485

498-
// Parsing
499-
//-----------------------------------------------------------------------
500-
501-
502-
/* (non-Javadoc)
503-
* @see DateParser#parse(java.lang.String)
504-
*/
505-
@Override
506-
public Date parse(final String source) throws ParseException {
507-
return parser.parse(source);
508-
}
509-
510-
/* (non-Javadoc)
511-
* @see DateParser#parse(java.lang.String, java.text.ParsePosition)
512-
*/
513-
@Override
514-
public Date parse(final String source, final ParsePosition pos) {
515-
return parser.parse(source, pos);
516-
}
517-
518-
/*
519-
* (non-Javadoc)
520-
* @see org.apache.commons.lang3.time.DateParser#parse(java.lang.String, java.text.ParsePosition, java.util.Calendar)
521-
*/
522-
@Override
523-
public boolean parse(final String source, final ParsePosition pos, final Calendar calendar) {
524-
return parser.parse(source, pos, calendar);
525-
}
526-
527-
/* (non-Javadoc)
528-
* @see java.text.Format#parseObject(java.lang.String, java.text.ParsePosition)
529-
*/
530-
@Override
531-
public Object parseObject(final String source, final ParsePosition pos) {
532-
return parser.parseObject(source, pos);
533-
}
534-
535486
// Accessors
536487
//-----------------------------------------------------------------------
537488
/**
@@ -589,7 +540,7 @@ public int getMaxLengthEstimate() {
589540
*/
590541
@Override
591542
public boolean equals(final Object obj) {
592-
if (obj instanceof FastDateFormat == false) {
543+
if (!(obj instanceof FastDateFormat)) {
593544
return false;
594545
}
595546
final FastDateFormat other = (FastDateFormat) obj;

0 commit comments

Comments
 (0)