diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/csv/CSVVariableSlidingWindowRecordReader.java b/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/csv/CSVVariableSlidingWindowRecordReader.java index def5fffc9..585d5cb13 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/csv/CSVVariableSlidingWindowRecordReader.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/csv/CSVVariableSlidingWindowRecordReader.java @@ -128,9 +128,7 @@ public class CSVVariableSlidingWindowRecordReader extends CSVRecordReader implem } List> sequence = new ArrayList<>(); - for(List line : queue) { - sequence.add(line); - } + sequence.addAll(queue); if(exhausted && queue.size()==1) queue.pollLast(); diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/transform/sequence/window/OverlappingTimeWindowFunction.java b/datavec/datavec-api/src/main/java/org/datavec/api/transform/sequence/window/OverlappingTimeWindowFunction.java index 81a3855f8..c2ebba01a 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/transform/sequence/window/OverlappingTimeWindowFunction.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/transform/sequence/window/OverlappingTimeWindowFunction.java @@ -200,9 +200,8 @@ public class OverlappingTimeWindowFunction implements WindowFunction { public Schema transform(Schema inputSchema) { if (!addWindowStartTimeColumn && !addWindowEndTimeColumn) return inputSchema; - List newMeta = new ArrayList<>(); - newMeta.addAll(inputSchema.getColumnMetaData()); + List newMeta = new ArrayList<>(inputSchema.getColumnMetaData()); if (addWindowStartTimeColumn) { newMeta.add(new TimeMetaData("windowStartTime")); diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/transform/sequence/window/TimeWindowFunction.java b/datavec/datavec-api/src/main/java/org/datavec/api/transform/sequence/window/TimeWindowFunction.java index f6396c801..c4474d172 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/transform/sequence/window/TimeWindowFunction.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/transform/sequence/window/TimeWindowFunction.java @@ -165,9 +165,8 @@ public class TimeWindowFunction implements WindowFunction { public Schema transform(Schema inputSchema) { if (!addWindowStartTimeColumn && !addWindowEndTimeColumn) return inputSchema; - List newMeta = new ArrayList<>(); - newMeta.addAll(inputSchema.getColumnMetaData()); + List newMeta = new ArrayList<>(inputSchema.getColumnMetaData()); if (addWindowStartTimeColumn) { newMeta.add(new TimeMetaData("windowStartTime")); diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/transform/transform/column/AddConstantColumnTransform.java b/datavec/datavec-api/src/main/java/org/datavec/api/transform/transform/column/AddConstantColumnTransform.java index 996c9e54d..ecb7d5f9e 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/transform/transform/column/AddConstantColumnTransform.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/transform/transform/column/AddConstantColumnTransform.java @@ -53,8 +53,7 @@ public class AddConstantColumnTransform implements Transform { @Override public Schema transform(Schema inputSchema) { - List outMeta = new ArrayList<>(); - outMeta.addAll(inputSchema.getColumnMetaData()); + List outMeta = new ArrayList<>(inputSchema.getColumnMetaData()); ColumnMetaData newColMeta = newColumnType.newColumnMetaData(newColumnName); outMeta.add(newColMeta); diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/transform/transform/string/ConcatenateStringColumns.java b/datavec/datavec-api/src/main/java/org/datavec/api/transform/transform/string/ConcatenateStringColumns.java index af2179b95..b97e23ae4 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/transform/transform/string/ConcatenateStringColumns.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/transform/transform/string/ConcatenateStringColumns.java @@ -75,8 +75,7 @@ public class ConcatenateStringColumns extends BaseTransform implements ColumnOp } } - List outMeta = new ArrayList<>(); - outMeta.addAll(inputSchema.getColumnMetaData()); + List outMeta = new ArrayList<>(inputSchema.getColumnMetaData()); ColumnMetaData newColMeta = ColumnType.String.newColumnMetaData(newColumnName); outMeta.add(newColMeta); diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/TestTransforms.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/TestTransforms.java index 90e129db4..c7e7bc467 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/TestTransforms.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/TestTransforms.java @@ -279,8 +279,7 @@ public class TestTransforms extends BaseND4JTest { Assert.assertEquals(outputColumns, newSchema.getColumnNames()); List input = new ArrayList<>(); - for (Writable value : COLUMN_VALUES) - input.add(value); + input.addAll(COLUMN_VALUES); transform.setInputSchema(schema); List transformed = transform.map(input); diff --git a/datavec/datavec-arrow/src/main/java/org/datavec/arrow/recordreader/ArrowWritableRecordBatch.java b/datavec/datavec-arrow/src/main/java/org/datavec/arrow/recordreader/ArrowWritableRecordBatch.java index a48769027..e07533248 100644 --- a/datavec/datavec-arrow/src/main/java/org/datavec/arrow/recordreader/ArrowWritableRecordBatch.java +++ b/datavec/datavec-arrow/src/main/java/org/datavec/arrow/recordreader/ArrowWritableRecordBatch.java @@ -243,8 +243,7 @@ public class ArrowWritableRecordBatch extends AbstractWritableRecordBatch implem public List> toArrayList() { List> ret = new ArrayList<>(); for(int i = 0; i < size(); i++) { - List add = new ArrayList<>(); - add.addAll(get(i)); + List add = new ArrayList<>(get(i)); ret.add(add); } diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalGroupToSequenceFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalGroupToSequenceFunction.java index 7b2bde115..0c1d85510 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalGroupToSequenceFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalGroupToSequenceFunction.java @@ -40,8 +40,7 @@ public class LocalGroupToSequenceFunction implements Function> apply(List> lists) { List> list = new ArrayList<>(); - for (List writables : lists) - list.add(writables); + list.addAll(lists); Collections.sort(list, comparator);