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();
