Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-189 Collapsed several commons libs into one

This commit is contained in:
joewitt 2014-12-20 00:40:14 -05:00
parent c0e4618d42
commit 1357a17b67
153 changed files with 205 additions and 501 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
commons/core-flowfile-attributes/pom.xml
View File

@ -1,29 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-core-flowfile-attributes</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>NiFi: Core FlowFile Attributes</name>
</project>

2
commons/data-provenance-utils/pom.xml
View File

@ -34,7 +34,7 @@
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-core-flowfile-attributes</artifactId>
<artifactId>nifi-utils</artifactId>
</dependency>
</dependencies>
</project>

30
commons/naive-search-ring-buffer/pom.xml
View File

@ -1,30 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>naive-search-ring-buffer</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>NiFi Ring Buffer</name>
</project>

35
commons/nifi-file-utils/pom.xml
View File

@ -1,35 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-file-utils</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>NiFi File Utils</name>
<dependencies>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
</dependencies>
</project>

1
commons/nifi-stream-utils/.gitignore vendored
View File

@ -1 +0,0 @@
/target

30
commons/nifi-stream-utils/pom.xml
View File

@ -1,30 +0,0 @@
<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-stream-utils</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>NiFi Stream Utils</name>
</project>

4
commons/nifi-utils/pom.xml
View File

@ -26,4 +26,8 @@
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>NiFi Utils</name>
<!--
This project intentionally has no additional dependencies beyond that pulled in by the parent. It is a general purpose utility library
and should keep its surface/tension minimal.
-->
</project>

0
commons/core-flowfile-attributes/src/main/java/org/apache/nifi/flowfile/attributes/CoreAttributes.java → commons/nifi-utils/src/main/java/org/apache/nifi/flowfile/attributes/CoreAttributes.java
View File

0
commons/core-flowfile-attributes/src/main/java/org/apache/nifi/flowfile/attributes/FlowFileAttributeKey.java → commons/nifi-utils/src/main/java/org/apache/nifi/flowfile/attributes/FlowFileAttributeKey.java
View File

0
commons/remote-communications-utils/src/main/java/org/apache/nifi/remote/StandardVersionNegotiator.java → commons/nifi-utils/src/main/java/org/apache/nifi/remote/StandardVersionNegotiator.java
View File

0
commons/remote-communications-utils/src/main/java/org/apache/nifi/remote/VersionNegotiator.java → commons/nifi-utils/src/main/java/org/apache/nifi/remote/VersionNegotiator.java
View File

0
commons/remote-communications-utils/src/main/java/org/apache/nifi/remote/exception/TransmissionDisabledException.java → commons/nifi-utils/src/main/java/org/apache/nifi/remote/exception/TransmissionDisabledException.java
View File

0
commons/remote-communications-utils/src/main/java/org/apache/nifi/remote/io/CompressionInputStream.java → commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/CompressionInputStream.java
View File

0
commons/remote-communications-utils/src/main/java/org/apache/nifi/remote/io/CompressionOutputStream.java → commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/CompressionOutputStream.java
View File

0
commons/remote-communications-utils/src/main/java/org/apache/nifi/remote/io/InterruptableInputStream.java → commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/InterruptableInputStream.java
View File

0
commons/remote-communications-utils/src/main/java/org/apache/nifi/remote/io/InterruptableOutputStream.java → commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/InterruptableOutputStream.java
View File

0
commons/remote-communications-utils/src/main/java/org/apache/nifi/remote/io/socket/BufferStateManager.java → commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/BufferStateManager.java
View File

0
commons/remote-communications-utils/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelInputStream.java → commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelInputStream.java
View File

0
commons/remote-communications-utils/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelOutputStream.java → commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelOutputStream.java
View File

0
commons/remote-communications-utils/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannel.java → commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannel.java
View File

0
commons/remote-communications-utils/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelInputStream.java → commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelInputStream.java
View File

0
commons/remote-communications-utils/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelOutputStream.java → commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelOutputStream.java
View File

2
commons/nifi-stream-utils/src/main/java/org/apache/nifi/io/BufferedInputStream.java → commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/BufferedInputStream.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.io;
package org.apache.nifi.stream.io;
import java.io.InputStream;

2
commons/nifi-stream-utils/src/main/java/org/apache/nifi/io/BufferedOutputStream.java → commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/BufferedOutputStream.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.io;
package org.apache.nifi.stream.io;
import java.io.FilterOutputStream;
import java.io.IOException;

