You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2020/11/21 22:24:47 UTC
[logging-log4j2] branch release-2.x updated (5031944 -> 8a120d1)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from 5031944 Use Objects.equals().
new 604895f Init map when it is created.
new 4a7fcee Define and init local var in one go.
new 947921a No need to call super() explicitly.
new 6204c49 Use Arrays.fill().
new a73f5f1 Use String.join().
new 8b6868c Use diamonds.
new aa64699 null check not needed.
new 2e7695c return not needed.
new 42b5a37 Use blocks.
new 2052276 Use switch.
new 22d8450 Add all collection elements at once.
new 8a120d1 Use lambdas.
The 12 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/log4j/AppenderSkeleton.java | 2 -
.../log4j/config/PropertySetterException.java | 1 -
.../AbstractLog4j1ConfigurationConverterTest.java | 1 -
.../java/org/apache/logging/log4j/LogManager.java | 2 +-
.../log4j/message/DefaultFlowMessageFactory.java | 1 -
.../log4j/message/FormattedMessageFactory.java | 1 -
.../log4j/message/MessageFormatMessageFactory.java | 1 -
.../log4j/message/ParameterizedMessageFactory.java | 1 -
.../ParameterizedNoReferenceMessageFactory.java | 1 -
.../log4j/message/ReusableMessageFactory.java | 1 -
.../message/StringFormatterMessageFactory.java | 1 -
.../logging/log4j/message/StringMapMessage.java | 1 -
.../CopyOnWriteSortedArrayThreadContextMap.java | 2 +-
.../logging/log4j/spi/DefaultThreadContextMap.java | 6 +-
.../GarbageFreeSortedArrayThreadContextMap.java | 2 +-
.../log4j/util/FilteredObjectInputStream.java | 2 -
.../apache/logging/log4j/util/PropertiesUtil.java | 30 +++-----
.../logging/log4j/util/SortedArrayStringMap.java | 7 +-
.../apache/logging/log4j/AbstractLoggerTest.java | 7 +-
.../logging/log4j/AbstractSerializationTest.java | 1 -
.../java/org/apache/logging/log4j/LoggerTest.java | 24 +-----
.../java/org/apache/logging/log4j/TestLogger.java | 1 -
.../junit/LogManagerLoggerContextFactoryRule.java | 1 -
.../log4j/junit/SecurityManagerTestRule.java | 1 -
.../logging/log4j/junit/ThreadContextRule.java | 1 -
.../message/ReusableParameterizedMessageTest.java | 7 +-
.../util/SystemPropertiesPropertySourceTest.java | 3 +-
.../log4j/appserver/jetty/Log4j2Logger.java | 1 -
.../log4j/core/appender/AbstractAppender.java | 2 +-
.../core/appender/ConfigurationFactoryData.java | 1 -
.../appender/RollingRandomAccessFileAppender.java | 1 -
.../AbstractDriverManagerConnectionSource.java | 1 -
.../core/appender/db/jdbc/JdbcDatabaseManager.java | 1 -
.../rewrite/LoggerNameLevelRewritePolicy.java | 1 -
.../core/appender/rolling/action/Duration.java | 1 -
.../log4j/core/config/ConfigurationFactory.java | 1 -
.../log4j/core/config/ConfigurationScheduler.java | 1 -
.../logging/log4j/core/filter/MapFilter.java | 8 +-
.../logging/log4j/core/impl/ExtendedClassInfo.java | 1 -
.../logging/log4j/core/jackson/Log4jXmlModule.java | 1 -
.../log4j/core/jmx/ContextSelectorAdmin.java | 1 -
.../logging/log4j/core/layout/AbstractLayout.java | 1 -
.../logging/log4j/core/layout/GelfLayout.java | 1 -
.../logging/log4j/core/layout/JsonLayout.java | 1 -
.../logging/log4j/core/layout/PatternLayout.java | 2 -
.../logging/log4j/core/layout/SyslogLayout.java | 1 -
.../logging/log4j/core/layout/XmlLayout.java | 1 -
.../logging/log4j/core/layout/YamlLayout.java | 1 -
.../lookup/JmxRuntimeInputArgumentsLookup.java | 1 -
.../logging/log4j/core/lookup/StrMatcher.java | 5 --
.../logging/log4j/core/util/CronExpression.java | 85 ++++++++++++----------
.../apache/logging/log4j/core/util/FileUtils.java | 12 +--
.../log4j/core/util/ObjectArrayIterator.java | 1 -
.../apache/logging/log4j/core/util/Transform.java | 29 +++++---
.../apache/logging/log4j/core/util/TypeUtil.java | 5 +-
.../log4j/core/util/datetime/FastDatePrinter.java | 3 -
.../logging/log4j/core/TimestampMessageTest.java | 1 -
.../jdbc/JdbcAppenderStringSubstitutionTest.java | 1 -
.../core/appender/mom/jeromq/JeroMqTestClient.java | 1 -
...llingAppenderDirectWriteWithHtmlLayoutTest.java | 3 +-
.../log4j/core/async/perftest/Histogram.java | 5 +-
.../log4j/core/config/InMemoryAdvertiser.java | 7 +-
.../config/plugins/convert/TypeConvertersTest.java | 4 +-
.../AbstractPluginWithGenericBuilder.java | 1 -
.../log4j/core/net/SocketReconnectTest.java | 1 -
.../log4j/core/net/mock/MockTlsSyslogServer.java | 2 +-
.../db/jdbc/PoolableConnectionFactoryConfig.java | 1 -
.../core/appender/db/jpa/BasicLogEventEntity.java | 1 -
.../log4j/core/appender/db/jpa/TestBaseEntity.java | 1 -
.../core/appender/db/jpa/TestBasicEntity.java | 1 -
.../org/apache/logging/log4j/jul/LogManager.java | 1 -
.../layout/template/json/JsonTemplateLayout.java | 8 +-
.../layout/template/json/util/MapAccessor.java | 8 +-
.../template/json/util/StringParameterParser.java | 16 +++-
.../log4j/osgi/tests/AbstractLoadBundleTest.java | 1 -
.../log4j/perf/jmh/jpa/TestBasicEntity.java | 1 -
.../apache/logging/log4j/perf/nogc/NoGcLayout.java | 1 -
.../logging/log4j/spring/boot/SpringLookup.java | 18 +----
.../org/apache/logging/log4j/taglib/DumpTag.java | 1 -
.../apache/logging/log4j/taglib/SetLoggerTag.java | 1 -
80 files changed, 133 insertions(+), 233 deletions(-)
[logging-log4j2] 01/12: Init map when it is created.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 604895fea5c93016115b505069a4b38cbe7b3570
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 16:34:34 2020 -0500
Init map when it is created.
---
.../org/apache/logging/log4j/core/config/InMemoryAdvertiser.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java
index d0823d3..c9bdf57 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java
@@ -27,11 +27,8 @@ import org.apache.logging.log4j.core.net.Advertiser;
public class InMemoryAdvertiser implements Advertiser {
private static Map<Object, Map<String, String>> properties = new HashMap<>();
- public static Map<Object, Map<String, String>> getAdvertisedEntries()
- {
- final Map<Object, Map<String, String>> result = new HashMap<>();
- result.putAll(properties);
- return result;
+ public static Map<Object, Map<String, String>> getAdvertisedEntries() {
+ return new HashMap<>(properties);
}
@Override
[logging-log4j2] 10/12: Use switch.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 205227679e83aabfdeb1f4850c7169cd53134a52
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 16:46:57 2020 -0500
Use switch.
---
.../logging/log4j/core/util/CronExpression.java | 78 ++++++++++++----------
.../apache/logging/log4j/core/util/Transform.java | 29 +++++---
2 files changed, 61 insertions(+), 46 deletions(-)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java
index 8a86da7..5097179 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java
@@ -574,7 +574,8 @@ public final class CronExpression {
return (i + 3);
}
- if (c == '?') {
+ switch (c) {
+ case '?':
i++;
if ((i + 1) < s.length()
&& (s.charAt(i) != ' ' && s.charAt(i + 1) != '\t')) {
@@ -594,12 +595,10 @@ public final class CronExpression {
i);
}
}
-
addToSet(NO_SPEC_INT, -1, 0, type);
return i;
- }
-
- if (c == '*' || c == '/') {
+ case '*':
+ case '/':
if (c == '*' && (i + 1) >= s.length()) {
addToSet(ALL_SPEC_INT, -1, incr, type);
return i + 1;
@@ -637,10 +636,9 @@ public final class CronExpression {
} else {
incr = 1;
}
-
addToSet(ALL_SPEC_INT, -1, incr, type);
return i;
- } else if (c == 'L') {
+ case 'L':
i++;
if (type == DAY_OF_MONTH) {
lastdayOfMonth = true;
@@ -667,23 +665,26 @@ public final class CronExpression {
}
}
return i;
- } else if (c >= '0' && c <= '9') {
- int val = Integer.parseInt(String.valueOf(c));
- i++;
- if (i >= s.length()) {
- addToSet(val, -1, -1, type);
- } else {
- c = s.charAt(i);
- if (c >= '0' && c <= '9') {
- final ValueSet vs = getValue(val, s, i);
- val = vs.value;
- i = vs.pos;
+ default:
+ if (c >= '0' && c <= '9') {
+ int val = Integer.parseInt(String.valueOf(c));
+ i++;
+ if (i >= s.length()) {
+ addToSet(val, -1, -1, type);
+ } else {
+ c = s.charAt(i);
+ if (c >= '0' && c <= '9') {
+ final ValueSet vs = getValue(val, s, i);
+ val = vs.value;
+ i = vs.pos;
+ }
+ i = checkNext(i, s, val, type);
+ return i;
}
- i = checkNext(i, s, val, type);
- return i;
+ } else {
+ throw new ParseException("Unexpected character: " + c, i);
}
- } else {
- throw new ParseException("Unexpected character: " + c, i);
+ break;
}
return i;
@@ -732,7 +733,8 @@ public final class CronExpression {
return i;
}
- if (c == '#') {
+ switch (c) {
+ case '#':
if (type != DAY_OF_WEEK) {
throw new ParseException("'#' option is not valid here. (pos=" + i + ")", i);
}
@@ -747,14 +749,11 @@ public final class CronExpression {
"A numeric value between 1 and 5 must follow the '#' option",
i);
}
-
final TreeSet<Integer> set = getSet(type);
set.add(val);
i++;
return i;
- }
-
- if (c == '-') {
+ case '-':
i++;
c = s.charAt(i);
final int v = Integer.parseInt(String.valueOf(c));
@@ -794,9 +793,7 @@ public final class CronExpression {
addToSet(val, end, 1, type);
return i;
}
- }
-
- if (c == '/') {
+ case '/':
i++;
c = s.charAt(i);
final int v2 = Integer.parseInt(String.valueOf(c));
@@ -815,6 +812,8 @@ public final class CronExpression {
} else {
throw new ParseException("Unexpected character '" + c + "' after '/'", i);
}
+ default:
+ break;
}
addToSet(val, end, 0, type);
@@ -939,34 +938,43 @@ public final class CronExpression {
final TreeSet<Integer> set = getSet(type);
- if (type == SECOND || type == MINUTE) {
+ switch (type) {
+ case SECOND:
+ case MINUTE:
if ((val < 0 || val > 59 || end > 59) && (val != ALL_SPEC_INT)) {
throw new ParseException(
"Minute and Second values must be between 0 and 59",
-1);
}
- } else if (type == HOUR) {
+ break;
+ case HOUR:
if ((val < 0 || val > 23 || end > 23) && (val != ALL_SPEC_INT)) {
throw new ParseException(
"Hour values must be between 0 and 23", -1);
}
- } else if (type == DAY_OF_MONTH) {
+ break;
+ case DAY_OF_MONTH:
if ((val < 1 || val > 31 || end > 31) && (val != ALL_SPEC_INT)
&& (val != NO_SPEC_INT)) {
throw new ParseException(
"Day of month values must be between 1 and 31", -1);
}
- } else if (type == MONTH) {
+ break;
+ case MONTH:
if ((val < 1 || val > 12 || end > 12) && (val != ALL_SPEC_INT)) {
throw new ParseException(
"Month values must be between 1 and 12", -1);
}
- } else if (type == DAY_OF_WEEK) {
+ break;
+ case DAY_OF_WEEK:
if ((val == 0 || val > 7 || end > 7) && (val != ALL_SPEC_INT)
&& (val != NO_SPEC_INT)) {
throw new ParseException(
"Day-of-Week values must be between 1 and 7", -1);
}
+ break;
+ default:
+ break;
}
if ((incr == 0 || incr == -1) && val != ALL_SPEC_INT) {
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Transform.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Transform.java
index 90f3a39..83a2784 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Transform.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Transform.java
@@ -64,17 +64,24 @@ public final class Transform {
final char ch = input.charAt(i);
if (ch > '>') {
buf.append(ch);
- } else if (ch == '<') {
- buf.append("<");
- } else if (ch == '>') {
- buf.append(">");
- } else if (ch == '&') {
- buf.append("&");
- } else if (ch == '"') {
- buf.append(""");
- } else {
- buf.append(ch);
- }
+ } else
+ switch (ch) {
+ case '<':
+ buf.append("<");
+ break;
+ case '>':
+ buf.append(">");
+ break;
+ case '&':
+ buf.append("&");
+ break;
+ case '"':
+ buf.append(""");
+ break;
+ default:
+ buf.append(ch);
+ break;
+ }
}
return buf.toString();
}
[logging-log4j2] 08/12: return not needed.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 2e7695c02f5e445cee7e8b43d9cdd621144ad2e4
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 16:43:56 2020 -0500
return not needed.
---
.../test/java/org/apache/logging/log4j/core/net/SocketReconnectTest.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketReconnectTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketReconnectTest.java
index 918da60..5fcbec1 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketReconnectTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketReconnectTest.java
@@ -260,7 +260,6 @@ public class SocketReconnectTest {
ex.printStackTrace();
}
}
- return;
}
}
[logging-log4j2] 04/12: Use Arrays.fill().
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 6204c496ce8a9d43a42ab90c46839d254e4d8099
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 16:39:13 2020 -0500
Use Arrays.fill().
---
.../java/org/apache/logging/log4j/core/async/perftest/Histogram.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java
index 39cde5f..89cf29f 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java
@@ -213,10 +213,7 @@ public final class Histogram
maxValue = 0L;
minValue = Long.MAX_VALUE;
- for (int i = 0, size = counts.length; i < size; i++)
- {
- counts[i] = 0L;
- }
+ Arrays.fill(counts, 0L);
}
/**
[logging-log4j2] 11/12: Add all collection elements at once.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 22d84509cac3a02962a281387a33756123fc47c6
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 16:47:45 2020 -0500
Add all collection elements at once.
---
.../src/main/java/org/apache/logging/log4j/core/util/TypeUtil.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/TypeUtil.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/TypeUtil.java
index 68255ac..a425369 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/TypeUtil.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/TypeUtil.java
@@ -22,6 +22,7 @@ import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.lang.reflect.WildcardType;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Objects;
@@ -53,9 +54,7 @@ public final class TypeUtil {
public static List<Field> getAllDeclaredFields(Class<?> cls) {
final List<Field> fields = new ArrayList<>();
while (cls != null) {
- for (final Field field : cls.getDeclaredFields()) {
- fields.add(field);
- }
+ Collections.addAll(fields, cls.getDeclaredFields());
cls = cls.getSuperclass();
}
return fields;
[logging-log4j2] 02/12: Define and init local var in one go.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 4a7fceecd6fe2b2a0d8d86076c06e2c1e963e49e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 16:36:49 2020 -0500
Define and init local var in one go.
---
.../java/org/apache/logging/log4j/core/util/CronExpression.java | 7 ++-----
.../apache/logging/log4j/core/net/mock/MockTlsSyslogServer.java | 2 +-
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java
index da580ff..8a86da7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java
@@ -1172,14 +1172,11 @@ public final class CronExpression {
return null;
}
- SortedSet<Integer> st = null;
- int t = 0;
-
int sec = cl.get(Calendar.SECOND);
int min = cl.get(Calendar.MINUTE);
// get second.................................................
- st = seconds.tailSet(sec);
+ SortedSet<Integer> st = seconds.tailSet(sec);
if (st != null && st.size() != 0) {
sec = st.first();
} else {
@@ -1191,7 +1188,7 @@ public final class CronExpression {
min = cl.get(Calendar.MINUTE);
int hr = cl.get(Calendar.HOUR_OF_DAY);
- t = -1;
+ int t = -1;
// get minute.................................................
st = minutes.tailSet(min);
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTlsSyslogServer.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTlsSyslogServer.java
index b116e40..9465473 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTlsSyslogServer.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTlsSyslogServer.java
@@ -127,7 +127,7 @@ public class MockTlsSyslogServer extends MockSyslogServer {
try {
int count = 0;
while (!shutdown) {
- String message = Strings.EMPTY;
+ String message;
message = syslogReader.read();
messageList.add(message);
count++;
[logging-log4j2] 12/12: Use lambdas.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 8a120d1692da08395c6cd13c79a4726bcd8db08d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 16:50:06 2020 -0500
Use lambdas.
---
.../apache/logging/log4j/util/PropertiesUtil.java | 30 +++++++++-------------
.../logging/log4j/util/SortedArrayStringMap.java | 7 +----
.../apache/logging/log4j/AbstractLoggerTest.java | 7 +----
.../java/org/apache/logging/log4j/LoggerTest.java | 24 ++---------------
.../message/ReusableParameterizedMessageTest.java | 7 +----
.../logging/log4j/core/filter/MapFilter.java | 8 +-----
6 files changed, 18 insertions(+), 65 deletions(-)
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
index 8421629..ca09ed8 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
@@ -429,12 +429,9 @@ public final class PropertiesUtil {
private Environment(final PropertySource propertySource) {
PropertyFilePropertySource sysProps = new PropertyFilePropertySource(LOG4J_SYSTEM_PROPERTIES_FILE_NAME);
try {
- sysProps.forEach(new BiConsumer<String, String>() {
- @Override
- public void accept(String key, String value) {
- if (System.getProperty(key) == null) {
- System.setProperty(key, value);
- }
+ sysProps.forEach((key, value) -> {
+ if (System.getProperty(key) == null) {
+ System.setProperty(key, value);
}
});
} catch (SecurityException ex) {
@@ -461,18 +458,15 @@ public final class PropertiesUtil {
normalized.clear();
tokenized.clear();
for (final PropertySource source : sources) {
- source.forEach(new BiConsumer<String, String>() {
- @Override
- public void accept(final String key, final String value) {
- if (key != null && value != null) {
- literal.put(key, value);
- final List<CharSequence> tokens = PropertySource.Util.tokenize(key);
- if (tokens.isEmpty()) {
- normalized.put(source.getNormalForm(Collections.singleton(key)), value);
- } else {
- normalized.put(source.getNormalForm(tokens), value);
- tokenized.put(tokens, value);
- }
+ source.forEach((key, value) -> {
+ if (key != null && value != null) {
+ literal.put(key, value);
+ final List<CharSequence> tokens = PropertySource.Util.tokenize(key);
+ if (tokens.isEmpty()) {
+ normalized.put(source.getNormalForm(Collections.singleton(key)), value);
+ } else {
+ normalized.put(source.getNormalForm(tokens), value);
+ tokenized.put(tokens, value);
}
}
});
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java
index ffd9745..0011afd 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java
@@ -67,12 +67,7 @@ public class SortedArrayStringMap implements IndexedStringMap {
private static final long serialVersionUID = -5748905872274478116L;
private static final int HASHVAL = 31;
- private static final TriConsumer<String, Object, StringMap> PUT_ALL = new TriConsumer<String, Object, StringMap>() {
- @Override
- public void accept(final String key, final Object value, final StringMap contextData) {
- contextData.putValue(key, value);
- }
- };
+ private static final TriConsumer<String, Object, StringMap> PUT_ALL = (key, value, contextData) -> contextData.putValue(key, value);
/**
* An empty array instance to share when the table is not inflated.
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
index bdce79d..26e9790 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
@@ -866,12 +866,7 @@ public class AbstractLoggerTest {
public void testSupplierWithoutThrowable() {
final ThrowableExpectingLogger logger = new ThrowableExpectingLogger(false);
final ThrowableMessage message = new ThrowableMessage(null);
- final Supplier<Message> supplier = new Supplier<Message>() {
- @Override
- public Message get() {
- return message;
- }
- };
+ final Supplier<Message> supplier = () -> message;
logger.debug(supplier);
logger.error(supplier);
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
index ec07d85..397fbe1 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
@@ -160,17 +160,7 @@ public class LoggerTest {
@Test
public void flowTracingString_SupplierOfObjectMessages() {
- final EntryMessage msg = logger.traceEntry("doFoo(a={}, b={})", new Supplier<Message>() {
- @Override
- public Message get() {
- return new ObjectMessage(1);
- }
- }, new Supplier<Message>() {
- @Override
- public Message get() {
- return new ObjectMessage(2);
- }
- });
+ final EntryMessage msg = logger.traceEntry("doFoo(a={}, b={})", (Supplier<Message>) () -> new ObjectMessage(1), (Supplier<Message>) () -> new ObjectMessage(2));
logger.traceExit(msg, 3);
assertEquals(2, results.size());
assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter"));
@@ -181,17 +171,7 @@ public class LoggerTest {
@Test
public void flowTracingString_SupplierOfStrings() {
- final EntryMessage msg = logger.traceEntry("doFoo(a={}, b={})", new Supplier<String>() {
- @Override
- public String get() {
- return "1";
- }
- }, new Supplier<String>() {
- @Override
- public String get() {
- return "2";
- }
- });
+ final EntryMessage msg = logger.traceEntry("doFoo(a={}, b={})", (Supplier<String>) () -> "1", (Supplier<String>) () -> "2");
logger.traceExit(msg, 3);
assertEquals(2, results.size());
assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter"));
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java
index 087c623..6cbb207 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java
@@ -158,12 +158,7 @@ public class ReusableParameterizedMessageTest {
expected.add("msg");
expected.add(EXCEPTION1);
final List<Object> actual = new LinkedList<>();
- msg.forEachParameter(new ParameterConsumer<Void>() {
- @Override
- public void accept(final Object parameter, final int parameterIndex, final Void state) {
- actual.add(parameter);
- }
- }, null);
+ msg.forEachParameter((parameter, parameterIndex, state) -> actual.add(parameter), null);
assertEquals(expected, actual);
}
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
index 39f3f14..fc74c73 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
@@ -35,7 +35,6 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.util.KeyValuePair;
import org.apache.logging.log4j.message.MapMessage;
import org.apache.logging.log4j.message.Message;
-import org.apache.logging.log4j.util.BiConsumer;
import org.apache.logging.log4j.util.IndexedReadOnlyStringMap;
import org.apache.logging.log4j.util.IndexedStringMap;
import org.apache.logging.log4j.util.PerformanceSensitive;
@@ -216,12 +215,7 @@ public class MapFilter extends AbstractFilter {
@Deprecated
protected Map<String, List<String>> getMap() {
final Map<String, List<String>> result = new HashMap<>(map.size());
- map.forEach(new BiConsumer<String, List<String>>() {
- @Override
- public void accept(final String key, final List<String> value) {
- result.put(key, value);
- }
- });
+ map.forEach((key, value) -> result.put(key, (List<String>) value));
return result;
}
[logging-log4j2] 03/12: No need to call super() explicitly.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 947921a72905f09fffc465570e4328bd309012cd
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 16:38:58 2020 -0500
No need to call super() explicitly.
---
log4j-1.2-api/src/main/java/org/apache/log4j/AppenderSkeleton.java | 2 --
.../main/java/org/apache/log4j/config/PropertySetterException.java | 1 -
.../log4j/config/AbstractLog4j1ConfigurationConverterTest.java | 1 -
.../org/apache/logging/log4j/message/DefaultFlowMessageFactory.java | 1 -
.../org/apache/logging/log4j/message/FormattedMessageFactory.java | 1 -
.../apache/logging/log4j/message/MessageFormatMessageFactory.java | 1 -
.../apache/logging/log4j/message/ParameterizedMessageFactory.java | 1 -
.../log4j/message/ParameterizedNoReferenceMessageFactory.java | 1 -
.../org/apache/logging/log4j/message/ReusableMessageFactory.java | 1 -
.../apache/logging/log4j/message/StringFormatterMessageFactory.java | 1 -
.../main/java/org/apache/logging/log4j/message/StringMapMessage.java | 1 -
.../org/apache/logging/log4j/util/FilteredObjectInputStream.java | 2 --
.../java/org/apache/logging/log4j/AbstractSerializationTest.java | 1 -
log4j-api/src/test/java/org/apache/logging/log4j/TestLogger.java | 1 -
.../logging/log4j/junit/LogManagerLoggerContextFactoryRule.java | 1 -
.../java/org/apache/logging/log4j/junit/SecurityManagerTestRule.java | 1 -
.../test/java/org/apache/logging/log4j/junit/ThreadContextRule.java | 1 -
.../java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java | 1 -
.../apache/logging/log4j/core/appender/ConfigurationFactoryData.java | 1 -
.../logging/log4j/core/appender/RollingRandomAccessFileAppender.java | 1 -
.../core/appender/db/jdbc/AbstractDriverManagerConnectionSource.java | 1 -
.../logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java | 1 -
.../log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java | 1 -
.../apache/logging/log4j/core/appender/rolling/action/Duration.java | 1 -
.../org/apache/logging/log4j/core/config/ConfigurationFactory.java | 1 -
.../org/apache/logging/log4j/core/config/ConfigurationScheduler.java | 1 -
.../java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java | 1 -
.../java/org/apache/logging/log4j/core/jackson/Log4jXmlModule.java | 1 -
.../java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java | 1 -
.../java/org/apache/logging/log4j/core/layout/AbstractLayout.java | 1 -
.../main/java/org/apache/logging/log4j/core/layout/GelfLayout.java | 1 -
.../main/java/org/apache/logging/log4j/core/layout/JsonLayout.java | 1 -
.../java/org/apache/logging/log4j/core/layout/PatternLayout.java | 2 --
.../main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java | 1 -
.../main/java/org/apache/logging/log4j/core/layout/XmlLayout.java | 1 -
.../main/java/org/apache/logging/log4j/core/layout/YamlLayout.java | 1 -
.../logging/log4j/core/lookup/JmxRuntimeInputArgumentsLookup.java | 1 -
.../main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java | 5 -----
.../java/org/apache/logging/log4j/core/util/ObjectArrayIterator.java | 1 -
.../org/apache/logging/log4j/core/util/datetime/FastDatePrinter.java | 3 ---
.../java/org/apache/logging/log4j/core/TimestampMessageTest.java | 1 -
.../core/appender/db/jdbc/JdbcAppenderStringSubstitutionTest.java | 1 -
.../logging/log4j/core/appender/mom/jeromq/JeroMqTestClient.java | 1 -
.../config/plugins/validation/AbstractPluginWithGenericBuilder.java | 1 -
.../log4j/core/appender/db/jdbc/PoolableConnectionFactoryConfig.java | 1 -
.../logging/log4j/core/appender/db/jpa/BasicLogEventEntity.java | 1 -
.../apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java | 1 -
.../apache/logging/log4j/core/appender/db/jpa/TestBasicEntity.java | 1 -
log4j-jul/src/main/java/org/apache/logging/log4j/jul/LogManager.java | 1 -
.../org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java | 1 -
.../java/org/apache/logging/log4j/perf/jmh/jpa/TestBasicEntity.java | 1 -
.../src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLayout.java | 1 -
.../src/main/java/org/apache/logging/log4j/taglib/DumpTag.java | 1 -
.../src/main/java/org/apache/logging/log4j/taglib/SetLoggerTag.java | 1 -
54 files changed, 63 deletions(-)
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/AppenderSkeleton.java b/log4j-1.2-api/src/main/java/org/apache/log4j/AppenderSkeleton.java
index e2d6a18..5bdabc0 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/AppenderSkeleton.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/AppenderSkeleton.java
@@ -44,11 +44,9 @@ public abstract class AppenderSkeleton implements Appender, OptionHandler {
* Create new instance.
*/
public AppenderSkeleton() {
- super();
}
protected AppenderSkeleton(final boolean isActive) {
- super();
}
@Override
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertySetterException.java b/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertySetterException.java
index c9dc4cf..703900c 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertySetterException.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertySetterException.java
@@ -45,7 +45,6 @@ public class PropertySetterException extends Exception {
* @param rootCause The root cause
*/
public PropertySetterException(final Throwable rootCause) {
- super();
this.rootCause = rootCause;
}
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationConverterTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationConverterTest.java
index 9c973ee..6288b24 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationConverterTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationConverterTest.java
@@ -49,7 +49,6 @@ public abstract class AbstractLog4j1ConfigurationConverterTest {
private final Path pathIn;
public AbstractLog4j1ConfigurationConverterTest(final Path path) {
- super();
this.pathIn = path;
}
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/DefaultFlowMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/DefaultFlowMessageFactory.java
index 5babca3..567a02f 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/DefaultFlowMessageFactory.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/DefaultFlowMessageFactory.java
@@ -45,7 +45,6 @@ public class DefaultFlowMessageFactory implements FlowMessageFactory, Serializab
* @param exitText the text to use for trace exit, like {@code "Exit"}.
*/
public DefaultFlowMessageFactory(final String entryText, final String exitText) {
- super();
this.entryText = entryText;
this.exitText = exitText;
}
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java
index 805e24b..df0b1d7 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java
@@ -33,7 +33,6 @@ public class FormattedMessageFactory extends AbstractMessageFactory {
* Constructs a message factory with default flow strings.
*/
public FormattedMessageFactory() {
- super();
}
/**
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java
index f75e68b..ec060ed 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java
@@ -32,7 +32,6 @@ public class MessageFormatMessageFactory extends AbstractMessageFactory {
* Constructs a message factory with default flow strings.
*/
public MessageFormatMessageFactory() {
- super();
}
/**
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java
index 5878cac..d15d73b 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java
@@ -46,7 +46,6 @@ public final class ParameterizedMessageFactory extends AbstractMessageFactory {
* Constructs a message factory.
*/
public ParameterizedMessageFactory() {
- super();
}
/**
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedNoReferenceMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedNoReferenceMessageFactory.java
index fdf397b..3ccb82b 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedNoReferenceMessageFactory.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedNoReferenceMessageFactory.java
@@ -80,7 +80,6 @@ public final class ParameterizedNoReferenceMessageFactory extends AbstractMessag
* Constructs a message factory with default flow strings.
*/
public ParameterizedNoReferenceMessageFactory() {
- super();
}
/**
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessageFactory.java
index bf30cfa..bdebc66 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessageFactory.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessageFactory.java
@@ -46,7 +46,6 @@ public final class ReusableMessageFactory implements MessageFactory2, Serializab
* Constructs a message factory.
*/
public ReusableMessageFactory() {
- super();
}
private static ReusableParameterizedMessage getParameterized() {
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java
index b6554d5..78d2da7 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java
@@ -45,7 +45,6 @@ public final class StringFormatterMessageFactory extends AbstractMessageFactory
* Constructs a message factory with default flow strings.
*/
public StringFormatterMessageFactory() {
- super();
}
/**
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/StringMapMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/StringMapMessage.java
index 9d05ce0..10d72c3 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/StringMapMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/StringMapMessage.java
@@ -36,7 +36,6 @@ public class StringMapMessage extends MapMessage<StringMapMessage, String> {
* Constructs a new instance.
*/
public StringMapMessage() {
- super();
}
/**
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/FilteredObjectInputStream.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/FilteredObjectInputStream.java
index 48080a7..33efcaa 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/FilteredObjectInputStream.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/FilteredObjectInputStream.java
@@ -52,7 +52,6 @@ public class FilteredObjectInputStream extends ObjectInputStream {
private final Collection<String> allowedClasses;
public FilteredObjectInputStream() throws IOException, SecurityException {
- super();
this.allowedClasses = new HashSet<>();
}
@@ -62,7 +61,6 @@ public class FilteredObjectInputStream extends ObjectInputStream {
}
public FilteredObjectInputStream(final Collection<String> allowedClasses) throws IOException, SecurityException {
- super();
this.allowedClasses = allowedClasses;
}
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/AbstractSerializationTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/AbstractSerializationTest.java
index ea38501..4f2e774 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/AbstractSerializationTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/AbstractSerializationTest.java
@@ -34,7 +34,6 @@ public abstract class AbstractSerializationTest {
private final Serializable serializable;
public AbstractSerializationTest(final Serializable serializable) {
- super();
this.serializable = serializable;
}
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/TestLogger.java b/log4j-api/src/test/java/org/apache/logging/log4j/TestLogger.java
index fa176f8..930bfb4 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/TestLogger.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/TestLogger.java
@@ -34,7 +34,6 @@ public class TestLogger extends AbstractLogger {
private static final long serialVersionUID = 1L;
public TestLogger() {
- super();
}
public TestLogger(final String name, final MessageFactory messageFactory) {
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/junit/LogManagerLoggerContextFactoryRule.java b/log4j-api/src/test/java/org/apache/logging/log4j/junit/LogManagerLoggerContextFactoryRule.java
index 6fcdbd0..4a46dc1 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/junit/LogManagerLoggerContextFactoryRule.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/junit/LogManagerLoggerContextFactoryRule.java
@@ -34,7 +34,6 @@ public class LogManagerLoggerContextFactoryRule extends ExternalResource {
private LoggerContextFactory restoreLoggerContextFactory;
public LogManagerLoggerContextFactoryRule(final LoggerContextFactory loggerContextFactory) {
- super();
this.loggerContextFactory = loggerContextFactory;
}
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/junit/SecurityManagerTestRule.java b/log4j-api/src/test/java/org/apache/logging/log4j/junit/SecurityManagerTestRule.java
index 57ac55d..370eed5 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/junit/SecurityManagerTestRule.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/junit/SecurityManagerTestRule.java
@@ -59,7 +59,6 @@ public class SecurityManagerTestRule implements TestRule {
* the {@link SecurityManager} to use while running a test.
*/
public SecurityManagerTestRule(final SecurityManager securityManager) {
- super();
this.securityManager = securityManager;
}
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextRule.java b/log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextRule.java
index 1d95bf7..b418818 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextRule.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextRule.java
@@ -55,7 +55,6 @@ public class ThreadContextRule extends ExternalResource {
* Whether to restore the thread context stack.
*/
public ThreadContextRule(final boolean restoreMap, final boolean restoreStack) {
- super();
this.restoreMap = restoreMap;
this.restoreStack = restoreStack;
}
diff --git a/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java b/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java
index 5b4bac2..983c0f6 100644
--- a/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java
+++ b/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java
@@ -72,7 +72,6 @@ public class Log4j2Logger extends AbstractLogger {
}
public Log4j2Logger(final String name) {
- super();
this.name = name;
this.logger = PrivateManager.getLogger(name);
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConfigurationFactoryData.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConfigurationFactoryData.java
index 7a93ad1..fca2004 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConfigurationFactoryData.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConfigurationFactoryData.java
@@ -30,7 +30,6 @@ public class ConfigurationFactoryData {
public final Configuration configuration;
public ConfigurationFactoryData(final Configuration configuration) {
- super();
this.configuration = configuration;
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
index 308a713..f431f2d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
@@ -54,7 +54,6 @@ public final class RollingRandomAccessFileAppender extends AbstractOutputStreamA
implements org.apache.logging.log4j.core.util.Builder<RollingRandomAccessFileAppender> {
public Builder() {
- super();
withBufferSize(RollingRandomAccessFileManager.DEFAULT_BUFFER_SIZE);
setIgnoreExceptions(true);
withImmediateFlush(true);
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractDriverManagerConnectionSource.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractDriverManagerConnectionSource.java
index 0a67d69..65e85f4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractDriverManagerConnectionSource.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractDriverManagerConnectionSource.java
@@ -128,7 +128,6 @@ public class AbstractDriverManagerConnectionSource extends AbstractConnectionSou
public AbstractDriverManagerConnectionSource(final String driverClassName, final String connectionString,
final String actualConnectionString, final char[] userName, final char[] password, final Property[] properties) {
- super();
this.driverClassName = driverClassName;
this.connectionString = connectionString;
this.actualConnectionString = actualConnectionString;
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
index 2a4018f..5117da8 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
@@ -245,7 +245,6 @@ public final class JdbcDatabaseManager extends AbstractDatabaseManager {
private ResultSetColumnMetaData(final String schemaName, final String catalogName, final String tableName,
final String name, final String label, final int displaySize, final int type, final String typeName,
final String className, final int precision, final int scale) {
- super();
this.schemaName = schemaName;
this.catalogName = catalogName;
this.tableName = tableName;
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java
index c6f9d44..34a8b96 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java
@@ -70,7 +70,6 @@ public class LoggerNameLevelRewritePolicy implements RewritePolicy {
private final Map<Level, Level> map;
private LoggerNameLevelRewritePolicy(final String loggerName, final Map<Level, Level> map) {
- super();
this.loggerName = loggerName;
this.map = map;
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/Duration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/Duration.java
index 8684a29..41728f6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/Duration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/Duration.java
@@ -78,7 +78,6 @@ public class Duration implements Serializable, Comparable<Duration> {
* @param seconds the length of the duration in seconds, positive or negative
*/
private Duration(final long seconds) {
- super();
this.seconds = seconds;
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
index aa4b935..70bd425 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
@@ -80,7 +80,6 @@ import java.util.concurrent.locks.ReentrantLock;
public abstract class ConfigurationFactory extends ConfigurationBuilderFactory {
public ConfigurationFactory() {
- super();
// TEMP For breakpoints
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java
index e393d4c..18e4046 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java
@@ -48,7 +48,6 @@ public class ConfigurationScheduler extends AbstractLifeCycle {
}
public ConfigurationScheduler(final String name) {
- super();
this.name = name;
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java
index 759b12e..48ca02e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java
@@ -43,7 +43,6 @@ public final class ExtendedClassInfo implements Serializable {
* @param version
*/
public ExtendedClassInfo(final boolean exact, final String location, final String version) {
- super();
this.exact = exact;
this.location = location;
this.version = version;
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jXmlModule.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jXmlModule.java
index 34f0f68..28909d5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jXmlModule.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jXmlModule.java
@@ -33,7 +33,6 @@ final class Log4jXmlModule extends JacksonXmlModule {
private final boolean stacktraceAsString;
Log4jXmlModule(final boolean includeStacktrace, final boolean stacktraceAsString) {
- super();
this.includeStacktrace = includeStacktrace;
this.stacktraceAsString = stacktraceAsString;
// MUST init here.
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java
index 53b6079..6bf7901 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java
@@ -43,7 +43,6 @@ public class ContextSelectorAdmin implements ContextSelectorAdminMBean {
* @param selector the instrumented object
*/
public ContextSelectorAdmin(final String contextName, final ContextSelector selector) {
- super();
this.selector = Objects.requireNonNull(selector, "ContextSelector");
try {
final String mbeanName = String.format(PATTERN, Server.escape(contextName));
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
index c8bb1be..6a7f175 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
@@ -136,7 +136,6 @@ public abstract class AbstractLayout<T extends Serializable> implements Layout<T
* The footer to add when the stream is closed. May be null.
*/
public AbstractLayout(final Configuration configuration, final byte[] header, final byte[] footer) {
- super();
this.configuration = configuration;
this.header = header;
this.footer = footer;
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
index 9b0acc9..8b01fc2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
@@ -147,7 +147,6 @@ public final class GelfLayout extends AbstractStringLayout {
public Builder() {
- super();
setCharset(StandardCharsets.UTF_8);
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
index 2270e63..6b3555d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
@@ -87,7 +87,6 @@ public final class JsonLayout extends AbstractJacksonLayout {
private KeyValuePair[] additionalFields;
public Builder() {
- super();
setCharset(StandardCharsets.UTF_8);
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
index d32f923..4d3c978 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
@@ -323,7 +323,6 @@ public final class PatternLayout extends AbstractStringLayout {
private final RegexReplacement replace;
private PatternSerializer(final PatternFormatter[] formatters, final RegexReplacement replace) {
- super();
this.formatters = formatters;
this.replace = replace;
}
@@ -454,7 +453,6 @@ public final class PatternLayout extends AbstractStringLayout {
private final RegexReplacement replace;
private PatternSelectorSerializer(final PatternSelector patternSelector, final RegexReplacement replace) {
- super();
this.patternSelector = patternSelector;
this.replace = replace;
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
index b6d58de..599ffad 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
@@ -58,7 +58,6 @@ public final class SyslogLayout extends AbstractStringLayout {
implements org.apache.logging.log4j.core.util.Builder<SyslogLayout> {
public Builder() {
- super();
setCharset(StandardCharsets.UTF_8);
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
index b8ef77e..7b2f7ce 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
@@ -68,7 +68,6 @@ public final class XmlLayout extends AbstractJacksonLayout {
implements org.apache.logging.log4j.core.util.Builder<XmlLayout> {
public Builder() {
- super();
setCharset(StandardCharsets.UTF_8);
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java
index 42b216f..8aafceb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java
@@ -58,7 +58,6 @@ public final class YamlLayout extends AbstractJacksonLayout {
implements org.apache.logging.log4j.core.util.Builder<YamlLayout> {
public Builder() {
- super();
setCharset(StandardCharsets.UTF_8);
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JmxRuntimeInputArgumentsLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JmxRuntimeInputArgumentsLookup.java
index 3dc2e5d..d220a43 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JmxRuntimeInputArgumentsLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JmxRuntimeInputArgumentsLookup.java
@@ -42,7 +42,6 @@ public class JmxRuntimeInputArgumentsLookup extends MapLookup {
* Constructor when used directly as a plugin.
*/
public JmxRuntimeInputArgumentsLookup() {
- super();
}
public JmxRuntimeInputArgumentsLookup(final Map<String, String> map) {
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java
index bea4262..d8b720c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java
@@ -276,7 +276,6 @@ public abstract class StrMatcher {
* @param chars the characters to match, must not be null
*/
CharSetMatcher(final char[] chars) {
- super();
this.chars = chars.clone();
Arrays.sort(this.chars);
}
@@ -310,7 +309,6 @@ public abstract class StrMatcher {
* @param ch the character to match
*/
CharMatcher(final char ch) {
- super();
this.ch = ch;
}
@@ -343,7 +341,6 @@ public abstract class StrMatcher {
* @param str the string to match, must not be null
*/
StringMatcher(final String str) {
- super();
chars = str.toCharArray();
}
@@ -387,7 +384,6 @@ public abstract class StrMatcher {
* Constructs a new instance of <code>NoMatcher</code>.
*/
NoMatcher() {
- super();
}
/**
@@ -415,7 +411,6 @@ public abstract class StrMatcher {
* Constructs a new instance of <code>TrimMatcher</code>.
*/
TrimMatcher() {
- super();
}
/**
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ObjectArrayIterator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ObjectArrayIterator.java
index db8fdd9..b085c62 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ObjectArrayIterator.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ObjectArrayIterator.java
@@ -81,7 +81,6 @@ public class ObjectArrayIterator<E> implements /*Resettable*/ Iterator<E> {
* @throws NullPointerException if <code>array</code> is <code>null</code>
*/
public ObjectArrayIterator(final E array[], final int start, final int end) {
- super();
if (start < 0) {
throw new ArrayIndexOutOfBoundsException("Start index must not be less than zero");
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDatePrinter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDatePrinter.java
index 307b16c..a5ab486 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDatePrinter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDatePrinter.java
@@ -934,7 +934,6 @@ public class FastDatePrinter implements DatePrinter, Serializable {
*
*/
UnpaddedMonthField() {
- super();
}
/**
@@ -1067,7 +1066,6 @@ public class FastDatePrinter implements DatePrinter, Serializable {
* Constructs an instance of {@code TwoDigitYearField}.
*/
TwoDigitYearField() {
- super();
}
/**
@@ -1105,7 +1103,6 @@ public class FastDatePrinter implements DatePrinter, Serializable {
* Constructs an instance of {@code TwoDigitMonthField}.
*/
TwoDigitMonthField() {
- super();
}
/**
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/TimestampMessageTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/TimestampMessageTest.java
index 12d74a7..2b1c19c 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/TimestampMessageTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/TimestampMessageTest.java
@@ -75,7 +75,6 @@ public class TimestampMessageTest {
public static class PoisonClock implements Clock {
public PoisonClock() {
- super();
// Breakpoint here for debuging.
}
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderStringSubstitutionTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderStringSubstitutionTest.java
index dca7dcf..d4a3149 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderStringSubstitutionTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderStringSubstitutionTest.java
@@ -28,7 +28,6 @@ public class JdbcAppenderStringSubstitutionTest {
private static final String KEY = "Test.TableName";
public JdbcAppenderStringSubstitutionTest() {
- super();
System.setProperty(KEY, VALUE);
}
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqTestClient.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqTestClient.java
index f35e82a..a1104ac 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqTestClient.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqTestClient.java
@@ -32,7 +32,6 @@ class JeroMqTestClient implements Callable<List<String>> {
private final int receiveCount;
JeroMqTestClient(final ZMQ.Context context, final String endpoint, final int receiveCount) {
- super();
this.context = context;
this.endpoint = endpoint;
this.receiveCount = receiveCount;
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/AbstractPluginWithGenericBuilder.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/AbstractPluginWithGenericBuilder.java
index 7b2a0f8..a6a126c 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/AbstractPluginWithGenericBuilder.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/AbstractPluginWithGenericBuilder.java
@@ -49,7 +49,6 @@ public class AbstractPluginWithGenericBuilder {
private final String thing;
public AbstractPluginWithGenericBuilder(final String thing) {
- super();
this.thing = thing;
}
diff --git a/log4j-jdbc-dbcp2/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/PoolableConnectionFactoryConfig.java b/log4j-jdbc-dbcp2/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/PoolableConnectionFactoryConfig.java
index 0770962..25ec3cc 100644
--- a/log4j-jdbc-dbcp2/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/PoolableConnectionFactoryConfig.java
+++ b/log4j-jdbc-dbcp2/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/PoolableConnectionFactoryConfig.java
@@ -228,7 +228,6 @@ public class PoolableConnectionFactoryConfig {
final boolean fastFailValidation, final long maxConnLifetimeMillis, final int maxOpenPreparedStatements,
final boolean poolStatements, final boolean rollbackOnReturn, final String validationQuery,
final int validationQueryTimeoutSeconds) {
- super();
this.cacheState = cacheState;
this.connectionInitSqls = connectionInitSqls;
this.defaultAutoCommit = defaultAutoCommit;
diff --git a/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/BasicLogEventEntity.java b/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/BasicLogEventEntity.java
index fa52501..7f47e85 100644
--- a/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/BasicLogEventEntity.java
+++ b/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/BasicLogEventEntity.java
@@ -68,7 +68,6 @@ public abstract class BasicLogEventEntity extends AbstractLogEventWrapperEntity
* entity.
*/
public BasicLogEventEntity() {
- super();
}
/**
diff --git a/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java b/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java
index 2171de4..38c35ac 100644
--- a/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java
+++ b/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java
@@ -52,7 +52,6 @@ public class TestBaseEntity extends AbstractLogEventWrapperEntity {
private long id = 0L;
public TestBaseEntity() {
- super();
}
public TestBaseEntity(final LogEvent wrappedEvent) {
diff --git a/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBasicEntity.java b/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBasicEntity.java
index b804078..0603d1e 100644
--- a/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBasicEntity.java
+++ b/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBasicEntity.java
@@ -38,7 +38,6 @@ public class TestBasicEntity extends BasicLogEventEntity {
private long id = 0L;
public TestBasicEntity() {
- super();
}
public TestBasicEntity(final LogEvent wrapped) {
diff --git a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/LogManager.java b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/LogManager.java
index 559c0be..7256c2b 100644
--- a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/LogManager.java
+++ b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/LogManager.java
@@ -47,7 +47,6 @@ public class LogManager extends java.util.logging.LogManager {
private final ThreadLocal<Set<String>> recursive = ThreadLocal.withInitial(HashSet::new);
public LogManager() {
- super();
AbstractLoggerAdapter adapter = null;
final String overrideAdaptorClassName =
PropertiesUtil.getProperties().getStringProperty(Constants.LOGGER_ADAPTOR_PROPERTY);
diff --git a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java b/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java
index 39fecb7..be4f95e 100644
--- a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java
+++ b/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java
@@ -51,7 +51,6 @@ public abstract class AbstractLoadBundleTest {
* Constructs a test for a given bundle.
*/
public AbstractLoadBundleTest() {
- super();
this.bundleTestInfo = new BundleTestInfo();
}
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/jpa/TestBasicEntity.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/jpa/TestBasicEntity.java
index b1e43d4..1f28fc9 100644
--- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/jpa/TestBasicEntity.java
+++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/jpa/TestBasicEntity.java
@@ -39,7 +39,6 @@ public class TestBasicEntity extends BasicLogEventEntity {
private long id = 0L;
public TestBasicEntity() {
- super();
}
public TestBasicEntity(final LogEvent wrapped) {
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLayout.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLayout.java
index c888972..62bbf50 100644
--- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLayout.java
+++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLayout.java
@@ -84,7 +84,6 @@ public class NoGcLayout implements Layout<Serializable> {
}
private PatternSerializer2(final PatternFormatter[] formatters) {
- super();
this.formatters = formatters;
}
diff --git a/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/DumpTag.java b/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/DumpTag.java
index 99c6a49..c0673aa 100644
--- a/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/DumpTag.java
+++ b/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/DumpTag.java
@@ -35,7 +35,6 @@ public class DumpTag extends TagSupport {
private int scope;
public DumpTag() {
- super();
init();
}
diff --git a/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/SetLoggerTag.java b/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/SetLoggerTag.java
index 4150dd9..58189f7 100644
--- a/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/SetLoggerTag.java
+++ b/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/SetLoggerTag.java
@@ -42,7 +42,6 @@ public class SetLoggerTag extends BodyTagSupport {
private int scope;
public SetLoggerTag() {
- super();
init();
}
[logging-log4j2] 06/12: Use diamonds.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 8b6868c16fa81aedd3e14c104cfd2a4a7d0ea5a7
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 16:42:00 2020 -0500
Use diamonds.
---
.../logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java | 2 +-
.../java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java | 6 +++---
.../logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
index 43ab1d4..12f7b11 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
@@ -214,7 +214,7 @@ class CopyOnWriteSortedArrayThreadContextMap implements ReadOnlyThreadContextMap
@Override
public Map<String, String> getCopy() {
final StringMap map = localMap.get();
- return map == null ? new HashMap<String, String>() : map.toMap();
+ return map == null ? new HashMap<>() : map.toMap();
}
/**
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
index 066d818..472b35a 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
@@ -86,7 +86,7 @@ public class DefaultThreadContextMap implements ThreadContextMap, ReadOnlyString
return;
}
Map<String, String> map = localMap.get();
- map = map == null ? new HashMap<String, String>(1) : new HashMap<>(map);
+ map = map == null ? new HashMap<>(1) : new HashMap<>(map);
map.put(key, value);
localMap.set(Collections.unmodifiableMap(map));
}
@@ -96,7 +96,7 @@ public class DefaultThreadContextMap implements ThreadContextMap, ReadOnlyString
return;
}
Map<String, String> map = localMap.get();
- map = map == null ? new HashMap<String, String>(m.size()) : new HashMap<>(map);
+ map = map == null ? new HashMap<>(m.size()) : new HashMap<>(map);
for (final Map.Entry<String, String> e : m.entrySet()) {
map.put(e.getKey(), e.getValue());
}
@@ -186,7 +186,7 @@ public class DefaultThreadContextMap implements ThreadContextMap, ReadOnlyString
@Override
public Map<String, String> getCopy() {
final Map<String, String> map = localMap.get();
- return map == null ? new HashMap<String, String>() : new HashMap<>(map);
+ return map == null ? new HashMap<>() : new HashMap<>(map);
}
@Override
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java
index bd77559..d378360 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java
@@ -202,7 +202,7 @@ class GarbageFreeSortedArrayThreadContextMap implements ReadOnlyThreadContextMap
@Override
public Map<String, String> getCopy() {
final StringMap map = localMap.get();
- return map == null ? new HashMap<String, String>() : map.toMap();
+ return map == null ? new HashMap<>() : map.toMap();
}
/**
[logging-log4j2] 05/12: Use String.join().
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit a73f5f124ffc0bc48181681114e32e85102f3949
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 16:40:46 2020 -0500
Use String.join().
---
.../apache/logging/log4j/spring/boot/SpringLookup.java | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/log4j-spring-boot/src/main/java/org/apache/logging/log4j/spring/boot/SpringLookup.java b/log4j-spring-boot/src/main/java/org/apache/logging/log4j/spring/boot/SpringLookup.java
index 4e2d528..c71941a 100644
--- a/log4j-spring-boot/src/main/java/org/apache/logging/log4j/spring/boot/SpringLookup.java
+++ b/log4j-spring-boot/src/main/java/org/apache/logging/log4j/spring/boot/SpringLookup.java
@@ -72,14 +72,7 @@ public class SpringLookup extends SpringEnvironmentHolder implements StrLookup {
}
}
- StringBuilder sb = new StringBuilder();
- for (String profile : env.getActiveProfiles()) {
- if (sb.length() > 0) {
- sb.append(",");
- }
- sb.append(profile);
- }
- return sb.toString();
+ return String.join(",", env.getActiveProfiles());
}
}
} else if (lowerKey.startsWith(DEFAULT)) {
@@ -106,14 +99,7 @@ public class SpringLookup extends SpringEnvironmentHolder implements StrLookup {
}
}
- StringBuilder sb = new StringBuilder();
- for (String profile : env.getDefaultProfiles()) {
- if (sb.length() > 0) {
- sb.append(",");
- }
- sb.append(profile);
- }
- return sb.toString();
+ return String.join(",", env.getDefaultProfiles());
}
}
}
[logging-log4j2] 09/12: Use blocks.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 42b5a378ca77867d2a965dae34ba8f076a62ce88
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 16:45:19 2020 -0500
Use blocks.
---
.../log4j/util/SystemPropertiesPropertySourceTest.java | 3 ++-
.../org/apache/logging/log4j/core/util/FileUtils.java | 12 +++++++-----
.../RollingAppenderDirectWriteWithHtmlLayoutTest.java | 3 ++-
.../log4j/layout/template/json/JsonTemplateLayout.java | 8 ++++++--
.../log4j/layout/template/json/util/MapAccessor.java | 8 ++++++--
.../layout/template/json/util/StringParameterParser.java | 16 ++++++++++++----
6 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceTest.java
index fb5d383..0eb711f 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceTest.java
@@ -59,10 +59,11 @@ public class SystemPropertiesPropertySourceTest {
properties.setProperty("FOO_" + i, "BAR");
}
});
- for (int i = 0; i < ITERATIONS; i++)
+ for (int i = 0; i < ITERATIONS; i++) {
new SystemPropertiesPropertySource().forEach((key, value) -> {
// nothing
});
+ }
future.get();
} finally {
threadPool.shutdown();
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileUtils.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileUtils.java
index a50a20d..e8d45fc 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileUtils.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileUtils.java
@@ -61,11 +61,13 @@ public final class FileUtils {
return null;
}
if (uri.isAbsolute()) {
- if (JBOSS_FILE.equals(uri.getScheme())) try {
- // patch the scheme
- uri = new URI(PROTOCOL_FILE, uri.getSchemeSpecificPart(), uri.getFragment());
- } catch (URISyntaxException use) {
- // should not happen, ignore
+ if (JBOSS_FILE.equals(uri.getScheme())) {
+ try {
+ // patch the scheme
+ uri = new URI(PROTOCOL_FILE, uri.getSchemeSpecificPart(), uri.getFragment());
+ } catch (URISyntaxException use) {
+ // should not happen, ignore
+ }
}
try {
if (PROTOCOL_FILE.equals(uri.getScheme())) {
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteWithHtmlLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteWithHtmlLayoutTest.java
index e0d2dce..f50e9e2 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteWithHtmlLayoutTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteWithHtmlLayoutTest.java
@@ -94,8 +94,9 @@ public class RollingAppenderDirectWriteWithHtmlLayoutTest {
int foundEvents = 0;
final Pattern eventMatcher = Pattern.compile("title=\"Message\"");
for (File file : files) {
- if (!file.getName().startsWith(prefix))
+ if (!file.getName().startsWith(prefix)) {
continue;
+ }
try (BufferedReader reader = new BufferedReader(new FileReader(file))) {
String data = IOUtils.toString(reader).trim();
// check that every file starts with the header
diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayout.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayout.java
index 33c73ef..ebc5a80 100644
--- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayout.java
+++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayout.java
@@ -544,8 +544,12 @@ public class JsonTemplateLayout implements StringLayout {
@Override
public boolean equals(Object object) {
- if (this == object) return true;
- if (object == null || getClass() != object.getClass()) return false;
+ if (this == object) {
+ return true;
+ }
+ if (object == null || getClass() != object.getClass()) {
+ return false;
+ }
EventTemplateAdditionalField that = (EventTemplateAdditionalField) object;
return key.equals(that.key) &&
value.equals(that.value) &&
diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/MapAccessor.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/MapAccessor.java
index cc3ef76..39cae10 100644
--- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/MapAccessor.java
+++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/MapAccessor.java
@@ -120,8 +120,12 @@ public class MapAccessor {
@Override
public boolean equals(final Object instance) {
- if (this == instance) return true;
- if (instance == null || getClass() != instance.getClass()) return false;
+ if (this == instance) {
+ return true;
+ }
+ if (instance == null || getClass() != instance.getClass()) {
+ return false;
+ }
final MapAccessor that = (MapAccessor) instance;
return map.equals(that.map);
}
diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParser.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParser.java
index 041f2e3..be58534 100644
--- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParser.java
+++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParser.java
@@ -77,8 +77,12 @@ public final class StringParameterParser {
@Override
public boolean equals(Object object) {
- if (this == object) return true;
- if (object == null || getClass() != object.getClass()) return false;
+ if (this == object) {
+ return true;
+ }
+ if (object == null || getClass() != object.getClass()) {
+ return false;
+ }
StringValue that = (StringValue) object;
return string.equals(that.string);
}
@@ -109,8 +113,12 @@ public final class StringParameterParser {
@Override
public boolean equals(Object object) {
- if (this == object) return true;
- if (object == null || getClass() != object.getClass()) return false;
+ if (this == object) {
+ return true;
+ }
+ if (object == null || getClass() != object.getClass()) {
+ return false;
+ }
DoubleQuotedStringValue that = (DoubleQuotedStringValue) object;
return doubleQuotedString.equals(that.doubleQuotedString);
}
[logging-log4j2] 07/12: null check not needed.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit aa64699bf245ee9873e5ad9e891d9aba93b2657d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 16:42:58 2020 -0500
null check not needed.
---
log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java | 2 +-
.../java/org/apache/logging/log4j/core/appender/AbstractAppender.java | 2 +-
.../logging/log4j/core/config/plugins/convert/TypeConvertersTest.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java b/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
index 7716c74..d7bc9fd 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
@@ -421,7 +421,7 @@ public class LogManager {
* @since 2.6
*/
public static void shutdown(final LoggerContext context) {
- if (context != null && context instanceof Terminable) {
+ if (context instanceof Terminable) {
((Terminable) context).terminate();
}
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
index e8ba01f..2ffbf15 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
@@ -163,7 +163,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
@Override
public boolean requiresLocation() {
- return layout != null && layout instanceof LocationAware && ((LocationAware) layout).requiresLocation();
+ return layout instanceof LocationAware && ((LocationAware) layout).requiresLocation();
}
/**
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConvertersTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConvertersTest.java
index 35a3855..0842abb 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConvertersTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConvertersTest.java
@@ -217,9 +217,9 @@ public class TypeConvertersTest {
public void testConvert() throws Exception {
final Object actual = TypeConverters.convert(value, clazz, defaultValue);
final String assertionMessage = "\nGiven: " + value + "\nDefault: " + defaultValue;
- if (expected != null && expected instanceof char[]) {
+ if (expected instanceof char[]) {
assertArrayEquals(assertionMessage, (char[]) expected, (char[]) actual);
- } else if (expected != null && expected instanceof byte[]) {
+ } else if (expected instanceof byte[]) {
assertArrayEquals(assertionMessage, (byte[]) expected, (byte[]) actual);
} else {
assertEquals(assertionMessage, expected, actual);