This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 520840d93b NIFI-12076 Removed ComponentLog methods with Object[] and
Throwable
520840d93b is described below
commit 520840d93b875ec3cba0c7792a80a25c9236b332
Author: Peter Turcsanyi <[email protected]>
AuthorDate: Sun Sep 17 21:51:46 2023 +0200
NIFI-12076 Removed ComponentLog methods with Object[] and Throwable
This closes #7759
Signed-off-by: David Handermann <[email protected]>
---
.../nifi/documentation/init/NopComponentLog.java | 30 ----
.../java/org/apache/nifi/logging/ComponentLog.java | 42 +----
.../org/apache/nifi/util/MockComponentLog.java | 137 ++++++----------
.../apache/nifi/processor/SimpleProcessLogger.java | 111 -------------
.../nifi/processor/TestSimpleProcessLogger.java | 173 ---------------------
.../nifi/controller/TerminationAwareLogger.java | 60 -------
.../org/apache/nifi/mock/MockComponentLogger.java | 30 ----
.../nifi/rules/handlers/MockComponentLog.java | 30 ----
8 files changed, 51 insertions(+), 562 deletions(-)
diff --git
a/nifi-api/src/main/java/org/apache/nifi/documentation/init/NopComponentLog.java
b/nifi-api/src/main/java/org/apache/nifi/documentation/init/NopComponentLog.java
index e2187a52ae..dd30eb420a 100644
---
a/nifi-api/src/main/java/org/apache/nifi/documentation/init/NopComponentLog.java
+++
b/nifi-api/src/main/java/org/apache/nifi/documentation/init/NopComponentLog.java
@@ -31,11 +31,6 @@ public class NopComponentLog implements ComponentLog {
}
- @Override
- public void warn(final String msg, final Object[] os, final Throwable t) {
-
- }
-
@Override
public void warn(final String msg) {
@@ -61,11 +56,6 @@ public class NopComponentLog implements ComponentLog {
}
- @Override
- public void trace(final String msg, final Object[] os, final Throwable t) {
-
- }
-
@Override
public void trace(LogMessage logMessage) {
@@ -111,11 +101,6 @@ public class NopComponentLog implements ComponentLog {
}
- @Override
- public void info(final String msg, final Object[] os, final Throwable t) {
-
- }
-
@Override
public void info(LogMessage message) {
@@ -141,11 +126,6 @@ public class NopComponentLog implements ComponentLog {
}
- @Override
- public void error(final String msg, final Object[] os, final Throwable t) {
-
- }
-
@Override
public void error(LogMessage message) {
@@ -161,11 +141,6 @@ public class NopComponentLog implements ComponentLog {
}
- @Override
- public void debug(final String msg, final Object[] os, final Throwable t) {
-
- }
-
@Override
public void debug(final String msg) {
@@ -191,11 +166,6 @@ public class NopComponentLog implements ComponentLog {
}
- @Override
- public void log(final LogLevel level, final String msg, final Object[] os,
final Throwable t) {
-
- }
-
@Override
public void log(LogMessage message) {
diff --git a/nifi-api/src/main/java/org/apache/nifi/logging/ComponentLog.java
b/nifi-api/src/main/java/org/apache/nifi/logging/ComponentLog.java
index dd65aedbb2..f83ce97d60 100644
--- a/nifi-api/src/main/java/org/apache/nifi/logging/ComponentLog.java
+++ b/nifi-api/src/main/java/org/apache/nifi/logging/ComponentLog.java
@@ -53,9 +53,6 @@ public interface ComponentLog {
void warn(String msg, Object... os);
- @Deprecated
- void warn(String msg, Object[] os, Throwable t);
-
void warn(String msg);
default void warn(LogMessage logMessage) {
@@ -68,9 +65,6 @@ public interface ComponentLog {
void trace(String msg);
- @Deprecated
- void trace(String msg, Object[] os, Throwable t);
-
default void trace(LogMessage logMessage) {
log(LogLevel.TRACE, logMessage);
}
@@ -91,9 +85,6 @@ public interface ComponentLog {
void info(String msg);
- @Deprecated
- void info(String msg, Object[] os, Throwable t);
-
default void info(LogMessage logMessage) {
log(LogLevel.INFO, logMessage);
}
@@ -106,9 +97,6 @@ public interface ComponentLog {
void error(String msg);
- @Deprecated
- void error(String msg, Object[] os, Throwable t);
-
default void error(LogMessage logMessage) {
log(LogLevel.ERROR, logMessage);
}
@@ -117,9 +105,6 @@ public interface ComponentLog {
void debug(String msg, Object... os);
- @Deprecated
- void debug(String msg, Object[] os, Throwable t);
-
void debug(String msg);
default void debug(LogMessage logMessage) {
@@ -189,28 +174,6 @@ public interface ComponentLog {
}
}
- @Deprecated
- default void log(LogLevel level, String msg, Object[] os, Throwable t) {
- switch (level) {
- case DEBUG:
- debug(msg, os, t);
- break;
- case ERROR:
- case FATAL:
- error(msg, os, t);
- break;
- case INFO:
- info(msg, os, t);
- break;
- case TRACE:
- trace(msg, os, t);
- break;
- case WARN:
- warn(msg, os, t);
- break;
- }
- }
-
default void log(LogMessage message) {
switch (message.getLogLevel()) {
case DEBUG:
@@ -238,7 +201,10 @@ public interface ComponentLog {
Object[] os = logMessage.getObjects();
if (os != null && t != null) {
- log(level, msg, os, t);
+ Object[] ost = new Object[os.length + 1];
+ System.arraycopy(os, 0, ost, 0, os.length);
+ ost[ost.length - 1] = t;
+ log(level, msg, ost);
} else if (os != null) {
log(level, msg, os);
} else if (t != null) {
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockComponentLog.java
b/nifi-mock/src/main/java/org/apache/nifi/util/MockComponentLog.java
index 7187aa41c1..756fd2efd9 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/MockComponentLog.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockComponentLog.java
@@ -71,27 +71,19 @@ public class MockComponentLog implements ComponentLog {
return prependToArgs(originalArgs, component);
}
- private Object[] addProcessorAndThrowable(final Object[] os, final
Throwable t) {
- final Object[] modifiedArgs = new Object[os.length + 2];
- modifiedArgs[0] = component.toString();
- System.arraycopy(os, 0, modifiedArgs, 1, os.length);
- modifiedArgs[modifiedArgs.length - 1] = t.toString();
+ private Object[] addProcessorAndFormattedThrowable(final Object[]
originalArgs) {
+ if (originalArgs != null && originalArgs.length > 0 &&
(originalArgs[originalArgs.length - 1] instanceof Throwable)) {
+ final Object[] modifiedArgs = new Object[originalArgs.length + 2];
- return modifiedArgs;
- }
+ modifiedArgs[0] = component.toString();
+ System.arraycopy(originalArgs, 0, modifiedArgs, 1,
originalArgs.length - 1);
+ modifiedArgs[modifiedArgs.length - 2] =
originalArgs[originalArgs.length - 1].toString();
+ modifiedArgs[modifiedArgs.length - 1] =
originalArgs[originalArgs.length - 1];
- private Object[] addProcessorAndThrowable(final Object[] os, final
Throwable t, final boolean appendThrowable) {
- if (!appendThrowable) {
- return addProcessorAndThrowable(os, t);
+ return modifiedArgs;
+ } else {
+ return addProcessor(originalArgs);
}
-
- final Object[] modifiedArgs = new Object[os.length + 3];
- modifiedArgs[0] = component.toString();
- System.arraycopy(os, 0, modifiedArgs, 1, os.length);
- modifiedArgs[modifiedArgs.length - 2] = t.toString();
- modifiedArgs[modifiedArgs.length - 1] = t;
-
- return modifiedArgs;
}
private Object[] prependToArgs(final Object[] originalArgs, final
Object... toAdd) {
@@ -101,47 +93,29 @@ public class MockComponentLog implements ComponentLog {
return newArgs;
}
- private Object[] translateException(final Object[] os) {
- if (os != null && os.length > 0 && (os[os.length - 1] instanceof
Throwable)) {
- final Object[] osCopy = new Object[os.length];
- osCopy[osCopy.length - 1] = os[os.length - 1].toString();
- System.arraycopy(os, 0, osCopy, 0, os.length - 1);
- return osCopy;
- }
- return os;
- }
-
private boolean lastArgIsException(final Object[] os) {
return (os != null && os.length > 0 && (os[os.length - 1] instanceof
Throwable));
}
@Override
public void warn(final String msg, final Throwable t) {
- warn("{} " + msg, new Object[]{component}, t);
+ warn("{} " + msg, component, t);
}
@Override
public void warn(String msg, Object... os) {
if (lastArgIsException(os)) {
- warn(msg, translateException(os), (Throwable) os[os.length - 1]);
+ os = addProcessorAndFormattedThrowable(os);
+ msg = "{} " + msg + ": {}";
+
+ logger.warn(msg, os);
} else {
- msg = "{} " + msg;
os = addProcessor(os);
+ msg = "{} " + msg;
logger.warn(msg, os);
}
}
- @Override
- public void warn(String msg, Object[] os, final Throwable t) {
- os = addProcessorAndThrowable(os, t);
- msg = "{} " + msg + ": {}";
-
- logger.warn(msg, os);
- if (logger.isDebugEnabled()) {
- logger.warn("", t);
- }
- }
-
@Override
public void warn(String msg) {
msg = "{} " + msg;
@@ -157,9 +131,16 @@ public class MockComponentLog implements ComponentLog {
@Override
public void trace(String msg, Object... os) {
- msg = "{} " + msg;
- os = addProcessor(os);
- logger.trace(msg, os);
+ if (lastArgIsException(os)) {
+ os = addProcessorAndFormattedThrowable(os);
+ msg = "{} " + msg + ": {}";
+
+ logger.trace(msg, os);
+ } else {
+ os = addProcessor(os);
+ msg = "{} " + msg;
+ logger.trace(msg, os);
+ }
}
@Override
@@ -169,15 +150,6 @@ public class MockComponentLog implements ComponentLog {
logger.trace(msg, os);
}
- @Override
- public void trace(String msg, Object[] os, Throwable t) {
- os = addProcessorAndThrowable(os, t);
- msg = "{} " + msg + ": {}";
-
- logger.trace(msg, os);
- logger.trace("", t);
- }
-
@Override
public boolean isWarnEnabled() {
return logger.isWarnEnabled();
@@ -216,10 +188,16 @@ public class MockComponentLog implements ComponentLog {
@Override
public void info(String msg, Object... os) {
- msg = "{} " + msg;
- os = addProcessor(os);
+ if (lastArgIsException(os)) {
+ os = addProcessorAndFormattedThrowable(os);
+ msg = "{} " + msg + ": {}";
- logger.info(msg, os);
+ logger.info(msg, os);
+ } else {
+ os = addProcessor(os);
+ msg = "{} " + msg;
+ logger.info(msg, os);
+ }
}
@Override
@@ -230,17 +208,6 @@ public class MockComponentLog implements ComponentLog {
logger.info(msg, os);
}
- @Override
- public void info(String msg, Object[] os, Throwable t) {
- os = addProcessorAndThrowable(os, t);
- msg = "{} " + msg + ": {}";
-
- logger.info(msg, os);
- if (logger.isDebugEnabled()) {
- logger.info("", t);
- }
- }
-
@Override
public String getName() {
return logger.getName();
@@ -260,7 +227,10 @@ public class MockComponentLog implements ComponentLog {
@Override
public void error(String msg, Object... os) {
if (lastArgIsException(os)) {
- error(msg, translateException(os), (Throwable) os[os.length - 1]);
+ os = addProcessorAndFormattedThrowable(os);
+ msg = "{} " + msg + ": {}";
+
+ logger.error(msg, os);
} else {
os = addProcessor(os);
msg = "{} " + msg;
@@ -276,14 +246,6 @@ public class MockComponentLog implements ComponentLog {
logger.error(msg, os);
}
- @Override
- public void error(String msg, Object[] os, Throwable t) {
- os = addProcessorAndThrowable(os, t, true);
- msg = "{} " + msg + ": {}";
-
- logger.error(msg, os);
- }
-
@Override
public void debug(String msg, Throwable t) {
msg = "{} " + msg;
@@ -294,20 +256,15 @@ public class MockComponentLog implements ComponentLog {
@Override
public void debug(String msg, Object... os) {
- os = addProcessor(os);
- msg = "{} " + msg;
-
- logger.debug(msg, os);
- }
-
- @Override
- public void debug(String msg, Object[] os, Throwable t) {
- os = addProcessorAndThrowable(os, t);
- msg = "{} " + msg + ": {}";
+ if (lastArgIsException(os)) {
+ os = addProcessorAndFormattedThrowable(os);
+ msg = "{} " + msg + ": {}";
- logger.debug(msg, os);
- if (logger.isDebugEnabled()) {
- logger.debug("", t);
+ logger.debug(msg, os);
+ } else {
+ os = addProcessor(os);
+ msg = "{} " + msg;
+ logger.debug(msg, os);
}
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
index 28af6a99a8..d4d30da274 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
@@ -86,22 +86,6 @@ public class SimpleProcessLogger implements ComponentLog {
}
}
- @Override
- public void warn(final String msg, final Object[] os, final Throwable t) {
- if (isWarnEnabled()) {
- final String componentMessage = getComponentMessage(msg);
- final Object[] arguments = insertComponent(os);
-
- if (t == null) {
- log(Level.WARN, componentMessage, arguments);
- logRepository.addLogMessage(LogLevel.WARN, componentMessage,
arguments);
- } else {
- log(Level.WARN, componentMessage, addThrowable(arguments, t));
- logRepository.addLogMessage(LogLevel.WARN,
getCausesMessage(msg), addCauses(arguments, t), t);
- }
- }
- }
-
@Override
public void warn(final String msg) {
warn(msg, NULL_THROWABLE);
@@ -153,22 +137,6 @@ public class SimpleProcessLogger implements ComponentLog {
trace(msg, NULL_THROWABLE);
}
- @Override
- public void trace(final String msg, final Object[] os, final Throwable t) {
- if (isTraceEnabled()) {
- final String componentMessage = getComponentMessage(msg);
- final Object[] arguments = insertComponent(os);
-
- if (t == null) {
- log(Level.TRACE, componentMessage, arguments);
- logRepository.addLogMessage(LogLevel.TRACE, componentMessage,
arguments);
- } else {
- log(Level.TRACE, componentMessage, addThrowable(arguments, t));
- logRepository.addLogMessage(LogLevel.TRACE,
getCausesMessage(msg), addCauses(arguments, t), t);
- }
- }
- }
-
@Override
public void trace(final LogMessage logMessage) {
if (isTraceEnabled()) {
@@ -240,22 +208,6 @@ public class SimpleProcessLogger implements ComponentLog {
info(msg, NULL_THROWABLE);
}
- @Override
- public void info(final String msg, final Object[] os, final Throwable t) {
- if (isInfoEnabled()) {
- final String componentMessage = getComponentMessage(msg);
- final Object[] arguments = insertComponent(os);
-
- if (t == null) {
- log(Level.INFO, componentMessage, arguments);
- logRepository.addLogMessage(LogLevel.INFO, componentMessage,
arguments);
- } else {
- log(Level.INFO, componentMessage, addThrowable(arguments, t));
- logRepository.addLogMessage(LogLevel.INFO,
getCausesMessage(msg), addCauses(arguments, t), t);
- }
- }
- }
-
@Override
public void info(LogMessage logMessage) {
if (isInfoEnabled()) {
@@ -307,22 +259,6 @@ public class SimpleProcessLogger implements ComponentLog {
}
}
- @Override
- public void error(final String msg, final Object[] os, final Throwable t) {
- if (isErrorEnabled()) {
- final String componentMessage = getComponentMessage(msg);
- final Object[] arguments = insertComponent(os);
-
- if (t == null) {
- log(Level.ERROR, componentMessage, arguments);
- logRepository.addLogMessage(LogLevel.ERROR, componentMessage,
arguments);
- } else {
- log(Level.ERROR, componentMessage, addThrowable(arguments, t));
- logRepository.addLogMessage(LogLevel.ERROR,
getCausesMessage(msg), addCauses(arguments, t), t);
- }
- }
- }
-
@Override
public void error(final LogMessage logMessage) {
if (isErrorEnabled()) {
@@ -364,22 +300,6 @@ public class SimpleProcessLogger implements ComponentLog {
}
}
- @Override
- public void debug(final String msg, final Object[] os, final Throwable t) {
- if (isDebugEnabled()) {
- final String componentMessage = getComponentMessage(msg);
- final Object[] arguments = insertComponent(os);
-
- if (t == null) {
- log(Level.DEBUG, componentMessage, arguments);
- logRepository.addLogMessage(LogLevel.DEBUG, componentMessage,
arguments);
- } else {
- log(Level.DEBUG, componentMessage, addThrowable(arguments, t));
- logRepository.addLogMessage(LogLevel.DEBUG,
getCausesMessage(msg), addCauses(arguments, t), t);
- }
- }
- }
-
@Override
public void debug(final String msg) {
debug(msg, NULL_THROWABLE);
@@ -459,28 +379,6 @@ public class SimpleProcessLogger implements ComponentLog {
}
}
- @Override
- public void log(final LogLevel level, final String msg, final Object[] os,
final Throwable t) {
- switch (level) {
- case DEBUG:
- debug(msg, os, t);
- break;
- case ERROR:
- case FATAL:
- error(msg, os, t);
- break;
- case INFO:
- info(msg, os, t);
- break;
- case TRACE:
- trace(msg, os, t);
- break;
- case WARN:
- warn(msg, os, t);
- break;
- }
- }
-
@Override
public void log(final LogMessage message) {
switch (message.getLogLevel()) {
@@ -538,15 +436,6 @@ public class SimpleProcessLogger implements ComponentLog {
return ArrayUtils.insert(0, originalArgs, component);
}
- private Object[] addThrowable(final Object[] originalArgs, final Throwable
throwable) {
- return ArrayUtils.add(originalArgs, throwable);
- }
-
- private Object[] addCauses(final Object[] arguments, final Throwable
throwable) {
- final String causes = getCauses(throwable);
- return ArrayUtils.add(arguments, causes);
- }
-
private Object[] setCauses(final Object[] arguments, final Throwable
throwable) {
final String causes = getCauses(throwable);
final int lastIndex = arguments.length - 1;
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/processor/TestSimpleProcessLogger.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/processor/TestSimpleProcessLogger.java
index 6ac558ca1f..ac6f0576d5 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/processor/TestSimpleProcessLogger.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/processor/TestSimpleProcessLogger.java
@@ -483,177 +483,4 @@ public class TestSimpleProcessLogger {
verify(logRepository).addLogMessage(eq(logLevel),
eq(LOG_ARGUMENTS_MESSAGE_WITH_COMPONENT_AND_CAUSES),
eq(componentValueCausesArguments), eq(EXCEPTION));
}
}
-
- @Test
- public void testLogLevelMessageArgumentsArrayThrowable() {
- for (final LogLevel logLevel : LogLevel.values()) {
- componentLog.log(logLevel, LOG_ARGUMENTS_MESSAGE, VALUE_ARGUMENTS,
EXCEPTION);
-
- switch (logLevel) {
- case TRACE:
- verify(logger,
times(1)).makeLoggingEventBuilder(eq(Level.TRACE));
- verify(loggingEventBuilder, times(1))
- .addKeyValue(eq(DISCRIMINATOR_KEY),
eq(LOG_FILE_SUFFIX));
- verify(loggingEventBuilder
- .addKeyValue(DISCRIMINATOR_KEY, LOG_FILE_SUFFIX),
times(1))
- .log(eq(LOG_ARGUMENTS_MESSAGE_WITH_COMPONENT),
argumentCaptor.capture());
-
- assertEquals(4, argumentCaptor.getValue().length);
- assertEquals(component, argumentCaptor.getValue()[0]);
- assertEquals(FIRST, argumentCaptor.getValue()[1]);
- assertEquals(SECOND, argumentCaptor.getValue()[2]);
- assertEquals(EXCEPTION, argumentCaptor.getValue()[3]);
-
- reset(loggingEventBuilder);
- break;
- case DEBUG:
- verify(logger,
times(1)).makeLoggingEventBuilder(eq(Level.DEBUG));
- verify(loggingEventBuilder, times(1))
- .addKeyValue(eq(DISCRIMINATOR_KEY),
eq(LOG_FILE_SUFFIX));
- verify(loggingEventBuilder
- .addKeyValue(DISCRIMINATOR_KEY, LOG_FILE_SUFFIX),
times(1))
- .log(eq(LOG_ARGUMENTS_MESSAGE_WITH_COMPONENT),
argumentCaptor.capture());
-
- assertEquals(4, argumentCaptor.getValue().length);
- assertEquals(component, argumentCaptor.getValue()[0]);
- assertEquals(FIRST, argumentCaptor.getValue()[1]);
- assertEquals(SECOND, argumentCaptor.getValue()[2]);
- assertEquals(EXCEPTION, argumentCaptor.getValue()[3]);
-
- reset(loggingEventBuilder);
- break;
- case INFO:
- verify(logger,
times(1)).makeLoggingEventBuilder(eq(Level.INFO));
- verify(loggingEventBuilder, times(1))
- .addKeyValue(eq(DISCRIMINATOR_KEY),
eq(LOG_FILE_SUFFIX));
- verify(loggingEventBuilder
- .addKeyValue(DISCRIMINATOR_KEY, LOG_FILE_SUFFIX),
times(1))
- .log(eq(LOG_ARGUMENTS_MESSAGE_WITH_COMPONENT),
argumentCaptor.capture());
-
- assertEquals(4, argumentCaptor.getValue().length);
- assertEquals(component, argumentCaptor.getValue()[0]);
- assertEquals(FIRST, argumentCaptor.getValue()[1]);
- assertEquals(SECOND, argumentCaptor.getValue()[2]);
- assertEquals(EXCEPTION, argumentCaptor.getValue()[3]);
-
- reset(loggingEventBuilder);
- break;
- case WARN:
- verify(logger,
times(1)).makeLoggingEventBuilder(eq(Level.WARN));
- verify(loggingEventBuilder, times(1))
- .addKeyValue(eq(DISCRIMINATOR_KEY),
eq(LOG_FILE_SUFFIX));
- verify(loggingEventBuilder
- .addKeyValue(DISCRIMINATOR_KEY, LOG_FILE_SUFFIX),
times(1))
- .log(eq(LOG_ARGUMENTS_MESSAGE_WITH_COMPONENT),
argumentCaptor.capture());
-
- assertEquals(4, argumentCaptor.getValue().length);
- assertEquals(component, argumentCaptor.getValue()[0]);
- assertEquals(FIRST, argumentCaptor.getValue()[1]);
- assertEquals(SECOND, argumentCaptor.getValue()[2]);
- assertEquals(EXCEPTION, argumentCaptor.getValue()[3]);
-
- reset(loggingEventBuilder);
- break;
- case ERROR:
- verify(logger,
times(1)).makeLoggingEventBuilder(eq(Level.ERROR));
- verify(loggingEventBuilder, times(1))
- .addKeyValue(eq(DISCRIMINATOR_KEY),
eq(LOG_FILE_SUFFIX));
- verify(loggingEventBuilder
- .addKeyValue(DISCRIMINATOR_KEY, LOG_FILE_SUFFIX),
times(1))
- .log(eq(LOG_ARGUMENTS_MESSAGE_WITH_COMPONENT),
argumentCaptor.capture());
-
- assertEquals(4, argumentCaptor.getValue().length);
- assertEquals(component, argumentCaptor.getValue()[0]);
- assertEquals(FIRST, argumentCaptor.getValue()[1]);
- assertEquals(SECOND, argumentCaptor.getValue()[2]);
- assertEquals(EXCEPTION, argumentCaptor.getValue()[3]);
-
- reset(loggingEventBuilder);
- break;
- default:
- continue;
- }
-
- verify(logRepository).addLogMessage(eq(logLevel),
eq(LOG_ARGUMENTS_MESSAGE_WITH_COMPONENT_AND_CAUSES),
eq(componentValueCausesArguments), eq(EXCEPTION));
- }
- }
-
- @Test
- public void testLogLevelMessageArgumentsThrowableNull() {
- for (final LogLevel logLevel : LogLevel.values()) {
- componentLog.log(logLevel, LOG_ARGUMENTS_MESSAGE, VALUE_ARGUMENTS,
NULL_THROWABLE);
-
- switch (logLevel) {
- case TRACE:
- verify(logger,
times(1)).makeLoggingEventBuilder(eq(Level.TRACE));
- verify(loggingEventBuilder, times(1))
- .addKeyValue(eq(DISCRIMINATOR_KEY),
eq(LOG_FILE_SUFFIX));
- verify(loggingEventBuilder
- .addKeyValue(DISCRIMINATOR_KEY, LOG_FILE_SUFFIX),
times(1))
- .log(eq(LOG_ARGUMENTS_MESSAGE_WITH_COMPONENT),
argumentCaptor.capture());
- assertEquals(3, argumentCaptor.getValue().length);
- assertEquals(component, argumentCaptor.getValue()[0]);
- assertEquals(FIRST, argumentCaptor.getValue()[1]);
- assertEquals(SECOND, argumentCaptor.getValue()[2]);
- reset(loggingEventBuilder);
- break;
- case DEBUG:
- verify(logger,
times(1)).makeLoggingEventBuilder(eq(Level.DEBUG));
- verify(loggingEventBuilder, times(1))
- .addKeyValue(eq(DISCRIMINATOR_KEY),
eq(LOG_FILE_SUFFIX));
- verify(loggingEventBuilder
- .addKeyValue(DISCRIMINATOR_KEY, LOG_FILE_SUFFIX),
times(1))
- .log(eq(LOG_ARGUMENTS_MESSAGE_WITH_COMPONENT),
argumentCaptor.capture());
- assertEquals(3, argumentCaptor.getValue().length);
- assertEquals(component, argumentCaptor.getValue()[0]);
- assertEquals(FIRST, argumentCaptor.getValue()[1]);
- assertEquals(SECOND, argumentCaptor.getValue()[2]);
- reset(loggingEventBuilder);
- break;
- case INFO:
- verify(logger,
times(1)).makeLoggingEventBuilder(eq(Level.INFO));
- verify(loggingEventBuilder, times(1))
- .addKeyValue(eq(DISCRIMINATOR_KEY),
eq(LOG_FILE_SUFFIX));
- verify(loggingEventBuilder
- .addKeyValue(DISCRIMINATOR_KEY, LOG_FILE_SUFFIX),
times(1))
- .log(eq(LOG_ARGUMENTS_MESSAGE_WITH_COMPONENT),
argumentCaptor.capture());
- assertEquals(3, argumentCaptor.getValue().length);
- assertEquals(component, argumentCaptor.getValue()[0]);
- assertEquals(FIRST, argumentCaptor.getValue()[1]);
- assertEquals(SECOND, argumentCaptor.getValue()[2]);
- reset(loggingEventBuilder);
- break;
- case WARN:
- verify(logger,
times(1)).makeLoggingEventBuilder(eq(Level.WARN));
- verify(loggingEventBuilder, times(1))
- .addKeyValue(eq(DISCRIMINATOR_KEY),
eq(LOG_FILE_SUFFIX));
- verify(loggingEventBuilder
- .addKeyValue(DISCRIMINATOR_KEY, LOG_FILE_SUFFIX),
times(1))
- .log(eq(LOG_ARGUMENTS_MESSAGE_WITH_COMPONENT),
argumentCaptor.capture());
- assertEquals(3, argumentCaptor.getValue().length);
- assertEquals(component, argumentCaptor.getValue()[0]);
- assertEquals(FIRST, argumentCaptor.getValue()[1]);
- assertEquals(SECOND, argumentCaptor.getValue()[2]);
- reset(loggingEventBuilder);
- break;
- case ERROR:
- verify(logger,
times(1)).makeLoggingEventBuilder(eq(Level.ERROR));
- verify(loggingEventBuilder, times(1))
- .addKeyValue(eq(DISCRIMINATOR_KEY),
eq(LOG_FILE_SUFFIX));
- verify(loggingEventBuilder
- .addKeyValue(DISCRIMINATOR_KEY, LOG_FILE_SUFFIX),
times(1))
- .log(eq(LOG_ARGUMENTS_MESSAGE_WITH_COMPONENT),
argumentCaptor.capture());
- assertEquals(3, argumentCaptor.getValue().length);
- assertEquals(component, argumentCaptor.getValue()[0]);
- assertEquals(FIRST, argumentCaptor.getValue()[1]);
- assertEquals(SECOND, argumentCaptor.getValue()[2]);
- reset(loggingEventBuilder);
- break;
- default:
- continue;
- }
-
- verify(logRepository).addLogMessage(eq(logLevel),
eq(LOG_ARGUMENTS_MESSAGE_WITH_COMPONENT), eq(componentValueArguments));
- }
- }
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/TerminationAwareLogger.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/TerminationAwareLogger.java
index d31c46e884..4e3318bbaa 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/TerminationAwareLogger.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/TerminationAwareLogger.java
@@ -63,16 +63,6 @@ public class TerminationAwareLogger implements ComponentLog {
logger.warn(msg, os);
}
- @Override
- public void warn(String msg, Object[] os, Throwable t) {
- if (isTerminated()) {
- logger.debug(getMessage(msg, LogLevel.WARN), os, t);
- return;
- }
-
- logger.warn(msg, os, t);
- }
-
@Override
public void warn(String msg) {
if (isTerminated()) {
@@ -113,16 +103,6 @@ public class TerminationAwareLogger implements
ComponentLog {
logger.trace(msg);
}
- @Override
- public void trace(String msg, Object[] os, Throwable t) {
- if (isTerminated()) {
- logger.trace(getMessage(msg, LogLevel.TRACE), os, t);
- return;
- }
-
- logger.trace(msg, os, t);
- }
-
@Override
public boolean isWarnEnabled() {
return logger.isWarnEnabled();
@@ -178,16 +158,6 @@ public class TerminationAwareLogger implements
ComponentLog {
logger.info(msg);
}
- @Override
- public void info(String msg, Object[] os, Throwable t) {
- if (isTerminated()) {
- logger.debug(getMessage(msg, LogLevel.INFO), os, t);
- return;
- }
-
- logger.info(msg, os, t);
- }
-
@Override
public String getName() {
return logger.getName();
@@ -223,16 +193,6 @@ public class TerminationAwareLogger implements
ComponentLog {
logger.error(msg);
}
- @Override
- public void error(String msg, Object[] os, Throwable t) {
- if (isTerminated()) {
- logger.debug(getMessage(msg, LogLevel.ERROR), os, t);
- return;
- }
-
- logger.error(msg, os, t);
- }
-
@Override
public void debug(String msg, Throwable t) {
if (isTerminated()) {
@@ -253,16 +213,6 @@ public class TerminationAwareLogger implements
ComponentLog {
logger.debug(msg, os);
}
- @Override
- public void debug(String msg, Object[] os, Throwable t) {
- if (isTerminated()) {
- logger.debug(getMessage(msg, LogLevel.DEBUG), os, t);
- return;
- }
-
- logger.debug(msg, os, t);
- }
-
@Override
public void debug(String msg) {
if (isTerminated()) {
@@ -302,14 +252,4 @@ public class TerminationAwareLogger implements
ComponentLog {
logger.log(level, msg);
}
-
- @Override
- public void log(LogLevel level, String msg, Object[] os, Throwable t) {
- if (isTerminated()) {
- logger.debug(getMessage(msg, level), os, t);
- return;
- }
-
- logger.log(level, msg, os, t);
- }
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/mock/MockComponentLogger.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/mock/MockComponentLogger.java
index 949deadc2f..b609ce3ecc 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/mock/MockComponentLogger.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/mock/MockComponentLogger.java
@@ -39,12 +39,6 @@ public class MockComponentLogger implements ComponentLog {
logger.warn(msg, os);
}
- @Override
- public void warn(String msg, Object[] os, Throwable t) {
- logger.warn(msg, os);
- logger.warn("", t);
- }
-
@Override
public void warn(String msg) {
logger.warn(msg);
@@ -65,12 +59,6 @@ public class MockComponentLogger implements ComponentLog {
logger.trace(msg);
}
- @Override
- public void trace(String msg, Object[] os, Throwable t) {
- logger.trace(msg, os);
- logger.trace("", t);
- }
-
@Override
public boolean isWarnEnabled() {
return logger.isWarnEnabled();
@@ -112,12 +100,6 @@ public class MockComponentLogger implements ComponentLog {
}
- @Override
- public void info(String msg, Object[] os, Throwable t) {
- logger.info(msg, os);
- logger.info("", t);
- }
-
@Override
public String getName() {
return logger.getName();
@@ -138,12 +120,6 @@ public class MockComponentLogger implements ComponentLog {
logger.error(msg);
}
- @Override
- public void error(String msg, Object[] os, Throwable t) {
- logger.error(msg, os);
- logger.error("", t);
- }
-
@Override
public void debug(String msg, Throwable t) {
logger.debug(msg, t);
@@ -154,12 +130,6 @@ public class MockComponentLogger implements ComponentLog {
logger.debug(msg, os);
}
- @Override
- public void debug(String msg, Object[] os, Throwable t) {
- logger.debug(msg, os);
- logger.debug("", t);
- }
-
@Override
public void debug(String msg) {
logger.debug(msg);
diff --git
a/nifi-nar-bundles/nifi-rules-action-handler-bundle/nifi-rules-action-handler-service/src/test/java/org/apache/nifi/rules/handlers/MockComponentLog.java
b/nifi-nar-bundles/nifi-rules-action-handler-bundle/nifi-rules-action-handler-service/src/test/java/org/apache/nifi/rules/handlers/MockComponentLog.java
index 4412a840d0..827ca3a0e9 100644
---
a/nifi-nar-bundles/nifi-rules-action-handler-bundle/nifi-rules-action-handler-service/src/test/java/org/apache/nifi/rules/handlers/MockComponentLog.java
+++
b/nifi-nar-bundles/nifi-rules-action-handler-bundle/nifi-rules-action-handler-service/src/test/java/org/apache/nifi/rules/handlers/MockComponentLog.java
@@ -46,11 +46,6 @@ public class MockComponentLog implements ComponentLog {
warn(msg);
}
- @Override
- public void warn(String msg, Object[] os, Throwable t) {
- warn(convertMessage(msg,os));
- }
-
@Override
public void warn(String msg) {
warnMessage = msg;
@@ -76,11 +71,6 @@ public class MockComponentLog implements ComponentLog {
traceMessage = msg;
}
- @Override
- public void trace(String msg, Object[] os, Throwable t) {
- trace(convertMessage(msg,os));
- }
-
@Override
public void trace(LogMessage logMessage) {
traceMessage = logMessage.getMessage();
@@ -126,11 +116,6 @@ public class MockComponentLog implements ComponentLog {
infoMessage = msg;
}
- @Override
- public void info(String msg, Object[] os, Throwable t) {
- info(convertMessage(msg,os));
- }
-
@Override
public void info(LogMessage message) {
infoMessage = message.getMessage();
@@ -156,11 +141,6 @@ public class MockComponentLog implements ComponentLog {
errorMessage = msg;
}
- @Override
- public void error(String msg, Object[] os, Throwable t) {
- error(msg);
- }
-
@Override
public void error(LogMessage message) {
errorMessage = message.getMessage();
@@ -176,11 +156,6 @@ public class MockComponentLog implements ComponentLog {
debug(convertMessage(msg, os));
}
- @Override
- public void debug(String msg, Object[] os, Throwable t) {
- debug(msg);
- }
-
@Override
public void debug(String msg) {
debugMessage = msg;
@@ -201,11 +176,6 @@ public class MockComponentLog implements ComponentLog {
}
- @Override
- public void log(LogLevel level, String msg, Object[] os, Throwable t) {
-
- }
-
public String getInfoMessage() {
return infoMessage;
}
