NIFI-1811 Removed ProcessorLog and updated dependent interfaces This closes #403.
Signed-off-by: Aldrin Piri <[email protected]> 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 <[email protected]> Authored: Mon May 2 17:47:44 2016 +0200 Committer: Aldrin Piri <[email protected]> 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;
