You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/02/19 20:46:37 UTC
[2/3] incubator-nifi git commit: NIFI-368: added componentlog to the
initialization contexts for appropriate components and made abstract
components return logger via getLogger() methods
NIFI-368: added componentlog to the initialization contexts for appropriate components and made abstract components return logger via getLogger() methods
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/5f2a4358
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/5f2a4358
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/5f2a4358
Branch: refs/heads/NIFI-250
Commit: 5f2a4358869853deff7747ae3908d6952ee94001
Parents: 8f78d61
Author: Mark Payne <ma...@hotmail.com>
Authored: Thu Feb 19 14:45:46 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Thu Feb 19 14:45:46 2015 -0500
----------------------------------------------------------------------
...kControllerServiceInitializationContext.java | 10 +++++-
.../org/apache/nifi/util/MockProcessorLog.java | 34 +++++++++---------
.../MockReportingInitializationContext.java | 10 +++++-
.../nifi/util/StandardProcessorTestRunner.java | 5 ++-
.../cluster/manager/impl/WebClusterManager.java | 6 +++-
.../StandardReportingInitializationContext.java | 13 +++++--
...dControllerServiceInitializationContext.java | 10 +++++-
.../StandardControllerServiceProvider.java | 5 ++-
.../nifi/processor/SimpleProcessLogger.java | 36 ++++++++++----------
.../standard/TestDetectDuplicate.java | 5 ++-
10 files changed, 89 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5f2a4358/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockControllerServiceInitializationContext.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockControllerServiceInitializationContext.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockControllerServiceInitializationContext.java
index 1d74029..38bf4fe 100644
--- a/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockControllerServiceInitializationContext.java
+++ b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockControllerServiceInitializationContext.java
@@ -19,13 +19,16 @@ package org.apache.nifi.util;
import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.controller.ControllerServiceInitializationContext;
import org.apache.nifi.controller.ControllerServiceLookup;
+import org.apache.nifi.logging.ComponentLog;
public class MockControllerServiceInitializationContext extends MockControllerServiceLookup implements ControllerServiceInitializationContext, ControllerServiceLookup {
private final String identifier;
+ private final ComponentLog logger;
- public MockControllerServiceInitializationContext(final ControllerService controllerService, final String identifier) {
+ public MockControllerServiceInitializationContext(final ControllerService controllerService, final String identifier, final ComponentLog logger) {
this.identifier = identifier;
+ this.logger = logger;
addControllerService(controllerService, identifier);
}
@@ -43,4 +46,9 @@ public class MockControllerServiceInitializationContext extends MockControllerSe
public ControllerServiceLookup getControllerServiceLookup() {
return this;
}
+
+ @Override
+ public ComponentLog getLogger() {
+ return logger;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5f2a4358/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorLog.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorLog.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorLog.java
index f8489f8..5505e88 100644
--- a/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorLog.java
+++ b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorLog.java
@@ -17,28 +17,26 @@
package org.apache.nifi.util;
import org.apache.nifi.logging.ProcessorLog;
-import org.apache.nifi.processor.Processor;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class MockProcessorLog implements ProcessorLog {
private final Logger logger;
- private final Processor processor;
+ private final Object component;
- public MockProcessorLog(final String processorId, final Processor processor) {
- this.logger = LoggerFactory.getLogger(processor.getClass());
- this.processor = processor;
+ public MockProcessorLog(final String componentId, final Object component) {
+ this.logger = LoggerFactory.getLogger(component.getClass());
+ this.component = component;
}
private Object[] addProcessor(final Object[] originalArgs) {
- return prependToArgs(originalArgs, processor);
+ return prependToArgs(originalArgs, component);
}
private Object[] addProcessorAndThrowable(final Object[] os, final Throwable t) {
final Object[] modifiedArgs = new Object[os.length + 2];
- modifiedArgs[0] = processor.toString();
+ modifiedArgs[0] = component.toString();
for (int i = 0; i < os.length; i++) {
modifiedArgs[i + 1] = os[i];
}
@@ -75,7 +73,7 @@ public class MockProcessorLog implements ProcessorLog {
*/
@Override
public void warn(final String msg, final Throwable t) {
- warn("{} " + msg, new Object[]{processor}, t);
+ warn("{} " + msg, new Object[]{component}, t);
}
/**
@@ -118,7 +116,7 @@ public class MockProcessorLog implements ProcessorLog {
@Override
public void warn(String msg) {
msg = "{} " + msg;
- logger.warn(msg, processor);
+ logger.warn(msg, component);
}
/**
@@ -129,7 +127,7 @@ public class MockProcessorLog implements ProcessorLog {
@Override
public void trace(String msg, Throwable t) {
msg = "{} " + msg;
- final Object[] os = {processor};
+ final Object[] os = {component};
logger.trace(msg, os, t);
}
@@ -152,7 +150,7 @@ public class MockProcessorLog implements ProcessorLog {
@Override
public void trace(String msg) {
msg = "{} " + msg;
- final Object[] os = {processor};
+ final Object[] os = {component};
logger.trace(msg, os);
}
@@ -224,7 +222,7 @@ public class MockProcessorLog implements ProcessorLog {
@Override
public void info(String msg, Throwable t) {
msg = "{} " + msg;
- final Object[] os = {processor};
+ final Object[] os = {component};
logger.info(msg, os);
if (logger.isDebugEnabled()) {
@@ -252,7 +250,7 @@ public class MockProcessorLog implements ProcessorLog {
@Override
public void info(String msg) {
msg = "{} " + msg;
- final Object[] os = {processor};
+ final Object[] os = {component};
logger.info(msg, os);
}
@@ -291,7 +289,7 @@ public class MockProcessorLog implements ProcessorLog {
@Override
public void error(String msg, Throwable t) {
msg = "{} " + msg;
- final Object[] os = {processor};
+ final Object[] os = {component};
logger.error(msg, os, t);
if (logger.isDebugEnabled()) {
@@ -322,7 +320,7 @@ public class MockProcessorLog implements ProcessorLog {
@Override
public void error(String msg) {
msg = "{} " + msg;
- final Object[] os = {processor};
+ final Object[] os = {component};
logger.error(msg, os);
}
@@ -352,7 +350,7 @@ public class MockProcessorLog implements ProcessorLog {
@Override
public void debug(String msg, Throwable t) {
msg = "{} " + msg;
- final Object[] os = {processor};
+ final Object[] os = {component};
logger.debug(msg, os, t);
}
@@ -394,7 +392,7 @@ public class MockProcessorLog implements ProcessorLog {
@Override
public void debug(String msg) {
msg = "{} " + msg;
- final Object[] os = {processor};
+ final Object[] os = {component};
logger.debug(msg, os);
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5f2a4358/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockReportingInitializationContext.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockReportingInitializationContext.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockReportingInitializationContext.java
index a874536..7cabef2 100644
--- a/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockReportingInitializationContext.java
+++ b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockReportingInitializationContext.java
@@ -22,6 +22,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.controller.ControllerServiceLookup;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.reporting.ReportingInitializationContext;
import org.apache.nifi.scheduling.SchedulingStrategy;
@@ -30,10 +31,12 @@ public class MockReportingInitializationContext extends MockControllerServiceLoo
private final String identifier;
private final String name;
private final Map<PropertyDescriptor, String> properties = new HashMap<>();
+ private final ComponentLog logger;
- public MockReportingInitializationContext(final String identifier, final String name) {
+ public MockReportingInitializationContext(final String identifier, final String name, final ComponentLog logger) {
this.identifier = identifier;
this.name = name;
+ this.logger = logger;
}
@Override
@@ -78,4 +81,9 @@ public class MockReportingInitializationContext extends MockControllerServiceLoo
public SchedulingStrategy getSchedulingStrategy() {
return SchedulingStrategy.TIMER_DRIVEN;
}
+
+ @Override
+ public ComponentLog getLogger() {
+ return logger;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5f2a4358/nifi/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
index f3fd3e8..f854826 100644
--- a/nifi/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
+++ b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
@@ -59,6 +59,7 @@ import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessSessionFactory;
import org.apache.nifi.processor.Processor;
import org.apache.nifi.processor.QueueSize;
@@ -512,13 +513,15 @@ public class StandardProcessorTestRunner implements TestRunner {
@Override
public void addControllerService(final String identifier, final ControllerService service, final Map<String, String> properties) throws InitializationException {
+ // hold off on failing due to deprecated annotation for now... will introduce later.
// for ( final Method method : service.getClass().getMethods() ) {
// if ( method.isAnnotationPresent(org.apache.nifi.controller.annotation.OnConfigured.class) ) {
// Assert.fail("Controller Service " + service + " is using deprecated Annotation " + org.apache.nifi.controller.annotation.OnConfigured.class + " for method " + method);
// }
// }
- final MockControllerServiceInitializationContext initContext = new MockControllerServiceInitializationContext(requireNonNull(service), requireNonNull(identifier));
+ final ComponentLog logger = new MockProcessorLog(identifier, service);
+ final MockControllerServiceInitializationContext initContext = new MockControllerServiceInitializationContext(requireNonNull(service), requireNonNull(identifier), logger);
service.initialize(initContext);
final Map<PropertyDescriptor, String> resolvedProps = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5f2a4358/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
index 3e522b9..f4c86f6 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
@@ -154,10 +154,12 @@ import org.apache.nifi.events.BulletinFactory;
import org.apache.nifi.events.VolatileBulletinRepository;
import org.apache.nifi.framework.security.util.SslContextFactory;
import org.apache.nifi.io.socket.multicast.DiscoverableService;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.logging.NiFiLog;
import org.apache.nifi.nar.ExtensionManager;
import org.apache.nifi.nar.NarCloseable;
import org.apache.nifi.nar.NarThreadContextClassLoader;
+import org.apache.nifi.processor.SimpleProcessLogger;
import org.apache.nifi.processor.StandardValidationContextFactory;
import org.apache.nifi.remote.RemoteResourceManager;
import org.apache.nifi.remote.RemoteSiteListener;
@@ -940,7 +942,9 @@ public class WebClusterManager implements HttpClusterManager, ProtocolHandler, C
final ReportingTask reportingTask = reportingTaskNode.getReportingTask();
- final ReportingInitializationContext config = new StandardReportingInitializationContext(taskId, taskName, schedulingStrategy, taskSchedulingPeriod, this);
+ final ComponentLog componentLog = new SimpleProcessLogger(taskId, reportingTask);
+ final ReportingInitializationContext config = new StandardReportingInitializationContext(taskId, taskName,
+ schedulingStrategy, taskSchedulingPeriod, componentLog, this);
reportingTask.initialize(config);
final Map<PropertyDescriptor, String> resolvedProps;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5f2a4358/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/StandardReportingInitializationContext.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/StandardReportingInitializationContext.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/StandardReportingInitializationContext.java
index 6330373..a2cf8ee 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/StandardReportingInitializationContext.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/StandardReportingInitializationContext.java
@@ -22,6 +22,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.controller.ControllerServiceLookup;
import org.apache.nifi.controller.service.ControllerServiceProvider;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.reporting.ReportingInitializationContext;
import org.apache.nifi.scheduling.SchedulingStrategy;
import org.apache.nifi.util.FormatUtils;
@@ -33,13 +34,16 @@ public class StandardReportingInitializationContext implements ReportingInitiali
private final String schedulingPeriod;
private final SchedulingStrategy schedulingStrategy;
private final ControllerServiceProvider serviceProvider;
-
- public StandardReportingInitializationContext(final String id, final String name, final SchedulingStrategy schedulingStrategy, final String schedulingPeriod, final ControllerServiceProvider serviceProvider) {
+ private final ComponentLog logger;
+
+ public StandardReportingInitializationContext(final String id, final String name, final SchedulingStrategy schedulingStrategy,
+ final String schedulingPeriod, final ComponentLog logger, final ControllerServiceProvider serviceProvider) {
this.id = id;
this.name = name;
this.schedulingPeriod = schedulingPeriod;
this.serviceProvider = serviceProvider;
this.schedulingStrategy = schedulingStrategy;
+ this.logger = logger;
}
@Override
@@ -98,4 +102,9 @@ public class StandardReportingInitializationContext implements ReportingInitiali
public String getControllerServiceName(final String serviceIdentifier) {
return serviceProvider.getControllerServiceName(serviceIdentifier);
}
+
+ @Override
+ public ComponentLog getLogger() {
+ return logger;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5f2a4358/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceInitializationContext.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceInitializationContext.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceInitializationContext.java
index ed7a152..dee8b37 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceInitializationContext.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceInitializationContext.java
@@ -21,14 +21,17 @@ import java.util.Set;
import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.controller.ControllerServiceInitializationContext;
import org.apache.nifi.controller.ControllerServiceLookup;
+import org.apache.nifi.logging.ComponentLog;
public class StandardControllerServiceInitializationContext implements ControllerServiceInitializationContext, ControllerServiceLookup {
private final String id;
private final ControllerServiceProvider serviceProvider;
+ private final ComponentLog logger;
- public StandardControllerServiceInitializationContext(final String identifier, final ControllerServiceProvider serviceProvider) {
+ public StandardControllerServiceInitializationContext(final String identifier, final ComponentLog logger, final ControllerServiceProvider serviceProvider) {
this.id = identifier;
+ this.logger = logger;
this.serviceProvider = serviceProvider;
}
@@ -66,4 +69,9 @@ public class StandardControllerServiceInitializationContext implements Controlle
public String getControllerServiceName(final String serviceIdentifier) {
return serviceProvider.getControllerServiceName(serviceIdentifier);
}
+
+ @Override
+ public ComponentLog getLogger() {
+ return logger;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5f2a4358/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
index d6596a4..74f11fb 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
@@ -44,8 +44,10 @@ import org.apache.nifi.controller.ScheduledState;
import org.apache.nifi.controller.ValidationContextFactory;
import org.apache.nifi.controller.exception.ControllerServiceNotFoundException;
import org.apache.nifi.controller.exception.ProcessorLifeCycleException;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.nar.ExtensionManager;
import org.apache.nifi.nar.NarCloseable;
+import org.apache.nifi.processor.SimpleProcessLogger;
import org.apache.nifi.processor.StandardValidationContextFactory;
import org.apache.nifi.util.ObjectHolder;
import org.apache.nifi.util.ReflectionUtils;
@@ -156,7 +158,8 @@ public class StandardControllerServiceProvider implements ControllerServiceProvi
}
logger.info("Create Controller Service of type {} with identifier {}", type, id);
- originalService.initialize(new StandardControllerServiceInitializationContext(id, this));
+ final ComponentLog serviceLogger = new SimpleProcessLogger(id, originalService);
+ originalService.initialize(new StandardControllerServiceInitializationContext(id, serviceLogger, this));
final ValidationContextFactory validationContextFactory = new StandardValidationContextFactory(this);
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5f2a4358/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
index 88f1790..25d8f10 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
@@ -28,16 +28,16 @@ public class SimpleProcessLogger implements ProcessorLog {
private final Logger logger;
private final LogRepository logRepository;
- private final Processor processor;
+ private final Object component;
- public SimpleProcessLogger(final String processorId, final Processor processor) {
- this.logger = LoggerFactory.getLogger(processor.getClass());
- this.logRepository = LogRepositoryFactory.getRepository(processorId);
- this.processor = processor;
+ public SimpleProcessLogger(final String componentId, final Object component) {
+ this.logger = LoggerFactory.getLogger(component.getClass());
+ this.logRepository = LogRepositoryFactory.getRepository(componentId);
+ this.component = component;
}
private Object[] addProcessor(final Object[] originalArgs) {
- return prependToArgs(originalArgs, processor);
+ return prependToArgs(originalArgs, component);
}
private Object[] prependToArgs(final Object[] originalArgs, final Object... toAdd) {
@@ -63,7 +63,7 @@ public class SimpleProcessLogger implements ProcessorLog {
@Override
public void warn(final String msg, final Throwable t) {
- warn("{} " + msg, new Object[]{processor}, t);
+ warn("{} " + msg, new Object[]{component}, t);
}
@Override
@@ -93,15 +93,15 @@ public class SimpleProcessLogger implements ProcessorLog {
@Override
public void warn(String msg) {
msg = "{} " + msg;
- final Object[] os = {processor};
- logger.warn(msg, processor);
+ final Object[] os = {component};
+ logger.warn(msg, component);
logRepository.addLogMessage(LogLevel.WARN, msg, os);
}
@Override
public void trace(String msg, Throwable t) {
msg = "{} " + msg;
- final Object[] os = {processor};
+ final Object[] os = {component};
logger.trace(msg, os, t);
logRepository.addLogMessage(LogLevel.TRACE, msg, os, t);
}
@@ -117,7 +117,7 @@ public class SimpleProcessLogger implements ProcessorLog {
@Override
public void trace(String msg) {
msg = "{} " + msg;
- final Object[] os = {processor};
+ final Object[] os = {component};
logger.trace(msg, os);
logRepository.addLogMessage(LogLevel.TRACE, msg, os);
}
@@ -160,7 +160,7 @@ public class SimpleProcessLogger implements ProcessorLog {
@Override
public void info(String msg, Throwable t) {
msg = "{} " + msg;
- final Object[] os = {processor};
+ final Object[] os = {component};
logger.info(msg, os);
if (logger.isDebugEnabled()) {
@@ -181,7 +181,7 @@ public class SimpleProcessLogger implements ProcessorLog {
@Override
public void info(String msg) {
msg = "{} " + msg;
- final Object[] os = {processor};
+ final Object[] os = {component};
logger.info(msg, os);
logRepository.addLogMessage(LogLevel.INFO, msg, os);
@@ -207,7 +207,7 @@ public class SimpleProcessLogger implements ProcessorLog {
@Override
public void error(String msg, Throwable t) {
msg = "{} " + msg;
- final Object[] os = {processor};
+ final Object[] os = {component};
logger.error(msg, os, t);
if (logger.isDebugEnabled()) {
@@ -231,7 +231,7 @@ public class SimpleProcessLogger implements ProcessorLog {
@Override
public void error(String msg) {
msg = "{} " + msg;
- final Object[] os = {processor};
+ final Object[] os = {component};
logger.error(msg, os);
logRepository.addLogMessage(LogLevel.ERROR, msg, os);
@@ -239,7 +239,7 @@ public class SimpleProcessLogger implements ProcessorLog {
private Object[] addProcessorAndThrowable(final Object[] os, final Throwable t) {
final Object[] modifiedArgs = new Object[os.length + 2];
- modifiedArgs[0] = processor.toString();
+ modifiedArgs[0] = component.toString();
for (int i = 0; i < os.length; i++) {
modifiedArgs[i + 1] = os[i];
}
@@ -263,7 +263,7 @@ public class SimpleProcessLogger implements ProcessorLog {
@Override
public void debug(String msg, Throwable t) {
msg = "{} " + msg;
- final Object[] os = {processor};
+ final Object[] os = {component};
logger.debug(msg, os, t);
logRepository.addLogMessage(LogLevel.DEBUG, msg, os, t);
@@ -298,7 +298,7 @@ public class SimpleProcessLogger implements ProcessorLog {
@Override
public void debug(String msg) {
msg = "{} " + msg;
- final Object[] os = {processor};
+ final Object[] os = {component};
logger.debug(msg, os);
logRepository.addLogMessage(LogLevel.DEBUG, msg, os);
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5f2a4358/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java
index 4a74416..eed0d36 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java
@@ -32,8 +32,10 @@ import org.apache.nifi.distributed.cache.client.Deserializer;
import org.apache.nifi.distributed.cache.client.DistributedMapCacheClient;
import org.apache.nifi.distributed.cache.client.DistributedMapCacheClientService;
import org.apache.nifi.distributed.cache.client.Serializer;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.util.MockControllerServiceInitializationContext;
+import org.apache.nifi.util.MockProcessorLog;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.Test;
@@ -111,7 +113,8 @@ public class TestDetectDuplicate {
private DistributedMapCacheClientImpl createClient() throws InitializationException {
final DistributedMapCacheClientImpl client = new DistributedMapCacheClientImpl();
- MockControllerServiceInitializationContext clientInitContext = new MockControllerServiceInitializationContext(client, "client");
+ final ComponentLog logger = new MockProcessorLog("client", client);
+ MockControllerServiceInitializationContext clientInitContext = new MockControllerServiceInitializationContext(client, "client", logger);
client.initialize(clientInitContext);
return client;