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 2021/01/08 15:54:00 UTC
[logging-log4j2] branch release-2.x updated: Collapse multiple
identical catch clauses into one.
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
The following commit(s) were added to refs/heads/release-2.x by this push:
new baefd36 Collapse multiple identical catch clauses into one.
baefd36 is described below
commit baefd36ff4bc4cc1345f864610a03766e284fd33
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jan 8 10:53:54 2021 -0500
Collapse multiple identical catch clauses into one.
---
.../core/config/plugins/convert/Base64Converter.java | 15 ++++-----------
.../core/config/plugins/processor/PluginProcessor.java | 4 ----
.../apache/logging/log4j/core/lookup/Interpolator.java | 4 +---
.../log4j/core/pattern/AbstractStyleNameConverter.java | 13 ++-----------
4 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/Base64Converter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/Base64Converter.java
index f4e421f..e539f77 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/Base64Converter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/Base64Converter.java
@@ -40,14 +40,9 @@ public class Base64Converter {
decoder = getDecoder.invoke(null, (Object[]) null);
clazz = decoder.getClass();
method = clazz.getMethod("decode", String.class);
- } catch (final ClassNotFoundException ex) {
-
- } catch (final NoSuchMethodException ex) {
-
- } catch (final IllegalAccessException ex) {
-
- } catch (final InvocationTargetException ex) {
-
+ } catch (final ClassNotFoundException | NoSuchMethodException | IllegalAccessException |
+ InvocationTargetException ex) {
+ // ignore
}
if (method == null) {
try {
@@ -68,9 +63,7 @@ public class Base64Converter {
} else {
try {
return (byte[]) method.invoke(decoder, encoded);
- } catch (final IllegalAccessException ex) {
- LOGGER.error("Error decoding string - " + ex.getMessage());
- } catch (final InvocationTargetException ex) {
+ } catch (final IllegalAccessException | InvocationTargetException ex) {
LOGGER.error("Error decoding string - " + ex.getMessage());
}
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java
index 023330f..4ee6917 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java
@@ -80,10 +80,6 @@ public class PluginProcessor extends AbstractProcessor {
writeCacheFile(elements.toArray(new Element[elements.size()]));
messager.printMessage(Kind.NOTE, "Annotations processed");
return true;
- } catch (final IOException e) {
- e.printStackTrace();
- error(e.getMessage());
- return false;
} catch (final Exception ex) {
ex.printStackTrace();
error(ex.getMessage());
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java
index f0c40f5..992bb8b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java
@@ -149,9 +149,7 @@ public class Interpolator extends AbstractConfigurationAwareLookup {
try {
strLookupMap.put(LOOKUP_KEY_KUBERNETES,
Loader.newCheckedInstanceOf("org.apache.logging.log4j.kubernetes.KubernetesLookup", StrLookup.class));
- } catch (final Exception ignored) {
- handleError(LOOKUP_KEY_KUBERNETES, ignored);
- } catch (final NoClassDefFoundError error) {
+ } catch (final Exception | NoClassDefFoundError error) {
handleError(LOOKUP_KEY_KUBERNETES, error);
}
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractStyleNameConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractStyleNameConverter.java
index 2e1db29..1f5f54e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractStyleNameConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractStyleNameConverter.java
@@ -331,17 +331,8 @@ public abstract class AbstractStyleNameConverter extends LogEventPatternConverte
try {
final Constructor<T> constructor = asnConverterClass.getConstructor(List.class, String.class);
return constructor.newInstance(formatters, AnsiEscape.createSequence(name));
- } catch (final SecurityException e) {
- LOGGER.error(e.toString(), e);
- } catch (final NoSuchMethodException e) {
- LOGGER.error(e.toString(), e);
- } catch (final IllegalArgumentException e) {
- LOGGER.error(e.toString(), e);
- } catch (final InstantiationException e) {
- LOGGER.error(e.toString(), e);
- } catch (final IllegalAccessException e) {
- LOGGER.error(e.toString(), e);
- } catch (final InvocationTargetException e) {
+ } catch (final SecurityException | NoSuchMethodException | IllegalArgumentException | InstantiationException |
+ IllegalAccessException | InvocationTargetException e) {
LOGGER.error(e.toString(), e);
}
return null;