You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2020/01/07 15:55:34 UTC
[nifi] branch master updated: NIFI-6955 close streams in
Reader/writer mock
This is an automated email from the ASF dual-hosted git repository.
markap14 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new 8f9fc49 NIFI-6955 close streams in Reader/writer mock
new 209c560 Merge pull request #3946 from IlyaKovalev/NIFI-6955
8f9fc49 is described below
commit 8f9fc49ca0277ea4a6429effd8b9090a1cd6a4da
Author: KovalevIV <El...@yandex.ru>
AuthorDate: Thu Dec 19 22:26:31 2019 +0300
NIFI-6955 close streams in Reader/writer mock
---
.../nifi/serialization/record/ArrayListRecordReader.java | 10 +++++++---
.../nifi/serialization/record/ArrayListRecordWriter.java | 12 ++++++++----
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-mock-record-utils/src/main/java/org/apache/nifi/serialization/record/ArrayListRecordReader.java b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-mock-record-utils/src/main/java/org/apache/nifi/serialization/record/ArrayListRecordReader.java
index ea6c02d..8ce4216 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-mock-record-utils/src/main/java/org/apache/nifi/serialization/record/ArrayListRecordReader.java
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-mock-record-utils/src/main/java/org/apache/nifi/serialization/record/ArrayListRecordReader.java
@@ -21,6 +21,7 @@ import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.serialization.RecordReader;
import org.apache.nifi.serialization.RecordReaderFactory;
+import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Iterator;
@@ -37,7 +38,7 @@ public class ArrayListRecordReader extends AbstractControllerService implements
@Override
public ArrayListReader createRecordReader(final Map<String, String> variables, final InputStream in, final long inputLength, final ComponentLog logger) {
- return new ArrayListReader(records, schema);
+ return new ArrayListReader(records, schema, in);
}
public void addRecord(final Record record) {
@@ -47,10 +48,12 @@ public class ArrayListRecordReader extends AbstractControllerService implements
public static class ArrayListReader implements RecordReader {
private final RecordSchema schema;
private final Iterator<Record> itr;
+ private final InputStream in;
- public ArrayListReader(final List<Record> records, final RecordSchema schema) {
+ public ArrayListReader(final List<Record> records, final RecordSchema schema, InputStream in) {
this.itr = records.iterator();
this.schema = schema;
+ this.in = in;
}
@Override
@@ -64,7 +67,8 @@ public class ArrayListRecordReader extends AbstractControllerService implements
}
@Override
- public void close(){
+ public void close() throws IOException {
+ in.close();
}
}
}
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-mock-record-utils/src/main/java/org/apache/nifi/serialization/record/ArrayListRecordWriter.java b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-mock-record-utils/src/main/java/org/apache/nifi/serialization/record/ArrayListRecordWriter.java
index 44303ae..16d105f 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-mock-record-utils/src/main/java/org/apache/nifi/serialization/record/ArrayListRecordWriter.java
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-mock-record-utils/src/main/java/org/apache/nifi/serialization/record/ArrayListRecordWriter.java
@@ -49,7 +49,7 @@ public class ArrayListRecordWriter extends AbstractControllerService implements
@Override
public RecordSetWriter createWriter(final ComponentLog logger, final RecordSchema schema, final OutputStream out, final Map<String, String> variables) {
- return new ArrayListRecordSetWriter(records);
+ return new ArrayListRecordSetWriter(records, out);
}
public List<Record> getRecordsWritten() {
@@ -58,9 +58,11 @@ public class ArrayListRecordWriter extends AbstractControllerService implements
public static class ArrayListRecordSetWriter implements RecordSetWriter {
private final List<Record> records;
+ private final OutputStream out;
- public ArrayListRecordSetWriter(final List<Record> records) {
+ public ArrayListRecordSetWriter(final List<Record> records, OutputStream out) {
this.records = records;
+ this.out = out;
}
@Override
@@ -97,11 +99,13 @@ public class ArrayListRecordWriter extends AbstractControllerService implements
}
@Override
- public void flush() {
+ public void flush() throws IOException {
+ out.flush();
}
@Override
- public void close() {
+ public void close() throws IOException {
+ out.close();
}
}
}