AVRO-2117: Cleanup Java - Remove redundant type arguments
Project: http://git-wip-us.apache.org/repos/asf/avro/repo Commit: http://git-wip-us.apache.org/repos/asf/avro/commit/a3e05bee Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/a3e05bee Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/a3e05bee Branch: refs/heads/master Commit: a3e05bee1c81b54eed8cb37b278652cf80666121 Parents: 6a4dd09 Author: Niels Basjes <[email protected]> Authored: Thu Dec 14 10:56:21 2017 +0100 Committer: Niels Basjes <[email protected]> Committed: Fri Dec 29 18:03:32 2017 +0100 ---------------------------------------------------------------------- lang/java/avro/src/main/java/org/apache/avro/SchemaBuilder.java | 2 +- lang/java/avro/src/test/java/org/apache/avro/TestDataFile.java | 4 ++-- lang/java/avro/src/test/java/org/apache/avro/TestSchemas.java | 4 ++-- .../src/test/java/org/apache/avro/reflect/TestReflectData.java | 2 +- .../tools/src/test/java/org/apache/avro/tool/TestCatTool.java | 2 +- .../tools/src/test/java/org/apache/avro/tool/TestConcatTool.java | 2 +- .../src/test/java/org/apache/avro/tool/TestDataFileTools.java | 2 +- .../core/src/main/java/org/apache/trevni/ColumnDescriptor.java | 2 +- .../core/src/main/java/org/apache/trevni/ColumnValues.java | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/avro/blob/a3e05bee/lang/java/avro/src/main/java/org/apache/avro/SchemaBuilder.java ---------------------------------------------------------------------- diff --git a/lang/java/avro/src/main/java/org/apache/avro/SchemaBuilder.java b/lang/java/avro/src/main/java/org/apache/avro/SchemaBuilder.java index e0f3ce5..cdc43e0 100644 --- a/lang/java/avro/src/main/java/org/apache/avro/SchemaBuilder.java +++ b/lang/java/avro/src/main/java/org/apache/avro/SchemaBuilder.java @@ -883,7 +883,7 @@ public class SchemaBuilder { **/ private static class NameContext { private static final Set<String> PRIMITIVES = new HashSet<>(); - { + static { PRIMITIVES.add("null"); PRIMITIVES.add("boolean"); PRIMITIVES.add("int"); http://git-wip-us.apache.org/repos/asf/avro/blob/a3e05bee/lang/java/avro/src/test/java/org/apache/avro/TestDataFile.java ---------------------------------------------------------------------- diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestDataFile.java b/lang/java/avro/src/test/java/org/apache/avro/TestDataFile.java index 4c9833d..cf41b0d 100644 --- a/lang/java/avro/src/test/java/org/apache/avro/TestDataFile.java +++ b/lang/java/avro/src/test/java/org/apache/avro/TestDataFile.java @@ -263,13 +263,13 @@ public class TestDataFile { // re-open to an arbitrary position near the middle, with sync == true SeekableFileInput sin = new SeekableFileInput(file); sin.seek(sin.length() / 2); - reader = DataFileReader.<Object>openReader(sin, new GenericDatumReader<>(), + reader = DataFileReader.openReader(sin, new GenericDatumReader<>(), header, true); assertNotNull("Should be able to reopen from arbitrary point", reader.next()); long validPos = reader.previousSync(); // post sync, we know of a valid sync point: re-open with seek (sync == false) sin.seek(validPos); - reader = DataFileReader.<Object>openReader(sin, new GenericDatumReader<>(), + reader = DataFileReader.openReader(sin, new GenericDatumReader<>(), header, false); assertEquals("Should not move from sync point on reopen", validPos, sin.tell()); assertNotNull("Should be able to reopen at sync point", reader.next()); http://git-wip-us.apache.org/repos/asf/avro/blob/a3e05bee/lang/java/avro/src/test/java/org/apache/avro/TestSchemas.java ---------------------------------------------------------------------- diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestSchemas.java b/lang/java/avro/src/test/java/org/apache/avro/TestSchemas.java index 2798977..271c5fd 100644 --- a/lang/java/avro/src/test/java/org/apache/avro/TestSchemas.java +++ b/lang/java/avro/src/test/java/org/apache/avro/TestSchemas.java @@ -84,8 +84,8 @@ public class TestSchemas { static final Schema FIXED_8_BYTES = Schema.createFixed("Fixed", null, null, 8); static { - EMPTY_RECORD1.setFields(Collections.<Field>emptyList()); - EMPTY_RECORD2.setFields(Collections.<Field>emptyList()); + EMPTY_RECORD1.setFields(Collections.emptyList()); + EMPTY_RECORD2.setFields(Collections.emptyList()); A_INT_RECORD1.setFields(list(new Field("a", INT_SCHEMA, null, null))); A_LONG_RECORD1.setFields(list(new Field("a", LONG_SCHEMA, null, null))); A_INT_B_INT_RECORD1.setFields( http://git-wip-us.apache.org/repos/asf/avro/blob/a3e05bee/lang/java/avro/src/test/java/org/apache/avro/reflect/TestReflectData.java ---------------------------------------------------------------------- diff --git a/lang/java/avro/src/test/java/org/apache/avro/reflect/TestReflectData.java b/lang/java/avro/src/test/java/org/apache/avro/reflect/TestReflectData.java index 6d198d5..3525d7b 100644 --- a/lang/java/avro/src/test/java/org/apache/avro/reflect/TestReflectData.java +++ b/lang/java/avro/src/test/java/org/apache/avro/reflect/TestReflectData.java @@ -34,7 +34,7 @@ public class TestReflectData { for (int i = 0; i < numSchemas; i++) { // Create schema Schema schema = Schema.createRecord("schema", null, null, false); - schema.setFields(Collections.<Schema.Field>emptyList()); + schema.setFields(Collections.emptyList()); ReflectData.get().getRecordState(new Object(), schema); } http://git-wip-us.apache.org/repos/asf/avro/blob/a3e05bee/lang/java/tools/src/test/java/org/apache/avro/tool/TestCatTool.java ---------------------------------------------------------------------- diff --git a/lang/java/tools/src/test/java/org/apache/avro/tool/TestCatTool.java b/lang/java/tools/src/test/java/org/apache/avro/tool/TestCatTool.java index a6510fe..cfc38c9 100644 --- a/lang/java/tools/src/test/java/org/apache/avro/tool/TestCatTool.java +++ b/lang/java/tools/src/test/java/org/apache/avro/tool/TestCatTool.java @@ -350,7 +350,7 @@ public class TestCatTool { System.in, out, System.err, - Collections.<String>emptyList()); + Collections.emptyList()); out.close(); // flushes too assertEquals(0, returnCode); http://git-wip-us.apache.org/repos/asf/avro/blob/a3e05bee/lang/java/tools/src/test/java/org/apache/avro/tool/TestConcatTool.java ---------------------------------------------------------------------- diff --git a/lang/java/tools/src/test/java/org/apache/avro/tool/TestConcatTool.java b/lang/java/tools/src/test/java/org/apache/avro/tool/TestConcatTool.java index c4e26ce..777d83e 100644 --- a/lang/java/tools/src/test/java/org/apache/avro/tool/TestConcatTool.java +++ b/lang/java/tools/src/test/java/org/apache/avro/tool/TestConcatTool.java @@ -292,7 +292,7 @@ public class TestConcatTool { System.in, out, System.err, - Collections.<String>emptyList()); + Collections.emptyList()); out.close(); // flushes too assertEquals(0, returnCode); http://git-wip-us.apache.org/repos/asf/avro/blob/a3e05bee/lang/java/tools/src/test/java/org/apache/avro/tool/TestDataFileTools.java ---------------------------------------------------------------------- diff --git a/lang/java/tools/src/test/java/org/apache/avro/tool/TestDataFileTools.java b/lang/java/tools/src/test/java/org/apache/avro/tool/TestDataFileTools.java index 38ce7f5..cab28d4 100644 --- a/lang/java/tools/src/test/java/org/apache/avro/tool/TestDataFileTools.java +++ b/lang/java/tools/src/test/java/org/apache/avro/tool/TestDataFileTools.java @@ -144,7 +144,7 @@ public class TestDataFileTools { @Test public void testWrite() throws Exception { - testWrite("plain", Collections.<String>emptyList(), "null"); + testWrite("plain", Collections.emptyList(), "null"); } public void testWrite(String name, List<String> extra, String expectedCodec) http://git-wip-us.apache.org/repos/asf/avro/blob/a3e05bee/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnDescriptor.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnDescriptor.java b/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnDescriptor.java index 1b94645..dfe772d 100644 --- a/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnDescriptor.java +++ b/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnDescriptor.java @@ -73,7 +73,7 @@ class ColumnDescriptor<T extends Comparable> { for (int i = 0; i < blockCount; i++) { blocks[i] = BlockDescriptor.read(in); if (metaData.hasIndexValues()) - firstValues[i] = in.<T>readValue(metaData.getType()); + firstValues[i] = in.readValue(metaData.getType()); } dataStart = in.tell(); http://git-wip-us.apache.org/repos/asf/avro/blob/a3e05bee/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnValues.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnValues.java b/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnValues.java index 9c50d6b..fc85e6e 100644 --- a/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnValues.java +++ b/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnValues.java @@ -142,7 +142,7 @@ public class ColumnValues<T extends Comparable> /** Expert: Returns the next value in a column. */ public T nextValue() throws IOException { arrayLength--; - return previous = values.<T>readValue(type); + return previous = values.readValue(type); } @Override public void remove() { throw new UnsupportedOperationException(); }
