You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2016/05/19 19:15:15 UTC
[1/5] nifi git commit: NIFI-1811 Removed ProcessorLog and updated
dependent interfaces
Repository: nifi
Updated Branches:
refs/heads/master 2d03489ec -> 1bd2cf0d0
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ContentAcknowledgmentServlet.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ContentAcknowledgmentServlet.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ContentAcknowledgmentServlet.java
index 3252aea..0faeec6 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ContentAcknowledgmentServlet.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ContentAcknowledgmentServlet.java
@@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.Path;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.Processor;
import org.apache.nifi.processors.standard.ListenHTTP;
@@ -46,7 +46,7 @@ public class ContentAcknowledgmentServlet extends HttpServlet {
private Processor processor;
private Pattern authorizedPattern;
- private ProcessorLog logger;
+ private ComponentLog logger;
private ConcurrentMap<String, FlowFileEntryTimeWrapper> flowFileMap;
@SuppressWarnings("unchecked")
@@ -54,7 +54,7 @@ public class ContentAcknowledgmentServlet extends HttpServlet {
public void init(final ServletConfig config) throws ServletException {
final ServletContext context = config.getServletContext();
this.processor = (Processor) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_PROCESSOR);
- this.logger = (ProcessorLog) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_LOGGER);
+ this.logger = (ComponentLog) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_LOGGER);
this.authorizedPattern = (Pattern) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_AUTHORITY_PATTERN);
this.flowFileMap = (ConcurrentMap<String, FlowFileEntryTimeWrapper>) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_FLOWFILE_MAP);
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java
index d740f93..24cfe1d 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java
@@ -47,7 +47,7 @@ import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.stream.io.BufferedOutputStream;
import org.apache.nifi.stream.io.StreamThrottler;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.ProcessSessionFactory;
@@ -87,7 +87,7 @@ public class ListenHTTPServlet extends HttpServlet {
private final AtomicLong filesReceived = new AtomicLong(0L);
private final AtomicBoolean spaceAvailable = new AtomicBoolean(true);
- private ProcessorLog logger;
+ private ComponentLog logger;
private AtomicReference<ProcessSessionFactory> sessionFactoryHolder;
private volatile ProcessContext processContext;
private Pattern authorizedPattern;
@@ -100,7 +100,7 @@ public class ListenHTTPServlet extends HttpServlet {
@Override
public void init(final ServletConfig config) throws ServletException {
final ServletContext context = config.getServletContext();
- this.logger = (ProcessorLog) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_LOGGER);
+ this.logger = (ComponentLog) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_LOGGER);
this.sessionFactoryHolder = (AtomicReference<ProcessSessionFactory>) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_SESSION_FACTORY_HOLDER);
this.processContext = (ProcessContext) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_PROCESS_CONTEXT_HOLDER);
this.authorizedPattern = (Pattern) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_AUTHORITY_PATTERN);
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
index a038eb7..3baf657 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
@@ -40,7 +40,7 @@ import org.apache.commons.net.ftp.FTPHTTPClient;
import org.apache.commons.net.ftp.FTPReply;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processor.util.StandardValidators;
@@ -105,7 +105,7 @@ public class FTPTransfer implements FileTransfer {
.sensitive(true)
.build();
- private final ProcessorLog logger;
+ private final ComponentLog logger;
private final ProcessContext ctx;
private boolean closed = true;
@@ -113,7 +113,7 @@ public class FTPTransfer implements FileTransfer {
private String homeDirectory;
private String remoteHostName;
- public FTPTransfer(final ProcessContext context, final ProcessorLog logger) {
+ public FTPTransfer(final ProcessContext context, final ComponentLog logger) {
this.ctx = context;
this.logger = logger;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java
index 9bad520..3a88862 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java
@@ -36,7 +36,7 @@ import java.util.regex.Pattern;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.PropertyValue;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.util.StandardValidators;
import org.slf4j.LoggerFactory;
@@ -107,7 +107,7 @@ public class SFTPTransfer implements FileTransfer {
.defaultValue("false")
.build();
- private final ProcessorLog logger;
+ private final ComponentLog logger;
private final ProcessContext ctx;
private Session session;
@@ -117,7 +117,7 @@ public class SFTPTransfer implements FileTransfer {
private final boolean disableDirectoryListing;
- public SFTPTransfer(final ProcessContext processContext, final ProcessorLog logger) {
+ public SFTPTransfer(final ProcessContext processContext, final ComponentLog logger) {
this.ctx = processContext;
this.logger = logger;
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/UDPStreamConsumer.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/UDPStreamConsumer.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/UDPStreamConsumer.java
index 38f8add..e159bdd 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/UDPStreamConsumer.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/UDPStreamConsumer.java
@@ -31,7 +31,7 @@ import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.stream.io.BufferedOutputStream;
import org.apache.nifi.io.nio.BufferPool;
import org.apache.nifi.io.nio.consumer.StreamConsumer;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.io.OutputStreamCallback;
@@ -44,7 +44,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
*/
public class UDPStreamConsumer implements StreamConsumer {
- private final ProcessorLog logger;
+ private final ComponentLog logger;
final List<FlowFile> newFlowFileQueue;
private final String uniqueId;
private BufferPool bufferPool = null;
@@ -54,7 +54,7 @@ public class UDPStreamConsumer implements StreamConsumer {
private ProcessSession session;
private final UDPConsumerCallback udpCallback;
- public UDPStreamConsumer(final String streamId, final List<FlowFile> newFlowFiles, final long fileSizeTrigger, final ProcessorLog logger,
+ public UDPStreamConsumer(final String streamId, final List<FlowFile> newFlowFiles, final long fileSizeTrigger, final ComponentLog logger,
final boolean flowFilePerDatagram) {
this.uniqueId = streamId;
this.newFlowFileQueue = newFlowFiles;
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/WrappedMessageConsumer.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/WrappedMessageConsumer.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/WrappedMessageConsumer.java
index fca6a70..cc33184 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/WrappedMessageConsumer.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/WrappedMessageConsumer.java
@@ -21,7 +21,7 @@ import javax.jms.JMSException;
import javax.jms.MessageConsumer;
import javax.jms.Session;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
public class WrappedMessageConsumer {
@@ -49,7 +49,7 @@ public class WrappedMessageConsumer {
return consumer;
}
- public void close(final ProcessorLog logger) {
+ public void close(final ComponentLog logger) {
closed = true;
try {
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/WrappedMessageProducer.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/WrappedMessageProducer.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/WrappedMessageProducer.java
index fc01b02..49e586d 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/WrappedMessageProducer.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/WrappedMessageProducer.java
@@ -21,7 +21,7 @@ import javax.jms.JMSException;
import javax.jms.MessageProducer;
import javax.jms.Session;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
public class WrappedMessageProducer {
@@ -49,7 +49,7 @@ public class WrappedMessageProducer {
return producer;
}
- public void close(final ProcessorLog logger) {
+ public void close(final ComponentLog logger) {
closed = true;
try {
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java
index 0d7394e..b23d56b 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java
@@ -32,7 +32,7 @@ import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.state.MockStateManager;
import org.apache.nifi.util.MockControllerServiceInitializationContext;
-import org.apache.nifi.util.MockProcessorLog;
+import org.apache.nifi.util.MockComponentLog;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.Test;
@@ -103,7 +103,7 @@ public class TestDetectDuplicate {
private DistributedMapCacheClientImpl createClient() throws InitializationException {
final DistributedMapCacheClientImpl client = new DistributedMapCacheClientImpl();
- final ComponentLog logger = new MockProcessorLog("client", client);
+ final ComponentLog logger = new MockComponentLog("client", client);
final MockControllerServiceInitializationContext clientInitContext = new MockControllerServiceInitializationContext(client, "client", logger, new MockStateManager(client));
client.initialize(clientInitContext);
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/relp/handler/TestRELPFrameHandler.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/relp/handler/TestRELPFrameHandler.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/relp/handler/TestRELPFrameHandler.java
index 892fb8e..46cd3ef 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/relp/handler/TestRELPFrameHandler.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/relp/handler/TestRELPFrameHandler.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.processors.standard.relp.handler;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.util.listen.dispatcher.AsyncChannelDispatcher;
import org.apache.nifi.processor.util.listen.event.EventFactory;
import org.apache.nifi.processor.util.listen.response.ChannelResponder;
@@ -46,7 +46,7 @@ public class TestRELPFrameHandler {
private BlockingQueue<RELPEvent> events;
private SelectionKey key;
private AsyncChannelDispatcher dispatcher;
- private ProcessorLog logger;
+ private ComponentLog logger;
private RELPFrameHandler<RELPEvent> frameHandler;
@@ -57,7 +57,7 @@ public class TestRELPFrameHandler {
this.events = new LinkedBlockingQueue<>();
this.key = Mockito.mock(SelectionKey.class);
this.dispatcher = Mockito.mock(AsyncChannelDispatcher.class);
- this.logger = Mockito.mock(ProcessorLog.class);
+ this.logger = Mockito.mock(ComponentLog.class);
this.frameHandler = new RELPFrameHandler<>(key, charset, eventFactory, events, dispatcher, logger);
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/relp/handler/TestRELPSocketChannelHandler.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/relp/handler/TestRELPSocketChannelHandler.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/relp/handler/TestRELPSocketChannelHandler.java
index 0bec3ed..4ac1fb7 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/relp/handler/TestRELPSocketChannelHandler.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/relp/handler/TestRELPSocketChannelHandler.java
@@ -17,7 +17,7 @@
package org.apache.nifi.processors.standard.relp.handler;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.util.listen.dispatcher.AsyncChannelDispatcher;
import org.apache.nifi.processor.util.listen.dispatcher.ChannelDispatcher;
import org.apache.nifi.processor.util.listen.dispatcher.SocketChannelDispatcher;
@@ -50,7 +50,7 @@ public class TestRELPSocketChannelHandler {
private ChannelHandlerFactory<TestEvent,AsyncChannelDispatcher> channelHandlerFactory;
private BlockingQueue<ByteBuffer> byteBuffers;
private BlockingQueue<TestEvent> events;
- private ProcessorLog logger = Mockito.mock(ProcessorLog.class);
+ private ComponentLog logger = Mockito.mock(ComponentLog.class);
private int maxConnections;
private SSLContext sslContext;
private Charset charset;
@@ -65,7 +65,7 @@ public class TestRELPSocketChannelHandler {
byteBuffers.add(ByteBuffer.allocate(4096));
events = new LinkedBlockingQueue<>();
- logger = Mockito.mock(ProcessorLog.class);
+ logger = Mockito.mock(ComponentLog.class);
maxConnections = 1;
sslContext = null;
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java
index cff2b55..d267bf7 100644
--- a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java
+++ b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java
@@ -49,7 +49,7 @@ import org.apache.nifi.components.Validator;
import org.apache.nifi.expression.AttributeExpression;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -332,7 +332,7 @@ public class UpdateAttribute extends AbstractProcessor implements Searchable {
@Override
public void onTrigger(final ProcessContext context, final ProcessSession session) {
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final Criteria criteria = criteriaCache.get();
List<FlowFile> flowFiles = session.get(100);
@@ -385,7 +385,7 @@ public class UpdateAttribute extends AbstractProcessor implements Searchable {
//Evaluates the specified Criteria on the specified flowfile. Clones the
// specified flow file for each rule that is applied.
private boolean evaluateCriteria(final ProcessSession session, final ProcessContext context, final Criteria criteria, final FlowFile flowfile, final Map<FlowFile, List<Rule>> matchedRules) {
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final List<Rule> rules = criteria.getRules();
// consider each rule and hold a copy of the flowfile for each matched rule
@@ -459,7 +459,7 @@ public class UpdateAttribute extends AbstractProcessor implements Searchable {
// Executes the specified action on the specified flowfile.
private FlowFile executeActions(final ProcessSession session, final ProcessContext context, final List<Rule> rules, final Map<String, Action> defaultActions, final FlowFile flowfile) {
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final Map<String, Action> actions = new HashMap<>(defaultActions);
final String ruleName = (rules == null || rules.isEmpty()) ? "default" : rules.get(rules.size() - 1).getName();
[4/5] nifi git commit: NIFI-1811 Removed ProcessorLog and updated
dependent interfaces
Posted by al...@apache.org.
NIFI-1811 Removed ProcessorLog and updated dependent interfaces
This closes #403.
Signed-off-by: Aldrin Piri <al...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/372ffb8a
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/372ffb8a
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/372ffb8a
Branch: refs/heads/master
Commit: 372ffb8aa08ad51a8faf25e56b794183df9f8a4a
Parents: 2d03489
Author: Pierre Villard <pi...@gmail.com>
Authored: Mon May 2 17:47:44 2016 +0200
Committer: Aldrin Piri <al...@apache.org>
Committed: Thu May 19 13:08:09 2016 -0400
----------------------------------------------------------------------
.../org/apache/nifi/logging/ProcessorLog.java | 30 --
.../AbstractSessionFactoryProcessor.java | 6 +-
.../ProcessorInitializationContext.java | 6 +-
.../nifi/processor/util/bin/BinFiles.java | 4 +-
.../dispatcher/DatagramChannelDispatcher.java | 8 +-
.../dispatcher/SocketChannelDispatcher.java | 8 +-
.../processor/util/listen/event/EventQueue.java | 9 +-
.../util/listen/handler/ChannelHandler.java | 7 +-
.../listen/handler/ChannelHandlerFactory.java | 6 +-
.../handler/socket/SSLSocketChannelHandler.java | 4 +-
.../handler/socket/SocketChannelHandler.java | 4 +-
.../socket/SocketChannelHandlerFactory.java | 6 +-
.../socket/StandardSocketChannelHandler.java | 4 +-
.../util/put/sender/ChannelSender.java | 7 +-
.../util/put/sender/DatagramChannelSender.java | 5 +-
.../util/put/sender/SSLSocketChannelSender.java | 4 +-
.../util/put/sender/SocketChannelSender.java | 4 +-
.../src/main/asciidoc/developer-guide.adoc | 14 +-
.../org/apache/nifi/util/MockComponentLog.java | 402 +++++++++++++++++++
...kControllerServiceInitializationContext.java | 2 +-
.../MockProcessorInitializationContext.java | 6 +-
.../org/apache/nifi/util/MockProcessorLog.java | 402 -------------------
.../nifi/util/StandardProcessorTestRunner.java | 10 +-
.../java/org/apache/nifi/util/TestRunner.java | 8 +-
.../nifi/amqp/processors/AMQPPublisher.java | 6 +-
.../nifi/amqp/processors/AMQPPublisherTest.java | 4 +-
.../cassandra/AbstractCassandraProcessor.java | 4 +-
.../processors/cassandra/PutCassandraQL.java | 6 +-
.../processors/cassandra/QueryCassandra.java | 6 +-
.../couchbase/AbstractCouchbaseProcessor.java | 4 +-
.../processors/couchbase/GetCouchbaseKey.java | 4 +-
.../processors/couchbase/PutCouchbaseKey.java | 4 +-
.../AbstractElasticsearchProcessor.java | 4 +-
.../elasticsearch/FetchElasticsearch.java | 4 +-
.../elasticsearch/PutElasticsearch.java | 4 +-
.../init/ControllerServiceInitializer.java | 4 +-
.../init/ProcessorInitializer.java | 4 +-
.../MockProcessorInitializationContext.java | 4 +-
.../documentation/mock/MockProcessorLogger.java | 4 +-
.../documentation/util/ReflectionUtils.java | 6 +-
.../apache/nifi/controller/FlowController.java | 3 +-
.../nifi/controller/StandardProcessorNode.java | 4 +-
.../scheduling/EventDrivenSchedulingAgent.java | 8 +-
.../tasks/ContinuallyRunProcessorTask.java | 10 +-
.../nifi/processor/SimpleProcessLogger.java | 4 +-
.../StandardProcessorInitializationContext.java | 8 +-
.../org/apache/nifi/util/ReflectionUtils.java | 16 +-
.../apache/nifi/util/ReflectionUtilsTest.java | 4 +-
.../processors/hadoop/GetHDFSSequenceFile.java | 4 +-
.../processors/image/ExtractImageMetadata.java | 4 +-
.../apache/nifi/jms/processors/JMSConsumer.java | 6 +-
.../nifi/jms/processors/JMSPublisher.java | 6 +-
.../apache/nifi/jms/processors/JMSWorker.java | 8 +-
.../nifi/jms/processors/ConsumeJMSTest.java | 4 +-
.../processors/JMSPublisherConsumerTest.java | 10 +-
.../nifi/processors/kafka/KafkaPublisher.java | 12 +-
.../nifi/processors/mongodb/GetMongo.java | 4 +-
.../nifi/processors/mongodb/PutMongo.java | 4 +-
.../script/AbstractScriptProcessor.java | 18 +-
.../nifi/processors/script/ExecuteScript.java | 10 +-
.../script/InvokeScriptedProcessor.java | 22 +-
.../impl/GroovyScriptEngineConfigurator.java | 2 +-
.../testInvokeScriptCausesException.groovy | 2 +-
.../groovy/testScriptRoutesToFailure.groovy | 2 +-
.../apache/nifi/processors/solr/GetSolr.java | 4 +-
.../nifi/processors/splunk/TestPutSplunk.java | 6 +-
.../standard/Base64EncodeContent.java | 4 +-
.../nifi/processors/standard/BinFiles.java | 4 +-
.../processors/standard/CompressContent.java | 4 +-
.../nifi/processors/standard/ControlRate.java | 8 +-
.../standard/ConvertCharacterSet.java | 4 +-
.../processors/standard/DetectDuplicate.java | 4 +-
.../nifi/processors/standard/EncodeContent.java | 4 +-
.../processors/standard/EncryptContent.java | 4 +-
.../processors/standard/EvaluateJsonPath.java | 4 +-
.../nifi/processors/standard/EvaluateXPath.java | 6 +-
.../processors/standard/EvaluateXQuery.java | 4 +-
.../processors/standard/ExecuteProcess.java | 6 +-
.../nifi/processors/standard/ExecuteSQL.java | 4 +-
.../standard/ExecuteStreamCommand.java | 10 +-
.../nifi/processors/standard/ExtractText.java | 4 +-
.../standard/FetchDistributedMapCache.java | 4 +-
.../nifi/processors/standard/GetFile.java | 4 +-
.../processors/standard/GetFileTransfer.java | 4 +-
.../nifi/processors/standard/GetHTTP.java | 4 +-
.../nifi/processors/standard/GetJMSQueue.java | 4 +-
.../nifi/processors/standard/GetJMSTopic.java | 4 +-
.../nifi/processors/standard/HashAttribute.java | 4 +-
.../nifi/processors/standard/HashContent.java | 4 +-
.../processors/standard/IdentifyMimeType.java | 4 +-
.../nifi/processors/standard/InvokeHTTP.java | 8 +-
.../nifi/processors/standard/JmsConsumer.java | 6 +-
.../nifi/processors/standard/LogAttribute.java | 8 +-
.../nifi/processors/standard/ModifyBytes.java | 4 +-
.../processors/standard/MonitorActivity.java | 4 +-
.../nifi/processors/standard/PostHTTP.java | 6 +-
.../standard/PutDistributedMapCache.java | 4 +-
.../nifi/processors/standard/PutEmail.java | 6 +-
.../nifi/processors/standard/PutFile.java | 4 +-
.../processors/standard/PutFileTransfer.java | 6 +-
.../apache/nifi/processors/standard/PutJMS.java | 6 +-
.../processors/standard/QueryDatabaseTable.java | 4 +-
.../nifi/processors/standard/ReplaceText.java | 4 +-
.../standard/ReplaceTextWithMapping.java | 6 +-
.../processors/standard/RouteOnAttribute.java | 4 +-
.../processors/standard/RouteOnContent.java | 4 +-
.../nifi/processors/standard/RouteText.java | 4 +-
.../nifi/processors/standard/ScanAttribute.java | 4 +-
.../nifi/processors/standard/ScanContent.java | 6 +-
.../nifi/processors/standard/SplitContent.java | 4 +-
.../nifi/processors/standard/SplitJson.java | 4 +-
.../nifi/processors/standard/SplitText.java | 4 +-
.../nifi/processors/standard/SplitXml.java | 4 +-
.../nifi/processors/standard/TransformXml.java | 4 +-
.../nifi/processors/standard/UnpackContent.java | 4 +-
.../nifi/processors/standard/ValidateXml.java | 4 +-
.../standard/relp/handler/RELPFrameHandler.java | 6 +-
.../handler/RELPSSLSocketChannelHandler.java | 4 +-
.../relp/handler/RELPSocketChannelHandler.java | 4 +-
.../RELPSocketChannelHandlerFactory.java | 6 +-
.../servlets/ContentAcknowledgmentServlet.java | 6 +-
.../standard/servlets/ListenHTTPServlet.java | 6 +-
.../processors/standard/util/FTPTransfer.java | 6 +-
.../processors/standard/util/SFTPTransfer.java | 6 +-
.../standard/util/UDPStreamConsumer.java | 6 +-
.../standard/util/WrappedMessageConsumer.java | 4 +-
.../standard/util/WrappedMessageProducer.java | 4 +-
.../standard/TestDetectDuplicate.java | 4 +-
.../relp/handler/TestRELPFrameHandler.java | 6 +-
.../handler/TestRELPSocketChannelHandler.java | 6 +-
.../processors/attributes/UpdateAttribute.java | 8 +-
131 files changed, 761 insertions(+), 780 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-api/src/main/java/org/apache/nifi/logging/ProcessorLog.java
----------------------------------------------------------------------
diff --git a/nifi-api/src/main/java/org/apache/nifi/logging/ProcessorLog.java b/nifi-api/src/main/java/org/apache/nifi/logging/ProcessorLog.java
deleted file mode 100644
index a90ee26..0000000
--- a/nifi-api/src/main/java/org/apache/nifi/logging/ProcessorLog.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.logging;
-
-/**
- * The ProcessorLog is an extension of ComponentLog but provides no additional
- * functionality. It exists because ProcessorLog was created first, but when
- * Controller Services and Reporting Tasks began to be used more heavily loggers
- * were needed for them as well. We did not want to return a ProcessorLog to a
- * ControllerService or a ReportingTask, so all of the methods were moved to a
- * higher interface named ComponentLog. However, we kept the ProcessorLog
- * interface around in order to maintain backward compatibility.
- */
-public interface ProcessorLog extends ComponentLog {
-
-}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-api/src/main/java/org/apache/nifi/processor/AbstractSessionFactoryProcessor.java
----------------------------------------------------------------------
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/AbstractSessionFactoryProcessor.java b/nifi-api/src/main/java/org/apache/nifi/processor/AbstractSessionFactoryProcessor.java
index cb9b188..e257e47 100644
--- a/nifi-api/src/main/java/org/apache/nifi/processor/AbstractSessionFactoryProcessor.java
+++ b/nifi-api/src/main/java/org/apache/nifi/processor/AbstractSessionFactoryProcessor.java
@@ -24,7 +24,7 @@ import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.annotation.lifecycle.OnUnscheduled;
import org.apache.nifi.components.AbstractConfigurableComponent;
import org.apache.nifi.controller.ControllerServiceLookup;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
/**
* <p>
@@ -46,7 +46,7 @@ import org.apache.nifi.logging.ProcessorLog;
public abstract class AbstractSessionFactoryProcessor extends AbstractConfigurableComponent implements Processor {
private String identifier;
- private ProcessorLog logger;
+ private ComponentLog logger;
private volatile boolean scheduled = false;
private volatile boolean configurationRestored = false;
private ControllerServiceLookup serviceLookup;
@@ -75,7 +75,7 @@ public abstract class AbstractSessionFactoryProcessor extends AbstractConfigurab
return Collections.emptySet();
}
- protected final ProcessorLog getLogger() {
+ protected final ComponentLog getLogger() {
return logger;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-api/src/main/java/org/apache/nifi/processor/ProcessorInitializationContext.java
----------------------------------------------------------------------
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/ProcessorInitializationContext.java b/nifi-api/src/main/java/org/apache/nifi/processor/ProcessorInitializationContext.java
index 779633c..8a04887 100644
--- a/nifi-api/src/main/java/org/apache/nifi/processor/ProcessorInitializationContext.java
+++ b/nifi-api/src/main/java/org/apache/nifi/processor/ProcessorInitializationContext.java
@@ -17,7 +17,7 @@
package org.apache.nifi.processor;
import org.apache.nifi.controller.ControllerServiceLookup;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
/**
* <p>
@@ -34,10 +34,10 @@ public interface ProcessorInitializationContext {
String getIdentifier();
/**
- * @return a {@link ProcessorLog} that is tied to this processor that can be
+ * @return a {@link ComponentLog} that is tied to this processor that can be
* used to log events
*/
- ProcessorLog getLogger();
+ ComponentLog getLogger();
/**
* @return the {@link ControllerServiceLookup} which can be used to obtain
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java
index 46891a4..a93550d 100644
--- a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java
+++ b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java
@@ -30,7 +30,7 @@ import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractSessionFactoryProcessor;
import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.processor.ProcessContext;
@@ -223,7 +223,7 @@ public abstract class BinFiles extends AbstractSessionFactoryProcessor {
final List<Bin> bins = new ArrayList<>();
bins.add(bin);
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final ProcessSession session = sessionFactory.createSession();
final List<FlowFileSessionWrapper> binCopy = new ArrayList<>(bin.getContents());
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/dispatcher/DatagramChannelDispatcher.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/dispatcher/DatagramChannelDispatcher.java b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/dispatcher/DatagramChannelDispatcher.java
index 3fb9ba9..69a1998 100644
--- a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/dispatcher/DatagramChannelDispatcher.java
+++ b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/dispatcher/DatagramChannelDispatcher.java
@@ -17,7 +17,7 @@
package org.apache.nifi.processor.util.listen.dispatcher;
import org.apache.commons.io.IOUtils;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.util.listen.event.Event;
import org.apache.nifi.processor.util.listen.event.EventFactory;
import org.apache.nifi.processor.util.listen.event.EventFactoryUtil;
@@ -45,7 +45,7 @@ public class DatagramChannelDispatcher<E extends Event<DatagramChannel>> impleme
private final EventFactory<E> eventFactory;
private final BlockingQueue<ByteBuffer> bufferPool;
private final EventQueue<E> events;
- private final ProcessorLog logger;
+ private final ComponentLog logger;
private final String sendingHost;
private final Integer sendingPort;
@@ -56,14 +56,14 @@ public class DatagramChannelDispatcher<E extends Event<DatagramChannel>> impleme
public DatagramChannelDispatcher(final EventFactory<E> eventFactory,
final BlockingQueue<ByteBuffer> bufferPool,
final BlockingQueue<E> events,
- final ProcessorLog logger) {
+ final ComponentLog logger) {
this(eventFactory, bufferPool, events, logger, null, null);
}
public DatagramChannelDispatcher(final EventFactory<E> eventFactory,
final BlockingQueue<ByteBuffer> bufferPool,
final BlockingQueue<E> events,
- final ProcessorLog logger,
+ final ComponentLog logger,
final String sendingHost,
final Integer sendingPort) {
this.eventFactory = eventFactory;
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/dispatcher/SocketChannelDispatcher.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/dispatcher/SocketChannelDispatcher.java b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/dispatcher/SocketChannelDispatcher.java
index 70b2bae..b07fbb9 100644
--- a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/dispatcher/SocketChannelDispatcher.java
+++ b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/dispatcher/SocketChannelDispatcher.java
@@ -17,7 +17,7 @@
package org.apache.nifi.processor.util.listen.dispatcher;
import org.apache.commons.io.IOUtils;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.util.listen.event.Event;
import org.apache.nifi.processor.util.listen.event.EventFactory;
import org.apache.nifi.processor.util.listen.handler.ChannelHandlerFactory;
@@ -55,7 +55,7 @@ public class SocketChannelDispatcher<E extends Event<SocketChannel>> implements
private final ChannelHandlerFactory<E, AsyncChannelDispatcher> handlerFactory;
private final BlockingQueue<ByteBuffer> bufferPool;
private final BlockingQueue<E> events;
- private final ProcessorLog logger;
+ private final ComponentLog logger;
private final int maxConnections;
private final SSLContext sslContext;
private final SslContextFactory.ClientAuth clientAuth;
@@ -71,7 +71,7 @@ public class SocketChannelDispatcher<E extends Event<SocketChannel>> implements
final ChannelHandlerFactory<E, AsyncChannelDispatcher> handlerFactory,
final BlockingQueue<ByteBuffer> bufferPool,
final BlockingQueue<E> events,
- final ProcessorLog logger,
+ final ComponentLog logger,
final int maxConnections,
final SSLContext sslContext,
final Charset charset) {
@@ -82,7 +82,7 @@ public class SocketChannelDispatcher<E extends Event<SocketChannel>> implements
final ChannelHandlerFactory<E, AsyncChannelDispatcher> handlerFactory,
final BlockingQueue<ByteBuffer> bufferPool,
final BlockingQueue<E> events,
- final ProcessorLog logger,
+ final ComponentLog logger,
final int maxConnections,
final SSLContext sslContext,
final SslContextFactory.ClientAuth clientAuth,
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/event/EventQueue.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/event/EventQueue.java b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/event/EventQueue.java
index 4afaf40..35e9ae0 100644
--- a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/event/EventQueue.java
+++ b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/event/EventQueue.java
@@ -17,8 +17,7 @@
package org.apache.nifi.processor.util.listen.event;
import org.apache.commons.lang3.Validate;
-import org.apache.nifi.logging.ProcessorLog;
-
+import org.apache.nifi.logging.ComponentLog;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.TimeUnit;
@@ -36,13 +35,13 @@ public class EventQueue<E extends Event> {
private final long offerWaitMs;
private final BlockingQueue<E> events;
- private final ProcessorLog logger;
+ private final ComponentLog logger;
- public EventQueue(final BlockingQueue<E> events, final ProcessorLog logger) {
+ public EventQueue(final BlockingQueue<E> events, final ComponentLog logger) {
this(events, DEFAULT_OFFER_WAIT_MS, logger);
}
- public EventQueue(final BlockingQueue<E> events, final long offerWaitMs, final ProcessorLog logger) {
+ public EventQueue(final BlockingQueue<E> events, final long offerWaitMs, final ComponentLog logger) {
this.events = events;
this.offerWaitMs = offerWaitMs;
this.logger = logger;
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/ChannelHandler.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/ChannelHandler.java b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/ChannelHandler.java
index 6307c76..84ef062 100644
--- a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/ChannelHandler.java
+++ b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/ChannelHandler.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.processor.util.listen.handler;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.util.listen.dispatcher.ChannelDispatcher;
import org.apache.nifi.processor.util.listen.event.Event;
import org.apache.nifi.processor.util.listen.event.EventFactory;
@@ -36,15 +36,14 @@ public abstract class ChannelHandler<E extends Event, D extends ChannelDispatche
protected final Charset charset;
protected final EventFactory<E> eventFactory;
protected final EventQueue<E> events;
- protected final ProcessorLog logger;
-
+ protected final ComponentLog logger;
public ChannelHandler(final SelectionKey key,
final D dispatcher,
final Charset charset,
final EventFactory<E> eventFactory,
final BlockingQueue<E> events,
- final ProcessorLog logger) {
+ final ComponentLog logger) {
this.key = key;
this.dispatcher = dispatcher;
this.charset = charset;
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/ChannelHandlerFactory.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/ChannelHandlerFactory.java b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/ChannelHandlerFactory.java
index d7916fd..9ca6bdd 100644
--- a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/ChannelHandlerFactory.java
+++ b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/ChannelHandlerFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.processor.util.listen.handler;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.util.listen.dispatcher.ChannelDispatcher;
import org.apache.nifi.processor.util.listen.event.Event;
import org.apache.nifi.processor.util.listen.event.EventFactory;
@@ -35,12 +35,12 @@ public interface ChannelHandlerFactory<E extends Event, D extends ChannelDispatc
final Charset charset,
final EventFactory<E> eventFactory,
final BlockingQueue<E> events,
- final ProcessorLog logger);
+ final ComponentLog logger);
ChannelHandler<E, D> createSSLHandler(final SelectionKey key,
final D dispatcher,
final Charset charset,
final EventFactory<E> eventFactory,
final BlockingQueue<E> events,
- final ProcessorLog logger);
+ final ComponentLog logger);
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/socket/SSLSocketChannelHandler.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/socket/SSLSocketChannelHandler.java b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/socket/SSLSocketChannelHandler.java
index d11cb02..951dc4b 100644
--- a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/socket/SSLSocketChannelHandler.java
+++ b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/socket/SSLSocketChannelHandler.java
@@ -17,7 +17,7 @@
package org.apache.nifi.processor.util.listen.handler.socket;
import org.apache.commons.io.IOUtils;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.util.listen.dispatcher.AsyncChannelDispatcher;
import org.apache.nifi.processor.util.listen.dispatcher.SocketChannelAttachment;
import org.apache.nifi.processor.util.listen.event.Event;
@@ -51,7 +51,7 @@ public class SSLSocketChannelHandler<E extends Event<SocketChannel>> extends Soc
final Charset charset,
final EventFactory<E> eventFactory,
final BlockingQueue<E> events,
- final ProcessorLog logger) {
+ final ComponentLog logger) {
super(key, dispatcher, charset, eventFactory, events, logger);
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/socket/SocketChannelHandler.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/socket/SocketChannelHandler.java b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/socket/SocketChannelHandler.java
index d20aaa6..07b5dcc 100644
--- a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/socket/SocketChannelHandler.java
+++ b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/socket/SocketChannelHandler.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.processor.util.listen.handler.socket;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.util.listen.dispatcher.AsyncChannelDispatcher;
import org.apache.nifi.processor.util.listen.event.Event;
import org.apache.nifi.processor.util.listen.event.EventFactory;
@@ -39,7 +39,7 @@ public abstract class SocketChannelHandler<E extends Event<SocketChannel>> exten
final Charset charset,
final EventFactory<E> eventFactory,
final BlockingQueue<E> events,
- final ProcessorLog logger) {
+ final ComponentLog logger) {
super(key, dispatcher, charset, eventFactory, events, logger);
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/socket/SocketChannelHandlerFactory.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/socket/SocketChannelHandlerFactory.java b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/socket/SocketChannelHandlerFactory.java
index cb189ba..9003f90 100644
--- a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/socket/SocketChannelHandlerFactory.java
+++ b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/socket/SocketChannelHandlerFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.processor.util.listen.handler.socket;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.util.listen.dispatcher.AsyncChannelDispatcher;
import org.apache.nifi.processor.util.listen.event.Event;
import org.apache.nifi.processor.util.listen.event.EventFactory;
@@ -39,7 +39,7 @@ public class SocketChannelHandlerFactory<E extends Event<SocketChannel>> impleme
final Charset charset,
final EventFactory<E> eventFactory,
final BlockingQueue<E> events,
- final ProcessorLog logger) {
+ final ComponentLog logger) {
return new StandardSocketChannelHandler<>(key, dispatcher, charset, eventFactory, events, logger);
}
@@ -49,7 +49,7 @@ public class SocketChannelHandlerFactory<E extends Event<SocketChannel>> impleme
final Charset charset,
final EventFactory<E> eventFactory,
final BlockingQueue<E> events,
- final ProcessorLog logger) {
+ final ComponentLog logger) {
return new SSLSocketChannelHandler<>(key, dispatcher, charset, eventFactory, events, logger);
}
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/socket/StandardSocketChannelHandler.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/socket/StandardSocketChannelHandler.java b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/socket/StandardSocketChannelHandler.java
index 94e41eb..1aac860 100644
--- a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/socket/StandardSocketChannelHandler.java
+++ b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/listen/handler/socket/StandardSocketChannelHandler.java
@@ -17,7 +17,7 @@
package org.apache.nifi.processor.util.listen.handler.socket;
import org.apache.commons.io.IOUtils;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.util.listen.dispatcher.AsyncChannelDispatcher;
import org.apache.nifi.processor.util.listen.dispatcher.SocketChannelAttachment;
import org.apache.nifi.processor.util.listen.event.Event;
@@ -50,7 +50,7 @@ public class StandardSocketChannelHandler<E extends Event<SocketChannel>> extend
final Charset charset,
final EventFactory<E> eventFactory,
final BlockingQueue<E> events,
- final ProcessorLog logger) {
+ final ComponentLog logger) {
super(key, dispatcher, charset, eventFactory, events, logger);
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/put/sender/ChannelSender.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/put/sender/ChannelSender.java b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/put/sender/ChannelSender.java
index 8c92b1f..d2daeb9 100644
--- a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/put/sender/ChannelSender.java
+++ b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/put/sender/ChannelSender.java
@@ -16,8 +16,7 @@
*/
package org.apache.nifi.processor.util.put.sender;
-import org.apache.nifi.logging.ProcessorLog;
-
+import org.apache.nifi.logging.ComponentLog;
import java.io.IOException;
import java.nio.charset.Charset;
@@ -29,12 +28,12 @@ public abstract class ChannelSender {
protected final int port;
protected final String host;
protected final int maxSendBufferSize;
- protected final ProcessorLog logger;
+ protected final ComponentLog logger;
protected volatile int timeout = 10000;
protected volatile long lastUsed;
- public ChannelSender(final String host, final int port, final int maxSendBufferSize, final ProcessorLog logger) {
+ public ChannelSender(final String host, final int port, final int maxSendBufferSize, final ComponentLog logger) {
this.port = port;
this.host = host;
this.maxSendBufferSize = maxSendBufferSize;
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/put/sender/DatagramChannelSender.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/put/sender/DatagramChannelSender.java b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/put/sender/DatagramChannelSender.java
index 632c6e5..0b2dfb8 100644
--- a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/put/sender/DatagramChannelSender.java
+++ b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/put/sender/DatagramChannelSender.java
@@ -17,8 +17,7 @@
package org.apache.nifi.processor.util.put.sender;
import org.apache.commons.io.IOUtils;
-import org.apache.nifi.logging.ProcessorLog;
-
+import org.apache.nifi.logging.ComponentLog;
import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
@@ -33,7 +32,7 @@ public class DatagramChannelSender extends ChannelSender {
private DatagramChannel channel;
- public DatagramChannelSender(final String host, final int port, final int maxSendBufferSize, final ProcessorLog logger) {
+ public DatagramChannelSender(final String host, final int port, final int maxSendBufferSize, final ComponentLog logger) {
super(host, port, maxSendBufferSize, logger);
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/put/sender/SSLSocketChannelSender.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/put/sender/SSLSocketChannelSender.java b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/put/sender/SSLSocketChannelSender.java
index dc85d80..a70c9c5 100644
--- a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/put/sender/SSLSocketChannelSender.java
+++ b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/put/sender/SSLSocketChannelSender.java
@@ -17,7 +17,7 @@
package org.apache.nifi.processor.util.put.sender;
import org.apache.commons.io.IOUtils;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.remote.io.socket.ssl.SSLSocketChannel;
import javax.net.ssl.SSLContext;
@@ -35,7 +35,7 @@ public class SSLSocketChannelSender extends SocketChannelSender {
final int port,
final int maxSendBufferSize,
final SSLContext sslContext,
- final ProcessorLog logger) {
+ final ComponentLog logger) {
super(host, port, maxSendBufferSize, logger);
this.sslContext = sslContext;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/put/sender/SocketChannelSender.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/put/sender/SocketChannelSender.java b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/put/sender/SocketChannelSender.java
index fcf341a..9755af7 100644
--- a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/put/sender/SocketChannelSender.java
+++ b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/put/sender/SocketChannelSender.java
@@ -16,7 +16,7 @@
*/package org.apache.nifi.processor.util.put.sender;
import org.apache.commons.io.IOUtils;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.remote.io.socket.SocketChannelOutputStream;
import java.io.IOException;
@@ -34,7 +34,7 @@ public class SocketChannelSender extends ChannelSender {
protected SocketChannel channel;
protected SocketChannelOutputStream socketChannelOutput;
- public SocketChannelSender(final String host, final int port, final int maxSendBufferSize, final ProcessorLog logger) {
+ public SocketChannelSender(final String host, final int port, final int maxSendBufferSize, final ComponentLog logger) {
super(host, port, maxSendBufferSize, logger);
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-docs/src/main/asciidoc/developer-guide.adoc
----------------------------------------------------------------------
diff --git a/nifi-docs/src/main/asciidoc/developer-guide.adoc b/nifi-docs/src/main/asciidoc/developer-guide.adoc
index bcdd6cd..d7efde4 100644
--- a/nifi-docs/src/main/asciidoc/developer-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/developer-guide.adoc
@@ -232,13 +232,13 @@ This object exposes configuration to the Processor that will not
change throughout the life of the Processor,
such as the unique identifier of the Processor.
-[[ProcessorLog]]
-==== ProcessorLog
+[[ComponentLog]]
+==== ComponentLog
Processors are encouraged to perform their logging via the
-`ProcessorLog` interface, rather than obtaining
+`ComponentLog` interface, rather than obtaining
a direct instance of a third-party logger. This is because logging via
-the ProcessorLog allows the framework
-to render log messages that exceed s a configurable severity level to
+the ComponentLog allows the framework
+to render log messages that exceeds a configurable severity level to
the User Interface, allowing those who
monitor the dataflow to be notified when important events occur.
Additionally, it provides a consistent logging
@@ -267,7 +267,7 @@ When a Processor is created, before any other methods are invoked, the
AbstractProcessor will be invoked. The method takes a single argument,
which is of type
`ProcessorInitializationContext`. The context object supplies the
-Processor with a ProcessorLog,
+Processor with a ComponentLog,
the Processor's unique identifier, and a ControllerServiceLookup that
can be used to interact with the
configured ControllerServices. Each of these objects is stored by the
@@ -632,7 +632,7 @@ The `MockStateManager` also provides the ability to indicate that the unit test
Processors are responsible for reporting their activity so that users
are able to understand what happens
-to their data. Processors should log events via the ProcessorLog,
+to their data. Processors should log events via the ComponentLog,
which is accessible via the InitializationContext
or by calling the `getLogger` method of `AbstractProcessor`.
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-mock/src/main/java/org/apache/nifi/util/MockComponentLog.java
----------------------------------------------------------------------
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
new file mode 100644
index 0000000..0ed7e76
--- /dev/null
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockComponentLog.java
@@ -0,0 +1,402 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.util;
+
+import java.util.List;
+
+import org.apache.nifi.logging.ComponentLog;
+import org.apache.nifi.logging.LogLevel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class MockComponentLog implements ComponentLog {
+
+ private final CapturingLogger logger;
+ private final Object component;
+
+ public MockComponentLog(final String componentId, final Object component) {
+ this.logger = new CapturingLogger(LoggerFactory.getLogger(component.getClass()));
+ this.component = component;
+ }
+
+ /**
+ * @return a {@link List} of all TRACE level messages recorded by this {@link Logger}.
+ */
+ public List<LogMessage> getTraceMessages() {
+ return logger.getTraceMessages();
+ }
+
+ /**
+ * @return a {@link List} of all DEBUG level messages recorded by this {@link Logger}.
+ */
+ public List<LogMessage> getDebugMessages() {
+ return logger.getDebugMessages();
+ }
+
+ /**
+ * @return a {@link List} of all INFO level messages recorded by this {@link Logger}.
+ */
+ public List<LogMessage> getInfoMessages() {
+ return logger.getInfoMessages();
+ }
+
+ /**
+ * @return a {@link List} of all WARN level messages recorded by this {@link Logger}.
+ */
+ public List<LogMessage> getWarnMessages() {
+ return logger.getWarnMessages();
+ }
+
+ /**
+ * @return a {@link List} of all ERROR level messages recorded by this {@link Logger}.
+ */
+ public List<LogMessage> getErrorMessages() {
+ return logger.getErrorMessages();
+ }
+
+ private Object[] addProcessor(final Object[] originalArgs) {
+ 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();
+ for (int i = 0; i < os.length; i++) {
+ modifiedArgs[i + 1] = os[i];
+ }
+ modifiedArgs[modifiedArgs.length - 1] = t.toString();
+
+ return modifiedArgs;
+ }
+
+ private Object[] prependToArgs(final Object[] originalArgs, final Object... toAdd) {
+ final Object[] newArgs = new Object[originalArgs.length + toAdd.length];
+ System.arraycopy(toAdd, 0, newArgs, 0, toAdd.length);
+ System.arraycopy(originalArgs, 0, newArgs, toAdd.length, originalArgs.length);
+ 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);
+ }
+
+ @Override
+ public void warn(String msg, Object[] os) {
+ if (lastArgIsException(os)) {
+ warn(msg, translateException(os), (Throwable) os[os.length - 1]);
+ } else {
+ msg = "{} " + msg;
+ os = addProcessor(os);
+ 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;
+ logger.warn(msg, component);
+ }
+
+ @Override
+ public void trace(String msg, Throwable t) {
+ msg = "{} " + msg;
+ final Object[] os = {component};
+ logger.trace(msg, os, t);
+ }
+
+ @Override
+ public void trace(String msg, Object[] os) {
+ msg = "{} " + msg;
+ os = addProcessor(os);
+ logger.trace(msg, os);
+ }
+
+ @Override
+ public void trace(String msg) {
+ msg = "{} " + msg;
+ final Object[] os = {component};
+ 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();
+ }
+
+ @Override
+ public boolean isTraceEnabled() {
+ return logger.isTraceEnabled();
+ }
+
+ @Override
+ public boolean isInfoEnabled() {
+ return logger.isInfoEnabled();
+ }
+
+ @Override
+ public boolean isErrorEnabled() {
+ return logger.isErrorEnabled();
+ }
+
+ @Override
+ public boolean isDebugEnabled() {
+ return logger.isDebugEnabled();
+ }
+
+ @Override
+ public void info(String msg, Throwable t) {
+ msg = "{} " + msg;
+ final Object[] os = {component};
+
+ logger.info(msg, os);
+ if (logger.isDebugEnabled()) {
+ logger.info("", t);
+ }
+ }
+
+ @Override
+ public void info(String msg, Object[] os) {
+ msg = "{} " + msg;
+ os = addProcessor(os);
+
+ logger.info(msg, os);
+ }
+
+ @Override
+ public void info(String msg) {
+ msg = "{} " + msg;
+ final Object[] os = {component};
+
+ 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();
+ }
+
+ @Override
+ public void error(String msg, Throwable t) {
+ msg = "{} " + msg;
+ final Object[] os = {component};
+
+ logger.error(msg, os, t);
+ if (logger.isDebugEnabled()) {
+ logger.error("", t);
+ }
+ }
+
+ @Override
+ public void error(String msg, Object[] os) {
+ if (lastArgIsException(os)) {
+ error(msg, translateException(os), (Throwable) os[os.length - 1]);
+ } else {
+ os = addProcessor(os);
+ msg = "{} " + msg;
+ logger.error(msg, os);
+ }
+ }
+
+ @Override
+ public void error(String msg) {
+ msg = "{} " + msg;
+ final Object[] os = {component};
+
+ logger.error(msg, os);
+ }
+
+ @Override
+ public void error(String msg, Object[] os, Throwable t) {
+ os = addProcessorAndThrowable(os, t);
+ msg = "{} " + msg + ": {}";
+
+ logger.error(msg, os);
+ if (logger.isDebugEnabled()) {
+ logger.error("", t);
+ }
+ }
+
+ @Override
+ public void debug(String msg, Throwable t) {
+ msg = "{} " + msg;
+ final Object[] os = {component};
+
+ logger.debug(msg, os, t);
+ }
+
+ @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 + ": {}";
+
+ logger.debug(msg, os);
+ if (logger.isDebugEnabled()) {
+ logger.debug("", t);
+ }
+ }
+
+ @Override
+ public void debug(String msg) {
+ msg = "{} " + msg;
+ final Object[] os = {component};
+
+ logger.debug(msg, os);
+ }
+
+ @Override
+ public void log(LogLevel level, String msg, Throwable t) {
+ switch (level) {
+ case DEBUG:
+ debug(msg, t);
+ break;
+ case ERROR:
+ case FATAL:
+ error(msg, t);
+ break;
+ case INFO:
+ info(msg, t);
+ break;
+ case TRACE:
+ trace(msg, t);
+ break;
+ case WARN:
+ warn(msg, t);
+ break;
+ }
+ }
+
+ @Override
+ public void log(LogLevel level, String msg, Object[] os) {
+ switch (level) {
+ case DEBUG:
+ debug(msg, os);
+ break;
+ case ERROR:
+ case FATAL:
+ error(msg, os);
+ break;
+ case INFO:
+ info(msg, os);
+ break;
+ case TRACE:
+ trace(msg, os);
+ break;
+ case WARN:
+ warn(msg, os);
+ break;
+ }
+ }
+
+ @Override
+ public void log(LogLevel level, String msg) {
+ switch (level) {
+ case DEBUG:
+ debug(msg);
+ break;
+ case ERROR:
+ case FATAL:
+ error(msg);
+ break;
+ case INFO:
+ info(msg);
+ break;
+ case TRACE:
+ trace(msg);
+ break;
+ case WARN:
+ warn(msg);
+ break;
+ }
+ }
+
+ @Override
+ public 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;
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-mock/src/main/java/org/apache/nifi/util/MockControllerServiceInitializationContext.java
----------------------------------------------------------------------
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockControllerServiceInitializationContext.java b/nifi-mock/src/main/java/org/apache/nifi/util/MockControllerServiceInitializationContext.java
index 754bec0..f8f4f59 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/MockControllerServiceInitializationContext.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockControllerServiceInitializationContext.java
@@ -34,7 +34,7 @@ public class MockControllerServiceInitializationContext extends MockControllerSe
}
public MockControllerServiceInitializationContext(final ControllerService controllerService, final String identifier, final StateManager stateManager) {
- this(controllerService, identifier, new MockProcessorLog(identifier, controllerService), stateManager);
+ this(controllerService, identifier, new MockComponentLog(identifier, controllerService), stateManager);
}
public MockControllerServiceInitializationContext(final ControllerService controllerService, final String identifier, final ComponentLog logger, final StateManager stateManager) {
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorInitializationContext.java
----------------------------------------------------------------------
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorInitializationContext.java b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorInitializationContext.java
index 87e2b45..f0961ef 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorInitializationContext.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorInitializationContext.java
@@ -26,13 +26,13 @@ import org.apache.nifi.processor.ProcessorInitializationContext;
public class MockProcessorInitializationContext implements ProcessorInitializationContext, ControllerServiceLookup {
- private final MockProcessorLog logger;
+ private final MockComponentLog logger;
private final String processorId;
private final MockProcessContext context;
public MockProcessorInitializationContext(final Processor processor, final MockProcessContext context) {
processorId = UUID.randomUUID().toString();
- logger = new MockProcessorLog(processorId, processor);
+ logger = new MockComponentLog(processorId, processor);
this.context = context;
}
@@ -42,7 +42,7 @@ public class MockProcessorInitializationContext implements ProcessorInitializati
}
@Override
- public MockProcessorLog getLogger() {
+ public MockComponentLog getLogger() {
return logger;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorLog.java
----------------------------------------------------------------------
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorLog.java b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorLog.java
deleted file mode 100644
index cb87e50..0000000
--- a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorLog.java
+++ /dev/null
@@ -1,402 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.util;
-
-import java.util.List;
-
-import org.apache.nifi.logging.LogLevel;
-import org.apache.nifi.logging.ProcessorLog;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class MockProcessorLog implements ProcessorLog {
-
- private final CapturingLogger logger;
- private final Object component;
-
- public MockProcessorLog(final String componentId, final Object component) {
- this.logger = new CapturingLogger(LoggerFactory.getLogger(component.getClass()));
- this.component = component;
- }
-
- /**
- * @return a {@link List} of all TRACE level messages recorded by this {@link Logger}.
- */
- public List<LogMessage> getTraceMessages() {
- return logger.getTraceMessages();
- }
-
- /**
- * @return a {@link List} of all DEBUG level messages recorded by this {@link Logger}.
- */
- public List<LogMessage> getDebugMessages() {
- return logger.getDebugMessages();
- }
-
- /**
- * @return a {@link List} of all INFO level messages recorded by this {@link Logger}.
- */
- public List<LogMessage> getInfoMessages() {
- return logger.getInfoMessages();
- }
-
- /**
- * @return a {@link List} of all WARN level messages recorded by this {@link Logger}.
- */
- public List<LogMessage> getWarnMessages() {
- return logger.getWarnMessages();
- }
-
- /**
- * @return a {@link List} of all ERROR level messages recorded by this {@link Logger}.
- */
- public List<LogMessage> getErrorMessages() {
- return logger.getErrorMessages();
- }
-
- private Object[] addProcessor(final Object[] originalArgs) {
- 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();
- for (int i = 0; i < os.length; i++) {
- modifiedArgs[i + 1] = os[i];
- }
- modifiedArgs[modifiedArgs.length - 1] = t.toString();
-
- return modifiedArgs;
- }
-
- private Object[] prependToArgs(final Object[] originalArgs, final Object... toAdd) {
- final Object[] newArgs = new Object[originalArgs.length + toAdd.length];
- System.arraycopy(toAdd, 0, newArgs, 0, toAdd.length);
- System.arraycopy(originalArgs, 0, newArgs, toAdd.length, originalArgs.length);
- 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);
- }
-
- @Override
- public void warn(String msg, Object[] os) {
- if (lastArgIsException(os)) {
- warn(msg, translateException(os), (Throwable) os[os.length - 1]);
- } else {
- msg = "{} " + msg;
- os = addProcessor(os);
- 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;
- logger.warn(msg, component);
- }
-
- @Override
- public void trace(String msg, Throwable t) {
- msg = "{} " + msg;
- final Object[] os = {component};
- logger.trace(msg, os, t);
- }
-
- @Override
- public void trace(String msg, Object[] os) {
- msg = "{} " + msg;
- os = addProcessor(os);
- logger.trace(msg, os);
- }
-
- @Override
- public void trace(String msg) {
- msg = "{} " + msg;
- final Object[] os = {component};
- 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();
- }
-
- @Override
- public boolean isTraceEnabled() {
- return logger.isTraceEnabled();
- }
-
- @Override
- public boolean isInfoEnabled() {
- return logger.isInfoEnabled();
- }
-
- @Override
- public boolean isErrorEnabled() {
- return logger.isErrorEnabled();
- }
-
- @Override
- public boolean isDebugEnabled() {
- return logger.isDebugEnabled();
- }
-
- @Override
- public void info(String msg, Throwable t) {
- msg = "{} " + msg;
- final Object[] os = {component};
-
- logger.info(msg, os);
- if (logger.isDebugEnabled()) {
- logger.info("", t);
- }
- }
-
- @Override
- public void info(String msg, Object[] os) {
- msg = "{} " + msg;
- os = addProcessor(os);
-
- logger.info(msg, os);
- }
-
- @Override
- public void info(String msg) {
- msg = "{} " + msg;
- final Object[] os = {component};
-
- 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();
- }
-
- @Override
- public void error(String msg, Throwable t) {
- msg = "{} " + msg;
- final Object[] os = {component};
-
- logger.error(msg, os, t);
- if (logger.isDebugEnabled()) {
- logger.error("", t);
- }
- }
-
- @Override
- public void error(String msg, Object[] os) {
- if (lastArgIsException(os)) {
- error(msg, translateException(os), (Throwable) os[os.length - 1]);
- } else {
- os = addProcessor(os);
- msg = "{} " + msg;
- logger.error(msg, os);
- }
- }
-
- @Override
- public void error(String msg) {
- msg = "{} " + msg;
- final Object[] os = {component};
-
- logger.error(msg, os);
- }
-
- @Override
- public void error(String msg, Object[] os, Throwable t) {
- os = addProcessorAndThrowable(os, t);
- msg = "{} " + msg + ": {}";
-
- logger.error(msg, os);
- if (logger.isDebugEnabled()) {
- logger.error("", t);
- }
- }
-
- @Override
- public void debug(String msg, Throwable t) {
- msg = "{} " + msg;
- final Object[] os = {component};
-
- logger.debug(msg, os, t);
- }
-
- @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 + ": {}";
-
- logger.debug(msg, os);
- if (logger.isDebugEnabled()) {
- logger.debug("", t);
- }
- }
-
- @Override
- public void debug(String msg) {
- msg = "{} " + msg;
- final Object[] os = {component};
-
- logger.debug(msg, os);
- }
-
- @Override
- public void log(LogLevel level, String msg, Throwable t) {
- switch (level) {
- case DEBUG:
- debug(msg, t);
- break;
- case ERROR:
- case FATAL:
- error(msg, t);
- break;
- case INFO:
- info(msg, t);
- break;
- case TRACE:
- trace(msg, t);
- break;
- case WARN:
- warn(msg, t);
- break;
- }
- }
-
- @Override
- public void log(LogLevel level, String msg, Object[] os) {
- switch (level) {
- case DEBUG:
- debug(msg, os);
- break;
- case ERROR:
- case FATAL:
- error(msg, os);
- break;
- case INFO:
- info(msg, os);
- break;
- case TRACE:
- trace(msg, os);
- break;
- case WARN:
- warn(msg, os);
- break;
- }
- }
-
- @Override
- public void log(LogLevel level, String msg) {
- switch (level) {
- case DEBUG:
- debug(msg);
- break;
- case ERROR:
- case FATAL:
- error(msg);
- break;
- case INFO:
- info(msg);
- break;
- case TRACE:
- trace(msg);
- break;
- case WARN:
- warn(msg);
- break;
- }
- }
-
- @Override
- public 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;
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
----------------------------------------------------------------------
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java b/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
index edc0e65..9e87d98 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
@@ -89,8 +89,8 @@ public class StandardProcessorTestRunner implements TestRunner {
private static final Set<Class<? extends Annotation>> deprecatedTypeAnnotations = new HashSet<>();
private static final Set<Class<? extends Annotation>> deprecatedMethodAnnotations = new HashSet<>();
- private final Map<String, MockProcessorLog> controllerServiceLoggers = new HashMap<>();
- private final MockProcessorLog logger;
+ private final Map<String, MockComponentLog> controllerServiceLoggers = new HashMap<>();
+ private final MockComponentLog logger;
static {
// do this in a separate method, just so that we can add a @SuppressWarnings annotation
@@ -640,7 +640,7 @@ public class StandardProcessorTestRunner implements TestRunner {
// }
// }
- final MockProcessorLog logger = new MockProcessorLog(identifier, service);
+ final MockComponentLog logger = new MockComponentLog(identifier, service);
controllerServiceLoggers.put(identifier, logger);
final MockStateManager serviceStateManager = new MockStateManager(service);
final MockControllerServiceInitializationContext initContext = new MockControllerServiceInitializationContext(requireNonNull(service), requireNonNull(identifier), logger, serviceStateManager);
@@ -869,12 +869,12 @@ public class StandardProcessorTestRunner implements TestRunner {
}
@Override
- public MockProcessorLog getLogger() {
+ public MockComponentLog getLogger() {
return logger;
}
@Override
- public MockProcessorLog getControllerServiceLogger(final String identifier) {
+ public MockComponentLog getControllerServiceLogger(final String identifier) {
return controllerServiceLoggers.get(identifier);
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
----------------------------------------------------------------------
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java b/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
index 5832c2e..c3bedb1 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
@@ -875,18 +875,18 @@ public interface TestRunner {
void clearProvenanceEvents();
/**
- * Returns the {@link MockProcessorLog} that is used by the Processor under test.
+ * Returns the {@link MockComponentLog} that is used by the Processor under test.
* @return the logger
*/
- public MockProcessorLog getLogger();
+ public MockComponentLog getLogger();
/**
- * Returns the {@link MockProcessorLog} that is used by the specified controller service.
+ * Returns the {@link MockComponentLog} that is used by the specified controller service.
*
* @param identifier a controller service identifier
* @return the logger
*/
- public MockProcessorLog getControllerServiceLogger(final String identifier);
+ public MockComponentLog getControllerServiceLogger(final String identifier);
/**
* @return the State Manager that is used to stored and retrieve state
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/AMQPPublisher.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/AMQPPublisher.java b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/AMQPPublisher.java
index 41a08d9..cd3b505 100644
--- a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/AMQPPublisher.java
+++ b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/AMQPPublisher.java
@@ -18,7 +18,7 @@ package org.apache.nifi.amqp.processors;
import java.io.IOException;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,7 +38,7 @@ final class AMQPPublisher extends AMQPWorker {
private final String routingKey;
- private final ProcessorLog processLog;
+ private final ComponentLog processLog;
/**
* Creates an instance of this publisher
@@ -52,7 +52,7 @@ final class AMQPPublisher extends AMQPWorker {
* (required) the name of the routingKey to be used by AMQP-based
* system to route messages to its final destination (queue).
*/
- AMQPPublisher(Connection connection, String exchangeName, String routingKey, ProcessorLog processLog) {
+ AMQPPublisher(Connection connection, String exchangeName, String routingKey, ComponentLog processLog) {
super(connection);
this.processLog = processLog;
this.validateStringProperty("routingKey", routingKey);
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/test/java/org/apache/nifi/amqp/processors/AMQPPublisherTest.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/test/java/org/apache/nifi/amqp/processors/AMQPPublisherTest.java b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/test/java/org/apache/nifi/amqp/processors/AMQPPublisherTest.java
index 9f01c04..c8d30f7 100644
--- a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/test/java/org/apache/nifi/amqp/processors/AMQPPublisherTest.java
+++ b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/test/java/org/apache/nifi/amqp/processors/AMQPPublisherTest.java
@@ -27,7 +27,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.nifi.util.MockProcessorLog;
+import org.apache.nifi.util.MockComponentLog;
import org.junit.Test;
import org.mockito.Mockito;
@@ -101,7 +101,7 @@ public class AMQPPublisherTest {
connection.createChannel().addReturnListener(retListener);
try (AMQPPublisher sender = new AMQPPublisher(connection, "myExchange", "key2",
- new MockProcessorLog("foo", ""))) {
+ new MockComponentLog("foo", ""))) {
sender.publish("hello".getBytes());
Thread.sleep(1000);
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/AbstractCassandraProcessor.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/AbstractCassandraProcessor.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/AbstractCassandraProcessor.java
index 478ffaf..3f93b81 100644
--- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/AbstractCassandraProcessor.java
+++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/AbstractCassandraProcessor.java
@@ -32,7 +32,7 @@ import org.apache.nifi.components.PropertyValue;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.util.StandardValidators;
@@ -183,7 +183,7 @@ public abstract class AbstractCassandraProcessor extends AbstractProcessor {
protected void connectToCassandra(ProcessContext context) {
if (cluster.get() == null) {
- ProcessorLog log = getLogger();
+ ComponentLog log = getLogger();
final String contactPointList = context.getProperty(CONTACT_POINTS).getValue();
final String consistencyLevel = context.getProperty(CONSISTENCY_LEVEL).getValue();
List<InetSocketAddress> contactPoints = getContactPoints(contactPointList);
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java
index c923b5b..8c0908a 100644
--- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java
+++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java
@@ -38,7 +38,7 @@ import org.apache.nifi.annotation.lifecycle.OnShutdown;
import org.apache.nifi.annotation.lifecycle.OnUnscheduled;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.Relationship;
@@ -150,7 +150,7 @@ public class PutCassandraQL extends AbstractCassandraProcessor {
@OnScheduled
public void onScheduled(final ProcessContext context) {
- ProcessorLog log = getLogger();
+ ComponentLog log = getLogger();
try {
connectToCassandra(context);
} catch (final NoHostAvailableException nhae) {
@@ -169,7 +169,7 @@ public class PutCassandraQL extends AbstractCassandraProcessor {
@Override
public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
- ProcessorLog logger = getLogger();
+ ComponentLog logger = getLogger();
FlowFile flowFile = session.get();
if (flowFile == null) {
return;
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java
index 7b78ea6..bf0890d 100644
--- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java
+++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java
@@ -45,7 +45,7 @@ import org.apache.nifi.annotation.behavior.WritesAttributes;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.Relationship;
@@ -175,7 +175,7 @@ public class QueryCassandra extends AbstractCassandraProcessor {
@OnScheduled
public void onScheduled(final ProcessContext context) {
- ProcessorLog log = getLogger();
+ ComponentLog log = getLogger();
try {
connectToCassandra(context);
final int fetchSize = context.getProperty(FETCH_SIZE).asInteger();
@@ -212,7 +212,7 @@ public class QueryCassandra extends AbstractCassandraProcessor {
}
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final String selectQuery = context.getProperty(CQL_SELECT_QUERY).evaluateAttributeExpressions(fileToProcess).getValue();
final long queryTimeout = context.getProperty(QUERY_TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS);
final String outputFormat = context.getProperty(OUTPUT_FORMAT).getValue();
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/main/java/org/apache/nifi/processors/couchbase/AbstractCouchbaseProcessor.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/main/java/org/apache/nifi/processors/couchbase/AbstractCouchbaseProcessor.java b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/main/java/org/apache/nifi/processors/couchbase/AbstractCouchbaseProcessor.java
index ec0e9ab..49f83b8 100644
--- a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/main/java/org/apache/nifi/processors/couchbase/AbstractCouchbaseProcessor.java
+++ b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/main/java/org/apache/nifi/processors/couchbase/AbstractCouchbaseProcessor.java
@@ -26,7 +26,7 @@ import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.couchbase.CouchbaseAttributes;
import org.apache.nifi.couchbase.CouchbaseClusterControllerService;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -178,7 +178,7 @@ public abstract class AbstractCouchbaseProcessor extends AbstractProcessor {
* @param errMsg a message to be logged
*/
protected void handleCouchbaseException(final ProcessContext context, final ProcessSession session,
- final ProcessorLog logger, FlowFile inFile, CouchbaseException e,
+ final ComponentLog logger, FlowFile inFile, CouchbaseException e,
String errMsg) {
logger.error(errMsg, e);
if (inFile != null) {
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/main/java/org/apache/nifi/processors/couchbase/GetCouchbaseKey.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/main/java/org/apache/nifi/processors/couchbase/GetCouchbaseKey.java b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/main/java/org/apache/nifi/processors/couchbase/GetCouchbaseKey.java
index b4ff467..63b583a 100644
--- a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/main/java/org/apache/nifi/processors/couchbase/GetCouchbaseKey.java
+++ b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/main/java/org/apache/nifi/processors/couchbase/GetCouchbaseKey.java
@@ -38,7 +38,7 @@ import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.couchbase.CouchbaseAttributes;
import org.apache.nifi.couchbase.CouchbaseClusterControllerService;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.Relationship;
@@ -92,7 +92,7 @@ public class GetCouchbaseKey extends AbstractCouchbaseProcessor {
}
final long startNanos = System.nanoTime();
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
String docId = null;
if (!StringUtils.isEmpty(context.getProperty(DOC_ID).getValue())) {
docId = context.getProperty(DOC_ID).evaluateAttributeExpressions(inFile).getValue();
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/main/java/org/apache/nifi/processors/couchbase/PutCouchbaseKey.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/main/java/org/apache/nifi/processors/couchbase/PutCouchbaseKey.java b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/main/java/org/apache/nifi/processors/couchbase/PutCouchbaseKey.java
index b03f3f2..2d89d8f 100644
--- a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/main/java/org/apache/nifi/processors/couchbase/PutCouchbaseKey.java
+++ b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/main/java/org/apache/nifi/processors/couchbase/PutCouchbaseKey.java
@@ -39,7 +39,7 @@ import org.apache.nifi.couchbase.CouchbaseAttributes;
import org.apache.nifi.couchbase.CouchbaseClusterControllerService;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.Relationship;
@@ -105,7 +105,7 @@ public class PutCouchbaseKey extends AbstractCouchbaseProcessor {
@Override
public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
FlowFile flowFile = session.get();
if (flowFile == null) {
return;
[3/5] nifi git commit: NIFI-1811 Removed ProcessorLog and updated
dependent interfaces
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchProcessor.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchProcessor.java b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchProcessor.java
index 43833ff..f810ec3 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchProcessor.java
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchProcessor.java
@@ -20,7 +20,7 @@ import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.exception.ProcessException;
@@ -182,7 +182,7 @@ public abstract class AbstractElasticsearchProcessor extends AbstractProcessor {
*/
protected void createElasticsearchClient(ProcessContext context) throws ProcessException {
- ProcessorLog log = getLogger();
+ ComponentLog log = getLogger();
if (esClient.get() != null) {
return;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearch.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearch.java b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearch.java
index 6b2b22f..8d2e378 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearch.java
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearch.java
@@ -27,7 +27,7 @@ import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.annotation.lifecycle.OnStopped;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.Relationship;
@@ -153,7 +153,7 @@ public class FetchElasticsearch extends AbstractElasticsearchProcessor {
final String docType = context.getProperty(TYPE).evaluateAttributeExpressions(flowFile).getValue();
final Charset charset = Charset.forName(context.getProperty(CHARSET).getValue());
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
try {
logger.debug("Fetching {}/{}/{} from Elasticsearch", new Object[]{index, docType, docId});
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearch.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearch.java b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearch.java
index a0c986c..6452bc7 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearch.java
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearch.java
@@ -27,7 +27,7 @@ import org.apache.nifi.annotation.lifecycle.OnStopped;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.expression.AttributeExpression;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.Relationship;
@@ -154,7 +154,7 @@ public class PutElasticsearch extends AbstractElasticsearchProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
// Keep track of the list of flow files that need to be transferred. As they are transferred, remove them from the list.
List<FlowFile> flowFilesToTransfer = new LinkedList<>(flowFiles);
try {
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ControllerServiceInitializer.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ControllerServiceInitializer.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ControllerServiceInitializer.java
index 6525280..7a6d62c 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ControllerServiceInitializer.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ControllerServiceInitializer.java
@@ -24,7 +24,7 @@ import org.apache.nifi.documentation.mock.MockConfigurationContext;
import org.apache.nifi.documentation.mock.MockControllerServiceInitializationContext;
import org.apache.nifi.documentation.mock.MockProcessorLogger;
import org.apache.nifi.documentation.util.ReflectionUtils;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.nar.NarCloseable;
import org.apache.nifi.reporting.InitializationException;
@@ -49,7 +49,7 @@ public class ControllerServiceInitializer implements ConfigurableComponentInitia
try (NarCloseable narCloseable = NarCloseable.withNarLoader()) {
ControllerService controllerService = (ControllerService) component;
- final ProcessorLog logger = new MockProcessorLogger();
+ final ComponentLog logger = new MockProcessorLogger();
final MockConfigurationContext context = new MockConfigurationContext();
ReflectionUtils.quietlyInvokeMethodsWithAnnotations(OnShutdown.class, org.apache.nifi.processor.annotation.OnShutdown.class, controllerService, logger, context);
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ProcessorInitializer.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ProcessorInitializer.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ProcessorInitializer.java
index 00669ce..7fe4946 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ProcessorInitializer.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ProcessorInitializer.java
@@ -23,7 +23,7 @@ import org.apache.nifi.documentation.mock.MockProcessContext;
import org.apache.nifi.documentation.mock.MockProcessorInitializationContext;
import org.apache.nifi.documentation.mock.MockProcessorLogger;
import org.apache.nifi.documentation.util.ReflectionUtils;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.nar.NarCloseable;
import org.apache.nifi.processor.Processor;
@@ -47,7 +47,7 @@ public class ProcessorInitializer implements ConfigurableComponentInitializer {
Processor processor = (Processor) component;
try (NarCloseable narCloseable = NarCloseable.withNarLoader()) {
- final ProcessorLog logger = new MockProcessorLogger();
+ final ComponentLog logger = new MockProcessorLogger();
final MockProcessContext context = new MockProcessContext();
ReflectionUtils.quietlyInvokeMethodsWithAnnotations(OnShutdown.class, org.apache.nifi.processor.annotation.OnShutdown.class, processor, logger, context);
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockProcessorInitializationContext.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockProcessorInitializationContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockProcessorInitializationContext.java
index fda94a2..4218250 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockProcessorInitializationContext.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockProcessorInitializationContext.java
@@ -17,7 +17,7 @@
package org.apache.nifi.documentation.mock;
import org.apache.nifi.controller.ControllerServiceLookup;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessorInitializationContext;
/**
@@ -34,7 +34,7 @@ public class MockProcessorInitializationContext implements ProcessorInitializati
}
@Override
- public ProcessorLog getLogger() {
+ public ComponentLog getLogger() {
return new MockProcessorLogger();
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockProcessorLogger.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockProcessorLogger.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockProcessorLogger.java
index 8cdd90a..df9e673 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockProcessorLogger.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockProcessorLogger.java
@@ -16,8 +16,8 @@
*/
package org.apache.nifi.documentation.mock;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.logging.LogLevel;
-import org.apache.nifi.logging.ProcessorLog;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
* be used during initialization of a component.
*
*/
-public class MockProcessorLogger implements ProcessorLog {
+public class MockProcessorLogger implements ComponentLog {
private static final Logger logger = LoggerFactory
.getLogger(MockProcessorLogger.class);
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/util/ReflectionUtils.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/util/ReflectionUtils.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/util/ReflectionUtils.java
index b16c605..94fc1f3 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/util/ReflectionUtils.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/util/ReflectionUtils.java
@@ -22,7 +22,7 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,13 +43,13 @@ public class ReflectionUtils {
* @param preferredAnnotation preferred
* @param alternateAnnotation alternate
* @param instance instance
- * @param logger the ProcessorLog to use for logging any errors. If null, will use own logger, but that will not generate bulletins or easily tie to the Processor's log messages.
+ * @param logger the ComponentLog to use for logging any errors. If null, will use own logger, but that will not generate bulletins or easily tie to the Processor's log messages.
* @param args args
* @return <code>true</code> if all appropriate methods were invoked and returned without throwing an Exception, <code>false</code> if one of the methods threw an Exception or could not be
* invoked; if <code>false</code> is returned, an error will have been logged.
*/
public static boolean quietlyInvokeMethodsWithAnnotations(
- final Class<? extends Annotation> preferredAnnotation, final Class<? extends Annotation> alternateAnnotation, final Object instance, final ProcessorLog logger, final Object... args) {
+ final Class<? extends Annotation> preferredAnnotation, final Class<? extends Annotation> alternateAnnotation, final Object instance, final ComponentLog logger, final Object... args) {
final List<Class<? extends Annotation>> annotationClasses = new ArrayList<>(alternateAnnotation == null ? 1 : 2);
annotationClasses.add(preferredAnnotation);
if (alternateAnnotation != null) {
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
index 43759f5..4650c92 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
@@ -169,7 +169,6 @@ import org.apache.nifi.logging.ControllerServiceLogObserver;
import org.apache.nifi.logging.LogLevel;
import org.apache.nifi.logging.LogRepository;
import org.apache.nifi.logging.LogRepositoryFactory;
-import org.apache.nifi.logging.ProcessorLog;
import org.apache.nifi.logging.ProcessorLogObserver;
import org.apache.nifi.logging.ReportingTaskLogObserver;
import org.apache.nifi.nar.ExtensionManager;
@@ -991,7 +990,7 @@ public class FlowController implements EventAccess, ControllerServiceProvider, R
Thread.currentThread().setContextClassLoader(detectedClassLoaderForType);
final Class<? extends Processor> processorClass = rawClass.asSubclass(Processor.class);
processor = processorClass.newInstance();
- final ProcessorLog processorLogger = new SimpleProcessLogger(identifier, processor);
+ final ComponentLog processorLogger = new SimpleProcessLogger(identifier, processor);
final ProcessorInitializationContext ctx = new StandardProcessorInitializationContext(identifier, processorLogger, this);
processor.initialize(ctx);
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
index 346f3db..2be0dcf 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
@@ -43,9 +43,9 @@ import org.apache.nifi.connectable.Position;
import org.apache.nifi.controller.service.ControllerServiceNode;
import org.apache.nifi.controller.service.ControllerServiceProvider;
import org.apache.nifi.groups.ProcessGroup;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.logging.LogLevel;
import org.apache.nifi.logging.LogRepositoryFactory;
-import org.apache.nifi.logging.ProcessorLog;
import org.apache.nifi.nar.NarCloseable;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSessionFactory;
@@ -1247,7 +1247,7 @@ public class StandardProcessorNode extends ProcessorNode implements Connectable
if (!this.isValid()) {
throw new IllegalStateException( "Processor " + this.getName() + " is not in a valid state due to " + this.getValidationErrors());
}
- final ProcessorLog procLog = new SimpleProcessLogger(StandardProcessorNode.this.getIdentifier(), processor);
+ final ComponentLog procLog = new SimpleProcessLogger(StandardProcessorNode.this.getIdentifier(), processor);
if (this.scheduledState.compareAndSet(ScheduledState.STOPPED, ScheduledState.STARTING)) { // will ensure that the Processor represented by this node can only be started once
final Runnable startProcRunnable = new Runnable() {
@Override
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/EventDrivenSchedulingAgent.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/EventDrivenSchedulingAgent.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/EventDrivenSchedulingAgent.java
index 228af70..c47d6aa 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/EventDrivenSchedulingAgent.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/EventDrivenSchedulingAgent.java
@@ -39,7 +39,7 @@ import org.apache.nifi.controller.repository.StandardProcessSessionFactory;
import org.apache.nifi.controller.service.ControllerServiceProvider;
import org.apache.nifi.encrypt.StringEncryptor;
import org.apache.nifi.engine.FlowEngine;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.nar.NarCloseable;
import org.apache.nifi.processor.ProcessSessionFactory;
import org.apache.nifi.processor.SimpleProcessLogger;
@@ -328,11 +328,11 @@ public class EventDrivenSchedulingAgent extends AbstractSchedulingAgent {
try (final AutoCloseable ncl = NarCloseable.withNarLoader()) {
worker.onTrigger(processContext, sessionFactory);
} catch (final ProcessException pe) {
- final ProcessorLog procLog = new SimpleProcessLogger(worker.getIdentifier(), worker.getProcessor());
+ final ComponentLog procLog = new SimpleProcessLogger(worker.getIdentifier(), worker.getProcessor());
procLog.error("Failed to process session due to {}", new Object[]{pe});
} catch (final Throwable t) {
- // Use ProcessorLog to log the event so that a bulletin will be created for this processor
- final ProcessorLog procLog = new SimpleProcessLogger(worker.getIdentifier(), worker.getProcessor());
+ // Use ComponentLog to log the event so that a bulletin will be created for this processor
+ final ComponentLog procLog = new SimpleProcessLogger(worker.getIdentifier(), worker.getProcessor());
procLog.error("{} failed to process session due to {}", new Object[]{worker.getProcessor(), t});
procLog.warn("Processor Administratively Yielded for {} due to processing failure", new Object[]{adminYieldDuration});
logger.warn("Administratively Yielding {} due to uncaught Exception: ", worker.getProcessor());
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunProcessorTask.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunProcessorTask.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunProcessorTask.java
index 91c17ae..b82cb3a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunProcessorTask.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunProcessorTask.java
@@ -31,7 +31,7 @@ import org.apache.nifi.controller.repository.StandardProcessSessionFactory;
import org.apache.nifi.controller.scheduling.ProcessContextFactory;
import org.apache.nifi.controller.scheduling.ScheduleState;
import org.apache.nifi.controller.scheduling.SchedulingAgent;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.nar.NarCloseable;
import org.apache.nifi.processor.ProcessSessionFactory;
import org.apache.nifi.processor.SimpleProcessLogger;
@@ -157,11 +157,11 @@ public class ContinuallyRunProcessorTask implements Callable<Boolean> {
}
}
} catch (final ProcessException pe) {
- final ProcessorLog procLog = new SimpleProcessLogger(procNode.getIdentifier(), procNode.getProcessor());
+ final ComponentLog procLog = new SimpleProcessLogger(procNode.getIdentifier(), procNode.getProcessor());
procLog.error("Failed to process session due to {}", new Object[]{pe});
} catch (final Throwable t) {
- // Use ProcessorLog to log the event so that a bulletin will be created for this processor
- final ProcessorLog procLog = new SimpleProcessLogger(procNode.getIdentifier(), procNode.getProcessor());
+ // Use ComponentLog to log the event so that a bulletin will be created for this processor
+ final ComponentLog procLog = new SimpleProcessLogger(procNode.getIdentifier(), procNode.getProcessor());
procLog.error("{} failed to process session due to {}", new Object[]{procNode.getProcessor(), t});
procLog.warn("Processor Administratively Yielded for {} due to processing failure", new Object[]{schedulingAgent.getAdministrativeYieldDuration()});
logger.warn("Administratively Yielding {} due to uncaught Exception: {}", procNode.getProcessor(), t.toString());
@@ -175,7 +175,7 @@ public class ContinuallyRunProcessorTask implements Callable<Boolean> {
try {
rawSession.commit();
} catch (final Exception e) {
- final ProcessorLog procLog = new SimpleProcessLogger(procNode.getIdentifier(), procNode.getProcessor());
+ final ComponentLog procLog = new SimpleProcessLogger(procNode.getIdentifier(), procNode.getProcessor());
procLog.error("Failed to commit session {} due to {}; rolling back", new Object[] { rawSession, e.toString() }, e);
try {
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
index a8c5069..4f31722 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
@@ -16,15 +16,15 @@
*/
package org.apache.nifi.processor;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.logging.LogLevel;
import org.apache.nifi.logging.LogRepository;
import org.apache.nifi.logging.LogRepositoryFactory;
-import org.apache.nifi.logging.ProcessorLog;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SimpleProcessLogger implements ProcessorLog {
+public class SimpleProcessLogger implements ComponentLog {
private final Logger logger;
private final LogRepository logRepository;
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardProcessorInitializationContext.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardProcessorInitializationContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardProcessorInitializationContext.java
index 59f4c79..e185331 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardProcessorInitializationContext.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardProcessorInitializationContext.java
@@ -18,15 +18,15 @@ package org.apache.nifi.processor;
import org.apache.nifi.controller.ControllerServiceLookup;
import org.apache.nifi.controller.service.ControllerServiceProvider;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
public class StandardProcessorInitializationContext implements ProcessorInitializationContext {
private final String identifier;
- private final ProcessorLog logger;
+ private final ComponentLog logger;
private final ControllerServiceProvider serviceProvider;
- public StandardProcessorInitializationContext(final String identifier, final ProcessorLog processorLog, final ControllerServiceProvider serviceProvider) {
+ public StandardProcessorInitializationContext(final String identifier, final ComponentLog processorLog, final ControllerServiceProvider serviceProvider) {
this.identifier = identifier;
this.logger = processorLog;
this.serviceProvider = serviceProvider;
@@ -38,7 +38,7 @@ public class StandardProcessorInitializationContext implements ProcessorInitiali
}
@Override
- public ProcessorLog getLogger() {
+ public ComponentLog getLogger() {
return logger;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/util/ReflectionUtils.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/util/ReflectionUtils.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/util/ReflectionUtils.java
index 9f0380b..5e1838a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/util/ReflectionUtils.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/util/ReflectionUtils.java
@@ -21,7 +21,7 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Arrays;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.annotation.AnnotationUtils;
@@ -98,7 +98,7 @@ public class ReflectionUtils {
* invoked; if <code>false</code> is returned, an error will have been logged.
*/
public static boolean quietlyInvokeMethodsWithAnnotation(final Class<? extends Annotation> annotation,
- final Object instance, final ProcessorLog logger, final Object... args) {
+ final Object instance, final ComponentLog logger, final Object... args) {
return quietlyInvokeMethodsWithAnnotations(annotation, null, instance, logger, args);
}
@@ -119,13 +119,13 @@ public class ReflectionUtils {
return quietlyInvokeMethodsWithAnnotations(preferredAnnotation, alternateAnnotation, instance, null, args);
}
- private static boolean invokeMethodsWithAnnotations(boolean quietly, ProcessorLog logger, Object instance,
+ private static boolean invokeMethodsWithAnnotations(boolean quietly, ComponentLog logger, Object instance,
Class<? extends Annotation>[] annotations, Object... args)
throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
return invokeMethodsWithAnnotations(quietly, logger, instance, instance.getClass(), annotations, args);
}
- private static boolean invokeMethodsWithAnnotations(boolean quietly, ProcessorLog logger, Object instance,
+ private static boolean invokeMethodsWithAnnotations(boolean quietly, ComponentLog logger, Object instance,
Class<?> clazz, Class<? extends Annotation>[] annotations, Object... args)
throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
boolean isSuccess = true;
@@ -159,7 +159,7 @@ public class ReflectionUtils {
return false;
}
- private static Object[] buildUpdatedArgumentsList(boolean quietly, Method method, Class<?>[] annotations, ProcessorLog processLogger, Object... args) {
+ private static Object[] buildUpdatedArgumentsList(boolean quietly, Method method, Class<?>[] annotations, ComponentLog processLogger, Object... args) {
boolean parametersCompatible = true;
int argsCount = 0;
@@ -185,7 +185,7 @@ public class ReflectionUtils {
return updatedArguments;
}
- private static void logErrorMessage(String message, ProcessorLog processLogger, Exception e) {
+ private static void logErrorMessage(String message, ComponentLog processLogger, Exception e) {
if (processLogger != null) {
if (e != null) {
processLogger.error(message, e);
@@ -214,7 +214,7 @@ public class ReflectionUtils {
* @param preferredAnnotation preferred
* @param alternateAnnotation alternate
* @param instance instance
- * @param logger the ProcessorLog to use for logging any errors. If null, will
+ * @param logger the ComponentLog to use for logging any errors. If null, will
* use own logger, but that will not generate bulletins or easily
* tie to the Processor's log messages.
* @param args args
@@ -225,7 +225,7 @@ public class ReflectionUtils {
*/
@SuppressWarnings("unchecked")
public static boolean quietlyInvokeMethodsWithAnnotations(final Class<? extends Annotation> preferredAnnotation,
- final Class<? extends Annotation> alternateAnnotation, final Object instance, final ProcessorLog logger,
+ final Class<? extends Annotation> alternateAnnotation, final Object instance, final ComponentLog logger,
final Object... args) {
Class<? extends Annotation>[] annotationArray = (Class<? extends Annotation>[]) (alternateAnnotation != null
? new Class<?>[] { preferredAnnotation, alternateAnnotation } : new Class<?>[] { preferredAnnotation });
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/util/ReflectionUtilsTest.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/util/ReflectionUtilsTest.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/util/ReflectionUtilsTest.java
index c3b35a9..8a956db 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/util/ReflectionUtilsTest.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/util/ReflectionUtilsTest.java
@@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.nifi.annotation.lifecycle.OnStopped;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
@@ -93,7 +93,7 @@ public class ReflectionUtilsTest {
@Test
public void validateNoFailureIfQuiatelyIfOneOfArgumentsWrongTypeAndProcessLog() throws Exception {
- ProcessorLog pl = mock(ProcessorLog.class);
+ ComponentLog pl = mock(ComponentLog.class);
ReflectionUtils.quietlyInvokeMethodsWithAnnotation(OnStopped.class, new E(), pl, 3, "hjk", "hjk");
verify(pl, Mockito.atMost(1)).error(Mockito.anyString());
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFSSequenceFile.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFSSequenceFile.java b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFSSequenceFile.java
index 7de728a..ccd5501 100644
--- a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFSSequenceFile.java
+++ b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFSSequenceFile.java
@@ -25,7 +25,7 @@ import org.apache.nifi.annotation.documentation.SeeAlso;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -82,7 +82,7 @@ public class GetHDFSSequenceFile extends GetHDFS {
int bufferSize = bufferSizeProp.intValue();
conf.setInt(BUFFER_SIZE_KEY, bufferSize);
}
- ProcessorLog logger = getLogger();
+ ComponentLog logger = getLogger();
final SequenceFileReader<Set<FlowFile>> reader;
if (flowFileContentValue.equalsIgnoreCase(VALUE_ONLY)) {
reader = new ValueReader(session);
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-image-bundle/nifi-image-processors/src/main/java/org/apache/nifi/processors/image/ExtractImageMetadata.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-image-bundle/nifi-image-processors/src/main/java/org/apache/nifi/processors/image/ExtractImageMetadata.java b/nifi-nar-bundles/nifi-image-bundle/nifi-image-processors/src/main/java/org/apache/nifi/processors/image/ExtractImageMetadata.java
index b44eccd..1dd9241 100644
--- a/nifi-nar-bundles/nifi-image-bundle/nifi-image-processors/src/main/java/org/apache/nifi/processors/image/ExtractImageMetadata.java
+++ b/nifi-nar-bundles/nifi-image-bundle/nifi-image-processors/src/main/java/org/apache/nifi/processors/image/ExtractImageMetadata.java
@@ -35,7 +35,7 @@ import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -115,7 +115,7 @@ public class ExtractImageMetadata extends AbstractProcessor {
return;
}
- final ProcessorLog logger = this.getLogger();
+ final ComponentLog logger = this.getLogger();
final ObjectHolder<Metadata> value = new ObjectHolder<>(null);
final Integer max = context.getProperty(MAX_NUMBER_OF_ATTRIBUTES).asInteger();
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSConsumer.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSConsumer.java b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSConsumer.java
index e69705a..d88b348 100644
--- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSConsumer.java
+++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSConsumer.java
@@ -29,7 +29,7 @@ import javax.jms.Queue;
import javax.jms.TextMessage;
import javax.jms.Topic;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.jms.core.JmsTemplate;
@@ -48,9 +48,9 @@ final class JMSConsumer extends JMSWorker {
* @param jmsTemplate
* instance of {@link JmsTemplate}
* @param processLog
- * instance of {@link ProcessorLog}
+ * instance of {@link ComponentLog}
*/
- JMSConsumer(JmsTemplate jmsTemplate, ProcessorLog processLog) {
+ JMSConsumer(JmsTemplate jmsTemplate, ComponentLog processLog) {
super(jmsTemplate, processLog);
if (logger.isInfoEnabled()) {
logger.info("Created Message Consumer for '" + jmsTemplate.toString() + "'.");
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSPublisher.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSPublisher.java b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSPublisher.java
index 3643c51..cc9ee7f 100644
--- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSPublisher.java
+++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSPublisher.java
@@ -28,7 +28,7 @@ import javax.jms.Session;
import javax.jms.Topic;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.jms.core.JmsTemplate;
@@ -50,9 +50,9 @@ final class JMSPublisher extends JMSWorker {
* @param jmsTemplate
* instance of {@link JmsTemplate}
* @param processLog
- * instance of {@link ProcessorLog}
+ * instance of {@link ComponentLog}
*/
- JMSPublisher(JmsTemplate jmsTemplate, ProcessorLog processLog) {
+ JMSPublisher(JmsTemplate jmsTemplate, ComponentLog processLog) {
super(jmsTemplate, processLog);
if (logger.isInfoEnabled()) {
logger.info("Created Message Publisher for '" + jmsTemplate.toString() + "'.");
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSWorker.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSWorker.java b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSWorker.java
index bfb3f86..b0e7087 100644
--- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSWorker.java
+++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSWorker.java
@@ -20,7 +20,7 @@ import java.nio.channels.Channel;
import javax.jms.Connection;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.springframework.jms.core.JmsTemplate;
@@ -34,7 +34,7 @@ abstract class JMSWorker {
protected final JmsTemplate jmsTemplate;
- protected final ProcessorLog processLog;
+ protected final ComponentLog processLog;
/**
* Creates an instance of this worker initializing it with JMS
@@ -42,9 +42,9 @@ abstract class JMSWorker {
* sub-classes to interact with JMS systems
*
* @param jmsTemplate the instance of {@link JmsTemplate}
- * @param processLog the instance of {@link ProcessorLog}
+ * @param processLog the instance of {@link ComponentLog}
*/
- public JMSWorker(JmsTemplate jmsTemplate, ProcessorLog processLog) {
+ public JMSWorker(JmsTemplate jmsTemplate, ComponentLog processLog) {
this.jmsTemplate = jmsTemplate;
this.processLog = processLog;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/ConsumeJMSTest.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/ConsumeJMSTest.java b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/ConsumeJMSTest.java
index 48195a3..68b95fd 100644
--- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/ConsumeJMSTest.java
+++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/ConsumeJMSTest.java
@@ -22,7 +22,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.apache.nifi.jms.cf.JMSConnectionFactoryProviderDefinition;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
@@ -36,7 +36,7 @@ public class ConsumeJMSTest {
@Test
public void validateSuccessfulConsumeAndTransferToSuccess() throws Exception {
JmsTemplate jmsTemplate = CommonTest.buildJmsTemplateForDestination("cooQueue", false);
- JMSPublisher sender = new JMSPublisher(jmsTemplate, mock(ProcessorLog.class));
+ JMSPublisher sender = new JMSPublisher(jmsTemplate, mock(ComponentLog.class));
sender.publish("Hey dude!".getBytes());
TestRunner runner = TestRunners.newTestRunner(new ConsumeJMS());
JMSConnectionFactoryProviderDefinition cs = mock(JMSConnectionFactoryProviderDefinition.class);
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/JMSPublisherConsumerTest.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/JMSPublisherConsumerTest.java b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/JMSPublisherConsumerTest.java
index e18263e..1aa5288 100644
--- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/JMSPublisherConsumerTest.java
+++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/JMSPublisherConsumerTest.java
@@ -31,7 +31,7 @@ import javax.jms.TextMessage;
import javax.jms.Topic;
import org.apache.nifi.jms.processors.JMSConsumer.JMSResponse;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.junit.Test;
import org.springframework.jms.connection.CachingConnectionFactory;
import org.springframework.jms.core.JmsTemplate;
@@ -44,7 +44,7 @@ public class JMSPublisherConsumerTest {
public void validateByesConvertedToBytesMessageOnSend() throws Exception {
JmsTemplate jmsTemplate = CommonTest.buildJmsTemplateForDestination("testQueue", false);
- JMSPublisher publisher = new JMSPublisher(jmsTemplate, mock(ProcessorLog.class));
+ JMSPublisher publisher = new JMSPublisher(jmsTemplate, mock(ComponentLog.class));
publisher.publish("hellomq".getBytes());
Message receivedMessage = jmsTemplate.receive();
@@ -60,7 +60,7 @@ public class JMSPublisherConsumerTest {
public void validateJmsHeadersAndPropertiesAreTransferredFromFFAttributes() throws Exception {
JmsTemplate jmsTemplate = CommonTest.buildJmsTemplateForDestination("testQueue", false);
- JMSPublisher publisher = new JMSPublisher(jmsTemplate, mock(ProcessorLog.class));
+ JMSPublisher publisher = new JMSPublisher(jmsTemplate, mock(ComponentLog.class));
Map<String, String> flowFileAttributes = new HashMap<>();
flowFileAttributes.put("foo", "foo");
flowFileAttributes.put(JmsHeaders.REPLY_TO, "myTopic");
@@ -92,7 +92,7 @@ public class JMSPublisherConsumerTest {
}
});
- JMSConsumer consumer = new JMSConsumer(jmsTemplate, mock(ProcessorLog.class));
+ JMSConsumer consumer = new JMSConsumer(jmsTemplate, mock(ComponentLog.class));
try {
consumer.consume();
} finally {
@@ -115,7 +115,7 @@ public class JMSPublisherConsumerTest {
}
});
- JMSConsumer consumer = new JMSConsumer(jmsTemplate, mock(ProcessorLog.class));
+ JMSConsumer consumer = new JMSConsumer(jmsTemplate, mock(ComponentLog.class));
assertEquals("JMSConsumer[destination:testQueue; pub-sub:false;]", consumer.toString());
JMSResponse response = consumer.consume();
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/processors/kafka/KafkaPublisher.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/processors/kafka/KafkaPublisher.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/processors/kafka/KafkaPublisher.java
index dac5804..bf89d22 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/processors/kafka/KafkaPublisher.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/processors/kafka/KafkaPublisher.java
@@ -33,7 +33,7 @@ import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.clients.producer.RecordMetadata;
import org.apache.kafka.common.serialization.ByteArraySerializer;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.stream.io.util.StreamDemarcator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,7 +52,7 @@ class KafkaPublisher implements Closeable {
private long ackWaitTime = 30000;
- private ProcessorLog processLog;
+ private ComponentLog processLog;
private final Partitioner partitioner;
@@ -110,7 +110,7 @@ class KafkaPublisher implements Closeable {
*/
KafkaPublisherResult publish(PublishingContext publishingContext) {
StreamDemarcator streamTokenizer = new StreamDemarcator(publishingContext.getContentStream(),
- publishingContext.getDelimiterBytes(), publishingContext.getMaxRequestSize());
+ publishingContext.getDelimiterBytes(), publishingContext.getMaxRequestSize());
int prevLastAckedMessageIndex = publishingContext.getLastAckedMessageIndex();
List<Future<RecordMetadata>> resultFutures = new ArrayList<>();
@@ -124,7 +124,7 @@ class KafkaPublisher implements Closeable {
partitionId = this.getPartition(publishingContext.getKeyBytes(), publishingContext.getTopic());
}
ProducerRecord<byte[], byte[]> message =
- new ProducerRecord<>(publishingContext.getTopic(), publishingContext.getPartitionId(), publishingContext.getKeyBytes(), messageBytes);
+ new ProducerRecord<>(publishingContext.getTopic(), publishingContext.getPartitionId(), publishingContext.getKeyBytes(), messageBytes);
resultFutures.add(this.kafkaProducer.send(message));
}
}
@@ -198,10 +198,10 @@ class KafkaPublisher implements Closeable {
}
/**
- * Will set {@link ProcessorLog} as an additional logger to forward log
+ * Will set {@link ComponentLog} as an additional logger to forward log
* messages to NiFi bulletin
*/
- void setProcessLog(ProcessorLog processLog) {
+ void setProcessLog(ComponentLog processLog) {
this.processLog = processLog;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/GetMongo.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/GetMongo.java b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/GetMongo.java
index ebe7a24..fc00a08 100644
--- a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/GetMongo.java
+++ b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/GetMongo.java
@@ -36,7 +36,7 @@ import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.Relationship;
@@ -132,7 +132,7 @@ public class GetMongo extends AbstractMongoProcessor {
@Override
public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final Document query = context.getProperty(QUERY).isSet() ? Document.parse(context.getProperty(QUERY).getValue()) : null;
final Document projection = context.getProperty(PROJECTION).isSet() ? Document.parse(context.getProperty(PROJECTION).getValue()) : null;
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongo.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongo.java b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongo.java
index 5f6d875..51e5265 100644
--- a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongo.java
+++ b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongo.java
@@ -32,7 +32,7 @@ import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.Relationship;
@@ -142,7 +142,7 @@ public class PutMongo extends AbstractMongoProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final Charset charset = Charset.forName(context.getProperty(CHARACTER_SET).getValue());
final String mode = context.getProperty(MODE).getValue();
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/AbstractScriptProcessor.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/AbstractScriptProcessor.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/AbstractScriptProcessor.java
index a34c83c..ad41850 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/AbstractScriptProcessor.java
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/AbstractScriptProcessor.java
@@ -16,6 +16,21 @@
*/
package org.apache.nifi.processors.script;
+import org.apache.nifi.components.AllowableValue;
+import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.ValidationContext;
+import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.Validator;
+import org.apache.nifi.logging.ComponentLog;
+import org.apache.nifi.processor.AbstractSessionFactoryProcessor;
+import org.apache.nifi.processor.Relationship;
+import org.apache.nifi.processor.util.StandardValidators;
+import org.apache.nifi.util.StringUtils;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineFactory;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
@@ -47,7 +62,6 @@ import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
-import org.apache.nifi.logging.ProcessorLog;
import org.apache.nifi.processor.AbstractSessionFactoryProcessor;
import org.apache.nifi.processor.Relationship;
import org.apache.nifi.processor.util.StandardValidators;
@@ -223,7 +237,7 @@ public abstract class AbstractScriptProcessor extends AbstractSessionFactoryProc
engineQ = new LinkedBlockingQueue<>(numberOfScriptEngines);
ClassLoader originalContextClassLoader = Thread.currentThread().getContextClassLoader();
try {
- ProcessorLog log = getLogger();
+ ComponentLog log = getLogger();
if (StringUtils.isBlank(scriptEngineName)) {
throw new IllegalArgumentException("The script engine name cannot be null");
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ExecuteScript.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ExecuteScript.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ExecuteScript.java
index f9fe2e3..224c55f 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ExecuteScript.java
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ExecuteScript.java
@@ -30,11 +30,13 @@ import javax.script.ScriptException;
import javax.script.SimpleBindings;
import org.apache.commons.io.IOUtils;
import org.apache.nifi.annotation.behavior.DynamicProperty;
+import org.apache.nifi.annotation.behavior.TriggerSerially;
+import org.apache.nifi.annotation.lifecycle.OnStopped;
+import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.logging.ComponentLog;
+import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
-import org.apache.nifi.annotation.lifecycle.OnScheduled;
-import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.logging.ProcessorLog;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.ProcessSessionFactory;
@@ -161,7 +163,7 @@ public class ExecuteScript extends AbstractScriptProcessor {
}
}
ScriptEngine scriptEngine = engineQ.poll();
- ProcessorLog log = getLogger();
+ ComponentLog log = getLogger();
if (scriptEngine == null) {
// No engine available so nothing more to do here
return;
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java
index 06c0a7f..b4a6c0d 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java
@@ -42,7 +42,7 @@ import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.controller.ControllerServiceLookup;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSessionFactory;
import org.apache.nifi.processor.Processor;
@@ -84,7 +84,7 @@ public class InvokeScriptedProcessor extends AbstractScriptProcessor {
try {
relationships.addAll(instance.getRelationships());
} catch (final Throwable t) {
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final String message = "Unable to get relationships from scripted Processor: " + t;
logger.error(message);
@@ -126,7 +126,7 @@ public class InvokeScriptedProcessor extends AbstractScriptProcessor {
supportedPropertyDescriptors.addAll(instanceDescriptors);
}
} catch (final Throwable t) {
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final String message = "Unable to get property descriptors from Processor: " + t;
logger.error(message);
@@ -206,7 +206,7 @@ public class InvokeScriptedProcessor extends AbstractScriptProcessor {
*/
@Override
public void onPropertyModified(final PropertyDescriptor descriptor, final String oldValue, final String newValue) {
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final Processor instance = processor.get();
if (SCRIPT_FILE.equals(descriptor)
@@ -240,7 +240,7 @@ public class InvokeScriptedProcessor extends AbstractScriptProcessor {
return reloadScript(IOUtils.toString(scriptStream));
} catch (final Exception e) {
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final String message = "Unable to load script: " + e;
logger.error(message, e);
@@ -271,7 +271,7 @@ public class InvokeScriptedProcessor extends AbstractScriptProcessor {
return reloadScript(scriptBody);
} catch (final Exception e) {
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final String message = "Unable to load script: " + e;
logger.error(message, e);
@@ -319,7 +319,7 @@ public class InvokeScriptedProcessor extends AbstractScriptProcessor {
// get configured processor from the script (if it exists)
final Object obj = scriptEngine.get("processor");
if (obj != null) {
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
try {
// set the logger if the processor wants it
@@ -343,7 +343,7 @@ public class InvokeScriptedProcessor extends AbstractScriptProcessor {
}
@Override
- public ProcessorLog getLogger() {
+ public ComponentLog getLogger() {
return logger;
}
@@ -363,7 +363,7 @@ public class InvokeScriptedProcessor extends AbstractScriptProcessor {
}
} catch (final Exception ex) {
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final String message = "Unable to load script: " + ex.getLocalizedMessage();
logger.error(message, ex);
@@ -423,7 +423,7 @@ public class InvokeScriptedProcessor extends AbstractScriptProcessor {
return instanceResults;
}
} catch (final Exception e) {
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final String message = "Unable to validate the script Processor: " + e;
logger.error(message, e);
@@ -465,7 +465,7 @@ public class InvokeScriptedProcessor extends AbstractScriptProcessor {
}
}
- ProcessorLog log = getLogger();
+ ComponentLog log = getLogger();
// ensure the processor (if it exists) is loaded
final Processor instance = processor.get();
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/impl/GroovyScriptEngineConfigurator.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/impl/GroovyScriptEngineConfigurator.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/impl/GroovyScriptEngineConfigurator.java
index 83e04cb..b4c4cd3 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/impl/GroovyScriptEngineConfigurator.java
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/impl/GroovyScriptEngineConfigurator.java
@@ -29,7 +29,7 @@ public class GroovyScriptEngineConfigurator extends AbstractModuleClassloaderCon
+ "import org.apache.nifi.processor.io.*\n"
+ "import org.apache.nifi.processor.util.*\n"
+ "import org.apache.nifi.processors.script.*\n"
- + "import org.apache.nifi.logging.ProcessorLog\n";
+ + "import org.apache.nifi.logging.ComponentLog\n";
private ScriptEngine scriptEngine;
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/groovy/testInvokeScriptCausesException.groovy
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/groovy/testInvokeScriptCausesException.groovy b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/groovy/testInvokeScriptCausesException.groovy
index 1b2922c..d41710f 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/groovy/testInvokeScriptCausesException.groovy
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/groovy/testInvokeScriptCausesException.groovy
@@ -17,7 +17,7 @@
class testInvokeScriptCausesException implements Processor {
- def ProcessorLog log
+ def ComponentLog log
@Override
void initialize(ProcessorInitializationContext context) {
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/groovy/testScriptRoutesToFailure.groovy
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/groovy/testScriptRoutesToFailure.groovy b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/groovy/testScriptRoutesToFailure.groovy
index 47074a2..90d7d6c 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/groovy/testScriptRoutesToFailure.groovy
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/groovy/testScriptRoutesToFailure.groovy
@@ -16,7 +16,7 @@
*/
class testScriptRoutesToFailure implements Processor {
- def ProcessorLog log
+ def ComponentLog log
@Override
void initialize(ProcessorInitializationContext context) {
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/GetSolr.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/GetSolr.java b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/GetSolr.java
index 0de5b08..3bf073e 100644
--- a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/GetSolr.java
+++ b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/GetSolr.java
@@ -47,7 +47,7 @@ import org.apache.nifi.annotation.lifecycle.OnRemoved;
import org.apache.nifi.annotation.lifecycle.OnStopped;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.ProcessorInitializationContext;
@@ -182,7 +182,7 @@ public class GetSolr extends SolrProcessor {
@Override
public void onTrigger(ProcessContext context, ProcessSession session) throws ProcessException {
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
readLastEndDate();
final SimpleDateFormat sdf = new SimpleDateFormat(LAST_END_DATE_PATTERN, Locale.US);
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/test/java/org/apache/nifi/processors/splunk/TestPutSplunk.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/test/java/org/apache/nifi/processors/splunk/TestPutSplunk.java b/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/test/java/org/apache/nifi/processors/splunk/TestPutSplunk.java
index d6bf3a1..a0713a3 100644
--- a/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/test/java/org/apache/nifi/processors/splunk/TestPutSplunk.java
+++ b/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/test/java/org/apache/nifi/processors/splunk/TestPutSplunk.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.processors.splunk;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.util.put.sender.ChannelSender;
import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.TestRunner;
@@ -43,7 +43,7 @@ public class TestPutSplunk {
@Before
public void init() {
- ProcessorLog logger = Mockito.mock(ProcessorLog.class);
+ ComponentLog logger = Mockito.mock(ComponentLog.class);
sender = new CapturingChannelSender("localhost", 12345, 0, logger);
proc = new TestablePutSplunk(sender);
@@ -356,7 +356,7 @@ public class TestPutSplunk {
private int errorStart = -1;
private int errorEnd = -1;
- public CapturingChannelSender(String host, int port, int maxSendBufferSize, ProcessorLog logger) {
+ public CapturingChannelSender(String host, int port, int maxSendBufferSize, ComponentLog logger) {
super(host, port, maxSendBufferSize, logger);
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/Base64EncodeContent.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/Base64EncodeContent.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/Base64EncodeContent.java
index db45109..cdade75 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/Base64EncodeContent.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/Base64EncodeContent.java
@@ -37,7 +37,7 @@ import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -107,7 +107,7 @@ public class Base64EncodeContent extends AbstractProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
boolean encode = context.getProperty(MODE).getValue().equalsIgnoreCase(ENCODE_MODE);
try {
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/BinFiles.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/BinFiles.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/BinFiles.java
index e5f3d55..3df4317 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/BinFiles.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/BinFiles.java
@@ -30,7 +30,7 @@ import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractSessionFactoryProcessor;
import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.processor.ProcessContext;
@@ -218,7 +218,7 @@ public abstract class BinFiles extends AbstractSessionFactoryProcessor {
final List<Bin> bins = new ArrayList<>();
bins.add(bin);
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final ProcessSession session = sessionFactory.createSession();
final List<FlowFileSessionWrapper> binCopy = new ArrayList<>(bin.getContents());
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java
index f885521..e4e6cf4 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java
@@ -44,7 +44,7 @@ import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -180,7 +180,7 @@ public class CompressContent extends AbstractProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final long sizeBeforeCompression = flowFile.getSize();
final String compressionMode = context.getProperty(MODE).getValue();
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
index 5612d4f..bce67ac 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
@@ -44,7 +44,7 @@ import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.processor.FlowFileFilter;
@@ -261,7 +261,7 @@ public class ControlRate extends AbstractProcessor {
}
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
for (FlowFile flowFile : flowFiles) {
// call this to capture potential error
final long accrualAmount = getFlowFileAccrual(flowFile);
@@ -311,13 +311,13 @@ public class ControlRate extends AbstractProcessor {
private final AtomicLong maxRate = new AtomicLong(1L);
private final long timePeriodMillis;
private final TimedBuffer<TimestampedLong> timedBuffer;
- private final ProcessorLog logger;
+ private final ComponentLog logger;
private volatile long penalizationPeriod = 0;
private volatile long penalizationExpired = 0;
private volatile long lastUpdateTime;
- public Throttle(final int timePeriod, final TimeUnit unit, final ProcessorLog logger) {
+ public Throttle(final int timePeriod, final TimeUnit unit, final ComponentLog logger) {
this.timePeriodMillis = TimeUnit.MILLISECONDS.convert(timePeriod, unit);
this.timedBuffer = new TimedBuffer<>(unit, timePeriod, new LongEntityAccess());
this.logger = logger;
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java
index 53c1954..c1f76a4 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java
@@ -31,7 +31,7 @@ import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.Relationship;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.behavior.EventDriven;
import org.apache.nifi.annotation.behavior.InputRequirement;
@@ -136,7 +136,7 @@ public class ConvertCharacterSet extends AbstractProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final Charset inputCharset = Charset.forName(context.getProperty(INPUT_CHARSET).evaluateAttributeExpressions(flowFile).getValue());
final Charset outputCharset = Charset.forName(context.getProperty(OUTPUT_CHARSET).evaluateAttributeExpressions(flowFile).getValue());
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DetectDuplicate.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DetectDuplicate.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DetectDuplicate.java
index 71195d9..2fd7b80 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DetectDuplicate.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DetectDuplicate.java
@@ -43,7 +43,7 @@ import org.apache.nifi.distributed.cache.client.exception.DeserializationExcepti
import org.apache.nifi.distributed.cache.client.exception.SerializationException;
import org.apache.nifi.expression.AttributeExpression.ResultType;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -160,7 +160,7 @@ public class DetectDuplicate extends AbstractProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final String cacheKey = context.getProperty(CACHE_ENTRY_IDENTIFIER).evaluateAttributeExpressions(flowFile).getValue();
if (StringUtils.isBlank(cacheKey)) {
logger.error("FlowFile {} has no attribute for given Cache Entry Identifier", new Object[]{flowFile});
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EncodeContent.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EncodeContent.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EncodeContent.java
index d1e010d..469e4ec 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EncodeContent.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EncodeContent.java
@@ -42,7 +42,7 @@ import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -128,7 +128,7 @@ public class EncodeContent extends AbstractProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
boolean encode = context.getProperty(MODE).getValue().equalsIgnoreCase(ENCODE_MODE);
String encoding = context.getProperty(ENCODING).getValue();
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EncryptContent.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EncryptContent.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EncryptContent.java
index a02fd30..b4f8c49 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EncryptContent.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EncryptContent.java
@@ -32,7 +32,7 @@ import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -454,7 +454,7 @@ public class EncryptContent extends AbstractProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final String method = context.getProperty(ENCRYPTION_ALGORITHM).getValue();
final EncryptionMethod encryptionMethod = EncryptionMethod.valueOf(method);
final String providerName = encryptionMethod.getProvider();
[2/5] nifi git commit: NIFI-1811 Removed ProcessorLog and updated
dependent interfaces
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJsonPath.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJsonPath.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJsonPath.java
index db60f13..18259d1 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJsonPath.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJsonPath.java
@@ -44,7 +44,7 @@ import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.ProcessorInitializationContext;
@@ -238,7 +238,7 @@ public class EvaluateJsonPath extends AbstractJsonPathProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
String representationOption = processContext.getProperty(NULL_VALUE_DEFAULT_REPRESENTATION).getValue();
final String nullDefaultValue = NULL_REPRESENTATION_MAP.get(representationOption);
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java
index 6b3c514..10d9af9 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java
@@ -64,7 +64,7 @@ import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -219,7 +219,7 @@ public class EvaluateXPath extends AbstractProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final XPathFactory factory = factoryRef.get();
final XPathEvaluator xpathEvaluator = (XPathEvaluator) factory.newXPath();
final Map<String, XPathExpression> attributeToXPathMap = new HashMap<>();
@@ -400,7 +400,7 @@ public class EvaluateXPath extends AbstractProcessor {
props.setProperty(OutputKeys.OMIT_XML_DECLARATION, "no");
transformer.setOutputProperties(props);
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final ObjectHolder<TransformerException> error = new ObjectHolder<>(null);
transformer.setErrorListener(new ErrorListener() {
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java
index f8db8f8..51a7db0 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java
@@ -54,7 +54,7 @@ import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -227,7 +227,7 @@ public class EvaluateXQuery extends AbstractProcessor {
if (flowFileBatch.isEmpty()) {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final Map<String, XQueryExecutable> attributeToXQueryMap = new HashMap<>();
final Processor proc = new Processor(false);
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteProcess.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteProcess.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteProcess.java
index fd6bb05..2af1f53 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteProcess.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteProcess.java
@@ -52,7 +52,7 @@ import org.apache.nifi.annotation.lifecycle.OnUnscheduled;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.Validator;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -389,12 +389,12 @@ public class ExecuteProcess extends AbstractProcessor {
*/
private static class ProxyOutputStream extends OutputStream {
- private final ProcessorLog logger;
+ private final ComponentLog logger;
private final Lock lock = new ReentrantLock();
private OutputStream delegate;
- public ProxyOutputStream(final ProcessorLog logger) {
+ public ProxyOutputStream(final ComponentLog logger) {
this.logger = logger;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteSQL.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteSQL.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteSQL.java
index 02d9f88..1e775bf 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteSQL.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteSQL.java
@@ -37,7 +37,7 @@ import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.dbcp.DBCPService;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -136,7 +136,7 @@ public class ExecuteSQL extends AbstractProcessor {
}
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final DBCPService dbcpService = context.getProperty(DBCP_SERVICE).asControllerService(DBCPService.class);
final String selectQuery = context.getProperty(SQL_SELECT_QUERY).evaluateAttributeExpressions(fileToProcess).getValue();
final Integer queryTimeout = context.getProperty(QUERY_TIMEOUT).asTimePeriod(TimeUnit.SECONDS).intValue();
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java
index 44a03b9..4654a22 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java
@@ -49,7 +49,7 @@ import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
import org.apache.nifi.expression.AttributeExpression.ResultType;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -245,7 +245,7 @@ public class ExecuteStreamCommand extends AbstractProcessor {
ATTRIBUTE_RELATIONSHIP_SET = Collections.unmodifiableSet(attributeRelationships);
}
- private ProcessorLog logger;
+ private ComponentLog logger;
@Override
public Set<Relationship> getRelationships() {
@@ -408,7 +408,7 @@ public class ExecuteStreamCommand extends AbstractProcessor {
final boolean ignoreStdin;
final OutputStream stdinWritable;
final InputStream stdoutReadable;
- final ProcessorLog logger;
+ final ComponentLog logger;
final ProcessSession session;
final Process process;
FlowFile outputFlowFile;
@@ -420,7 +420,7 @@ public class ExecuteStreamCommand extends AbstractProcessor {
byte[] outputBuffer;
int size;
- public ProcessStreamWriterCallback(boolean ignoreStdin, OutputStream stdinWritable, InputStream stdoutReadable,ProcessorLog logger, String attributeName,
+ public ProcessStreamWriterCallback(boolean ignoreStdin, OutputStream stdinWritable, InputStream stdoutReadable,ComponentLog logger, String attributeName,
ProcessSession session, FlowFile outputFlowFile, Process process, boolean putToAttribute, int attributeSize) {
this.ignoreStdin = ignoreStdin;
this.stdinWritable = stdinWritable;
@@ -477,7 +477,7 @@ public class ExecuteStreamCommand extends AbstractProcessor {
}
private static void readStdoutReadable(final boolean ignoreStdin, final OutputStream stdinWritable,
- final ProcessorLog logger, final InputStream incomingFlowFileIS) throws IOException {
+ final ComponentLog logger, final InputStream incomingFlowFileIS) throws IOException {
Thread writerThread = new Thread(new Runnable() {
@Override
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractText.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractText.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractText.java
index 0c40a15..a4370b8 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractText.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractText.java
@@ -44,7 +44,7 @@ import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.annotation.lifecycle.OnStopped;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.processor.ProcessContext;
@@ -285,7 +285,7 @@ public class ExtractText extends AbstractProcessor {
if (flowFile == null) {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final Charset charset = Charset.forName(context.getProperty(CHARACTER_SET).getValue());
final int maxCaptureGroupLength = context.getProperty(MAX_CAPTURE_GROUP_LENGTH).asInteger();
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchDistributedMapCache.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchDistributedMapCache.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchDistributedMapCache.java
index ee1a897..185ed72 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchDistributedMapCache.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchDistributedMapCache.java
@@ -34,7 +34,7 @@ import org.apache.nifi.distributed.cache.client.exception.SerializationException
import org.apache.nifi.expression.AttributeExpression;
import org.apache.nifi.expression.AttributeExpression.ResultType;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -157,7 +157,7 @@ public class FetchDistributedMapCache extends AbstractProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final String cacheKey = context.getProperty(PROP_CACHE_ENTRY_IDENTIFIER).evaluateAttributeExpressions(flowFile).getValue();
if (StringUtils.isBlank(cacheKey)) {
logger.error("FlowFile {} has no attribute for given Cache Entry Identifier", new Object[]{flowFile});
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFile.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFile.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFile.java
index 74b6761..45c95eb 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFile.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFile.java
@@ -61,7 +61,7 @@ import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.processor.ProcessContext;
@@ -363,7 +363,7 @@ public class GetFile extends AbstractProcessor {
public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
final File directory = new File(context.getProperty(DIRECTORY).evaluateAttributeExpressions().getValue());
final boolean keepingSourceFile = context.getProperty(KEEP_SOURCE_FILE).asBoolean();
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
if (fileQueue.size() < 100) {
final long pollingMillis = context.getProperty(POLLING_INTERVAL).asTimePeriod(TimeUnit.MILLISECONDS);
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFileTransfer.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFileTransfer.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFileTransfer.java
index 810a91e..7347db1 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFileTransfer.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFileTransfer.java
@@ -43,7 +43,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -115,7 +115,7 @@ public abstract class GetFileTransfer extends AbstractProcessor {
final long pollingIntervalMillis = context.getProperty(FileTransfer.POLLING_INTERVAL).asTimePeriod(TimeUnit.MILLISECONDS);
final long nextPollTime = lastPollTime.get() + pollingIntervalMillis;
BlockingQueue<FileInfo> fileQueue = fileQueueRef.get();
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
// dont do the listing if there are already 100 or more items in our queue
// 100 is really just a magic number that seems to work out well in practice
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java
index 438e3b9..288d5da 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java
@@ -81,7 +81,7 @@ import org.apache.nifi.components.state.StateMap;
import org.apache.nifi.expression.AttributeExpression;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractSessionFactoryProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -307,7 +307,7 @@ public class GetHTTP extends AbstractSessionFactoryProcessor {
@Override
public void onTrigger(final ProcessContext context, final ProcessSessionFactory sessionFactory) throws ProcessException {
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final ProcessSession session = sessionFactory.createSession();
final FlowFile incomingFlowFile = session.get();
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetJMSQueue.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetJMSQueue.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetJMSQueue.java
index 0ba7f98..09a79aa 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetJMSQueue.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetJMSQueue.java
@@ -28,7 +28,7 @@ import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.SeeAlso;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnStopped;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.exception.ProcessException;
@@ -55,7 +55,7 @@ public class GetJMSQueue extends JmsConsumer {
@Override
public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
WrappedMessageConsumer wrappedConsumer = consumerQueue.poll();
if (wrappedConsumer == null) {
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetJMSTopic.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetJMSTopic.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetJMSTopic.java
index 272c7ab..2876e60 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetJMSTopic.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetJMSTopic.java
@@ -52,7 +52,7 @@ import org.apache.nifi.annotation.lifecycle.OnRemoved;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.annotation.lifecycle.OnStopped;
import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.exception.ProcessException;
@@ -323,7 +323,7 @@ public class GetJMSTopic extends JmsConsumer {
@Override
public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
WrappedMessageConsumer consumer = this.wrappedConsumer;
if (consumer == null || consumer.isClosed()) {
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java
index a0c603c..e263705 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java
@@ -42,7 +42,7 @@ import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -191,7 +191,7 @@ public class HashAttribute extends AbstractProcessor {
}
final Map<String, Pattern> patterns = regexMapRef.get();
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final SortedMap<String, String> attributes = getRelevantAttributes(flowFile, patterns);
if (attributes.size() != patterns.size()) {
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HashContent.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HashContent.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HashContent.java
index 9885599..d0e99f8 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HashContent.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HashContent.java
@@ -37,7 +37,7 @@ import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -118,7 +118,7 @@ public class HashContent extends AbstractProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final String algorithm = context.getProperty(HASH_ALGORITHM).getValue();
final MessageDigest digest;
try {
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java
index d514722..f4189c3 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java
@@ -33,7 +33,7 @@ import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -116,7 +116,7 @@ public class IdentifyMimeType extends AbstractProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final ObjectHolder<String> mimeTypeRef = new ObjectHolder<>(null);
final String filename = flowFile.getAttribute(CoreAttributes.FILENAME.key());
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
index 4470bf6..2552e9a 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
@@ -78,7 +78,7 @@ import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.expression.AttributeExpression;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -543,7 +543,7 @@ public final class InvokeHTTP extends AbstractProcessor {
// Setting some initial variables
final int maxAttributeSize = context.getProperty(PROP_PUT_ATTRIBUTE_MAX_LENGTH).asInteger();
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
// Every request/response cycle has a unique transaction id which will be stored as a flowfile attribute.
final UUID txId = UUID.randomUUID();
@@ -866,12 +866,12 @@ public final class InvokeHTTP extends AbstractProcessor {
return statusCode / 100 == 2;
}
- private void logRequest(ProcessorLog logger, Request request) {
+ private void logRequest(ComponentLog logger, Request request) {
logger.debug("\nRequest to remote service:\n\t{}\n{}",
new Object[]{request.url().toExternalForm(), getLogString(request.headers().toMultimap())});
}
- private void logResponse(ProcessorLog logger, URL url, Response response) {
+ private void logResponse(ComponentLog logger, URL url, Response response) {
logger.debug("\nResponse from remote service:\n\t{}\n{}",
new Object[]{url.toExternalForm(), getLogString(response.headers().toMultimap())});
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JmsConsumer.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JmsConsumer.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JmsConsumer.java
index ea70d52..0031c6a 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JmsConsumer.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JmsConsumer.java
@@ -49,7 +49,7 @@ import javax.jms.MessageConsumer;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -107,7 +107,7 @@ public abstract class JmsConsumer extends AbstractProcessor {
}
public void consume(final ProcessContext context, final ProcessSession session, final WrappedMessageConsumer wrappedConsumer) throws ProcessException {
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final MessageConsumer consumer = wrappedConsumer.getConsumer();
final boolean clientAcknowledge = context.getProperty(ACKNOWLEDGEMENT_MODE).getValue().equalsIgnoreCase(ACK_MODE_CLIENT);
@@ -177,7 +177,7 @@ public abstract class JmsConsumer extends AbstractProcessor {
}
}
- public static JmsProcessingSummary map2FlowFile(final ProcessContext context, final ProcessSession session, final Message message, final boolean addAttributes, ProcessorLog logger)
+ public static JmsProcessingSummary map2FlowFile(final ProcessContext context, final ProcessSession session, final Message message, final boolean addAttributes, ComponentLog logger)
throws Exception {
// Currently not very useful, because always one Message == one FlowFile
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java
index 5cd5b14..0aeff11 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java
@@ -37,7 +37,7 @@ import org.apache.nifi.annotation.behavior.SupportsBatching;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -132,9 +132,9 @@ public class LogAttribute extends AbstractProcessor {
return supportedDescriptors;
}
- protected String processFlowFile(final ProcessorLog logger, final DebugLevels logLevel, final FlowFile flowFile, final ProcessSession session, final ProcessContext context) {
+ protected String processFlowFile(final ComponentLog logger, final DebugLevels logLevel, final FlowFile flowFile, final ProcessSession session, final ProcessContext context) {
final Set<String> attributeKeys = getAttributesToLog(flowFile.getAttributes().keySet(), context);
- final ProcessorLog LOG = getLogger();
+ final ComponentLog LOG = getLogger();
final String dashedLine;
String logPrefix = context.getProperty(LOG_PREFIX).evaluateAttributeExpressions(flowFile).getValue();
@@ -240,7 +240,7 @@ public class LogAttribute extends AbstractProcessor {
throw new ProcessException(e);
}
- final ProcessorLog LOG = getLogger();
+ final ComponentLog LOG = getLogger();
boolean isLogLevelEnabled = false;
switch (logLevel) {
case trace:
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ModifyBytes.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ModifyBytes.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ModifyBytes.java
index e0efa3d..958096a 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ModifyBytes.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ModifyBytes.java
@@ -34,7 +34,7 @@ import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.processor.ProcessContext;
@@ -104,7 +104,7 @@ public class ModifyBytes extends AbstractProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final int startOffset = context.getProperty(START_OFFSET).asDataSize(DataUnit.B).intValue();
final int endOffset = context.getProperty(END_OFFSET).asDataSize(DataUnit.B).intValue();
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MonitorActivity.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MonitorActivity.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MonitorActivity.java
index 426b792..9d4dbe5 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MonitorActivity.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MonitorActivity.java
@@ -43,7 +43,7 @@ import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -167,7 +167,7 @@ public class MonitorActivity extends AbstractProcessor {
final long thresholdMillis = context.getProperty(THRESHOLD).asTimePeriod(TimeUnit.MILLISECONDS);
final long now = System.currentTimeMillis();
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final List<FlowFile> flowFiles = session.get(50);
if (flowFiles.isEmpty()) {
final long previousSuccessMillis = latestSuccessTransfer.get();
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java
index 79d2815..d3713a1 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java
@@ -94,7 +94,7 @@ import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.processor.ProcessContext;
@@ -455,7 +455,7 @@ public class PostHTTP extends AbstractProcessor {
final RequestConfig requestConfig = requestConfigBuilder.build();
final StreamThrottler throttler = throttlerRef.get();
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final Double maxBatchBytes = context.getProperty(MAX_BATCH_SIZE).asDataSize(DataUnit.B);
String lastUrl = null;
@@ -877,7 +877,7 @@ public class PostHTTP extends AbstractProcessor {
}
private DestinationAccepts getDestinationAcceptance(final boolean sendAsFlowFile, final HttpClient client, final String uri,
- final ProcessorLog logger, final String transactionId) throws IOException {
+ final ComponentLog logger, final String transactionId) throws IOException {
final HttpHead head = new HttpHead(uri);
if (sendAsFlowFile) {
head.addHeader(TRANSACTION_ID_HEADER, transactionId);
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDistributedMapCache.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDistributedMapCache.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDistributedMapCache.java
index 6e89502..180ff8e 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDistributedMapCache.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDistributedMapCache.java
@@ -44,7 +44,7 @@ import org.apache.nifi.distributed.cache.client.exception.DeserializationExcepti
import org.apache.nifi.distributed.cache.client.exception.SerializationException;
import org.apache.nifi.expression.AttributeExpression.ResultType;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.processor.ProcessContext;
@@ -155,7 +155,7 @@ public class PutDistributedMapCache extends AbstractProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
// cache key is computed from attribute 'CACHE_ENTRY_IDENTIFIER' with expression language support
final String cacheKey = context.getProperty(CACHE_ENTRY_IDENTIFIER).evaluateAttributeExpressions(flowFile).getValue();
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
index e71f5aa..27534fe 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
@@ -57,7 +57,7 @@ import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -295,7 +295,7 @@ public class PutEmail extends AbstractProcessor {
final Session mailSession = this.createMailSession(properties);
final Message message = new MimeMessage(mailSession);
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
try {
message.addFrom(toInetAddresses(context, flowFile, FROM));
@@ -384,7 +384,7 @@ public class PutEmail extends AbstractProcessor {
final Properties properties = new Properties();
- final ProcessorLog logger = this.getLogger();
+ final ComponentLog logger = this.getLogger();
for (Entry<String, PropertyDescriptor> entry : propertyToContext.entrySet()) {
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFile.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFile.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFile.java
index d32427e..5cce470 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFile.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFile.java
@@ -43,7 +43,7 @@ import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -183,7 +183,7 @@ public class PutFile extends AbstractProcessor {
final Path configuredRootDirPath = Paths.get(context.getProperty(DIRECTORY).evaluateAttributeExpressions(flowFile).getValue());
final String conflictResponse = context.getProperty(CONFLICT_RESOLUTION).getValue();
final Integer maxDestinationFiles = context.getProperty(MAX_DESTINATION_FILES).asInteger();
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
Path tempDotCopyFile = null;
try {
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFileTransfer.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFileTransfer.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFileTransfer.java
index c03f755..8fb5996 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFileTransfer.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFileTransfer.java
@@ -19,7 +19,7 @@ package org.apache.nifi.processors.standard;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.stream.io.BufferedInputStream;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -94,7 +94,7 @@ public abstract class PutFileTransfer<T extends FileTransfer> extends AbstractPr
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final String hostname = context.getProperty(FileTransfer.HOSTNAME).evaluateAttributeExpressions(flowFile).getValue();
final int maxNumberOfFiles = context.getProperty(FileTransfer.BATCH_SIZE).asInteger();
@@ -187,7 +187,7 @@ public abstract class PutFileTransfer<T extends FileTransfer> extends AbstractPr
final String path,
final FlowFile flowFile,
final boolean rejectZeroByteFiles,
- final ProcessorLog logger)
+ final ComponentLog logger)
throws IOException {
Relationship destinationRelationship = REL_SUCCESS;
String fileName = flowFile.getAttribute(CoreAttributes.FILENAME.key());
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutJMS.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutJMS.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutJMS.java
index c2cd35f..b72fa49 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutJMS.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutJMS.java
@@ -79,7 +79,7 @@ import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnStopped;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.processor.ProcessContext;
@@ -160,7 +160,7 @@ public class PutJMS extends AbstractProcessor {
@Override
public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final List<FlowFile> flowFiles = session.get(context.getProperty(BATCH_SIZE).asInteger().intValue());
if (flowFiles.isEmpty()) {
return;
@@ -335,7 +335,7 @@ public class PutJMS extends AbstractProcessor {
* @throws JMSException ex
*/
private void copyAttributesToJmsProps(final FlowFile flowFile, final Message message) throws JMSException {
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final Map<String, String> attributes = flowFile.getAttributes();
for (final Entry<String, String> entry : attributes.entrySet()) {
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryDatabaseTable.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryDatabaseTable.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryDatabaseTable.java
index 9403eb8..ec81446 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryDatabaseTable.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryDatabaseTable.java
@@ -31,7 +31,7 @@ import org.apache.nifi.components.state.StateManager;
import org.apache.nifi.components.state.StateMap;
import org.apache.nifi.dbcp.DBCPService;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractSessionFactoryProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -254,7 +254,7 @@ public class QueryDatabaseTable extends AbstractSessionFactoryProcessor {
ProcessSession session = sessionFactory.createSession();
FlowFile fileToProcess = null;
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final DBCPService dbcpService = context.getProperty(DBCP_SERVICE).asControllerService(DBCPService.class);
final String tableName = context.getProperty(TABLE_NAME).getValue();
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
index 3cb7eda..43a01c7 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
@@ -47,7 +47,7 @@ import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.Validator;
import org.apache.nifi.expression.AttributeValueDecorator;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.processor.ProcessContext;
@@ -206,7 +206,7 @@ public class ReplaceText extends AbstractProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final String unsubstitutedRegex = context.getProperty(SEARCH_VALUE).getValue();
String unsubstitutedReplacement = context.getProperty(REPLACEMENT_VALUE).getValue();
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java
index f68ac6c..84aeb75 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java
@@ -52,7 +52,7 @@ import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.expression.AttributeValueDecorator;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.processor.ProcessContext;
@@ -192,7 +192,7 @@ public class ReplaceTextWithMapping extends AbstractProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final int maxBufferSize = context.getProperty(MAX_BUFFER_SIZE).asDataSize(DataUnit.B).intValue();
@@ -236,7 +236,7 @@ public class ReplaceTextWithMapping extends AbstractProcessor {
private void updateMapping(final ProcessContext context) {
if (processorLock.tryLock()) {
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
try {
// if not queried mapping file lastUpdate time in
// mapppingRefreshPeriodSecs, do so.
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
index acfa3dd..3a1ed9f 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
@@ -41,7 +41,7 @@ import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.PropertyValue;
import org.apache.nifi.expression.AttributeExpression.ResultType;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -203,7 +203,7 @@ public class RouteOnAttribute extends AbstractProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final Map<Relationship, PropertyValue> propMap = this.propertyMap;
final Set<Relationship> matchingRelationships = new HashSet<>();
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnContent.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnContent.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnContent.java
index c63839c..1bf235b 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnContent.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnContent.java
@@ -41,7 +41,7 @@ import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.expression.AttributeValueDecorator;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.processor.ProcessContext;
@@ -174,7 +174,7 @@ public class RouteOnContent extends AbstractProcessor {
};
final Map<FlowFile, Set<Relationship>> flowFileDestinationMap = new HashMap<>();
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final Charset charset = Charset.forName(context.getProperty(CHARACTER_SET).getValue());
final byte[] buffer = new byte[context.getProperty(BUFFER_SIZE).asDataSize(DataUnit.B).intValue()];
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteText.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteText.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteText.java
index 0ed43b4..01148f2 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteText.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteText.java
@@ -54,7 +54,7 @@ import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
import org.apache.nifi.expression.AttributeExpression.ResultType;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -354,7 +354,7 @@ public class RouteText extends AbstractProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final Charset charset = Charset.forName(context.getProperty(CHARACTER_SET).getValue());
final boolean trim = context.getProperty(TRIM_WHITESPACE).asBoolean();
final String routeStrategy = context.getProperty(ROUTE_STRATEGY).getValue();
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java
index aa88827..cd3d36a 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java
@@ -42,7 +42,7 @@ import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -195,7 +195,7 @@ public class ScanAttribute extends AbstractProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
try {
if (fileWatcher.checkAndReset()) {
this.dictionaryTerms = createDictionary(context);
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanContent.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanContent.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanContent.java
index 6fe8446..59d1cbd 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanContent.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanContent.java
@@ -44,7 +44,7 @@ import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -142,7 +142,7 @@ public class ScanContent extends AbstractProcessor {
}
}
- private boolean reloadDictionary(final ProcessContext context, final boolean force, final ProcessorLog logger) throws IOException {
+ private boolean reloadDictionary(final ProcessContext context, final boolean force, final ComponentLog logger) throws IOException {
boolean obtainedLock;
if (force) {
dictionaryUpdateLock.lock();
@@ -188,7 +188,7 @@ public class ScanContent extends AbstractProcessor {
@Override
public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final SynchronousFileWatcher fileWatcher = fileWatcherRef.get();
try {
if (fileWatcher.checkAndReset()) {
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitContent.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitContent.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitContent.java
index 3cdf787..52b124e 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitContent.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitContent.java
@@ -50,7 +50,7 @@ import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -187,7 +187,7 @@ public class SplitContent extends AbstractProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final boolean keepSequence = context.getProperty(KEEP_SEQUENCE).asBoolean();
final boolean keepTrailingSequence;
final boolean keepLeadingSequence;
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java
index dfd09a2..58b3adc 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java
@@ -39,7 +39,7 @@ import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.ProcessorInitializationContext;
@@ -151,7 +151,7 @@ public class SplitJson extends AbstractJsonPathProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
DocumentContext documentContext = null;
try {
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java
index 8c59d88..39eb4e8 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java
@@ -43,7 +43,7 @@ import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -288,7 +288,7 @@ public class SplitText extends AbstractProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final int headerCount = context.getProperty(HEADER_LINE_COUNT).asInteger();
final int splitCount = context.getProperty(LINE_SPLIT_COUNT).asInteger();
final boolean removeTrailingNewlines = context.getProperty(REMOVE_TRAILING_NEWLINES).asBoolean();
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java
index b503f9b..055ffd8 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java
@@ -42,7 +42,7 @@ import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -143,7 +143,7 @@ public class SplitXml extends AbstractProcessor {
}
final int depth = context.getProperty(SPLIT_DEPTH).asInteger();
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final List<FlowFile> splits = new ArrayList<>();
final XmlSplitterSaxParser parser = new XmlSplitterSaxParser(new XmlElementNotifier() {
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java
index e77dfc6..5c3c23c 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java
@@ -47,7 +47,7 @@ import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
import org.apache.nifi.expression.AttributeExpression;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -131,7 +131,7 @@ public class TransformXml extends AbstractProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final StopWatch stopWatch = new StopWatch(true);
try {
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
index 3443aea..decbd54 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
@@ -48,7 +48,7 @@ import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -161,7 +161,7 @@ public class UnpackContent extends AbstractProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
String packagingFormat = context.getProperty(PACKAGING_FORMAT).getValue().toLowerCase();
if (AUTO_DETECT_FORMAT.equals(packagingFormat)) {
final String mimeType = flowFile.getAttribute(CoreAttributes.MIME_TYPE.key());
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateXml.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateXml.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateXml.java
index 3693590..4647028 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateXml.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateXml.java
@@ -41,7 +41,7 @@ import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -125,7 +125,7 @@ public class ValidateXml extends AbstractProcessor {
final Schema schema = schemaRef.get();
final Validator validator = schema.newValidator();
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
for (final FlowFile flowFile : flowFiles) {
final BooleanHolder valid = new BooleanHolder(true);
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/relp/handler/RELPFrameHandler.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/relp/handler/RELPFrameHandler.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/relp/handler/RELPFrameHandler.java
index 7b879f3..dff8c84 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/relp/handler/RELPFrameHandler.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/relp/handler/RELPFrameHandler.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.processors.standard.relp.handler;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.util.listen.dispatcher.AsyncChannelDispatcher;
import org.apache.nifi.processor.util.listen.event.Event;
import org.apache.nifi.processor.util.listen.event.EventFactory;
@@ -50,7 +50,7 @@ public class RELPFrameHandler<E extends Event<SocketChannel>> {
private final EventQueue<E> events;
private final SelectionKey key;
private final AsyncChannelDispatcher dispatcher;
- private final ProcessorLog logger;
+ private final ComponentLog logger;
private final RELPEncoder encoder;
public RELPFrameHandler(final SelectionKey selectionKey,
@@ -58,7 +58,7 @@ public class RELPFrameHandler<E extends Event<SocketChannel>> {
final EventFactory<E> eventFactory,
final BlockingQueue<E> events,
final AsyncChannelDispatcher dispatcher,
- final ProcessorLog logger) {
+ final ComponentLog logger) {
this.key = selectionKey;
this.charset = charset;
this.eventFactory = eventFactory;
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/relp/handler/RELPSSLSocketChannelHandler.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/relp/handler/RELPSSLSocketChannelHandler.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/relp/handler/RELPSSLSocketChannelHandler.java
index 30697ed..9bb2548 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/relp/handler/RELPSSLSocketChannelHandler.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/relp/handler/RELPSSLSocketChannelHandler.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.processors.standard.relp.handler;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.util.listen.dispatcher.AsyncChannelDispatcher;
import org.apache.nifi.processor.util.listen.event.Event;
import org.apache.nifi.processor.util.listen.event.EventFactory;
@@ -47,7 +47,7 @@ public class RELPSSLSocketChannelHandler<E extends Event<SocketChannel>> extends
final Charset charset,
final EventFactory<E> eventFactory,
final BlockingQueue<E> events,
- final ProcessorLog logger) {
+ final ComponentLog logger) {
super(key, dispatcher, charset, eventFactory, events, logger);
this.decoder = new RELPDecoder(charset);
this.frameHandler = new RELPFrameHandler<>(key, charset, eventFactory, events, dispatcher, logger);
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/relp/handler/RELPSocketChannelHandler.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/relp/handler/RELPSocketChannelHandler.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/relp/handler/RELPSocketChannelHandler.java
index e3e84cf..7e7b769 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/relp/handler/RELPSocketChannelHandler.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/relp/handler/RELPSocketChannelHandler.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.processors.standard.relp.handler;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.util.listen.dispatcher.AsyncChannelDispatcher;
import org.apache.nifi.processor.util.listen.event.Event;
import org.apache.nifi.processor.util.listen.event.EventFactory;
@@ -47,7 +47,7 @@ public class RELPSocketChannelHandler<E extends Event<SocketChannel>> extends St
final Charset charset,
final EventFactory<E> eventFactory,
final BlockingQueue<E> events,
- final ProcessorLog logger) {
+ final ComponentLog logger) {
super(key, dispatcher, charset, eventFactory, events, logger);
this.decoder = new RELPDecoder(charset);
this.frameHandler = new RELPFrameHandler<>(key, charset, eventFactory, events, dispatcher, logger);
http://git-wip-us.apache.org/repos/asf/nifi/blob/372ffb8a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/relp/handler/RELPSocketChannelHandlerFactory.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/relp/handler/RELPSocketChannelHandlerFactory.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/relp/handler/RELPSocketChannelHandlerFactory.java
index 2299a6b..625219b 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/relp/handler/RELPSocketChannelHandlerFactory.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/relp/handler/RELPSocketChannelHandlerFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.processors.standard.relp.handler;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.util.listen.dispatcher.AsyncChannelDispatcher;
import org.apache.nifi.processor.util.listen.event.Event;
import org.apache.nifi.processor.util.listen.event.EventFactory;
@@ -39,7 +39,7 @@ public class RELPSocketChannelHandlerFactory<E extends Event<SocketChannel>> imp
final Charset charset,
final EventFactory<E> eventFactory,
final BlockingQueue<E> events,
- final ProcessorLog logger) {
+ final ComponentLog logger) {
return new RELPSocketChannelHandler<>(key, dispatcher, charset, eventFactory, events, logger);
}
@@ -49,7 +49,7 @@ public class RELPSocketChannelHandlerFactory<E extends Event<SocketChannel>> imp
final Charset charset,
final EventFactory<E> eventFactory,
final BlockingQueue<E> events,
- final ProcessorLog logger) {
+ final ComponentLog logger) {
return new RELPSSLSocketChannelHandler<>(key, dispatcher, charset, eventFactory, events, logger);
}
[5/5] nifi git commit: NIFI-1811 Renaming MockProcessorLogger to
MockComponentLogger for consistency. Removing unused imports from
ExecuteScript causing checkstyle failures.
Posted by al...@apache.org.
NIFI-1811 Renaming MockProcessorLogger to MockComponentLogger for consistency. Removing unused imports from ExecuteScript causing checkstyle failures.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/1bd2cf0d
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/1bd2cf0d
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/1bd2cf0d
Branch: refs/heads/master
Commit: 1bd2cf0d09a7111bcecffd0f473aa71c25a69845
Parents: 372ffb8
Author: Aldrin Piri <al...@apache.org>
Authored: Thu May 19 13:03:29 2016 -0400
Committer: Aldrin Piri <al...@apache.org>
Committed: Thu May 19 14:38:41 2016 -0400
----------------------------------------------------------------------
.../init/ControllerServiceInitializer.java | 4 +-
.../init/ProcessorInitializer.java | 4 +-
.../init/ReportingTaskingInitializer.java | 4 +-
.../documentation/mock/MockComponentLogger.java | 258 +++++++++++
...kControllerServiceInitializationContext.java | 2 +-
.../MockProcessorInitializationContext.java | 2 +-
.../documentation/mock/MockProcessorLogger.java | 258 -----------
.../MockReportingInitializationContext.java | 2 +-
.../apache/nifi/controller/FlowController.java | 6 +-
.../StandardProcessorInitializationContext.java | 4 +-
.../nifi/processors/hive/SelectHiveQL.java | 30 +-
.../processors/kafka/pubsub/KafkaPublisher.java | 8 +-
.../AbstractKafkaProcessorLifecycelTest.java | 456 -------------------
.../AbstractKafkaProcessorLifecycleTest.java | 456 +++++++++++++++++++
.../nifi/processors/script/ExecuteScript.java | 2 -
.../nifi/processors/standard/TransformJSON.java | 10 +-
16 files changed, 752 insertions(+), 754 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/1bd2cf0d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ControllerServiceInitializer.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ControllerServiceInitializer.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ControllerServiceInitializer.java
index 7a6d62c..4d1651e 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ControllerServiceInitializer.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ControllerServiceInitializer.java
@@ -22,7 +22,7 @@ import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.documentation.ConfigurableComponentInitializer;
import org.apache.nifi.documentation.mock.MockConfigurationContext;
import org.apache.nifi.documentation.mock.MockControllerServiceInitializationContext;
-import org.apache.nifi.documentation.mock.MockProcessorLogger;
+import org.apache.nifi.documentation.mock.MockComponentLogger;
import org.apache.nifi.documentation.util.ReflectionUtils;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.nar.NarCloseable;
@@ -49,7 +49,7 @@ public class ControllerServiceInitializer implements ConfigurableComponentInitia
try (NarCloseable narCloseable = NarCloseable.withNarLoader()) {
ControllerService controllerService = (ControllerService) component;
- final ComponentLog logger = new MockProcessorLogger();
+ final ComponentLog logger = new MockComponentLogger();
final MockConfigurationContext context = new MockConfigurationContext();
ReflectionUtils.quietlyInvokeMethodsWithAnnotations(OnShutdown.class, org.apache.nifi.processor.annotation.OnShutdown.class, controllerService, logger, context);
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/1bd2cf0d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ProcessorInitializer.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ProcessorInitializer.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ProcessorInitializer.java
index 7fe4946..7a66f72 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ProcessorInitializer.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ProcessorInitializer.java
@@ -21,7 +21,7 @@ import org.apache.nifi.components.ConfigurableComponent;
import org.apache.nifi.documentation.ConfigurableComponentInitializer;
import org.apache.nifi.documentation.mock.MockProcessContext;
import org.apache.nifi.documentation.mock.MockProcessorInitializationContext;
-import org.apache.nifi.documentation.mock.MockProcessorLogger;
+import org.apache.nifi.documentation.mock.MockComponentLogger;
import org.apache.nifi.documentation.util.ReflectionUtils;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.nar.NarCloseable;
@@ -47,7 +47,7 @@ public class ProcessorInitializer implements ConfigurableComponentInitializer {
Processor processor = (Processor) component;
try (NarCloseable narCloseable = NarCloseable.withNarLoader()) {
- final ComponentLog logger = new MockProcessorLogger();
+ final ComponentLog logger = new MockComponentLogger();
final MockProcessContext context = new MockProcessContext();
ReflectionUtils.quietlyInvokeMethodsWithAnnotations(OnShutdown.class, org.apache.nifi.processor.annotation.OnShutdown.class, processor, logger, context);
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/1bd2cf0d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ReportingTaskingInitializer.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ReportingTaskingInitializer.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ReportingTaskingInitializer.java
index 171f1d9..32e878c 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ReportingTaskingInitializer.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/init/ReportingTaskingInitializer.java
@@ -20,7 +20,7 @@ import org.apache.nifi.annotation.lifecycle.OnShutdown;
import org.apache.nifi.components.ConfigurableComponent;
import org.apache.nifi.documentation.ConfigurableComponentInitializer;
import org.apache.nifi.documentation.mock.MockConfigurationContext;
-import org.apache.nifi.documentation.mock.MockProcessorLogger;
+import org.apache.nifi.documentation.mock.MockComponentLogger;
import org.apache.nifi.documentation.mock.MockReportingInitializationContext;
import org.apache.nifi.documentation.util.ReflectionUtils;
import org.apache.nifi.nar.NarCloseable;
@@ -48,7 +48,7 @@ public class ReportingTaskingInitializer implements ConfigurableComponentInitial
try (NarCloseable narCloseable = NarCloseable.withNarLoader()) {
final MockConfigurationContext context = new MockConfigurationContext();
- ReflectionUtils.quietlyInvokeMethodsWithAnnotations(OnShutdown.class, org.apache.nifi.processor.annotation.OnShutdown.class, reportingTask, new MockProcessorLogger(), context);
+ ReflectionUtils.quietlyInvokeMethodsWithAnnotations(OnShutdown.class, org.apache.nifi.processor.annotation.OnShutdown.class, reportingTask, new MockComponentLogger(), context);
}
}
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/1bd2cf0d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockComponentLogger.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockComponentLogger.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockComponentLogger.java
new file mode 100644
index 0000000..dd2f1b3
--- /dev/null
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockComponentLogger.java
@@ -0,0 +1,258 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.documentation.mock;
+
+import org.apache.nifi.logging.ComponentLog;
+import org.apache.nifi.logging.LogLevel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Stubs out the functionality of a ComponentLog so that it can
+ * be used during initialization of a component.
+ *
+ */
+public class MockComponentLogger implements ComponentLog {
+
+ private static final Logger logger = LoggerFactory
+ .getLogger(MockComponentLogger.class);
+
+ @Override
+ public void warn(String msg, Throwable t) {
+ logger.warn(msg, t);
+ }
+
+ @Override
+ public void warn(String msg, Object[] os) {
+ 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);
+ }
+
+ @Override
+ public void trace(String msg, Throwable t) {
+ logger.trace(msg, t);
+ }
+
+ @Override
+ public void trace(String msg, Object[] os) {
+ logger.trace(msg, os);
+ }
+
+ @Override
+ public void trace(String msg) {
+ 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();
+ }
+
+ @Override
+ public boolean isTraceEnabled() {
+ return logger.isTraceEnabled();
+ }
+
+ @Override
+ public boolean isInfoEnabled() {
+ return logger.isInfoEnabled();
+ }
+
+ @Override
+ public boolean isErrorEnabled() {
+ return logger.isErrorEnabled();
+ }
+
+ @Override
+ public boolean isDebugEnabled() {
+ return logger.isDebugEnabled();
+ }
+
+ @Override
+ public void info(String msg, Throwable t) {
+ logger.info(msg, t);
+ }
+
+ @Override
+ public void info(String msg, Object[] os) {
+ logger.info(msg, os);
+ }
+
+ @Override
+ public void info(String msg) {
+ logger.info(msg);
+
+ }
+
+ @Override
+ public void info(String msg, Object[] os, Throwable t) {
+ logger.trace(msg, os);
+ logger.trace("", t);
+
+ }
+
+ @Override
+ public String getName() {
+ return logger.getName();
+ }
+
+ @Override
+ public void error(String msg, Throwable t) {
+ logger.error(msg, t);
+ }
+
+ @Override
+ public void error(String msg, Object[] os) {
+ logger.error(msg, os);
+ }
+
+ @Override
+ public void error(String msg) {
+ 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);
+ }
+
+ @Override
+ public void debug(String msg, Object[] os) {
+ 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);
+ }
+
+ @Override
+ public void log(LogLevel level, String msg, Throwable t) {
+ switch (level) {
+ case DEBUG:
+ debug(msg, t);
+ break;
+ case ERROR:
+ case FATAL:
+ error(msg, t);
+ break;
+ case INFO:
+ info(msg, t);
+ break;
+ case TRACE:
+ trace(msg, t);
+ break;
+ case WARN:
+ warn(msg, t);
+ break;
+ }
+ }
+
+ @Override
+ public void log(LogLevel level, String msg, Object[] os) {
+ switch (level) {
+ case DEBUG:
+ debug(msg, os);
+ break;
+ case ERROR:
+ case FATAL:
+ error(msg, os);
+ break;
+ case INFO:
+ info(msg, os);
+ break;
+ case TRACE:
+ trace(msg, os);
+ break;
+ case WARN:
+ warn(msg, os);
+ break;
+ }
+ }
+
+ @Override
+ public void log(LogLevel level, String msg) {
+ switch (level) {
+ case DEBUG:
+ debug(msg);
+ break;
+ case ERROR:
+ case FATAL:
+ error(msg);
+ break;
+ case INFO:
+ info(msg);
+ break;
+ case TRACE:
+ trace(msg);
+ break;
+ case WARN:
+ warn(msg);
+ break;
+ }
+ }
+
+ @Override
+ public 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;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/nifi/blob/1bd2cf0d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockControllerServiceInitializationContext.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockControllerServiceInitializationContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockControllerServiceInitializationContext.java
index c1cca26..abbde61 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockControllerServiceInitializationContext.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockControllerServiceInitializationContext.java
@@ -41,7 +41,7 @@ public class MockControllerServiceInitializationContext implements ControllerSer
@Override
public ComponentLog getLogger() {
- return new MockProcessorLogger();
+ return new MockComponentLogger();
}
@Override
http://git-wip-us.apache.org/repos/asf/nifi/blob/1bd2cf0d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockProcessorInitializationContext.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockProcessorInitializationContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockProcessorInitializationContext.java
index 4218250..e536471 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockProcessorInitializationContext.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockProcessorInitializationContext.java
@@ -35,7 +35,7 @@ public class MockProcessorInitializationContext implements ProcessorInitializati
@Override
public ComponentLog getLogger() {
- return new MockProcessorLogger();
+ return new MockComponentLogger();
}
@Override
http://git-wip-us.apache.org/repos/asf/nifi/blob/1bd2cf0d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockProcessorLogger.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockProcessorLogger.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockProcessorLogger.java
deleted file mode 100644
index df9e673..0000000
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockProcessorLogger.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.documentation.mock;
-
-import org.apache.nifi.logging.ComponentLog;
-import org.apache.nifi.logging.LogLevel;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Stubs out the functionality of a ProcessorLog/ComponentLog so that it can
- * be used during initialization of a component.
- *
- */
-public class MockProcessorLogger implements ComponentLog {
-
- private static final Logger logger = LoggerFactory
- .getLogger(MockProcessorLogger.class);
-
- @Override
- public void warn(String msg, Throwable t) {
- logger.warn(msg, t);
- }
-
- @Override
- public void warn(String msg, Object[] os) {
- 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);
- }
-
- @Override
- public void trace(String msg, Throwable t) {
- logger.trace(msg, t);
- }
-
- @Override
- public void trace(String msg, Object[] os) {
- logger.trace(msg, os);
- }
-
- @Override
- public void trace(String msg) {
- 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();
- }
-
- @Override
- public boolean isTraceEnabled() {
- return logger.isTraceEnabled();
- }
-
- @Override
- public boolean isInfoEnabled() {
- return logger.isInfoEnabled();
- }
-
- @Override
- public boolean isErrorEnabled() {
- return logger.isErrorEnabled();
- }
-
- @Override
- public boolean isDebugEnabled() {
- return logger.isDebugEnabled();
- }
-
- @Override
- public void info(String msg, Throwable t) {
- logger.info(msg, t);
- }
-
- @Override
- public void info(String msg, Object[] os) {
- logger.info(msg, os);
- }
-
- @Override
- public void info(String msg) {
- logger.info(msg);
-
- }
-
- @Override
- public void info(String msg, Object[] os, Throwable t) {
- logger.trace(msg, os);
- logger.trace("", t);
-
- }
-
- @Override
- public String getName() {
- return logger.getName();
- }
-
- @Override
- public void error(String msg, Throwable t) {
- logger.error(msg, t);
- }
-
- @Override
- public void error(String msg, Object[] os) {
- logger.error(msg, os);
- }
-
- @Override
- public void error(String msg) {
- 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);
- }
-
- @Override
- public void debug(String msg, Object[] os) {
- 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);
- }
-
- @Override
- public void log(LogLevel level, String msg, Throwable t) {
- switch (level) {
- case DEBUG:
- debug(msg, t);
- break;
- case ERROR:
- case FATAL:
- error(msg, t);
- break;
- case INFO:
- info(msg, t);
- break;
- case TRACE:
- trace(msg, t);
- break;
- case WARN:
- warn(msg, t);
- break;
- }
- }
-
- @Override
- public void log(LogLevel level, String msg, Object[] os) {
- switch (level) {
- case DEBUG:
- debug(msg, os);
- break;
- case ERROR:
- case FATAL:
- error(msg, os);
- break;
- case INFO:
- info(msg, os);
- break;
- case TRACE:
- trace(msg, os);
- break;
- case WARN:
- warn(msg, os);
- break;
- }
- }
-
- @Override
- public void log(LogLevel level, String msg) {
- switch (level) {
- case DEBUG:
- debug(msg);
- break;
- case ERROR:
- case FATAL:
- error(msg);
- break;
- case INFO:
- info(msg);
- break;
- case TRACE:
- trace(msg);
- break;
- case WARN:
- warn(msg);
- break;
- }
- }
-
- @Override
- public 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;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/nifi/blob/1bd2cf0d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockReportingInitializationContext.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockReportingInitializationContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockReportingInitializationContext.java
index abaa766..ebf59d6 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockReportingInitializationContext.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockReportingInitializationContext.java
@@ -62,6 +62,6 @@ public class MockReportingInitializationContext implements ReportingInitializati
@Override
public ComponentLog getLogger() {
- return new MockProcessorLogger();
+ return new MockComponentLogger();
}
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/1bd2cf0d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
index 4650c92..6b61b49 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
@@ -990,11 +990,11 @@ public class FlowController implements EventAccess, ControllerServiceProvider, R
Thread.currentThread().setContextClassLoader(detectedClassLoaderForType);
final Class<? extends Processor> processorClass = rawClass.asSubclass(Processor.class);
processor = processorClass.newInstance();
- final ComponentLog processorLogger = new SimpleProcessLogger(identifier, processor);
- final ProcessorInitializationContext ctx = new StandardProcessorInitializationContext(identifier, processorLogger, this);
+ final ComponentLog componentLogger = new SimpleProcessLogger(identifier, processor);
+ final ProcessorInitializationContext ctx = new StandardProcessorInitializationContext(identifier, componentLogger, this);
processor.initialize(ctx);
- LogRepositoryFactory.getRepository(identifier).setLogger(processorLogger);
+ LogRepositoryFactory.getRepository(identifier).setLogger(componentLogger);
return processor;
} catch (final Throwable t) {
throw new ProcessorInstantiationException(type, t);
http://git-wip-us.apache.org/repos/asf/nifi/blob/1bd2cf0d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardProcessorInitializationContext.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardProcessorInitializationContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardProcessorInitializationContext.java
index e185331..ccd731d 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardProcessorInitializationContext.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardProcessorInitializationContext.java
@@ -26,9 +26,9 @@ public class StandardProcessorInitializationContext implements ProcessorInitiali
private final ComponentLog logger;
private final ControllerServiceProvider serviceProvider;
- public StandardProcessorInitializationContext(final String identifier, final ComponentLog processorLog, final ControllerServiceProvider serviceProvider) {
+ public StandardProcessorInitializationContext(final String identifier, final ComponentLog componentLog, final ControllerServiceProvider serviceProvider) {
this.identifier = identifier;
- this.logger = processorLog;
+ this.logger = componentLog;
this.serviceProvider = serviceProvider;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/1bd2cf0d/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/SelectHiveQL.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/SelectHiveQL.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/SelectHiveQL.java
index 1b65af6..77ded36 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/SelectHiveQL.java
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/SelectHiveQL.java
@@ -16,6 +16,19 @@
*/
package org.apache.nifi.processors.hive;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
import org.apache.nifi.annotation.behavior.EventDriven;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
@@ -27,7 +40,7 @@ import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.dbcp.hive.HiveDBCPService;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.Relationship;
@@ -38,19 +51,6 @@ import org.apache.nifi.util.LongHolder;
import org.apache.nifi.util.StopWatch;
import org.apache.nifi.util.hive.HiveJdbcCommon;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
@EventDriven
@InputRequirement(Requirement.INPUT_ALLOWED)
@Tags({"hive", "sql", "select", "jdbc", "query", "database"})
@@ -149,7 +149,7 @@ public class SelectHiveQL extends AbstractHiveQLProcessor {
}
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final HiveDBCPService dbcpService = context.getProperty(HIVE_DBCP_SERVICE).asControllerService(HiveDBCPService.class);
final String selectQuery = context.getProperty(HIVEQL_SELECT_QUERY).evaluateAttributeExpressions(fileToProcess).getValue();
final String outputFormat = context.getProperty(HIVEQL_OUTPUT_FORMAT).getValue();
http://git-wip-us.apache.org/repos/asf/nifi/blob/1bd2cf0d/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-pubsub-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaPublisher.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-pubsub-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaPublisher.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-pubsub-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaPublisher.java
index f42a892..79dfce7 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-pubsub-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaPublisher.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-pubsub-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaPublisher.java
@@ -31,7 +31,7 @@ import org.apache.kafka.clients.producer.Producer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.clients.producer.RecordMetadata;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.stream.io.util.StreamDemarcator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,7 +48,7 @@ class KafkaPublisher implements Closeable {
private volatile long ackWaitTime = 30000;
- private volatile ProcessorLog processLog;
+ private volatile ComponentLog processLog;
/**
* Creates an instance of this class as well as the instance of the
@@ -177,10 +177,10 @@ class KafkaPublisher implements Closeable {
}
/**
- * Will set {@link ProcessorLog} as an additional logger to forward log
+ * Will set {@link ComponentLog} as an additional logger to forward log
* messages to NiFi bulletin
*/
- void setProcessLog(ProcessorLog processLog) {
+ void setProcessLog(ComponentLog processLog) {
this.processLog = processLog;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/1bd2cf0d/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-pubsub-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/AbstractKafkaProcessorLifecycelTest.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-pubsub-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/AbstractKafkaProcessorLifecycelTest.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-pubsub-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/AbstractKafkaProcessorLifecycelTest.java
deleted file mode 100644
index 6346ffd..0000000
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-pubsub-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/AbstractKafkaProcessorLifecycelTest.java
+++ /dev/null
@@ -1,456 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.processors.kafka.pubsub;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import java.io.Closeable;
-import java.lang.reflect.Field;
-import java.util.List;
-import java.util.Random;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.apache.nifi.annotation.lifecycle.OnStopped;
-import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.logging.ProcessorLog;
-import org.apache.nifi.processor.AbstractSessionFactoryProcessor;
-import org.apache.nifi.processor.ProcessContext;
-import org.apache.nifi.processor.ProcessSession;
-import org.apache.nifi.processor.ProcessSessionFactory;
-import org.apache.nifi.processor.exception.ProcessException;
-import org.apache.nifi.util.TestRunner;
-import org.apache.nifi.util.TestRunners;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
-public class AbstractKafkaProcessorLifecycelTest {
-
- private final static Random random = new Random();
-
- @Test
- public void validateBaseProperties() throws Exception {
- TestRunner runner = TestRunners.newTestRunner(DummyProcessor.class);
- runner.setProperty(AbstractKafkaProcessor.BOOTSTRAP_SERVERS, "");
- runner.setProperty(AbstractKafkaProcessor.TOPIC, "foo");
- runner.setProperty(ConsumeKafka.CLIENT_ID, "foo");
-
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
- }
-
- runner.setProperty(ConsumeKafka.BOOTSTRAP_SERVERS, "foo");
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("'bootstrap.servers' validated against 'foo' is invalid"));
- }
- runner.setProperty(ConsumeKafka.BOOTSTRAP_SERVERS, "foo:1234");
-
- runner.removeProperty(ConsumeKafka.TOPIC);
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("'topic' is invalid because topic is required"));
- }
-
- runner.setProperty(ConsumeKafka.TOPIC, "");
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
- }
-
- runner.setProperty(ConsumeKafka.TOPIC, " ");
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
- }
- runner.setProperty(ConsumeKafka.TOPIC, "blah");
-
- runner.removeProperty(ConsumeKafka.CLIENT_ID);
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("invalid because client.id is required"));
- }
-
- runner.setProperty(ConsumeKafka.CLIENT_ID, "");
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
- }
-
- runner.setProperty(ConsumeKafka.CLIENT_ID, " ");
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
- }
- runner.setProperty(ConsumeKafka.CLIENT_ID, "ghj");
-
- runner.setProperty(PublishKafka.KERBEROS_PRINCIPLE, "");
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
- }
- runner.setProperty(PublishKafka.KERBEROS_PRINCIPLE, " ");
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
- }
- }
-
- @Test
- @Ignore // just for extra sanity check
- public void validateConcurrencyWithRandomFailuresMultiple() throws Exception {
- for (int i = 0; i < 100; i++) {
- validateConcurrencyWithRandomFailures();
- }
- }
-
- @Test
- public void validateConcurrencyWithRandomFailures() throws Exception {
- ExecutorService processingExecutor = Executors.newFixedThreadPool(32);
- final AtomicInteger commitCounter = new AtomicInteger();
- final AtomicInteger rollbackCounter = new AtomicInteger();
- final AtomicInteger yieldCounter = new AtomicInteger();
-
- final ProcessSessionFactory sessionFactory = mock(ProcessSessionFactory.class);
- final ProcessSession session = mock(ProcessSession.class);
- when(sessionFactory.createSession()).thenReturn(session);
- doAnswer(new Answer<Void>() {
- @Override
- public Void answer(InvocationOnMock invocation) throws Throwable {
- commitCounter.incrementAndGet();
- return null;
- }
- }).when(session).commit();
- doAnswer(new Answer<Void>() {
- @Override
- public Void answer(InvocationOnMock invocation) throws Throwable {
- rollbackCounter.incrementAndGet();
- return null;
- }
- }).when(session).rollback(true);
-
- final ConcurrencyValidatingProcessor processor = spy(new ConcurrencyValidatingProcessor());
-
- int testCount = 1000;
- final CountDownLatch latch = new CountDownLatch(testCount);
- for (int i = 0; i < testCount; i++) {
- processingExecutor.execute(new Runnable() {
- @Override
- public void run() {
- ProcessContext context = mock(ProcessContext.class);
- doAnswer(new Answer<Void>() {
- @Override
- public Void answer(InvocationOnMock invocation) throws Throwable {
- yieldCounter.incrementAndGet();
- return null;
- }
- }).when(context).yield();
- if (random.nextInt(10) == 5) {
- when(context.getName()).thenReturn("fail");
- }
- try {
- processor.onTrigger(context, sessionFactory);
- } catch (Exception e) {
- fail();
- } finally {
- latch.countDown();
- }
- }
- });
- }
-
- assertTrue(latch.await(20000, TimeUnit.MILLISECONDS));
- processingExecutor.shutdown();
-
- System.out.println("SUCCESS: " + processor.successfulTriggers);
- System.out.println("FAILURE: " + processor.failedTriggers);
- System.out.println("INIT: " + processor.resourceReinitialized);
- System.out.println("YIELD CALLS: " + yieldCounter.get());
- System.out.println("COMMIT CALLS: " + commitCounter.get());
- System.out.println("ROLLBACK CALLS: " + rollbackCounter.get());
- System.out.println("Close CALLS: " + processor.closeCounter.get());
-
- /*
- * this has to be <= 1 since the last thread may come to finally block
- * after acceptTask flag has been reset at which point the close will
- * not be called (which is correct behavior since it will be invoked
- * explicitly by the life-cycle operations of a running processor).
- *
- * You can actually observe the =1 behavior in the next test where it is
- * always 0 close calls
- */
- int closeVsInitDiff = processor.resourceReinitialized.get() - processor.closeCounter.get();
- assertTrue(closeVsInitDiff <= 1);
-
- assertEquals(commitCounter.get(), processor.successfulTriggers.get());
- assertEquals(rollbackCounter.get(), processor.failedTriggers.get());
-
- assertEquals(testCount,
- processor.successfulTriggers.get() + processor.failedTriggers.get() + yieldCounter.get());
- }
-
- @Test
- public void validateConcurrencyWithAllSuccesses() throws Exception {
- ExecutorService processingExecutor = Executors.newFixedThreadPool(32);
- final AtomicInteger commitCounter = new AtomicInteger();
- final AtomicInteger rollbackCounter = new AtomicInteger();
- final AtomicInteger yieldCounter = new AtomicInteger();
-
- final ProcessSessionFactory sessionFactory = mock(ProcessSessionFactory.class);
- final ProcessSession session = mock(ProcessSession.class);
- when(sessionFactory.createSession()).thenReturn(session);
- doAnswer(new Answer<Void>() {
- @Override
- public Void answer(InvocationOnMock invocation) throws Throwable {
- commitCounter.incrementAndGet();
- return null;
- }
- }).when(session).commit();
- doAnswer(new Answer<Void>() {
- @Override
- public Void answer(InvocationOnMock invocation) throws Throwable {
- rollbackCounter.incrementAndGet();
- return null;
- }
- }).when(session).rollback(true);
-
- final ConcurrencyValidatingProcessor processor = spy(new ConcurrencyValidatingProcessor());
-
- int testCount = 1000;
- final CountDownLatch latch = new CountDownLatch(testCount);
- for (int i = 0; i < testCount; i++) {
- processingExecutor.execute(new Runnable() {
- @Override
- public void run() {
- ProcessContext context = mock(ProcessContext.class);
- doAnswer(new Answer<Void>() {
- @Override
- public Void answer(InvocationOnMock invocation) throws Throwable {
- yieldCounter.incrementAndGet();
- return null;
- }
- }).when(context).yield();
- try {
- processor.onTrigger(context, sessionFactory);
- } catch (Exception e) {
- fail();
- } finally {
- latch.countDown();
- }
- }
- });
- }
-
- assertTrue(latch.await(30000, TimeUnit.MILLISECONDS));
- processingExecutor.shutdown();
-
- System.out.println("SUCCESS: " + processor.successfulTriggers);
- System.out.println("FAILURE: " + processor.failedTriggers);
- System.out.println("INIT: " + processor.resourceReinitialized);
- System.out.println("YIELD CALLS: " + yieldCounter.get());
- System.out.println("COMMIT CALLS: " + commitCounter.get());
- System.out.println("ROLLBACK CALLS: " + rollbackCounter.get());
- System.out.println("Close CALLS: " + processor.closeCounter.get());
-
- /*
- * unlike previous test this one will always be 1 since there are no
- * failures
- */
- int closeVsInitDiff = processor.resourceReinitialized.get() - processor.closeCounter.get();
- assertEquals(1, closeVsInitDiff);
-
- assertEquals(commitCounter.get(), processor.successfulTriggers.get());
- assertEquals(rollbackCounter.get(), processor.failedTriggers.get());
-
- assertEquals(testCount,
- processor.successfulTriggers.get() + processor.failedTriggers.get() + yieldCounter.get());
- }
-
- @Test
- public void validateConcurrencyWithAllFailures() throws Exception {
- ExecutorService processingExecutor = Executors.newFixedThreadPool(32);
- final AtomicInteger commitCounter = new AtomicInteger();
- final AtomicInteger rollbackCounter = new AtomicInteger();
- final AtomicInteger yieldCounter = new AtomicInteger();
-
- final ProcessSessionFactory sessionFactory = mock(ProcessSessionFactory.class);
- final ProcessSession session = mock(ProcessSession.class);
- when(sessionFactory.createSession()).thenReturn(session);
- doAnswer(new Answer<Void>() {
- @Override
- public Void answer(InvocationOnMock invocation) throws Throwable {
- commitCounter.incrementAndGet();
- return null;
- }
- }).when(session).commit();
- doAnswer(new Answer<Void>() {
- @Override
- public Void answer(InvocationOnMock invocation) throws Throwable {
- rollbackCounter.incrementAndGet();
- return null;
- }
- }).when(session).rollback(true);
-
- final ConcurrencyValidatingProcessor processor = spy(new ConcurrencyValidatingProcessor());
-
- int testCount = 1000;
- final CountDownLatch latch = new CountDownLatch(testCount);
- for (int i = 0; i < testCount; i++) {
- processingExecutor.execute(new Runnable() {
- @Override
- public void run() {
- ProcessContext context = mock(ProcessContext.class);
- doAnswer(new Answer<Void>() {
- @Override
- public Void answer(InvocationOnMock invocation) throws Throwable {
- yieldCounter.incrementAndGet();
- return null;
- }
- }).when(context).yield();
- when(context.getName()).thenReturn("fail");
- try {
- processor.onTrigger(context, sessionFactory);
- } catch (Exception e) {
- fail();
- } finally {
- latch.countDown();
- }
- }
- });
- }
-
- assertTrue(latch.await(20000, TimeUnit.MILLISECONDS));
- processingExecutor.shutdown();
-
- System.out.println("SUCCESS: " + processor.successfulTriggers);
- System.out.println("FAILURE: " + processor.failedTriggers);
- System.out.println("INIT: " + processor.resourceReinitialized);
- System.out.println("YIELD CALLS: " + yieldCounter.get());
- System.out.println("COMMIT CALLS: " + commitCounter.get());
- System.out.println("ROLLBACK CALLS: " + rollbackCounter.get());
- System.out.println("Close CALLS: " + processor.closeCounter.get());
-
- /*
- * unlike previous test this one will always be 0 since all triggers are
- * failures
- */
- int closeVsInitDiff = processor.resourceReinitialized.get() - processor.closeCounter.get();
- assertEquals(0, closeVsInitDiff);
-
- assertEquals(commitCounter.get(), processor.successfulTriggers.get());
- assertEquals(rollbackCounter.get(), processor.failedTriggers.get());
-
- assertEquals(testCount,
- processor.successfulTriggers.get() + processor.failedTriggers.get() + yieldCounter.get());
- }
-
- /**
- *
- */
- public static class DummyProcessor extends AbstractKafkaProcessor<Closeable> {
- @Override
- protected boolean rendezvousWithKafka(ProcessContext context, ProcessSession session) throws ProcessException {
- return true;
- }
-
- @Override
- protected Closeable buildKafkaResource(ProcessContext context, ProcessSession session) throws ProcessException {
- return mock(Closeable.class);
- }
-
- @Override
- protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
- return SHARED_DESCRIPTORS;
- }
- }
-
-
- public static class ConcurrencyValidatingProcessor extends AbstractKafkaProcessor<Closeable> {
- final AtomicInteger failedTriggers = new AtomicInteger();
- final AtomicInteger successfulTriggers = new AtomicInteger();
- final AtomicInteger resourceReinitialized = new AtomicInteger();
- final AtomicInteger closeCounter = new AtomicInteger();
-
- ConcurrencyValidatingProcessor() {
- try {
- Field loggerField = AbstractSessionFactoryProcessor.class.getDeclaredField("logger");
- loggerField.setAccessible(true);
- loggerField.set(this, mock(ProcessorLog.class));
- } catch (Exception e) {
- throw new IllegalStateException(e);
- }
- }
-
- @Override
- @OnStopped
- public void close() {
- super.close();
- assertTrue(this.kafkaResource == null);
- closeCounter.incrementAndGet();
- }
-
- @Override
- protected boolean rendezvousWithKafka(ProcessContext context, ProcessSession session) {
- assertNotNull(this.kafkaResource);
- if ("fail".equals(context.getName())) {
- failedTriggers.incrementAndGet();
- throw new RuntimeException("Intentional");
- }
- this.successfulTriggers.incrementAndGet();
- return true;
- }
-
- @Override
- protected Closeable buildKafkaResource(ProcessContext context, ProcessSession session) throws ProcessException {
- this.resourceReinitialized.incrementAndGet();
- return mock(Closeable.class);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/nifi/blob/1bd2cf0d/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-pubsub-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/AbstractKafkaProcessorLifecycleTest.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-pubsub-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/AbstractKafkaProcessorLifecycleTest.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-pubsub-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/AbstractKafkaProcessorLifecycleTest.java
new file mode 100644
index 0000000..d09be60
--- /dev/null
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-pubsub-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/AbstractKafkaProcessorLifecycleTest.java
@@ -0,0 +1,456 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.processors.kafka.pubsub;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import java.io.Closeable;
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.nifi.annotation.lifecycle.OnStopped;
+import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.logging.ComponentLog;
+import org.apache.nifi.processor.AbstractSessionFactoryProcessor;
+import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.processor.ProcessSession;
+import org.apache.nifi.processor.ProcessSessionFactory;
+import org.apache.nifi.processor.exception.ProcessException;
+import org.apache.nifi.util.TestRunner;
+import org.apache.nifi.util.TestRunners;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+public class AbstractKafkaProcessorLifecycleTest {
+
+ private final static Random random = new Random();
+
+ @Test
+ public void validateBaseProperties() throws Exception {
+ TestRunner runner = TestRunners.newTestRunner(DummyProcessor.class);
+ runner.setProperty(AbstractKafkaProcessor.BOOTSTRAP_SERVERS, "");
+ runner.setProperty(AbstractKafkaProcessor.TOPIC, "foo");
+ runner.setProperty(ConsumeKafka.CLIENT_ID, "foo");
+
+ try {
+ runner.assertValid();
+ fail();
+ } catch (AssertionError e) {
+ assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
+ }
+
+ runner.setProperty(ConsumeKafka.BOOTSTRAP_SERVERS, "foo");
+ try {
+ runner.assertValid();
+ fail();
+ } catch (AssertionError e) {
+ assertTrue(e.getMessage().contains("'bootstrap.servers' validated against 'foo' is invalid"));
+ }
+ runner.setProperty(ConsumeKafka.BOOTSTRAP_SERVERS, "foo:1234");
+
+ runner.removeProperty(ConsumeKafka.TOPIC);
+ try {
+ runner.assertValid();
+ fail();
+ } catch (AssertionError e) {
+ assertTrue(e.getMessage().contains("'topic' is invalid because topic is required"));
+ }
+
+ runner.setProperty(ConsumeKafka.TOPIC, "");
+ try {
+ runner.assertValid();
+ fail();
+ } catch (AssertionError e) {
+ assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
+ }
+
+ runner.setProperty(ConsumeKafka.TOPIC, " ");
+ try {
+ runner.assertValid();
+ fail();
+ } catch (AssertionError e) {
+ assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
+ }
+ runner.setProperty(ConsumeKafka.TOPIC, "blah");
+
+ runner.removeProperty(ConsumeKafka.CLIENT_ID);
+ try {
+ runner.assertValid();
+ fail();
+ } catch (AssertionError e) {
+ assertTrue(e.getMessage().contains("invalid because client.id is required"));
+ }
+
+ runner.setProperty(ConsumeKafka.CLIENT_ID, "");
+ try {
+ runner.assertValid();
+ fail();
+ } catch (AssertionError e) {
+ assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
+ }
+
+ runner.setProperty(ConsumeKafka.CLIENT_ID, " ");
+ try {
+ runner.assertValid();
+ fail();
+ } catch (AssertionError e) {
+ assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
+ }
+ runner.setProperty(ConsumeKafka.CLIENT_ID, "ghj");
+
+ runner.setProperty(PublishKafka.KERBEROS_PRINCIPLE, "");
+ try {
+ runner.assertValid();
+ fail();
+ } catch (AssertionError e) {
+ assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
+ }
+ runner.setProperty(PublishKafka.KERBEROS_PRINCIPLE, " ");
+ try {
+ runner.assertValid();
+ fail();
+ } catch (AssertionError e) {
+ assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
+ }
+ }
+
+ @Test
+ @Ignore // just for extra sanity check
+ public void validateConcurrencyWithRandomFailuresMultiple() throws Exception {
+ for (int i = 0; i < 100; i++) {
+ validateConcurrencyWithRandomFailures();
+ }
+ }
+
+ @Test
+ public void validateConcurrencyWithRandomFailures() throws Exception {
+ ExecutorService processingExecutor = Executors.newFixedThreadPool(32);
+ final AtomicInteger commitCounter = new AtomicInteger();
+ final AtomicInteger rollbackCounter = new AtomicInteger();
+ final AtomicInteger yieldCounter = new AtomicInteger();
+
+ final ProcessSessionFactory sessionFactory = mock(ProcessSessionFactory.class);
+ final ProcessSession session = mock(ProcessSession.class);
+ when(sessionFactory.createSession()).thenReturn(session);
+ doAnswer(new Answer<Void>() {
+ @Override
+ public Void answer(InvocationOnMock invocation) throws Throwable {
+ commitCounter.incrementAndGet();
+ return null;
+ }
+ }).when(session).commit();
+ doAnswer(new Answer<Void>() {
+ @Override
+ public Void answer(InvocationOnMock invocation) throws Throwable {
+ rollbackCounter.incrementAndGet();
+ return null;
+ }
+ }).when(session).rollback(true);
+
+ final ConcurrencyValidatingProcessor processor = spy(new ConcurrencyValidatingProcessor());
+
+ int testCount = 1000;
+ final CountDownLatch latch = new CountDownLatch(testCount);
+ for (int i = 0; i < testCount; i++) {
+ processingExecutor.execute(new Runnable() {
+ @Override
+ public void run() {
+ ProcessContext context = mock(ProcessContext.class);
+ doAnswer(new Answer<Void>() {
+ @Override
+ public Void answer(InvocationOnMock invocation) throws Throwable {
+ yieldCounter.incrementAndGet();
+ return null;
+ }
+ }).when(context).yield();
+ if (random.nextInt(10) == 5) {
+ when(context.getName()).thenReturn("fail");
+ }
+ try {
+ processor.onTrigger(context, sessionFactory);
+ } catch (Exception e) {
+ fail();
+ } finally {
+ latch.countDown();
+ }
+ }
+ });
+ }
+
+ assertTrue(latch.await(20000, TimeUnit.MILLISECONDS));
+ processingExecutor.shutdown();
+
+ System.out.println("SUCCESS: " + processor.successfulTriggers);
+ System.out.println("FAILURE: " + processor.failedTriggers);
+ System.out.println("INIT: " + processor.resourceReinitialized);
+ System.out.println("YIELD CALLS: " + yieldCounter.get());
+ System.out.println("COMMIT CALLS: " + commitCounter.get());
+ System.out.println("ROLLBACK CALLS: " + rollbackCounter.get());
+ System.out.println("Close CALLS: " + processor.closeCounter.get());
+
+ /*
+ * this has to be <= 1 since the last thread may come to finally block
+ * after acceptTask flag has been reset at which point the close will
+ * not be called (which is correct behavior since it will be invoked
+ * explicitly by the life-cycle operations of a running processor).
+ *
+ * You can actually observe the =1 behavior in the next test where it is
+ * always 0 close calls
+ */
+ int closeVsInitDiff = processor.resourceReinitialized.get() - processor.closeCounter.get();
+ assertTrue(closeVsInitDiff <= 1);
+
+ assertEquals(commitCounter.get(), processor.successfulTriggers.get());
+ assertEquals(rollbackCounter.get(), processor.failedTriggers.get());
+
+ assertEquals(testCount,
+ processor.successfulTriggers.get() + processor.failedTriggers.get() + yieldCounter.get());
+ }
+
+ @Test
+ public void validateConcurrencyWithAllSuccesses() throws Exception {
+ ExecutorService processingExecutor = Executors.newFixedThreadPool(32);
+ final AtomicInteger commitCounter = new AtomicInteger();
+ final AtomicInteger rollbackCounter = new AtomicInteger();
+ final AtomicInteger yieldCounter = new AtomicInteger();
+
+ final ProcessSessionFactory sessionFactory = mock(ProcessSessionFactory.class);
+ final ProcessSession session = mock(ProcessSession.class);
+ when(sessionFactory.createSession()).thenReturn(session);
+ doAnswer(new Answer<Void>() {
+ @Override
+ public Void answer(InvocationOnMock invocation) throws Throwable {
+ commitCounter.incrementAndGet();
+ return null;
+ }
+ }).when(session).commit();
+ doAnswer(new Answer<Void>() {
+ @Override
+ public Void answer(InvocationOnMock invocation) throws Throwable {
+ rollbackCounter.incrementAndGet();
+ return null;
+ }
+ }).when(session).rollback(true);
+
+ final ConcurrencyValidatingProcessor processor = spy(new ConcurrencyValidatingProcessor());
+
+ int testCount = 1000;
+ final CountDownLatch latch = new CountDownLatch(testCount);
+ for (int i = 0; i < testCount; i++) {
+ processingExecutor.execute(new Runnable() {
+ @Override
+ public void run() {
+ ProcessContext context = mock(ProcessContext.class);
+ doAnswer(new Answer<Void>() {
+ @Override
+ public Void answer(InvocationOnMock invocation) throws Throwable {
+ yieldCounter.incrementAndGet();
+ return null;
+ }
+ }).when(context).yield();
+ try {
+ processor.onTrigger(context, sessionFactory);
+ } catch (Exception e) {
+ fail();
+ } finally {
+ latch.countDown();
+ }
+ }
+ });
+ }
+
+ assertTrue(latch.await(30000, TimeUnit.MILLISECONDS));
+ processingExecutor.shutdown();
+
+ System.out.println("SUCCESS: " + processor.successfulTriggers);
+ System.out.println("FAILURE: " + processor.failedTriggers);
+ System.out.println("INIT: " + processor.resourceReinitialized);
+ System.out.println("YIELD CALLS: " + yieldCounter.get());
+ System.out.println("COMMIT CALLS: " + commitCounter.get());
+ System.out.println("ROLLBACK CALLS: " + rollbackCounter.get());
+ System.out.println("Close CALLS: " + processor.closeCounter.get());
+
+ /*
+ * unlike previous test this one will always be 1 since there are no
+ * failures
+ */
+ int closeVsInitDiff = processor.resourceReinitialized.get() - processor.closeCounter.get();
+ assertEquals(1, closeVsInitDiff);
+
+ assertEquals(commitCounter.get(), processor.successfulTriggers.get());
+ assertEquals(rollbackCounter.get(), processor.failedTriggers.get());
+
+ assertEquals(testCount,
+ processor.successfulTriggers.get() + processor.failedTriggers.get() + yieldCounter.get());
+ }
+
+ @Test
+ public void validateConcurrencyWithAllFailures() throws Exception {
+ ExecutorService processingExecutor = Executors.newFixedThreadPool(32);
+ final AtomicInteger commitCounter = new AtomicInteger();
+ final AtomicInteger rollbackCounter = new AtomicInteger();
+ final AtomicInteger yieldCounter = new AtomicInteger();
+
+ final ProcessSessionFactory sessionFactory = mock(ProcessSessionFactory.class);
+ final ProcessSession session = mock(ProcessSession.class);
+ when(sessionFactory.createSession()).thenReturn(session);
+ doAnswer(new Answer<Void>() {
+ @Override
+ public Void answer(InvocationOnMock invocation) throws Throwable {
+ commitCounter.incrementAndGet();
+ return null;
+ }
+ }).when(session).commit();
+ doAnswer(new Answer<Void>() {
+ @Override
+ public Void answer(InvocationOnMock invocation) throws Throwable {
+ rollbackCounter.incrementAndGet();
+ return null;
+ }
+ }).when(session).rollback(true);
+
+ final ConcurrencyValidatingProcessor processor = spy(new ConcurrencyValidatingProcessor());
+
+ int testCount = 1000;
+ final CountDownLatch latch = new CountDownLatch(testCount);
+ for (int i = 0; i < testCount; i++) {
+ processingExecutor.execute(new Runnable() {
+ @Override
+ public void run() {
+ ProcessContext context = mock(ProcessContext.class);
+ doAnswer(new Answer<Void>() {
+ @Override
+ public Void answer(InvocationOnMock invocation) throws Throwable {
+ yieldCounter.incrementAndGet();
+ return null;
+ }
+ }).when(context).yield();
+ when(context.getName()).thenReturn("fail");
+ try {
+ processor.onTrigger(context, sessionFactory);
+ } catch (Exception e) {
+ fail();
+ } finally {
+ latch.countDown();
+ }
+ }
+ });
+ }
+
+ assertTrue(latch.await(20000, TimeUnit.MILLISECONDS));
+ processingExecutor.shutdown();
+
+ System.out.println("SUCCESS: " + processor.successfulTriggers);
+ System.out.println("FAILURE: " + processor.failedTriggers);
+ System.out.println("INIT: " + processor.resourceReinitialized);
+ System.out.println("YIELD CALLS: " + yieldCounter.get());
+ System.out.println("COMMIT CALLS: " + commitCounter.get());
+ System.out.println("ROLLBACK CALLS: " + rollbackCounter.get());
+ System.out.println("Close CALLS: " + processor.closeCounter.get());
+
+ /*
+ * unlike previous test this one will always be 0 since all triggers are
+ * failures
+ */
+ int closeVsInitDiff = processor.resourceReinitialized.get() - processor.closeCounter.get();
+ assertEquals(0, closeVsInitDiff);
+
+ assertEquals(commitCounter.get(), processor.successfulTriggers.get());
+ assertEquals(rollbackCounter.get(), processor.failedTriggers.get());
+
+ assertEquals(testCount,
+ processor.successfulTriggers.get() + processor.failedTriggers.get() + yieldCounter.get());
+ }
+
+ /**
+ *
+ */
+ public static class DummyProcessor extends AbstractKafkaProcessor<Closeable> {
+ @Override
+ protected boolean rendezvousWithKafka(ProcessContext context, ProcessSession session) throws ProcessException {
+ return true;
+ }
+
+ @Override
+ protected Closeable buildKafkaResource(ProcessContext context, ProcessSession session) throws ProcessException {
+ return mock(Closeable.class);
+ }
+
+ @Override
+ protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
+ return SHARED_DESCRIPTORS;
+ }
+ }
+
+
+ public static class ConcurrencyValidatingProcessor extends AbstractKafkaProcessor<Closeable> {
+ final AtomicInteger failedTriggers = new AtomicInteger();
+ final AtomicInteger successfulTriggers = new AtomicInteger();
+ final AtomicInteger resourceReinitialized = new AtomicInteger();
+ final AtomicInteger closeCounter = new AtomicInteger();
+
+ ConcurrencyValidatingProcessor() {
+ try {
+ Field loggerField = AbstractSessionFactoryProcessor.class.getDeclaredField("logger");
+ loggerField.setAccessible(true);
+ loggerField.set(this, mock(ComponentLog.class));
+ } catch (Exception e) {
+ throw new IllegalStateException(e);
+ }
+ }
+
+ @Override
+ @OnStopped
+ public void close() {
+ super.close();
+ assertTrue(this.kafkaResource == null);
+ closeCounter.incrementAndGet();
+ }
+
+ @Override
+ protected boolean rendezvousWithKafka(ProcessContext context, ProcessSession session) {
+ assertNotNull(this.kafkaResource);
+ if ("fail".equals(context.getName())) {
+ failedTriggers.incrementAndGet();
+ throw new RuntimeException("Intentional");
+ }
+ this.successfulTriggers.incrementAndGet();
+ return true;
+ }
+
+ @Override
+ protected Closeable buildKafkaResource(ProcessContext context, ProcessSession session) throws ProcessException {
+ this.resourceReinitialized.incrementAndGet();
+ return mock(Closeable.class);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/nifi/blob/1bd2cf0d/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ExecuteScript.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ExecuteScript.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ExecuteScript.java
index 224c55f..b863a42 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ExecuteScript.java
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ExecuteScript.java
@@ -30,8 +30,6 @@ import javax.script.ScriptException;
import javax.script.SimpleBindings;
import org.apache.commons.io.IOUtils;
import org.apache.nifi.annotation.behavior.DynamicProperty;
-import org.apache.nifi.annotation.behavior.TriggerSerially;
-import org.apache.nifi.annotation.lifecycle.OnStopped;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
http://git-wip-us.apache.org/repos/asf/nifi/blob/1bd2cf0d/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformJSON.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformJSON.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformJSON.java
index c8576aa..675b135 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformJSON.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformJSON.java
@@ -42,7 +42,7 @@ import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -57,13 +57,13 @@ import org.apache.nifi.util.StopWatch;
import org.apache.nifi.util.StringUtils;
import com.bazaarvoice.jolt.CardinalityTransform;
-import com.bazaarvoice.jolt.Shiftr;
-import com.bazaarvoice.jolt.Removr;
import com.bazaarvoice.jolt.Chainr;
import com.bazaarvoice.jolt.Defaultr;
+import com.bazaarvoice.jolt.JsonUtils;
+import com.bazaarvoice.jolt.Removr;
+import com.bazaarvoice.jolt.Shiftr;
import com.bazaarvoice.jolt.Sortr;
import com.bazaarvoice.jolt.Transform;
-import com.bazaarvoice.jolt.JsonUtils;
@EventDriven
@SideEffectFree
@@ -175,7 +175,7 @@ public class TransformJSON extends AbstractProcessor {
return;
}
- final ProcessorLog logger = getLogger();
+ final ComponentLog logger = getLogger();
final StopWatch stopWatch = new StopWatch(true);
final byte[] originalContent = new byte[(int) original.getSize()];