2
commons/nifi-stream-utils/src/main/java/org/apache/nifi/io/ByteArrayInputStream.java → commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ByteArrayInputStream.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.io;
package org.apache.nifi.stream.io;
import java.io.InputStream;

2
commons/nifi-stream-utils/src/main/java/org/apache/nifi/io/ByteArrayOutputStream.java → commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ByteArrayOutputStream.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.io;
package org.apache.nifi.stream.io;
import java.io.IOException;
import java.io.OutputStream;

2
commons/nifi-stream-utils/src/main/java/org/apache/nifi/io/ByteCountingInputStream.java → commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ByteCountingInputStream.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.io;
package org.apache.nifi.stream.io;
import java.io.IOException;
import java.io.InputStream;

2
commons/nifi-stream-utils/src/main/java/org/apache/nifi/io/ByteCountingOutputStream.java → commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ByteCountingOutputStream.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.io;
package org.apache.nifi.stream.io;
import java.io.IOException;
import java.io.OutputStream;

2
commons/nifi-stream-utils/src/main/java/org/apache/nifi/io/DataOutputStream.java → commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/DataOutputStream.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.io;
package org.apache.nifi.stream.io;
import java.io.DataOutput;
import java.io.FilterOutputStream;

2
commons/nifi-stream-utils/src/main/java/org/apache/nifi/io/GZIPOutputStream.java → commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/GZIPOutputStream.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.io;
package org.apache.nifi.stream.io;
import java.io.IOException;
import java.io.OutputStream;

2
commons/nifi-stream-utils/src/main/java/org/apache/nifi/io/LeakyBucketStreamThrottler.java → commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/LeakyBucketStreamThrottler.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.io;
package org.apache.nifi.stream.io;
import java.io.IOException;
import java.io.InputStream;

2
commons/nifi-stream-utils/src/main/java/org/apache/nifi/io/NonCloseableInputStream.java → commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/NonCloseableInputStream.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.io;
package org.apache.nifi.stream.io;
import java.io.FilterInputStream;
import java.io.IOException;

2
commons/nifi-stream-utils/src/main/java/org/apache/nifi/io/NonCloseableOutputStream.java → commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/NonCloseableOutputStream.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.io;
package org.apache.nifi.stream.io;
import java.io.FilterOutputStream;
import java.io.IOException;

2
commons/nifi-stream-utils/src/main/java/org/apache/nifi/io/NullOutputStream.java → commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/NullOutputStream.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.io;
package org.apache.nifi.stream.io;
import java.io.IOException;
import java.io.OutputStream;

2
commons/nifi-stream-utils/src/main/java/org/apache/nifi/io/StreamThrottler.java → commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/StreamThrottler.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.io;
package org.apache.nifi.stream.io;
import java.io.Closeable;
import java.io.IOException;

