NIFI-5376 Removed deprecation warnings. Updated Javadoc for SiteToSiteClient#createTransaction() and HttpClient implementation. Reverted exception listing in method contract for SiteToSiteClient#createTransaction and HttpClient tion of same. Reverted import ordering in TestSiteToSiteClient. Reverted exception listing in TestGetHDFSFileInfo, TestListHDFS, and StandardHttpFlowFileServerProtocol. Restored @SuppressWarnings annotation and removed unnecessary "public static" keywords from inner classes in SiteToSiteClient.
This closes #2841. Signed-off-by: Joe Witt <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/f60585a9 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/f60585a9 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/f60585a9 Branch: refs/heads/master Commit: f60585a9b6df6b3b28be1eb80a0a60deac6c0493 Parents: 3826536 Author: Andy LoPresto <[email protected]> Authored: Wed Jul 4 00:30:32 2018 -0700 Committer: Andy LoPresto <[email protected]> Committed: Mon Jul 9 20:45:34 2018 -0700 ---------------------------------------------------------------------- .../org/apache/nifi/util/NiFiProperties.java | 5 - .../util/crypto/CipherProviderFactory.java | 3 +- .../nifi/remote/client/SiteToSiteClient.java | 3 +- .../remote/io/socket/SocketChannelInput.java | 5 +- .../remote/io/socket/SocketChannelOutput.java | 5 +- .../io/socket/ssl/SSLSocketChannelInput.java | 5 +- .../io/socket/ssl/SSLSocketChannelOutput.java | 5 +- .../protocol/http/HttpClientTransaction.java | 11 +- .../nifi/remote/client/http/TestHttpClient.java | 65 ++++++----- .../remote/protocol/SiteToSiteTestUtils.java | 21 ++-- .../http/TestHttpClientTransaction.java | 53 +++++---- .../socket/TestSocketClientTransaction.java | 41 ++++--- .../stream/io/LeakyBucketStreamThrottler.java | 2 + .../nifi/stream/io/LimitingInputStreamTest.java | 3 +- .../stream/io/TestLeakyBucketThrottler.java | 6 +- .../wali/TestMinimalLockingWriteAheadLog.java | 6 +- .../nifi/processors/WriteResourceToStream.java | 6 +- .../apache/nifi/processors/avro/SplitAvro.java | 17 ++- .../nifi/processors/avro/AvroTestUtil.java | 5 +- .../processors/avro/TestConvertAvroToJSON.java | 3 +- .../avro/TestExtractAvroMetadata.java | 9 +- .../nifi/processors/avro/TestSplitAvro.java | 27 +++-- .../processors/beats/frame/BeatsDecoder.java | 5 +- .../cassandra/QueryCassandraTest.java | 37 +++---- .../email/ExtractEmailAttachments.java | 8 +- .../processors/email/ExtractEmailHeaders.java | 43 ++++---- .../email/ExtractTNEFAttachments.java | 27 +++-- .../processors/email/GenerateAttachment.java | 9 +- .../email/TestExtractEmailHeaders.java | 11 +- .../processors/evtx/XmlRootNodeHandler.java | 9 +- .../processors/evtx/parser/BinaryReader.java | 5 +- .../parser/bxml/value/WStringArrayTypeNode.java | 11 +- .../processors/flume/util/FlowFileEvent.java | 14 +-- .../nifi/documentation/DocGeneratorTest.java | 18 +-- .../example/FullyDocumentedProcessor.java | 13 ++- .../PopularVoteFlowElectionFactoryBean.java | 7 +- .../flow/TestPopularVoteFlowElection.java | 18 ++- .../nifi/cluster/integration/Cluster.java | 7 +- .../apache/nifi/cluster/integration/Node.java | 18 ++- .../apache/nifi/controller/SnippetManager.java | 17 ++- .../repository/VolatileContentRepository.java | 3 +- .../apache/nifi/encrypt/StringEncryptor.java | 6 +- .../serialization/FlowFromDOMFactoryTest.groovy | 6 +- .../nifi/controller/TestFlowController.java | 98 +++++++++-------- .../reporting/TestStandardReportingContext.java | 27 +++-- .../TestWriteAheadFlowFileRepository.java | 2 +- .../repository/io/TestLimitedInputStream.java | 4 +- .../StandardFlowSerializerTest.java | 30 ++--- .../TestSimpleSwapSerializerDeserializer.java | 2 +- .../java/org/apache/nifi/nar/NarUnpacker.java | 17 ++- .../java/org/apache/nifi/util/FileUtils.java | 5 +- .../nifi/web/HttpServletRequestContext.java | 1 + .../nifi/web/ContentViewerController.java | 24 ++-- .../gcp/storage/PutGCSObjectTest.java | 40 +++---- ...lowFileStreamUnpackerSequenceFileWriter.java | 15 ++- .../hadoop/TarUnpackerSequenceFileWriter.java | 7 +- .../hadoop/ZipUnpackerSequenceFileWriter.java | 13 +-- .../hadoop/util/OutputStreamWritable.java | 9 +- .../processors/hadoop/TestGetHDFSFileInfo.java | 6 +- .../nifi/processors/hadoop/TestListHDFS.java | 43 ++++---- .../nifi/processors/kafka/PutKafkaTest.java | 13 +-- .../lumberjack/frame/LumberjackDecoder.java | 5 +- .../event/TestLumberjackEventFactory.java | 5 +- .../lumberjack/frame/TestLumberjackDecoder.java | 4 +- .../lumberjack/frame/TestLumberjackEncoder.java | 4 +- .../lumberjack/frame/TestLumberjackFrame.java | 2 +- .../ITLumberjackSocketChannelHandler.java | 6 +- .../handler/TestLumberjackFrameHandler.java | 3 +- .../TestStandardRecordReaderWriter.java | 2 +- .../nifi/processors/slack/CaptureServlet.java | 4 +- .../standard/AbstractJsonPathProcessor.java | 17 ++- .../processors/standard/CompressContent.java | 16 ++- .../processors/standard/EvaluateXQuery.java | 30 +++-- .../nifi/processors/standard/GetHTTP.java | 110 +++++++++---------- .../nifi/processors/standard/JmsConsumer.java | 4 +- .../nifi/processors/standard/ParseCEF.java | 58 +++++----- .../nifi/processors/standard/PostHTTP.java | 87 +++++++-------- .../processors/standard/PutFileTransfer.java | 19 ++-- .../nifi/processors/standard/ScanContent.java | 5 +- .../nifi/processors/standard/SplitContent.java | 5 +- .../nifi/processors/standard/TransformXml.java | 11 +- .../nifi/processors/standard/UnpackContent.java | 7 +- .../standard/relp/frame/RELPDecoder.java | 5 +- .../standard/servlets/ListenHTTPServlet.java | 10 +- .../processors/standard/util/JmsFactory.java | 4 +- .../standard/util/UDPStreamConsumer.java | 10 +- .../util/crypto/PasswordBasedEncryptor.java | 10 +- .../PasswordBasedEncryptorGroovyTest.groovy | 1 - .../processors/standard/CaptureServlet.java | 4 +- .../standard/TestEvaluateJsonPath.java | 21 ++-- .../processors/standard/TestGetJMSQueue.java | 22 ++-- .../processors/standard/TestJmsConsumer.java | 6 +- .../nifi/processors/standard/TestPutJMS.java | 50 ++++----- .../processors/standard/TestScanContent.java | 6 +- .../nifi/processors/standard/TestSplitJson.java | 25 ++--- .../event/log/ConsumeWindowsEventLog.java | 27 +++-- .../jna/EventSubscribeXmlRenderingCallback.java | 7 +- .../event/log/ConsumeWindowsEventLogTest.java | 47 ++++---- 98 files changed, 783 insertions(+), 830 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java index 56ba75a..4d4f483 100644 --- a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java +++ b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java @@ -131,11 +131,6 @@ public abstract class NiFiProperties { public static final String COMPONENT_STATUS_REPOSITORY_IMPLEMENTATION = "nifi.components.status.repository.implementation"; public static final String COMPONENT_STATUS_SNAPSHOT_FREQUENCY = "nifi.components.status.snapshot.frequency"; - // encryptor properties - public static final String NF_SENSITIVE_PROPS_KEY = "nifi.sensitive.props.key"; - public static final String NF_SENSITIVE_PROPS_ALGORITHM = "nifi.sensitive.props.algorithm"; - public static final String NF_SENSITIVE_PROPS_PROVIDER = "nifi.sensitive.props.provider"; - // security properties public static final String SECURITY_KEYSTORE = "nifi.security.keystore"; public static final String SECURITY_KEYSTORE_TYPE = "nifi.security.keystoreType"; http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/crypto/CipherProviderFactory.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/crypto/CipherProviderFactory.java b/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/crypto/CipherProviderFactory.java index 09004bf..8ef388a 100644 --- a/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/crypto/CipherProviderFactory.java +++ b/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/crypto/CipherProviderFactory.java @@ -23,6 +23,7 @@ import org.apache.nifi.security.util.KeyDerivationFunction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@SuppressWarnings("deprecation") public class CipherProviderFactory { private static final Logger logger = LoggerFactory.getLogger(CipherProviderFactory.class); @@ -30,7 +31,7 @@ public class CipherProviderFactory { static { registeredCipherProviders = new HashMap<>(); - registeredCipherProviders.put(KeyDerivationFunction.NIFI_LEGACY, NiFiLegacyCipherProvider.class); + registeredCipherProviders.put(KeyDerivationFunction.NIFI_LEGACY, org.apache.nifi.security.util.crypto.NiFiLegacyCipherProvider.class); registeredCipherProviders.put(KeyDerivationFunction.OPENSSL_EVP_BYTES_TO_KEY, OpenSSLPKCS5CipherProvider.class); registeredCipherProviders.put(KeyDerivationFunction.PBKDF2, PBKDF2CipherProvider.class); registeredCipherProviders.put(KeyDerivationFunction.BCRYPT, BcryptCipherProvider.class); http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/SiteToSiteClient.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/SiteToSiteClient.java b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/SiteToSiteClient.java index 39dbda5..29eb465 100644 --- a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/SiteToSiteClient.java +++ b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/SiteToSiteClient.java @@ -146,7 +146,7 @@ public interface SiteToSiteClient extends Closeable { * new client created. * </p> */ - public static class Builder implements Serializable { + class Builder implements Serializable { private static final long serialVersionUID = -4954962284343090219L; @@ -728,6 +728,7 @@ public interface SiteToSiteClient extends Closeable { } + @SuppressWarnings("deprecation") class StandardSiteToSiteClientConfig implements SiteToSiteClientConfig, Serializable { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelInput.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelInput.java b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelInput.java index 68a8dc4..85ae504 100644 --- a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelInput.java +++ b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelInput.java @@ -16,14 +16,13 @@ */ package org.apache.nifi.remote.io.socket; +import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; import java.nio.channels.SocketChannel; - -import org.apache.nifi.stream.io.BufferedInputStream; -import org.apache.nifi.stream.io.ByteCountingInputStream; import org.apache.nifi.remote.io.InterruptableInputStream; import org.apache.nifi.remote.protocol.CommunicationsInput; +import org.apache.nifi.stream.io.ByteCountingInputStream; public class SocketChannelInput implements CommunicationsInput { http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelOutput.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelOutput.java b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelOutput.java index 13974a5..859b88c 100644 --- a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelOutput.java +++ b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelOutput.java @@ -16,14 +16,13 @@ */ package org.apache.nifi.remote.io.socket; +import java.io.BufferedOutputStream; import java.io.IOException; import java.io.OutputStream; import java.nio.channels.SocketChannel; - -import org.apache.nifi.stream.io.BufferedOutputStream; -import org.apache.nifi.stream.io.ByteCountingOutputStream; import org.apache.nifi.remote.io.InterruptableOutputStream; import org.apache.nifi.remote.protocol.CommunicationsOutput; +import org.apache.nifi.stream.io.ByteCountingOutputStream; public class SocketChannelOutput implements CommunicationsOutput { http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelInput.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelInput.java b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelInput.java index 6cd2344..842b7f2 100644 --- a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelInput.java +++ b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelInput.java @@ -16,12 +16,11 @@ */ package org.apache.nifi.remote.io.socket.ssl; +import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; - -import org.apache.nifi.stream.io.BufferedInputStream; -import org.apache.nifi.stream.io.ByteCountingInputStream; import org.apache.nifi.remote.protocol.CommunicationsInput; +import org.apache.nifi.stream.io.ByteCountingInputStream; public class SSLSocketChannelInput implements CommunicationsInput { http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelOutput.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelOutput.java b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelOutput.java index 33d13cb..d413d0b 100644 --- a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelOutput.java +++ b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelOutput.java @@ -16,12 +16,11 @@ */ package org.apache.nifi.remote.io.socket.ssl; +import java.io.BufferedOutputStream; import java.io.IOException; import java.io.OutputStream; - -import org.apache.nifi.stream.io.BufferedOutputStream; -import org.apache.nifi.stream.io.ByteCountingOutputStream; import org.apache.nifi.remote.protocol.CommunicationsOutput; +import org.apache.nifi.stream.io.ByteCountingOutputStream; public class SSLSocketChannelOutput implements CommunicationsOutput { http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/protocol/http/HttpClientTransaction.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/protocol/http/HttpClientTransaction.java b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/protocol/http/HttpClientTransaction.java index 693b3c7..d41cee3 100644 --- a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/protocol/http/HttpClientTransaction.java +++ b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/protocol/http/HttpClientTransaction.java @@ -16,6 +16,11 @@ */ package org.apache.nifi.remote.protocol.http; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import org.apache.commons.lang3.StringUtils; import org.apache.nifi.events.EventReporter; import org.apache.nifi.remote.AbstractTransaction; @@ -26,14 +31,8 @@ import org.apache.nifi.remote.io.http.HttpCommunicationsSession; import org.apache.nifi.remote.protocol.Response; import org.apache.nifi.remote.protocol.ResponseCode; import org.apache.nifi.remote.util.SiteToSiteRestApiClient; -import org.apache.nifi.stream.io.ByteArrayInputStream; -import org.apache.nifi.stream.io.ByteArrayOutputStream; import org.apache.nifi.web.api.entity.TransactionResultEntity; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - public class HttpClientTransaction extends AbstractTransaction { private SiteToSiteRestApiClient apiClient; http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/client/http/TestHttpClient.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/client/http/TestHttpClient.java b/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/client/http/TestHttpClient.java index e027dc9..ebcab31 100644 --- a/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/client/http/TestHttpClient.java +++ b/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/client/http/TestHttpClient.java @@ -16,7 +16,39 @@ */ package org.apache.nifi.remote.client.http; +import static org.apache.commons.lang3.StringUtils.isEmpty; +import static org.apache.nifi.remote.protocol.http.HttpHeaders.LOCATION_HEADER_NAME; +import static org.apache.nifi.remote.protocol.http.HttpHeaders.LOCATION_URI_INTENT_NAME; +import static org.apache.nifi.remote.protocol.http.HttpHeaders.LOCATION_URI_INTENT_VALUE; +import static org.apache.nifi.remote.protocol.http.HttpHeaders.PROTOCOL_VERSION; +import static org.apache.nifi.remote.protocol.http.HttpHeaders.SERVER_SIDE_TRANSACTION_TTL; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.junit.Assume.assumeFalse; + import com.fasterxml.jackson.databind.ObjectMapper; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.ServerSocket; +import java.net.SocketTimeoutException; +import java.net.URI; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.apache.nifi.controller.ScheduledState; import org.apache.nifi.remote.Peer; import org.apache.nifi.remote.Transaction; @@ -33,8 +65,6 @@ import org.apache.nifi.remote.protocol.SiteToSiteTransportProtocol; import org.apache.nifi.remote.protocol.http.HttpHeaders; import org.apache.nifi.remote.protocol.http.HttpProxy; import org.apache.nifi.remote.util.StandardDataPacket; -import org.apache.nifi.stream.io.ByteArrayInputStream; -import org.apache.nifi.stream.io.ByteArrayOutputStream; import org.apache.nifi.stream.io.StreamUtils; import org.apache.nifi.web.api.dto.ControllerDTO; import org.apache.nifi.web.api.dto.PortDTO; @@ -67,37 +97,6 @@ import org.littleshoot.proxy.impl.ThreadPoolConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.ServerSocket; -import java.net.SocketTimeoutException; -import java.net.URI; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - -import static org.apache.commons.lang3.StringUtils.isEmpty; -import static org.apache.nifi.remote.protocol.http.HttpHeaders.LOCATION_HEADER_NAME; -import static org.apache.nifi.remote.protocol.http.HttpHeaders.LOCATION_URI_INTENT_NAME; -import static org.apache.nifi.remote.protocol.http.HttpHeaders.LOCATION_URI_INTENT_VALUE; -import static org.apache.nifi.remote.protocol.http.HttpHeaders.PROTOCOL_VERSION; -import static org.apache.nifi.remote.protocol.http.HttpHeaders.SERVER_SIDE_TRANSACTION_TTL; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.junit.Assume.assumeFalse; - public class TestHttpClient { private static Logger logger = LoggerFactory.getLogger(TestHttpClient.class); http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/protocol/SiteToSiteTestUtils.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/protocol/SiteToSiteTestUtils.java b/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/protocol/SiteToSiteTestUtils.java index 90e8f55..1ed23e0 100644 --- a/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/protocol/SiteToSiteTestUtils.java +++ b/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/protocol/SiteToSiteTestUtils.java @@ -16,17 +16,6 @@ */ package org.apache.nifi.remote.protocol; -import org.apache.nifi.remote.Transaction; -import org.apache.nifi.remote.TransactionCompletion; -import org.apache.nifi.remote.util.StandardDataPacket; -import org.apache.nifi.stream.io.ByteArrayInputStream; -import org.apache.nifi.stream.io.ByteArrayOutputStream; -import org.apache.nifi.stream.io.StreamUtils; - -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.util.HashMap; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -34,6 +23,16 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.util.HashMap; +import org.apache.nifi.remote.Transaction; +import org.apache.nifi.remote.TransactionCompletion; +import org.apache.nifi.remote.util.StandardDataPacket; +import org.apache.nifi.stream.io.StreamUtils; + public class SiteToSiteTestUtils { public static DataPacket createDataPacket(String contents) { try { http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/protocol/http/TestHttpClientTransaction.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/protocol/http/TestHttpClientTransaction.java b/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/protocol/http/TestHttpClientTransaction.java index b9ab25c..475642f 100644 --- a/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/protocol/http/TestHttpClientTransaction.java +++ b/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/protocol/http/TestHttpClientTransaction.java @@ -16,33 +16,6 @@ */ package org.apache.nifi.remote.protocol.http; -import org.apache.nifi.events.EventReporter; -import org.apache.nifi.remote.Peer; -import org.apache.nifi.remote.PeerDescription; -import org.apache.nifi.remote.TransferDirection; -import org.apache.nifi.remote.codec.FlowFileCodec; -import org.apache.nifi.remote.codec.StandardFlowFileCodec; -import org.apache.nifi.remote.io.http.HttpCommunicationsSession; -import org.apache.nifi.remote.io.http.HttpInput; -import org.apache.nifi.remote.io.http.HttpOutput; -import org.apache.nifi.remote.protocol.CommunicationsSession; -import org.apache.nifi.remote.protocol.DataPacket; -import org.apache.nifi.remote.protocol.ResponseCode; -import org.apache.nifi.remote.util.SiteToSiteRestApiClient; -import org.apache.nifi.reporting.Severity; -import org.apache.nifi.stream.io.ByteArrayInputStream; -import org.apache.nifi.stream.io.ByteArrayOutputStream; -import org.apache.nifi.web.api.entity.TransactionResultEntity; -import org.junit.Test; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - import static org.apache.nifi.remote.protocol.ResponseCode.CONFIRM_TRANSACTION; import static org.apache.nifi.remote.protocol.SiteToSiteTestUtils.createDataPacket; import static org.apache.nifi.remote.protocol.SiteToSiteTestUtils.execReceiveOneFlowFile; @@ -64,6 +37,32 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import org.apache.nifi.events.EventReporter; +import org.apache.nifi.remote.Peer; +import org.apache.nifi.remote.PeerDescription; +import org.apache.nifi.remote.TransferDirection; +import org.apache.nifi.remote.codec.FlowFileCodec; +import org.apache.nifi.remote.codec.StandardFlowFileCodec; +import org.apache.nifi.remote.io.http.HttpCommunicationsSession; +import org.apache.nifi.remote.io.http.HttpInput; +import org.apache.nifi.remote.io.http.HttpOutput; +import org.apache.nifi.remote.protocol.CommunicationsSession; +import org.apache.nifi.remote.protocol.DataPacket; +import org.apache.nifi.remote.protocol.ResponseCode; +import org.apache.nifi.remote.util.SiteToSiteRestApiClient; +import org.apache.nifi.reporting.Severity; +import org.apache.nifi.web.api.entity.TransactionResultEntity; +import org.junit.Test; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class TestHttpClientTransaction { private Logger logger = LoggerFactory.getLogger(TestHttpClientTransaction.class); http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/protocol/socket/TestSocketClientTransaction.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/protocol/socket/TestSocketClientTransaction.java b/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/protocol/socket/TestSocketClientTransaction.java index 9624f44..a327313 100644 --- a/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/protocol/socket/TestSocketClientTransaction.java +++ b/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/protocol/socket/TestSocketClientTransaction.java @@ -16,6 +16,26 @@ */ package org.apache.nifi.remote.protocol.socket; +import static org.apache.nifi.remote.protocol.SiteToSiteTestUtils.createDataPacket; +import static org.apache.nifi.remote.protocol.SiteToSiteTestUtils.execReceiveOneFlowFile; +import static org.apache.nifi.remote.protocol.SiteToSiteTestUtils.execReceiveTwoFlowFiles; +import static org.apache.nifi.remote.protocol.SiteToSiteTestUtils.execReceiveWithInvalidChecksum; +import static org.apache.nifi.remote.protocol.SiteToSiteTestUtils.execReceiveZeroFlowFile; +import static org.apache.nifi.remote.protocol.SiteToSiteTestUtils.execSendButDestinationFull; +import static org.apache.nifi.remote.protocol.SiteToSiteTestUtils.execSendOneFlowFile; +import static org.apache.nifi.remote.protocol.SiteToSiteTestUtils.execSendTwoFlowFiles; +import static org.apache.nifi.remote.protocol.SiteToSiteTestUtils.execSendWithInvalidChecksum; +import static org.apache.nifi.remote.protocol.SiteToSiteTestUtils.execSendZeroFlowFile; +import static org.apache.nifi.remote.protocol.SiteToSiteTestUtils.readContents; +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import org.apache.nifi.events.EventReporter; import org.apache.nifi.remote.Peer; import org.apache.nifi.remote.PeerDescription; @@ -30,31 +50,10 @@ import org.apache.nifi.remote.protocol.DataPacket; import org.apache.nifi.remote.protocol.RequestType; import org.apache.nifi.remote.protocol.Response; import org.apache.nifi.remote.protocol.ResponseCode; -import org.apache.nifi.stream.io.ByteArrayInputStream; -import org.apache.nifi.stream.io.ByteArrayOutputStream; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -import static org.apache.nifi.remote.protocol.SiteToSiteTestUtils.createDataPacket; -import static org.apache.nifi.remote.protocol.SiteToSiteTestUtils.execReceiveOneFlowFile; -import static org.apache.nifi.remote.protocol.SiteToSiteTestUtils.execReceiveTwoFlowFiles; -import static org.apache.nifi.remote.protocol.SiteToSiteTestUtils.execReceiveWithInvalidChecksum; -import static org.apache.nifi.remote.protocol.SiteToSiteTestUtils.execReceiveZeroFlowFile; -import static org.apache.nifi.remote.protocol.SiteToSiteTestUtils.execSendButDestinationFull; -import static org.apache.nifi.remote.protocol.SiteToSiteTestUtils.execSendOneFlowFile; -import static org.apache.nifi.remote.protocol.SiteToSiteTestUtils.execSendTwoFlowFiles; -import static org.apache.nifi.remote.protocol.SiteToSiteTestUtils.execSendWithInvalidChecksum; -import static org.apache.nifi.remote.protocol.SiteToSiteTestUtils.execSendZeroFlowFile; -import static org.apache.nifi.remote.protocol.SiteToSiteTestUtils.readContents; -import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - public class TestSocketClientTransaction { private Logger logger = LoggerFactory.getLogger(TestSocketClientTransaction.class); http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/LeakyBucketStreamThrottler.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/LeakyBucketStreamThrottler.java b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/LeakyBucketStreamThrottler.java index 0bee0d7..729ac87 100644 --- a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/LeakyBucketStreamThrottler.java +++ b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/LeakyBucketStreamThrottler.java @@ -16,6 +16,8 @@ */ package org.apache.nifi.stream.io; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/LimitingInputStreamTest.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/LimitingInputStreamTest.java b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/LimitingInputStreamTest.java index a884ef2..475a665 100644 --- a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/LimitingInputStreamTest.java +++ b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/LimitingInputStreamTest.java @@ -16,8 +16,9 @@ */ package org.apache.nifi.stream.io; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.IOException; - import junit.framework.TestCase; public class LimitingInputStreamTest extends TestCase { http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/TestLeakyBucketThrottler.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/TestLeakyBucketThrottler.java b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/TestLeakyBucketThrottler.java index 1e498b7..3f28412 100644 --- a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/TestLeakyBucketThrottler.java +++ b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/TestLeakyBucketThrottler.java @@ -16,18 +16,16 @@ */ package org.apache.nifi.stream.io; -import org.apache.nifi.stream.io.ByteArrayInputStream; -import org.apache.nifi.stream.io.ByteArrayOutputStream; -import org.apache.nifi.stream.io.LeakyBucketStreamThrottler; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; import java.util.List; - import org.junit.Ignore; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-commons/nifi-write-ahead-log/src/test/java/org/wali/TestMinimalLockingWriteAheadLog.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-write-ahead-log/src/test/java/org/wali/TestMinimalLockingWriteAheadLog.java b/nifi-commons/nifi-write-ahead-log/src/test/java/org/wali/TestMinimalLockingWriteAheadLog.java index 265c547..5f1c589 100644 --- a/nifi-commons/nifi-write-ahead-log/src/test/java/org/wali/TestMinimalLockingWriteAheadLog.java +++ b/nifi-commons/nifi-write-ahead-log/src/test/java/org/wali/TestMinimalLockingWriteAheadLog.java @@ -48,13 +48,13 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; - import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@SuppressWarnings("deprecation") public class TestMinimalLockingWriteAheadLog { private static final Logger logger = LoggerFactory.getLogger(TestMinimalLockingWriteAheadLog.class); @@ -119,7 +119,7 @@ public class TestMinimalLockingWriteAheadLog { } }; - final WriteAheadRepository<Object> repo = new MinimalLockingWriteAheadLog<>(path, numPartitions, serde, (SyncListener) null); + final WriteAheadRepository<Object> repo = new MinimalLockingWriteAheadLog<>(path, numPartitions, serde, null); try { final Collection<Object> initialRecs = repo.recoverRecords(); assertTrue(initialRecs.isEmpty()); @@ -131,7 +131,7 @@ public class TestMinimalLockingWriteAheadLog { repo.shutdown(); } - final WriteAheadRepository<Object> secondRepo = new MinimalLockingWriteAheadLog<>(path, numPartitions, serde, (SyncListener) null); + final WriteAheadRepository<Object> secondRepo = new MinimalLockingWriteAheadLog<>(path, numPartitions, serde, null); try { secondRepo.recoverRecords(); } finally { http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-external/nifi-example-bundle/nifi-nifi-example-processors/src/main/java/org/apache/nifi/processors/WriteResourceToStream.java ---------------------------------------------------------------------- diff --git a/nifi-external/nifi-example-bundle/nifi-nifi-example-processors/src/main/java/org/apache/nifi/processors/WriteResourceToStream.java b/nifi-external/nifi-example-bundle/nifi-nifi-example-processors/src/main/java/org/apache/nifi/processors/WriteResourceToStream.java index 39c3d14..1ce0974 100644 --- a/nifi-external/nifi-example-bundle/nifi-nifi-example-processors/src/main/java/org/apache/nifi/processors/WriteResourceToStream.java +++ b/nifi-external/nifi-example-bundle/nifi-nifi-example-processors/src/main/java/org/apache/nifi/processors/WriteResourceToStream.java @@ -19,10 +19,10 @@ package org.apache.nifi.processors; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.nio.charset.Charset; import java.util.Collections; import java.util.HashSet; import java.util.Set; - import org.apache.commons.io.IOUtils; import org.apache.nifi.annotation.documentation.CapabilityDescription; import org.apache.nifi.annotation.documentation.Tags; @@ -61,7 +61,7 @@ public class WriteResourceToStream extends AbstractProcessor { final InputStream resourceStream = Thread.currentThread() .getContextClassLoader().getResourceAsStream("file.txt"); try { - this.resourceData = IOUtils.toString(resourceStream); + this.resourceData = IOUtils.toString(resourceStream, Charset.defaultCharset()); } catch (IOException e) { throw new RuntimeException("Unable to load resources", e); } finally { @@ -93,7 +93,7 @@ public class WriteResourceToStream extends AbstractProcessor { @Override public void process(OutputStream out) throws IOException { - IOUtils.write(resourceData, out); + IOUtils.write(resourceData, out, Charset.defaultCharset()); } }); http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/main/java/org/apache/nifi/processors/avro/SplitAvro.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/main/java/org/apache/nifi/processors/avro/SplitAvro.java b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/main/java/org/apache/nifi/processors/avro/SplitAvro.java index db57291..a35412f 100644 --- a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/main/java/org/apache/nifi/processors/avro/SplitAvro.java +++ b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/main/java/org/apache/nifi/processors/avro/SplitAvro.java @@ -16,7 +16,14 @@ */ package org.apache.nifi.processors.avro; +import static org.apache.nifi.flowfile.attributes.FragmentAttributes.FRAGMENT_COUNT; +import static org.apache.nifi.flowfile.attributes.FragmentAttributes.FRAGMENT_ID; +import static org.apache.nifi.flowfile.attributes.FragmentAttributes.FRAGMENT_INDEX; +import static org.apache.nifi.flowfile.attributes.FragmentAttributes.SEGMENT_ORIGINAL_FILENAME; +import static org.apache.nifi.flowfile.attributes.FragmentAttributes.copyAttributesToOriginal; + import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -30,7 +37,6 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.IntStream; - import org.apache.avro.file.CodecFactory; import org.apache.avro.file.DataFileConstants; import org.apache.avro.file.DataFileStream; @@ -41,12 +47,12 @@ import org.apache.avro.generic.GenericRecord; import org.apache.avro.io.DatumWriter; import org.apache.avro.io.Encoder; import org.apache.avro.io.EncoderFactory; -import org.apache.nifi.annotation.behavior.SystemResourceConsideration; import org.apache.nifi.annotation.behavior.InputRequirement; import org.apache.nifi.annotation.behavior.InputRequirement.Requirement; import org.apache.nifi.annotation.behavior.SideEffectFree; import org.apache.nifi.annotation.behavior.SupportsBatching; import org.apache.nifi.annotation.behavior.SystemResource; +import org.apache.nifi.annotation.behavior.SystemResourceConsideration; import org.apache.nifi.annotation.behavior.WritesAttribute; import org.apache.nifi.annotation.behavior.WritesAttributes; import org.apache.nifi.annotation.documentation.CapabilityDescription; @@ -64,13 +70,6 @@ import org.apache.nifi.processor.exception.ProcessException; import org.apache.nifi.processor.io.InputStreamCallback; import org.apache.nifi.processor.io.OutputStreamCallback; import org.apache.nifi.processor.util.StandardValidators; -import org.apache.nifi.stream.io.BufferedOutputStream; - -import static org.apache.nifi.flowfile.attributes.FragmentAttributes.FRAGMENT_COUNT; -import static org.apache.nifi.flowfile.attributes.FragmentAttributes.FRAGMENT_ID; -import static org.apache.nifi.flowfile.attributes.FragmentAttributes.FRAGMENT_INDEX; -import static org.apache.nifi.flowfile.attributes.FragmentAttributes.SEGMENT_ORIGINAL_FILENAME; -import static org.apache.nifi.flowfile.attributes.FragmentAttributes.copyAttributesToOriginal; @SideEffectFree @SupportsBatching http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/test/java/org/apache/nifi/processors/avro/AvroTestUtil.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/test/java/org/apache/nifi/processors/avro/AvroTestUtil.java b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/test/java/org/apache/nifi/processors/avro/AvroTestUtil.java index 1315b18..dd8eadd 100644 --- a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/test/java/org/apache/nifi/processors/avro/AvroTestUtil.java +++ b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/test/java/org/apache/nifi/processors/avro/AvroTestUtil.java @@ -16,13 +16,12 @@ */ package org.apache.nifi.processors.avro; +import java.io.ByteArrayOutputStream; +import java.io.IOException; import org.apache.avro.Schema; import org.apache.avro.file.DataFileWriter; import org.apache.avro.generic.GenericRecord; import org.apache.avro.io.DatumWriter; -import org.apache.nifi.stream.io.ByteArrayOutputStream; - -import java.io.IOException; public class AvroTestUtil { http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/test/java/org/apache/nifi/processors/avro/TestConvertAvroToJSON.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/test/java/org/apache/nifi/processors/avro/TestConvertAvroToJSON.java b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/test/java/org/apache/nifi/processors/avro/TestConvertAvroToJSON.java index 0884eb3..4e302bd 100644 --- a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/test/java/org/apache/nifi/processors/avro/TestConvertAvroToJSON.java +++ b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/test/java/org/apache/nifi/processors/avro/TestConvertAvroToJSON.java @@ -16,9 +16,9 @@ */ package org.apache.nifi.processors.avro; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; - import org.apache.avro.Schema; import org.apache.avro.file.DataFileWriter; import org.apache.avro.generic.GenericData; @@ -27,7 +27,6 @@ import org.apache.avro.generic.GenericRecord; import org.apache.avro.io.BinaryEncoder; import org.apache.avro.io.DatumWriter; import org.apache.avro.io.EncoderFactory; -import org.apache.nifi.stream.io.ByteArrayOutputStream; import org.apache.nifi.util.MockFlowFile; import org.apache.nifi.util.TestRunner; import org.apache.nifi.util.TestRunners; http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/test/java/org/apache/nifi/processors/avro/TestExtractAvroMetadata.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/test/java/org/apache/nifi/processors/avro/TestExtractAvroMetadata.java b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/test/java/org/apache/nifi/processors/avro/TestExtractAvroMetadata.java index 474b34c..b4a68e6 100644 --- a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/test/java/org/apache/nifi/processors/avro/TestExtractAvroMetadata.java +++ b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/test/java/org/apache/nifi/processors/avro/TestExtractAvroMetadata.java @@ -16,6 +16,10 @@ */ package org.apache.nifi.processors.avro; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.util.Arrays; import org.apache.avro.Schema; import org.apache.avro.file.CodecFactory; import org.apache.avro.file.DataFileWriter; @@ -23,16 +27,11 @@ import org.apache.avro.generic.GenericData; import org.apache.avro.generic.GenericDatumWriter; import org.apache.avro.generic.GenericRecord; import org.apache.avro.io.DatumWriter; -import org.apache.nifi.stream.io.ByteArrayOutputStream; import org.apache.nifi.util.MockFlowFile; import org.apache.nifi.util.TestRunner; import org.apache.nifi.util.TestRunners; import org.junit.Test; -import java.io.File; -import java.io.IOException; -import java.util.Arrays; - public class TestExtractAvroMetadata { static final String AVRO_SCHEMA_ATTR = "avro.schema"; http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/test/java/org/apache/nifi/processors/avro/TestSplitAvro.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/test/java/org/apache/nifi/processors/avro/TestSplitAvro.java b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/test/java/org/apache/nifi/processors/avro/TestSplitAvro.java index c17842d..a0d351e 100644 --- a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/test/java/org/apache/nifi/processors/avro/TestSplitAvro.java +++ b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/test/java/org/apache/nifi/processors/avro/TestSplitAvro.java @@ -16,6 +16,19 @@ */ package org.apache.nifi.processors.avro; +import static org.apache.nifi.flowfile.attributes.FragmentAttributes.FRAGMENT_COUNT; +import static org.apache.nifi.flowfile.attributes.FragmentAttributes.FRAGMENT_ID; +import static org.junit.Assert.assertEquals; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.EOFException; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.stream.IntStream; import org.apache.avro.Schema; import org.apache.avro.file.DataFileStream; import org.apache.avro.file.DataFileWriter; @@ -27,8 +40,6 @@ import org.apache.avro.io.DatumReader; import org.apache.avro.io.Decoder; import org.apache.avro.io.DecoderFactory; import org.apache.nifi.flowfile.attributes.CoreAttributes; -import org.apache.nifi.stream.io.ByteArrayInputStream; -import org.apache.nifi.stream.io.ByteArrayOutputStream; import org.apache.nifi.util.MockFlowFile; import org.apache.nifi.util.TestRunner; import org.apache.nifi.util.TestRunners; @@ -36,18 +47,6 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import java.io.EOFException; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.stream.IntStream; - -import static org.apache.nifi.flowfile.attributes.FragmentAttributes.FRAGMENT_COUNT; -import static org.apache.nifi.flowfile.attributes.FragmentAttributes.FRAGMENT_ID; -import static org.junit.Assert.assertEquals; - public class TestSplitAvro { static final String META_KEY1 = "metaKey1"; http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-processors/src/main/java/org/apache/nifi/processors/beats/frame/BeatsDecoder.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-processors/src/main/java/org/apache/nifi/processors/beats/frame/BeatsDecoder.java b/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-processors/src/main/java/org/apache/nifi/processors/beats/frame/BeatsDecoder.java index 9e4f3f3..4d55484 100644 --- a/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-processors/src/main/java/org/apache/nifi/processors/beats/frame/BeatsDecoder.java +++ b/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-processors/src/main/java/org/apache/nifi/processors/beats/frame/BeatsDecoder.java @@ -16,6 +16,8 @@ */ package org.apache.nifi.processors.beats.frame; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; @@ -23,10 +25,7 @@ import java.nio.charset.Charset; import java.util.LinkedList; import java.util.List; import java.util.zip.InflaterInputStream; - import org.apache.nifi.logging.ComponentLog; -import org.apache.nifi.stream.io.ByteArrayInputStream; -import org.apache.nifi.stream.io.ByteArrayOutputStream; /** * Decodes a Beats frame by maintaining a state based on each byte that has been processed. This class http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/QueryCassandraTest.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/QueryCassandraTest.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/QueryCassandraTest.java index 07c1df0..dfec386 100644 --- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/QueryCassandraTest.java +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/QueryCassandraTest.java @@ -16,6 +16,16 @@ */ package org.apache.nifi.processors.cassandra; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyLong; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import com.datastax.driver.core.Cluster; import com.datastax.driver.core.Configuration; import com.datastax.driver.core.ConsistencyLevel; @@ -26,33 +36,22 @@ import com.datastax.driver.core.Session; import com.datastax.driver.core.exceptions.InvalidQueryException; import com.datastax.driver.core.exceptions.NoHostAvailableException; import com.datastax.driver.core.exceptions.ReadTimeoutException; +import java.io.ByteArrayOutputStream; +import java.net.InetSocketAddress; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.List; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import javax.net.ssl.SSLContext; import org.apache.avro.Schema; import org.apache.nifi.processor.exception.ProcessException; -import org.apache.nifi.stream.io.ByteArrayOutputStream; import org.apache.nifi.util.MockFlowFile; import org.apache.nifi.util.TestRunner; import org.apache.nifi.util.TestRunners; import org.junit.Before; import org.junit.Test; -import javax.net.ssl.SSLContext; -import java.net.InetSocketAddress; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; -import java.util.List; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - public class QueryCassandraTest { http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailAttachments.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailAttachments.java b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailAttachments.java index e92889c..c0496a7 100644 --- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailAttachments.java +++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailAttachments.java @@ -16,30 +16,27 @@ */ package org.apache.nifi.processors.email; +import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; import java.util.Collections; +import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Properties; import java.util.Set; -import java.util.Date; - import javax.activation.DataSource; import javax.mail.Address; import javax.mail.MessagingException; import javax.mail.Session; import javax.mail.internet.MimeMessage; - import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.mail.util.MimeMessageParser; - - import org.apache.nifi.annotation.behavior.EventDriven; import org.apache.nifi.annotation.behavior.InputRequirement; import org.apache.nifi.annotation.behavior.InputRequirement.Requirement; @@ -61,7 +58,6 @@ import org.apache.nifi.processor.Relationship; import org.apache.nifi.processor.exception.FlowFileHandlingException; import org.apache.nifi.processor.io.InputStreamCallback; import org.apache.nifi.processor.io.OutputStreamCallback; -import org.apache.nifi.stream.io.BufferedInputStream; http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailHeaders.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailHeaders.java b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailHeaders.java index 5a11f04..55b2b65 100644 --- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailHeaders.java +++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailHeaders.java @@ -17,6 +17,26 @@ package org.apache.nifi.processors.email; +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Date; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import javax.mail.Address; +import javax.mail.Header; +import javax.mail.Message; +import javax.mail.MessagingException; +import javax.mail.Session; +import javax.mail.internet.MimeMessage; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.mail.util.MimeMessageParser; @@ -29,9 +49,9 @@ import org.apache.nifi.annotation.behavior.WritesAttribute; import org.apache.nifi.annotation.behavior.WritesAttributes; import org.apache.nifi.annotation.documentation.CapabilityDescription; import org.apache.nifi.annotation.documentation.Tags; +import org.apache.nifi.components.AllowableValue; import org.apache.nifi.components.PropertyDescriptor; import org.apache.nifi.expression.ExpressionLanguageScope; -import org.apache.nifi.components.AllowableValue; import org.apache.nifi.flowfile.FlowFile; import org.apache.nifi.logging.ComponentLog; import org.apache.nifi.processor.AbstractProcessor; @@ -41,27 +61,6 @@ import org.apache.nifi.processor.ProcessorInitializationContext; import org.apache.nifi.processor.Relationship; import org.apache.nifi.processor.io.InputStreamCallback; import org.apache.nifi.processor.util.StandardValidators; -import org.apache.nifi.stream.io.BufferedInputStream; - -import javax.mail.Address; -import javax.mail.Header; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.Session; -import javax.mail.internet.MimeMessage; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Date; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; @SupportsBatching @EventDriven http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractTNEFAttachments.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractTNEFAttachments.java b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractTNEFAttachments.java index a87c62d..e849903 100644 --- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractTNEFAttachments.java +++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractTNEFAttachments.java @@ -16,6 +16,18 @@ */ package org.apache.nifi.processors.email; +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; import org.apache.commons.lang3.StringUtils; import org.apache.nifi.annotation.behavior.EventDriven; import org.apache.nifi.annotation.behavior.InputRequirement; @@ -37,22 +49,9 @@ import org.apache.nifi.processor.Relationship; import org.apache.nifi.processor.exception.FlowFileHandlingException; import org.apache.nifi.processor.io.InputStreamCallback; import org.apache.nifi.processor.io.OutputStreamCallback; -import org.apache.nifi.stream.io.BufferedInputStream; import org.apache.poi.hmef.Attachment; import org.apache.poi.hmef.HMEFMessage; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - @SupportsBatching @EventDriven @@ -192,7 +191,7 @@ public class ExtractTNEFAttachments extends AbstractProcessor { @Override public Set<Relationship> getRelationships() { - return this.RELATIONSHIPS; + return RELATIONSHIPS; } @Override http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/java/org/apache/nifi/processors/email/GenerateAttachment.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/java/org/apache/nifi/processors/email/GenerateAttachment.java b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/java/org/apache/nifi/processors/email/GenerateAttachment.java index 621597f..6bfbc78 100644 --- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/java/org/apache/nifi/processors/email/GenerateAttachment.java +++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/java/org/apache/nifi/processors/email/GenerateAttachment.java @@ -17,16 +17,15 @@ package org.apache.nifi.processors.email; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import javax.mail.MessagingException; +import javax.mail.internet.MimeMessage; import org.apache.commons.mail.Email; import org.apache.commons.mail.EmailAttachment; import org.apache.commons.mail.EmailException; import org.apache.commons.mail.MultiPartEmail; import org.apache.commons.mail.SimpleEmail; -import org.apache.nifi.stream.io.ByteArrayOutputStream; - -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; -import java.io.IOException; public class GenerateAttachment { String from; http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/java/org/apache/nifi/processors/email/TestExtractEmailHeaders.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/java/org/apache/nifi/processors/email/TestExtractEmailHeaders.java b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/java/org/apache/nifi/processors/email/TestExtractEmailHeaders.java index 4cb0009..f1652f4 100644 --- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/java/org/apache/nifi/processors/email/TestExtractEmailHeaders.java +++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/java/org/apache/nifi/processors/email/TestExtractEmailHeaders.java @@ -17,17 +17,16 @@ package org.apache.nifi.processors.email; -import org.apache.nifi.stream.io.ByteArrayOutputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.List; +import javax.mail.MessagingException; +import javax.mail.internet.MimeMessage; import org.apache.nifi.util.MockFlowFile; import org.apache.nifi.util.TestRunner; import org.apache.nifi.util.TestRunners; import org.junit.Test; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; -import java.io.IOException; -import java.util.List; - public class TestExtractEmailHeaders { // Setup the fields to be used... http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/XmlRootNodeHandler.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/XmlRootNodeHandler.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/XmlRootNodeHandler.java index ad4ce39..3dd0152 100644 --- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/XmlRootNodeHandler.java +++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/XmlRootNodeHandler.java @@ -17,14 +17,13 @@ package org.apache.nifi.processors.evtx; -import org.apache.nifi.processors.evtx.parser.bxml.RootNode; -import org.apache.nifi.stream.io.BufferedOutputStream; - +import java.io.BufferedOutputStream; +import java.io.IOException; +import java.io.OutputStream; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import java.io.IOException; -import java.io.OutputStream; +import org.apache.nifi.processors.evtx.parser.bxml.RootNode; public class XmlRootNodeHandler implements RootNodeHandler { public static final String EVENTS = "Events"; http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/BinaryReader.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/BinaryReader.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/BinaryReader.java index e65e9e0..30f7fd4 100644 --- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/BinaryReader.java +++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/BinaryReader.java @@ -19,12 +19,11 @@ package org.apache.nifi.processors.evtx.parser; import com.google.common.primitives.UnsignedInteger; import com.google.common.primitives.UnsignedLong; -import org.apache.commons.io.Charsets; - import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.ByteOrder; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Base64; import java.util.Date; @@ -182,7 +181,7 @@ public class BinaryReader { */ public String readWString(int length) { int numBytes = length * 2; - String result = Charsets.UTF_16LE.decode(ByteBuffer.wrap(bytes, position, numBytes)).toString(); + String result = StandardCharsets.UTF_16LE.decode(ByteBuffer.wrap(bytes, position, numBytes)).toString(); position += numBytes; return result; } http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/bxml/value/WStringArrayTypeNode.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/bxml/value/WStringArrayTypeNode.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/bxml/value/WStringArrayTypeNode.java index b301a60..953199d 100644 --- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/bxml/value/WStringArrayTypeNode.java +++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/bxml/value/WStringArrayTypeNode.java @@ -17,15 +17,14 @@ package org.apache.nifi.processors.evtx.parser.bxml.value; -import org.apache.nifi.processors.evtx.parser.BinaryReader; -import org.apache.nifi.processors.evtx.parser.ChunkHeader; -import org.apache.nifi.processors.evtx.parser.bxml.BxmlNode; -import org.apache.nifi.stream.io.ByteArrayOutputStream; - +import java.io.ByteArrayOutputStream; +import java.io.IOException; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import java.io.IOException; +import org.apache.nifi.processors.evtx.parser.BinaryReader; +import org.apache.nifi.processors.evtx.parser.ChunkHeader; +import org.apache.nifi.processors.evtx.parser.bxml.BxmlNode; /** * Node representing an array of wstring values http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/src/main/java/org/apache/nifi/processors/flume/util/FlowFileEvent.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/src/main/java/org/apache/nifi/processors/flume/util/FlowFileEvent.java b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/src/main/java/org/apache/nifi/processors/flume/util/FlowFileEvent.java index d682946..c9ec3d1 100644 --- a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/src/main/java/org/apache/nifi/processors/flume/util/FlowFileEvent.java +++ b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/src/main/java/org/apache/nifi/processors/flume/util/FlowFileEvent.java @@ -16,7 +16,14 @@ */ package org.apache.nifi.processors.flume.util; +import static org.apache.nifi.processors.flume.util.FlowFileEventConstants.ENTRY_DATE_HEADER; +import static org.apache.nifi.processors.flume.util.FlowFileEventConstants.ID_HEADER; +import static org.apache.nifi.processors.flume.util.FlowFileEventConstants.LAST_QUEUE_DATE_HEADER; +import static org.apache.nifi.processors.flume.util.FlowFileEventConstants.LINEAGE_START_DATE_HEADER; +import static org.apache.nifi.processors.flume.util.FlowFileEventConstants.SIZE_HEADER; + import com.google.common.collect.Maps; +import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -26,13 +33,6 @@ import org.apache.flume.Event; import org.apache.nifi.flowfile.FlowFile; import org.apache.nifi.processor.ProcessSession; import org.apache.nifi.processor.io.InputStreamCallback; -import static org.apache.nifi.processors.flume.util.FlowFileEventConstants.ENTRY_DATE_HEADER; -import static org.apache.nifi.processors.flume.util.FlowFileEventConstants.ID_HEADER; -import static org.apache.nifi.processors.flume.util.FlowFileEventConstants.LAST_QUEUE_DATE_HEADER; -import static org.apache.nifi.processors.flume.util.FlowFileEventConstants.LINEAGE_START_DATE_HEADER; -import static org.apache.nifi.processors.flume.util.FlowFileEventConstants.SIZE_HEADER; - -import org.apache.nifi.stream.io.BufferedInputStream; import org.apache.nifi.stream.io.StreamUtils; public class FlowFileEvent implements Event { http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/DocGeneratorTest.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/DocGeneratorTest.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/DocGeneratorTest.java index a165de1..e3b3ffd 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/DocGeneratorTest.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/DocGeneratorTest.java @@ -16,6 +16,14 @@ */ package org.apache.nifi.documentation; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.Charset; +import java.util.Properties; +import java.util.Set; import org.apache.commons.io.FileUtils; import org.apache.nifi.bundle.Bundle; import org.apache.nifi.bundle.BundleCoordinate; @@ -29,14 +37,6 @@ import org.junit.Assert; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.Properties; -import java.util.Set; - public class DocGeneratorTest { @Test @@ -63,7 +63,7 @@ public class DocGeneratorTest { File processorDirectory = new File(temporaryFolder.getRoot(), path); File indexHtml = new File(processorDirectory, "index.html"); Assert.assertTrue(indexHtml + " should have been generated", indexHtml.exists()); - String generatedHtml = FileUtils.readFileToString(indexHtml); + String generatedHtml = FileUtils.readFileToString(indexHtml, Charset.defaultCharset()); Assert.assertNotNull(generatedHtml); Assert.assertTrue(generatedHtml.contains("This example processor loads a resource from the nar and writes it to the FlowFile content")); Assert.assertTrue(generatedHtml.contains("files that were successfully processed")); http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/example/FullyDocumentedProcessor.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/example/FullyDocumentedProcessor.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/example/FullyDocumentedProcessor.java index efd8e99..d4fdb12 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/example/FullyDocumentedProcessor.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/example/FullyDocumentedProcessor.java @@ -16,6 +16,11 @@ */ package org.apache.nifi.documentation.example; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import org.apache.nifi.annotation.behavior.DynamicProperty; import org.apache.nifi.annotation.behavior.DynamicRelationship; import org.apache.nifi.annotation.behavior.InputRequirement; @@ -46,12 +51,6 @@ import org.apache.nifi.processor.Relationship; import org.apache.nifi.processor.exception.ProcessException; import org.apache.nifi.processor.util.StandardValidators; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - @Tags({"one", "two", "three"}) @CapabilityDescription("This is a processor that is used to test documentation.") @WritesAttributes({ @@ -104,6 +103,7 @@ public class FullyDocumentedProcessor extends AbstractProcessor { .defaultValue("0 sec") .build(); + @SuppressWarnings("deprecation") public static final PropertyDescriptor OPTIONAL_PROPERTY = new PropertyDescriptor.Builder() .name("Optional Property") .description("This is a property you can use or not") @@ -111,6 +111,7 @@ public class FullyDocumentedProcessor extends AbstractProcessor { .expressionLanguageSupported(true) // test documentation of deprecated method .build(); + @SuppressWarnings("deprecation") public static final PropertyDescriptor TYPE_PROPERTY = new PropertyDescriptor.Builder() .name("Type") .description("This is the type of something that you can choose. It has several possible values") http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/flow/PopularVoteFlowElectionFactoryBean.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/flow/PopularVoteFlowElectionFactoryBean.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/flow/PopularVoteFlowElectionFactoryBean.java index 09d3845..641d767 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/flow/PopularVoteFlowElectionFactoryBean.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/flow/PopularVoteFlowElectionFactoryBean.java @@ -18,7 +18,6 @@ package org.apache.nifi.cluster.coordination.flow; import java.util.concurrent.TimeUnit; - import org.apache.nifi.encrypt.StringEncryptor; import org.apache.nifi.fingerprint.FingerprintFactory; import org.apache.nifi.util.FormatUtils; @@ -44,8 +43,10 @@ public class PopularVoteFlowElectionFactoryBean implements FactoryBean<PopularVo } final Integer maxNodes = properties.getFlowElectionMaxCandidates(); - - final StringEncryptor encryptor = StringEncryptor.createEncryptor(properties); + final String algorithm = properties.getProperty(NiFiProperties.SENSITIVE_PROPS_ALGORITHM); + final String provider = properties.getProperty(NiFiProperties.SENSITIVE_PROPS_PROVIDER); + final String password = properties.getProperty(NiFiProperties.SENSITIVE_PROPS_KEY); + final StringEncryptor encryptor = StringEncryptor.createEncryptor(algorithm, provider, password); final FingerprintFactory fingerprintFactory = new FingerprintFactory(encryptor); return new PopularVoteFlowElection(maxWaitMillis, TimeUnit.MILLISECONDS, maxNodes, fingerprintFactory); } http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/coordination/flow/TestPopularVoteFlowElection.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/coordination/flow/TestPopularVoteFlowElection.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/coordination/flow/TestPopularVoteFlowElection.java index 95e9f5f..1915b9b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/coordination/flow/TestPopularVoteFlowElection.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/coordination/flow/TestPopularVoteFlowElection.java @@ -32,7 +32,6 @@ import java.nio.file.Paths; import java.util.HashSet; import java.util.UUID; import java.util.concurrent.TimeUnit; - import org.apache.nifi.cluster.protocol.DataFlow; import org.apache.nifi.cluster.protocol.NodeIdentifier; import org.apache.nifi.cluster.protocol.StandardDataFlow; @@ -46,6 +45,19 @@ import org.mockito.stubbing.Answer; public class TestPopularVoteFlowElection { + /** + * Utility method which accepts {@link NiFiProperties} object but calls {@link StringEncryptor#createEncryptor(String, String, String)} with extracted properties. + * + * @param nifiProperties the NiFiProperties object + * @return the StringEncryptor + */ + private StringEncryptor createEncryptorFromProperties(NiFiProperties nifiProperties) { + final String algorithm = nifiProperties.getProperty(NiFiProperties.SENSITIVE_PROPS_ALGORITHM); + final String provider = nifiProperties.getProperty(NiFiProperties.SENSITIVE_PROPS_PROVIDER); + final String password = nifiProperties.getProperty(NiFiProperties.SENSITIVE_PROPS_KEY, "nififtw!"); + return StringEncryptor.createEncryptor(algorithm, provider, password); + } + @Test public void testOnlyEmptyFlows() throws IOException { final FingerprintFactory fingerprintFactory = Mockito.mock(FingerprintFactory.class); @@ -141,7 +153,7 @@ public class TestPopularVoteFlowElection { @Test public void testAutoGeneratedVsPopulatedFlowElection() throws IOException { - final FingerprintFactory fingerprintFactory = new FingerprintFactory(StringEncryptor.createEncryptor(getNiFiProperties())); + final FingerprintFactory fingerprintFactory = new FingerprintFactory(createEncryptorFromProperties(getNiFiProperties())); final PopularVoteFlowElection election = new PopularVoteFlowElection(1, TimeUnit.MINUTES, 4, fingerprintFactory); final byte[] emptyFlow = Files.readAllBytes(Paths.get("src/test/resources/conf/auto-generated-empty-flow.xml")); final byte[] nonEmptyFlow = Files.readAllBytes(Paths.get("src/test/resources/conf/reporting-task-flow.xml")); @@ -170,7 +182,7 @@ public class TestPopularVoteFlowElection { @Test public void testDifferentPopulatedFlowsElection() throws IOException { - final FingerprintFactory fingerprintFactory = new FingerprintFactory(StringEncryptor.createEncryptor(getNiFiProperties())); + final FingerprintFactory fingerprintFactory = new FingerprintFactory(createEncryptorFromProperties(getNiFiProperties())); final PopularVoteFlowElection election = new PopularVoteFlowElection(1, TimeUnit.MINUTES, 4, fingerprintFactory); final byte[] nonEmptyCandidateA = Files.readAllBytes(Paths.get("src/test/resources/conf/controller-service-flow.xml")); final byte[] nonEmptyCandidateB = Files.readAllBytes(Paths.get("src/test/resources/conf/reporting-task-flow.xml")); http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/integration/Cluster.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/integration/Cluster.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/integration/Cluster.java index 63c3f60..dab073d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/integration/Cluster.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/integration/Cluster.java @@ -24,7 +24,6 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; - import org.apache.curator.RetryPolicy; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; @@ -131,7 +130,11 @@ public class Cluster { final NiFiProperties nifiProperties = NiFiProperties.createBasicNiFiProperties("src/test/resources/conf/nifi.properties", addProps); - final FingerprintFactory fingerprintFactory = new FingerprintFactory(StringEncryptor.createEncryptor(nifiProperties)); + final String algorithm = nifiProperties.getProperty(NiFiProperties.SENSITIVE_PROPS_ALGORITHM); + final String provider = nifiProperties.getProperty(NiFiProperties.SENSITIVE_PROPS_PROVIDER); + final String password = nifiProperties.getProperty(NiFiProperties.SENSITIVE_PROPS_KEY); + final StringEncryptor encryptor = StringEncryptor.createEncryptor(algorithm, provider, password); + final FingerprintFactory fingerprintFactory = new FingerprintFactory(encryptor); final FlowElection flowElection = new PopularVoteFlowElection(flowElectionTimeoutMillis, TimeUnit.MILLISECONDS, flowElectionMaxNodes, fingerprintFactory); final Node node = new Node(nifiProperties, flowElection); http://git-wip-us.apache.org/repos/asf/nifi/blob/f60585a9/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/integration/Node.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/integration/Node.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/integration/Node.java index 44d4905..e0d8a97 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/integration/Node.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/integration/Node.java @@ -28,7 +28,6 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; - import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.nifi.authorization.Authorizer; import org.apache.nifi.bundle.Bundle; @@ -137,6 +136,19 @@ public class Node { return new NodeIdentifier(UUID.randomUUID().toString(), "localhost", createPort(), "localhost", createPort(), "localhost", null, null, false, null); } + /** + * Utility method which accepts {@link NiFiProperties} object but calls {@link StringEncryptor#createEncryptor(String, String, String)} with extracted properties. + * + * @param nifiProperties the NiFiProperties object + * @return the StringEncryptor + */ + private StringEncryptor createEncryptorFromProperties(NiFiProperties nifiProperties) { + final String algorithm = nifiProperties.getProperty(NiFiProperties.SENSITIVE_PROPS_ALGORITHM); + final String provider = nifiProperties.getProperty(NiFiProperties.SENSITIVE_PROPS_PROVIDER); + final String password = nifiProperties.getProperty(NiFiProperties.SENSITIVE_PROPS_KEY); + return StringEncryptor.createEncryptor(algorithm, provider, password); + } + public synchronized void start() { running = true; @@ -147,7 +159,7 @@ public class Node { final HeartbeatMonitor heartbeatMonitor = createHeartbeatMonitor(); flowController = FlowController.createClusteredInstance(Mockito.mock(FlowFileEventRepository.class), nodeProperties, - null, null, StringEncryptor.createEncryptor(nodeProperties), protocolSender, Mockito.mock(BulletinRepository.class), clusterCoordinator, + null, null, createEncryptorFromProperties(nodeProperties), protocolSender, Mockito.mock(BulletinRepository.class), clusterCoordinator, heartbeatMonitor, electionManager, VariableRegistry.EMPTY_REGISTRY, Mockito.mock(FlowRegistryClient.class)); try { @@ -161,7 +173,7 @@ public class Node { flowController.getStateManagerProvider().getStateManager("Cluster Node Configuration").setState(Collections.singletonMap("Node UUID", nodeId.getId()), Scope.LOCAL); flowService = StandardFlowService.createClusteredInstance(flowController, nodeProperties, senderListener, clusterCoordinator, - StringEncryptor.createEncryptor(nodeProperties), revisionManager, Mockito.mock(Authorizer.class)); + createEncryptorFromProperties(nodeProperties), revisionManager, Mockito.mock(Authorizer.class)); flowService.start();