6
commons/nifi-stream-utils/src/main/java/org/apache/nifi/io/StreamUtils.java → commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/StreamUtils.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.io;
package org.apache.nifi.stream.io;
import java.io.EOFException;
import java.io.IOException;
@ -23,8 +23,8 @@ import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
import org.apache.nifi.io.exception.BytePatternNotFoundException;
import org.apache.nifi.io.util.NonThreadSafeCircularBuffer;
import org.apache.nifi.stream.io.exception.BytePatternNotFoundException;
import org.apache.nifi.stream.io.util.NonThreadSafeCircularBuffer;
public class StreamUtils {

2
commons/nifi-stream-utils/src/main/java/org/apache/nifi/io/ZipOutputStream.java → commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ZipOutputStream.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.io;
package org.apache.nifi.stream.io;
import java.io.OutputStream;

2
commons/nifi-stream-utils/src/main/java/org/apache/nifi/io/exception/BytePatternNotFoundException.java → commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/exception/BytePatternNotFoundException.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.io.exception;
package org.apache.nifi.stream.io.exception;
import java.io.IOException;

2
commons/nifi-stream-utils/src/main/java/org/apache/nifi/io/util/NonThreadSafeCircularBuffer.java → commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/util/NonThreadSafeCircularBuffer.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.io.util;
package org.apache.nifi.stream.io.util;
import java.util.Arrays;

0
commons/naive-search-ring-buffer/src/main/java/org/apache/nifi/util/NaiveSearchRingBuffer.java → commons/nifi-utils/src/main/java/org/apache/nifi/util/NaiveSearchRingBuffer.java
View File

25
commons/nifi-file-utils/src/main/java/org/apache/nifi/file/FileUtils.java → commons/nifi-utils/src/main/java/org/apache/nifi/util/file/FileUtils.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.file;
package org.apache.nifi.util.file;
import java.io.BufferedInputStream;
import java.io.Closeable;
@ -30,11 +30,12 @@ import java.nio.channels.FileChannel;
import java.nio.channels.FileLock;
import java.nio.file.Files;
import java.nio.file.Path;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Random;
import org.apache.commons.codec.digest.DigestUtils;
import org.slf4j.Logger;
@ -601,12 +602,22 @@ public class FileUtils {
* @throws IOException if the MD5 hash could not be computed
*/
public static byte[] computeMd5Digest(final File file) throws IOException {
BufferedInputStream bis = null;
final MessageDigest digest;
try {
bis = new BufferedInputStream(new FileInputStream(file));
return DigestUtils.md5(bis);
} finally {
FileUtils.closeQuietly(bis);
digest = MessageDigest.getInstance("MD5");
} catch (final NoSuchAlgorithmException nsae) {
throw new IOException(nsae);
}
try (final FileInputStream fis = new FileInputStream(file)) {
int len;
final byte[] buffer = new byte[8192];
while ((len = fis.read(buffer)) > -1) {
if (len > 0) {
digest.update(buffer, 0, len);
}
}
}
return digest.digest();
}
}

2
commons/nifi-utils/src/main/java/org/apache/nifi/io/CompoundUpdateMonitor.java → commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/CompoundUpdateMonitor.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.io;
package org.apache.nifi.util.file.monitor;
import java.io.IOException;
import java.nio.file.Path;

2
commons/nifi-utils/src/main/java/org/apache/nifi/io/LastModifiedMonitor.java → commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/LastModifiedMonitor.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.io;
package org.apache.nifi.util.file.monitor;
import java.io.IOException;
import java.nio.file.Files;

6
commons/nifi-utils/src/main/java/org/apache/nifi/io/MD5SumMonitor.java → commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/MD5SumMonitor.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.io;
package org.apache.nifi.util.file.monitor;
import java.io.FileInputStream;
import java.io.IOException;
@ -37,10 +37,12 @@ public class MD5SumMonitor implements UpdateMonitor {
try (final FileInputStream fis = new FileInputStream(path.toFile())) {
int len;
final byte[] buffer = new byte[8192];
while ((len = fis.read(buffer)) > 0) {
while ((len = fis.read(buffer)) > -1) {
if (len > 0) {
digest.update(buffer, 0, len);
}
}
}
// Return a ByteBuffer instead of byte[] because we want equals() to do a deep equality
return ByteBuffer.wrap(digest.digest());

2
commons/nifi-utils/src/main/java/org/apache/nifi/io/SynchronousFileWatcher.java → commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/SynchronousFileWatcher.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.io;
package org.apache.nifi.util.file.monitor;
import java.io.IOException;
import java.nio.file.Path;

2
commons/nifi-utils/src/main/java/org/apache/nifi/io/UpdateMonitor.java → commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/UpdateMonitor.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.io;
package org.apache.nifi.util.file.monitor;
import java.io.IOException;
import java.nio.file.Path;

0
commons/search-utils/src/main/java/org/apache/nifi/util/search/Search.java → commons/nifi-utils/src/main/java/org/apache/nifi/util/search/Search.java
View File

0
commons/search-utils/src/main/java/org/apache/nifi/util/search/SearchTerm.java → commons/nifi-utils/src/main/java/org/apache/nifi/util/search/SearchTerm.java
View File

0
commons/search-utils/src/main/java/org/apache/nifi/util/search/ahocorasick/AhoCorasick.java → commons/nifi-utils/src/main/java/org/apache/nifi/util/search/ahocorasick/AhoCorasick.java
View File

0
commons/search-utils/src/main/java/org/apache/nifi/util/search/ahocorasick/Node.java → commons/nifi-utils/src/main/java/org/apache/nifi/util/search/ahocorasick/Node.java
View File

0
commons/search-utils/src/main/java/org/apache/nifi/util/search/ahocorasick/SearchState.java → commons/nifi-utils/src/main/java/org/apache/nifi/util/search/ahocorasick/SearchState.java
View File

0
commons/remote-communications-utils/src/test/java/org/apache/nifi/remote/io/TestCompressionInputOutputStreams.java → commons/nifi-utils/src/test/java/org/apache/nifi/remote/io/TestCompressionInputOutputStreams.java
View File

5
commons/nifi-stream-utils/src/test/java/org/apache/nifi/io/TestLeakyBucketThrottler.java → commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/TestLeakyBucketThrottler.java
View File

@ -14,8 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.io;
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;

0
commons/naive-search-ring-buffer/src/test/java/org/apache/nifi/util/TestNaiveSearchRingBuffer.java → commons/nifi-utils/src/test/java/org/apache/nifi/util/TestNaiveSearchRingBuffer.java
View File

6
commons/nifi-utils/src/test/java/org/apache/nifi/util/timebuffer/TestCompoundUpdateMonitor.java → commons/nifi-utils/src/test/java/org/apache/nifi/util/file/monitor/TestCompoundUpdateMonitor.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.util.timebuffer;
package org.apache.nifi.util.file.monitor;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
@ -27,10 +27,6 @@ import java.io.OutputStream;
import java.nio.file.Path;
import java.util.UUID;
import org.apache.nifi.io.CompoundUpdateMonitor;
import org.apache.nifi.io.LastModifiedMonitor;
import org.apache.nifi.io.MD5SumMonitor;
import org.apache.nifi.io.UpdateMonitor;
import org.junit.Test;

5
commons/nifi-utils/src/test/java/org/apache/nifi/util/timebuffer/TestSynchronousFileWatcher.java → commons/nifi-utils/src/test/java/org/apache/nifi/util/file/monitor/TestSynchronousFileWatcher.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.util.timebuffer;
package org.apache.nifi.util.file.monitor;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@ -30,9 +30,6 @@ import java.nio.file.StandardCopyOption;
import org.junit.Test;
import org.apache.nifi.io.MD5SumMonitor;
import org.apache.nifi.io.SynchronousFileWatcher;
import org.apache.nifi.io.UpdateMonitor;
public class TestSynchronousFileWatcher {

18
commons/nifi-stream-utils/src/test/resources/logback-test.xml → commons/nifi-utils/src/test/resources/logback-test.xml
View File

@ -24,25 +24,9 @@
<!-- valid logging levels: TRACE, DEBUG, INFO, WARN, ERROR -->
<logger name="org.apache.nifi" level="DEBUG"/>
<!-- Logger for managing logging statements for nifi clusters. -->
<logger name="org.apache.nifi.cluster" level="INFO"/>
<!--
Logger for logging HTTP requests received by the web server. Setting
log level to 'debug' activates HTTP request logging.
-->
<logger name="org.apache.nifi.server.JettyServer" level="INFO"/>
<!-- Logger for managing logging statements for jetty -->
<logger name="org.mortbay" level="INFO"/>
<!-- Suppress non-error messages due to excessive logging by class -->
<logger name="com.sun.jersey.spi.container.servlet.WebComponent" level="ERROR"/>
<logger name="org.apache.nifi.processors.standard" level="DEBUG"/>
<root level="INFO">
<appender-ref ref="CONSOLE"/>
</root>
</configuration>

6
commons/pom.xml
View File

@ -29,22 +29,16 @@
<name>NiFi :: Commons Parent</name>
<modules>
<module>core-flowfile-attributes</module>
<module>data-provenance-utils</module>
<module>flowfile-packager</module>
<module>naive-search-ring-buffer</module>
<module>nifi-expression-language</module>
<module>nifi-file-utils</module>
<module>nifi-logging-utils</module>
<module>nifi-properties</module>
<module>nifi-security-utils</module>
<module>nifi-socket-utils</module>
<module>nifi-stream-utils</module>
<module>nifi-utils</module>
<module>nifi-web-utils</module>
<module>processor-utilities</module>
<module>remote-communications-utils</module>
<module>search-utils</module>
<module>wali</module>
</modules>
</project>

29
commons/remote-communications-utils/pom.xml
View File

@ -1,29 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>remote-communications-utils</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>remote-communications-utils</name>
</project>

30
commons/search-utils/pom.xml
View File

@ -1,30 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-search-utils</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>search-utils</name>
</project>

2
commons/wali/pom.xml
View File

@ -35,7 +35,7 @@
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-stream-utils</artifactId>
<artifactId>nifi-utils</artifactId>
</dependency>
</dependencies>
</project>

4
commons/wali/src/main/java/org/wali/MinimalLockingWriteAheadLog.java
View File

@ -58,8 +58,8 @@ import java.util.concurrent.locks.ReentrantLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.regex.Pattern;
import org.apache.nifi.io.BufferedInputStream;
import org.apache.nifi.io.BufferedOutputStream;
import org.apache.nifi.stream.io.BufferedInputStream;
import org.apache.nifi.stream.io.BufferedOutputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
nar-bundles/framework-bundle/framework/cluster/pom.xml
View File

@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-file-utils</artifactId>
<artifactId>nifi-utils</artifactId>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>

2
nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/firewall/impl/FileBasedClusterNodeFirewall.java
View File

@ -22,7 +22,7 @@ import java.net.UnknownHostException;
import java.util.*;
import org.apache.commons.net.util.SubnetUtils;
import org.apache.nifi.cluster.firewall.ClusterNodeFirewall;
import org.apache.nifi.file.FileUtils;
import org.apache.nifi.util.file.FileUtils;
import org.apache.nifi.logging.NiFiLog;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

10
nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/impl/DataFlowDaoImpl.java
View File

@ -48,11 +48,11 @@ import org.apache.nifi.cluster.protocol.DataFlow;
import org.apache.nifi.cluster.protocol.NodeIdentifier;
import org.apache.nifi.cluster.protocol.StandardDataFlow;
import org.apache.nifi.cluster.protocol.jaxb.message.NodeIdentifierAdapter;
import org.apache.nifi.file.FileUtils;
import org.apache.nifi.io.BufferedInputStream;
import org.apache.nifi.io.BufferedOutputStream;
import org.apache.nifi.io.ByteArrayInputStream;
import org.apache.nifi.io.StreamUtils;
import org.apache.nifi.util.file.FileUtils;
import org.apache.nifi.stream.io.BufferedInputStream;
import org.apache.nifi.stream.io.BufferedOutputStream;
import org.apache.nifi.stream.io.ByteArrayInputStream;
import org.apache.nifi.stream.io.StreamUtils;
import org.apache.nifi.logging.NiFiLog;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;

3
nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/firewall/impl/FileBasedClusterNodeFirewallTest.java
View File

@ -16,10 +16,9 @@
*/
package org.apache.nifi.cluster.firewall.impl;
import org.apache.nifi.cluster.firewall.impl.FileBasedClusterNodeFirewall;
import java.io.File;
import java.io.IOException;
import org.apache.nifi.file.FileUtils;
import org.apache.nifi.util.file.FileUtils;
import org.junit.After;
import org.junit.Before;
import static org.junit.Assert.*;

6
nar-bundles/framework-bundle/framework/core-api/pom.xml
View File

@ -30,7 +30,7 @@
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>remote-communications-utils</artifactId>
<artifactId>nifi-utils</artifactId>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
@ -48,10 +48,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>

8
nar-bundles/framework-bundle/framework/core/pom.xml
View File

@ -40,10 +40,6 @@
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-file-utils</artifactId>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-properties</artifactId>
@ -52,10 +48,6 @@
<groupId>org.apache.nifi</groupId>
<artifactId>site-to-site</artifactId>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-core-flowfile-attributes</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>

2
nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java
View File

@ -62,7 +62,7 @@ import org.apache.nifi.controller.repository.claim.ContentClaim;
import org.apache.nifi.controller.repository.claim.ContentClaimManager;
import org.apache.nifi.engine.FlowEngine;
import org.apache.nifi.events.EventReporter;
import org.apache.nifi.io.BufferedOutputStream;
import org.apache.nifi.stream.io.BufferedOutputStream;
import org.apache.nifi.processor.QueueSize;
import org.apache.nifi.reporting.Severity;
import org.apache.nifi.util.FormatUtils;

2
nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
View File

@ -125,7 +125,7 @@ import org.apache.nifi.groups.ProcessGroup;
import org.apache.nifi.groups.RemoteProcessGroup;
import org.apache.nifi.groups.RemoteProcessGroupPortDescriptor;
import org.apache.nifi.groups.StandardProcessGroup;
import org.apache.nifi.io.StreamUtils;
import org.apache.nifi.stream.io.StreamUtils;
import org.apache.nifi.logging.LogLevel;
import org.apache.nifi.logging.LogRepository;
import org.apache.nifi.logging.LogRepositoryFactory;

2
nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowUnmarshaller.java
View File

@ -26,7 +26,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.nifi.encrypt.StringEncryptor;
import org.apache.nifi.io.ByteArrayInputStream;
import org.apache.nifi.stream.io.ByteArrayInputStream;
import org.apache.nifi.web.api.dto.FlowSnippetDTO;
import org.apache.nifi.web.api.dto.ProcessGroupDTO;

8
nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/SnippetManager.java
View File

@ -25,10 +25,10 @@ import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.apache.nifi.io.ByteArrayInputStream;
import org.apache.nifi.io.ByteArrayOutputStream;
import org.apache.nifi.io.DataOutputStream;
import org.apache.nifi.io.StreamUtils;
import org.apache.nifi.stream.io.ByteArrayInputStream;
import org.apache.nifi.stream.io.ByteArrayOutputStream;
import org.apache.nifi.stream.io.DataOutputStream;
import org.apache.nifi.stream.io.StreamUtils;
import org.apache.nifi.persistence.StandardSnippetDeserializer;
import org.apache.nifi.persistence.StandardSnippetSerializer;

2
nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
View File

@ -59,7 +59,7 @@ import org.apache.nifi.cluster.protocol.message.ReconnectionRequestMessage;
import org.apache.nifi.cluster.protocol.message.ReconnectionResponseMessage;
import org.apache.nifi.engine.FlowEngine;
import org.apache.nifi.events.BulletinFactory;
import org.apache.nifi.file.FileUtils;
import org.apache.nifi.util.file.FileUtils;
import org.apache.nifi.groups.ProcessGroup;
import org.apache.nifi.lifecycle.LifeCycleStartException;
import org.apache.nifi.logging.LogLevel;

2
nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
View File

@ -52,7 +52,7 @@ import org.apache.nifi.connectable.Size;
import org.apache.nifi.controller.exception.ProcessorInstantiationException;
import org.apache.nifi.controller.label.Label;
import org.apache.nifi.events.BulletinFactory;
import org.apache.nifi.file.FileUtils;
import org.apache.nifi.util.file.FileUtils;
import org.apache.nifi.fingerprint.FingerprintException;
import org.apache.nifi.fingerprint.FingerprintFactory;
import org.apache.nifi.flowfile.FlowFilePrioritizer;

8
nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/TemplateManager.java
View File

@ -42,10 +42,10 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.nifi.io.ByteArrayInputStream;
import org.apache.nifi.io.ByteArrayOutputStream;
import org.apache.nifi.io.DataOutputStream;
import org.apache.nifi.io.StreamUtils;
import org.apache.nifi.stream.io.ByteArrayInputStream;
import org.apache.nifi.stream.io.ByteArrayOutputStream;
import org.apache.nifi.stream.io.DataOutputStream;
import org.apache.nifi.stream.io.StreamUtils;
import org.apache.nifi.persistence.TemplateDeserializer;
import org.apache.nifi.persistence.TemplateSerializer;
import org.apache.nifi.web.api.dto.ConnectableDTO;

4
nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
View File

@ -65,8 +65,8 @@ import org.apache.nifi.controller.repository.claim.ContentClaim;
import org.apache.nifi.controller.repository.claim.ContentClaimManager;
import org.apache.nifi.controller.repository.io.SyncOnCloseOutputStream;
import org.apache.nifi.engine.FlowEngine;
import org.apache.nifi.file.FileUtils;
import org.apache.nifi.io.StreamUtils;
import org.apache.nifi.util.file.FileUtils;
import org.apache.nifi.stream.io.StreamUtils;
import org.apache.nifi.util.FormatUtils;
import org.apache.nifi.util.LongHolder;
import org.apache.nifi.util.NiFiProperties;

6
nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
View File

@ -53,9 +53,9 @@ import org.apache.nifi.controller.repository.io.LimitedInputStream;
import org.apache.nifi.controller.repository.io.LongHolder;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.io.BufferedOutputStream;
import org.apache.nifi.io.NonCloseableInputStream;
import org.apache.nifi.io.StreamUtils;
import org.apache.nifi.stream.io.BufferedOutputStream;
import org.apache.nifi.stream.io.NonCloseableInputStream;
import org.apache.nifi.stream.io.StreamUtils;
import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.processor.FlowFileFilter;
import org.apache.nifi.processor.ProcessSession;

4
nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
View File

@ -44,8 +44,8 @@ import org.apache.nifi.controller.repository.claim.StandardContentClaim;
import org.apache.nifi.controller.repository.io.ArrayManagedOutputStream;
import org.apache.nifi.controller.repository.io.MemoryManager;
import org.apache.nifi.engine.FlowEngine;
import org.apache.nifi.io.ByteArrayInputStream;
import org.apache.nifi.io.StreamUtils;
import org.apache.nifi.stream.io.ByteArrayInputStream;
import org.apache.nifi.stream.io.StreamUtils;
import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.util.NiFiProperties;

2
nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/ControllerServiceLoader.java
View File

@ -36,7 +36,7 @@ import javax.xml.parsers.ParserConfigurationException;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
import org.apache.nifi.file.FileUtils;
import org.apache.nifi.util.file.FileUtils;
import org.apache.nifi.util.DomUtils;
import org.apache.commons.logging.Log;

2
nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/StandardXMLFlowConfigurationDAO.java
View File

@ -57,7 +57,7 @@ import org.apache.nifi.controller.reporting.StandardReportingInitializationConte
import org.apache.nifi.controller.service.ControllerServiceLoader;
import org.apache.nifi.controller.service.ControllerServiceNode;
import org.apache.nifi.encrypt.StringEncryptor;
import org.apache.nifi.file.FileUtils;
import org.apache.nifi.util.file.FileUtils;
import org.apache.nifi.nar.NarCloseable;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.reporting.ReportingInitializationContext;

2
nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/remote/StandardRemoteProcessGroup.java
View File

@ -72,7 +72,7 @@ import org.apache.nifi.groups.ProcessGroup;
import org.apache.nifi.groups.ProcessGroupCounts;
import org.apache.nifi.groups.RemoteProcessGroup;
import org.apache.nifi.groups.RemoteProcessGroupPortDescriptor;
import org.apache.nifi.io.BufferedOutputStream;
import org.apache.nifi.stream.io.BufferedOutputStream;
import org.apache.nifi.remote.exception.BadRequestException;
import org.apache.nifi.remote.exception.HandshakeException;
import org.apache.nifi.remote.exception.PortNotRunningException;

2
nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestWriteAheadFlowFileRepository.java
View File

@ -35,7 +35,7 @@ import java.util.List;
import org.apache.nifi.connectable.Connection;
import org.apache.nifi.controller.FlowFileQueue;
import org.apache.nifi.controller.repository.claim.StandardContentClaimManager;
import org.apache.nifi.file.FileUtils;
import org.apache.nifi.util.file.FileUtils;
import org.junit.Test;
import org.mockito.Mockito;

3
nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/io/TestLimitedOutputStream.java
View File

@ -16,13 +16,12 @@
*/
package org.apache.nifi.controller.repository.io;
import org.apache.nifi.controller.repository.io.LimitedInputStream;
import static org.junit.Assert.assertEquals;
import java.io.IOException;
import java.io.InputStream;
import org.apache.nifi.io.ByteArrayInputStream;
import org.apache.nifi.stream.io.ByteArrayInputStream;
import org.junit.Test;

2
nar-bundles/framework-bundle/framework/file-authorization-provider/pom.xml
View File

@ -62,7 +62,7 @@
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-file-utils</artifactId>
<artifactId>nifi-utils</artifactId>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>

2
nar-bundles/framework-bundle/framework/file-authorization-provider/src/main/java/org/apache/nifi/authorization/FileAuthorizationProvider.java
View File

@ -36,7 +36,7 @@ import org.apache.nifi.authorization.exception.AuthorityAccessException;
import org.apache.nifi.authorization.exception.IdentityAlreadyExistsException;
import org.apache.nifi.authorization.exception.ProviderCreationException;
import org.apache.nifi.authorization.exception.UnknownIdentityException;
import org.apache.nifi.file.FileUtils;
import org.apache.nifi.util.file.FileUtils;
import org.apache.nifi.user.generated.ObjectFactory;
import org.apache.nifi.user.generated.Role;
import org.apache.nifi.user.generated.User;

2
nar-bundles/framework-bundle/framework/file-authorization-provider/src/test/java/org/apache/nifi/authorization/FileAuthorizationProviderTest.java
View File

@ -20,7 +20,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import org.apache.nifi.authorization.exception.ProviderCreationException;
import org.apache.nifi.file.FileUtils;
import org.apache.nifi.util.file.FileUtils;
import org.apache.nifi.util.NiFiProperties;
import org.junit.After;
import org.junit.Before;

12
nar-bundles/framework-bundle/framework/site-to-site/pom.xml
View File

@ -29,10 +29,6 @@
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security</artifactId>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-core-flowfile-attributes</artifactId>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-administration</artifactId>
@ -49,10 +45,6 @@
<groupId>org.apache.nifi</groupId>
<artifactId>core-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-stream-utils</artifactId>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
@ -73,10 +65,6 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>remote-communications-utils</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>

2
nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/codec/StandardFlowFileCodec.java
View File

@ -27,7 +27,7 @@ import java.util.List;
import java.util.Map;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.io.StreamUtils;
import org.apache.nifi.stream.io.StreamUtils;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.io.InputStreamCallback;
import org.apache.nifi.processor.io.OutputStreamCallback;

4
nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelInput.java
View File

@ -20,8 +20,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.channels.SocketChannel;
import org.apache.nifi.io.BufferedInputStream;
import org.apache.nifi.io.ByteCountingInputStream;
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;

4
nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelOutput.java
View File

@ -20,8 +20,8 @@ import java.io.IOException;
import java.io.OutputStream;
import java.nio.channels.SocketChannel;
import org.apache.nifi.io.BufferedOutputStream;
import org.apache.nifi.io.ByteCountingOutputStream;
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;

4
nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelInput.java
View File

@ -19,8 +19,8 @@ package org.apache.nifi.remote.io.socket.ssl;
import java.io.IOException;
import java.io.InputStream;
import org.apache.nifi.io.BufferedInputStream;
import org.apache.nifi.io.ByteCountingInputStream;
import org.apache.nifi.stream.io.BufferedInputStream;
import org.apache.nifi.stream.io.ByteCountingInputStream;
import org.apache.nifi.remote.protocol.CommunicationsInput;
public class SSLSocketChannelInput implements CommunicationsInput {

4
nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelOutput.java
View File

@ -19,8 +19,8 @@ package org.apache.nifi.remote.io.socket.ssl;
import java.io.IOException;
import java.io.OutputStream;
import org.apache.nifi.io.BufferedOutputStream;
import org.apache.nifi.io.ByteCountingOutputStream;
import org.apache.nifi.stream.io.BufferedOutputStream;
import org.apache.nifi.stream.io.ByteCountingOutputStream;
import org.apache.nifi.remote.protocol.CommunicationsOutput;
public class SSLSocketChannelOutput implements CommunicationsOutput {

2
nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceResource.java
View File

@ -54,7 +54,7 @@ import org.apache.nifi.cluster.manager.impl.WebClusterManager;
import org.apache.nifi.cluster.node.Node;
import org.apache.nifi.cluster.protocol.NodeIdentifier;
import org.apache.nifi.controller.repository.claim.ContentDirection;
import org.apache.nifi.io.StreamUtils;
import org.apache.nifi.stream.io.StreamUtils;
import org.apache.nifi.util.NiFiProperties;
import org.apache.nifi.web.NiFiServiceFacade;
import static org.apache.nifi.web.api.ApplicationResource.CLIENT_ID;

2
nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/util/ClientResponseUtils.java
View File

@ -19,7 +19,7 @@ package org.apache.nifi.web.util;
import com.sun.jersey.api.client.ClientResponse;
import java.io.BufferedInputStream;
import java.io.IOException;
import org.apache.nifi.io.NullOutputStream;
import org.apache.nifi.stream.io.NullOutputStream;
import org.apache.nifi.logging.NiFiLog;
import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;

6
nar-bundles/hadoop-bundle/hdfs-processors/pom.xml
View File

@ -32,7 +32,7 @@
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-core-flowfile-attributes</artifactId>
<artifactId>nifi-utils</artifactId>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
@ -42,10 +42,6 @@
<groupId>org.apache.nifi</groupId>
<artifactId>flowfile-packager</artifactId>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-stream-utils</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>

2
nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/FlowFileStreamUnpackerSequenceFileWriter.java
View File

@ -25,7 +25,7 @@ import java.util.Map;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.io.BufferedInputStream;
import org.apache.nifi.stream.io.BufferedInputStream;
import org.apache.nifi.processors.hadoop.util.InputStreamWritable;
import org.apache.nifi.util.FlowFilePackagerV3;

4
nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/PutHDFS.java
View File

@ -33,8 +33,8 @@ import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.io.BufferedInputStream;
import org.apache.nifi.io.StreamUtils;
import org.apache.nifi.stream.io.BufferedInputStream;
import org.apache.nifi.stream.io.StreamUtils;
import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;

2
nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/SequenceFileWriterImpl.java
View File

@ -23,7 +23,7 @@ import java.io.UnsupportedEncodingException;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.io.BufferedInputStream;
import org.apache.nifi.stream.io.BufferedInputStream;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.io.StreamCallback;
import org.apache.nifi.processors.hadoop.util.ByteFilteringOutputStream;

2
nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/TarUnpackerSequenceFileWriter.java
View File

@ -20,7 +20,7 @@ import java.io.IOException;
import java.io.InputStream;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.io.BufferedInputStream;
import org.apache.nifi.stream.io.BufferedInputStream;
import org.apache.nifi.processors.hadoop.util.InputStreamWritable;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;

2
nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ZipUnpackerSequenceFileWriter.java
View File

@ -23,7 +23,7 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.io.BufferedInputStream;
import org.apache.nifi.stream.io.BufferedInputStream;
import org.apache.nifi.processors.hadoop.util.InputStreamWritable;
import org.apache.hadoop.io.SequenceFile.Writer;

Some files were not shown because too many files have changed in this diff Show More