http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/tools/src/test/java/org/apache/avro/tool/TestRecodecTool.java ---------------------------------------------------------------------- diff --git a/lang/java/tools/src/test/java/org/apache/avro/tool/TestRecodecTool.java b/lang/java/tools/src/test/java/org/apache/avro/tool/TestRecodecTool.java index e885115..9af86a1 100644 --- a/lang/java/tools/src/test/java/org/apache/avro/tool/TestRecodecTool.java +++ b/lang/java/tools/src/test/java/org/apache/avro/tool/TestRecodecTool.java @@ -1,109 +1,109 @@ -/** - * 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. - */ -package org.apache.avro.tool; - -import static java.util.Arrays.asList; - -import java.io.File; -import java.io.FileInputStream; -import java.io.PrintStream; -import java.util.ArrayList; - -import org.apache.avro.AvroTestUtil; -import org.apache.avro.Schema; -import org.apache.avro.Schema.Type; -import org.apache.avro.file.DataFileReader; -import org.apache.avro.file.DataFileWriter; -import org.apache.avro.generic.GenericDatumReader; -import org.apache.avro.generic.GenericDatumWriter; -import org.junit.Assert; -import org.junit.Test; - -public class TestRecodecTool { - @Test - public void testRecodec() throws Exception { - String metaKey = "myMetaKey"; - String metaValue = "myMetaValue"; - - File inputFile = AvroTestUtil.tempFile(getClass(), "input.avro"); - - Schema schema = Schema.create(Type.STRING); - DataFileWriter<String> writer = new DataFileWriter<String>( - new GenericDatumWriter<String>(schema)) - .setMeta(metaKey, metaValue) - .create(schema, inputFile); - // We write some garbage which should be quite compressible by deflate, - // but is complicated enough that deflate-9 will work better than deflate-1. - // These values were plucked from thin air and worked on the first try, so - // don't read too much into them. - for (int i = 0; i < 100000; i++) { - writer.append("" + i % 100); - } - writer.close(); - - File defaultOutputFile = AvroTestUtil.tempFile(getClass(), "default-output.avro"); - File nullOutputFile = AvroTestUtil.tempFile(getClass(), "null-output.avro"); - File deflateDefaultOutputFile = AvroTestUtil.tempFile(getClass(), "deflate-default-output.avro"); - File deflate1OutputFile = AvroTestUtil.tempFile(getClass(), "deflate-1-output.avro"); - File deflate9OutputFile = AvroTestUtil.tempFile(getClass(), "deflate-9-output.avro"); - - new RecodecTool().run(new FileInputStream(inputFile), new PrintStream(defaultOutputFile), null, new ArrayList<String>()); - new RecodecTool().run(new FileInputStream(inputFile), new PrintStream(nullOutputFile), null, asList("--codec=null")); - new RecodecTool().run(new FileInputStream(inputFile), new PrintStream(deflateDefaultOutputFile), null, asList("--codec=deflate")); - new RecodecTool().run(new FileInputStream(inputFile), new PrintStream(deflate1OutputFile), null, asList("--codec=deflate", "--level=1")); - new RecodecTool().run(new FileInputStream(inputFile), new PrintStream(deflate9OutputFile), null, asList("--codec=deflate", "--level=9")); - - // We assume that metadata copying is orthogonal to codec selection, and - // so only test it for a single file. - Assert.assertEquals( - metaValue, - new DataFileReader<Void>(defaultOutputFile, new GenericDatumReader<Void>()) - .getMetaString(metaKey)); - - // The "default" codec should be the same as null. - Assert.assertEquals(defaultOutputFile.length(), nullOutputFile.length()); - - // All of the deflated files should be smaller than the null file. - assertLessThan(deflateDefaultOutputFile.length(), nullOutputFile.length()); - assertLessThan(deflate1OutputFile.length(), nullOutputFile.length()); - assertLessThan(deflate9OutputFile.length(), nullOutputFile.length()); - - // The "level 9" file should be smaller than the "level 1" file. - assertLessThan(deflate9OutputFile.length(), deflate1OutputFile.length()); - -// System.err.println(inputFile.length()); -// System.err.println(defaultOutputFile.length()); -// System.err.println(nullOutputFile.length()); -// System.err.println(deflateDefaultOutputFile.length()); -// System.err.println(deflate1OutputFile.length()); -// System.err.println(deflate9OutputFile.length()); - - inputFile.delete(); - defaultOutputFile.delete(); - nullOutputFile.delete(); - deflateDefaultOutputFile.delete(); - deflate1OutputFile.delete(); - deflate9OutputFile.delete(); - } - - private static void assertLessThan(long less, long more) { - if (less >= more) { - Assert.fail("Expected " + less + " to be less than " + more); - } - } -} +/** + * 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. + */ +package org.apache.avro.tool; + +import static java.util.Arrays.asList; + +import java.io.File; +import java.io.FileInputStream; +import java.io.PrintStream; +import java.util.ArrayList; + +import org.apache.avro.AvroTestUtil; +import org.apache.avro.Schema; +import org.apache.avro.Schema.Type; +import org.apache.avro.file.DataFileReader; +import org.apache.avro.file.DataFileWriter; +import org.apache.avro.generic.GenericDatumReader; +import org.apache.avro.generic.GenericDatumWriter; +import org.junit.Assert; +import org.junit.Test; + +public class TestRecodecTool { + @Test + public void testRecodec() throws Exception { + String metaKey = "myMetaKey"; + String metaValue = "myMetaValue"; + + File inputFile = AvroTestUtil.tempFile(getClass(), "input.avro"); + + Schema schema = Schema.create(Type.STRING); + DataFileWriter<String> writer = new DataFileWriter<>( + new GenericDatumWriter<String>(schema)) + .setMeta(metaKey, metaValue) + .create(schema, inputFile); + // We write some garbage which should be quite compressible by deflate, + // but is complicated enough that deflate-9 will work better than deflate-1. + // These values were plucked from thin air and worked on the first try, so + // don't read too much into them. + for (int i = 0; i < 100000; i++) { + writer.append("" + i % 100); + } + writer.close(); + + File defaultOutputFile = AvroTestUtil.tempFile(getClass(), "default-output.avro"); + File nullOutputFile = AvroTestUtil.tempFile(getClass(), "null-output.avro"); + File deflateDefaultOutputFile = AvroTestUtil.tempFile(getClass(), "deflate-default-output.avro"); + File deflate1OutputFile = AvroTestUtil.tempFile(getClass(), "deflate-1-output.avro"); + File deflate9OutputFile = AvroTestUtil.tempFile(getClass(), "deflate-9-output.avro"); + + new RecodecTool().run(new FileInputStream(inputFile), new PrintStream(defaultOutputFile), null, new ArrayList<>()); + new RecodecTool().run(new FileInputStream(inputFile), new PrintStream(nullOutputFile), null, asList("--codec=null")); + new RecodecTool().run(new FileInputStream(inputFile), new PrintStream(deflateDefaultOutputFile), null, asList("--codec=deflate")); + new RecodecTool().run(new FileInputStream(inputFile), new PrintStream(deflate1OutputFile), null, asList("--codec=deflate", "--level=1")); + new RecodecTool().run(new FileInputStream(inputFile), new PrintStream(deflate9OutputFile), null, asList("--codec=deflate", "--level=9")); + + // We assume that metadata copying is orthogonal to codec selection, and + // so only test it for a single file. + Assert.assertEquals( + metaValue, + new DataFileReader<Void>(defaultOutputFile, new GenericDatumReader<>()) + .getMetaString(metaKey)); + + // The "default" codec should be the same as null. + Assert.assertEquals(defaultOutputFile.length(), nullOutputFile.length()); + + // All of the deflated files should be smaller than the null file. + assertLessThan(deflateDefaultOutputFile.length(), nullOutputFile.length()); + assertLessThan(deflate1OutputFile.length(), nullOutputFile.length()); + assertLessThan(deflate9OutputFile.length(), nullOutputFile.length()); + + // The "level 9" file should be smaller than the "level 1" file. + assertLessThan(deflate9OutputFile.length(), deflate1OutputFile.length()); + +// System.err.println(inputFile.length()); +// System.err.println(defaultOutputFile.length()); +// System.err.println(nullOutputFile.length()); +// System.err.println(deflateDefaultOutputFile.length()); +// System.err.println(deflate1OutputFile.length()); +// System.err.println(deflate9OutputFile.length()); + + inputFile.delete(); + defaultOutputFile.delete(); + nullOutputFile.delete(); + deflateDefaultOutputFile.delete(); + deflate1OutputFile.delete(); + deflate9OutputFile.delete(); + } + + private static void assertLessThan(long less, long more) { + if (less >= more) { + Assert.fail("Expected " + less + " to be less than " + more); + } + } +}
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/tools/src/test/java/org/apache/avro/tool/TestTetherTool.java ---------------------------------------------------------------------- diff --git a/lang/java/tools/src/test/java/org/apache/avro/tool/TestTetherTool.java b/lang/java/tools/src/test/java/org/apache/avro/tool/TestTetherTool.java index 865c245..4e7af12 100644 --- a/lang/java/tools/src/test/java/org/apache/avro/tool/TestTetherTool.java +++ b/lang/java/tools/src/test/java/org/apache/avro/tool/TestTetherTool.java @@ -95,7 +95,7 @@ public class TestTetherTool { execargs += " org.apache.avro.mapred.tether.WordCountTask"; // Create a list of the arguments to pass to the tull run method - java.util.List<String> runargs = new java.util.ArrayList<String> (); + java.util.List<String> runargs = new java.util.ArrayList<>(); runargs.addAll(java.util.Arrays.asList("--program", "java")); @@ -111,9 +111,9 @@ public class TestTetherTool { // TODO:: We should probably do some validation // validate the output - DatumReader<Pair<Utf8,Long>> reader = new SpecificDatumReader<Pair<Utf8,Long>>(); + DatumReader<Pair<Utf8,Long>> reader = new SpecificDatumReader<>(); InputStream cin = new BufferedInputStream(new FileInputStream(WordCountUtil.COUNTS_FILE)); - DataFileStream<Pair<Utf8,Long>> counts = new DataFileStream<Pair<Utf8,Long>>(cin,reader); + DataFileStream<Pair<Utf8,Long>> counts = new DataFileStream<>(cin, reader); int numWords = 0; for (Pair<Utf8,Long> wc : counts) { assertEquals(wc.key().toString(), http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/tools/src/test/java/org/apache/avro/tool/TestTextFileTools.java ---------------------------------------------------------------------- diff --git a/lang/java/tools/src/test/java/org/apache/avro/tool/TestTextFileTools.java b/lang/java/tools/src/test/java/org/apache/avro/tool/TestTextFileTools.java index 0e3c5e8..dccf93b 100644 --- a/lang/java/tools/src/test/java/org/apache/avro/tool/TestTextFileTools.java +++ b/lang/java/tools/src/test/java/org/apache/avro/tool/TestTextFileTools.java @@ -86,7 +86,7 @@ public class TestTextFileTools { private void fromText(String name, String... args) throws Exception { File avroFile = AvroTestUtil.tempFile(getClass(), name + ".avro"); - ArrayList<String> arglist = new ArrayList<String>(); + ArrayList<String> arglist = new ArrayList<>(); arglist.addAll(Arrays.asList(args)); arglist.add(linesFile.toString()); arglist.add(avroFile.toString()); @@ -94,8 +94,8 @@ public class TestTextFileTools { new FromTextTool().run(null, null, null, arglist); // Read it back, and make sure it's valid. - DataFileReader<ByteBuffer> file = new DataFileReader<ByteBuffer> - (avroFile, new GenericDatumReader<ByteBuffer>()); + DataFileReader<ByteBuffer> file = new DataFileReader<> + (avroFile, new GenericDatumReader<>()); int i = 0; for (ByteBuffer line : file) { System.out.println("Reading line = "+line.remaining()); @@ -123,7 +123,7 @@ public class TestTextFileTools { File avroFile = AvroTestUtil.tempFile(TestTextFileTools.class, name + ".avro"); File outFile = AvroTestUtil.tempFile(TestTextFileTools.class, name + ".lines"); - ArrayList<String> arglist = new ArrayList<String>(); + ArrayList<String> arglist = new ArrayList<>(); arglist.add(avroFile.toString()); arglist.add(outFile.toString()); http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/tools/src/test/java/org/apache/avro/tool/TestToTrevniTool.java ---------------------------------------------------------------------- diff --git a/lang/java/tools/src/test/java/org/apache/avro/tool/TestToTrevniTool.java b/lang/java/tools/src/test/java/org/apache/avro/tool/TestToTrevniTool.java index 164acaf..f1254d6 100644 --- a/lang/java/tools/src/test/java/org/apache/avro/tool/TestToTrevniTool.java +++ b/lang/java/tools/src/test/java/org/apache/avro/tool/TestToTrevniTool.java @@ -56,7 +56,7 @@ public class TestToTrevniTool { Schema schema = Schema.parse(SCHEMA_FILE); DataFileWriter<Object> writer = - new DataFileWriter<Object>(new GenericDatumWriter<Object>()); + new DataFileWriter<>(new GenericDatumWriter<>()); writer.create(schema, Util.createFromFS(AVRO_FILE.toString())); for (Object datum : new RandomData(schema, COUNT)) writer.append(datum); @@ -65,7 +65,7 @@ public class TestToTrevniTool { run(AVRO_FILE.toString(), TREVNI_FILE.toString()); AvroColumnReader<Object> reader = - new AvroColumnReader<Object>(new AvroColumnReader.Params(TREVNI_FILE)); + new AvroColumnReader<>(new AvroColumnReader.Params(TREVNI_FILE)); Iterator<Object> found = reader.iterator(); for (Object expected : new RandomData(schema, COUNT)) assertEquals(expected, found.next()); http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/AvroColumnReader.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/AvroColumnReader.java b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/AvroColumnReader.java index 97ee485..1f22184 100644 --- a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/AvroColumnReader.java +++ b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/AvroColumnReader.java @@ -56,7 +56,7 @@ public class AvroColumnReader<D> private int column; // current index in values private Map<String,Map<String,Object>> defaults = - new HashMap<String,Map<String,Object>>(); + new HashMap<>(); /** Parameters for reading an Avro column file. */ public static class Params { @@ -101,7 +101,7 @@ public class AvroColumnReader<D> void initialize() throws IOException { // compute a mapping from column name to number for file - Map<String,Integer> fileColumnNumbers = new HashMap<String,Integer>(); + Map<String,Integer> fileColumnNumbers = new HashMap<>(); int i = 0; for (ColumnMetaData c : new AvroColumnator(fileSchema).getColumns()) fileColumnNumbers.put(c.getName(), i++); @@ -163,7 +163,7 @@ public class AvroColumnReader<D> String recordName = record.getFullName(); Map<String,Object> recordDefaults = defaults.get(recordName); if (recordDefaults == null) { - recordDefaults = new HashMap<String,Object>(); + recordDefaults = new HashMap<>(); defaults.put(recordName, recordDefaults); } recordDefaults.put(f.name(), model.getDefaultValue(f)); http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/AvroColumnator.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/AvroColumnator.java b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/AvroColumnator.java index a546c14..070f653 100644 --- a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/AvroColumnator.java +++ b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/AvroColumnator.java @@ -34,8 +34,8 @@ class AvroColumnator { private Schema schema; - private List<ColumnMetaData> columns = new ArrayList<ColumnMetaData>(); - private List<Integer> arrayWidths = new ArrayList<Integer>(); + private List<ColumnMetaData> columns = new ArrayList<>(); + private List<Integer> arrayWidths = new ArrayList<>(); public AvroColumnator(Schema schema) { this.schema = schema; @@ -57,7 +57,7 @@ class AvroColumnator { return result; } - private Map<Schema,Schema> seen = new IdentityHashMap<Schema,Schema>(); + private Map<Schema,Schema> seen = new IdentityHashMap<>(); private void columnize(String path, Schema s, ColumnMetaData parent, boolean isArray) { http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/AvroTrevniInputFormat.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/AvroTrevniInputFormat.java b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/AvroTrevniInputFormat.java index 003c266..6ed719b 100644 --- a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/AvroTrevniInputFormat.java +++ b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/AvroTrevniInputFormat.java @@ -52,7 +52,7 @@ public class AvroTrevniInputFormat<T> @Override protected FileStatus[] listStatus(JobConf job) throws IOException { - List<FileStatus> result = new ArrayList<FileStatus>(); + List<FileStatus> result = new ArrayList<>(); job.setBoolean("mapred.input.dir.recursive", true); for (FileStatus file : super.listStatus(job)) if (file.getPath().getName().endsWith(AvroTrevniOutputFormat.EXT)) @@ -74,11 +74,11 @@ public class AvroTrevniInputFormat<T> params.setSchema(AvroJob.getInputSchema(job)); return new RecordReader<AvroWrapper<T>, NullWritable>() { - private AvroColumnReader<T> reader = new AvroColumnReader<T>(params); + private AvroColumnReader<T> reader = new AvroColumnReader<>(params); private float rows = reader.getRowCount(); private long row; - public AvroWrapper<T> createKey() { return new AvroWrapper<T>(null); } + public AvroWrapper<T> createKey() { return new AvroWrapper<>(null); } public NullWritable createValue() { return NullWritable.get(); } http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/AvroTrevniOutputFormat.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/AvroTrevniOutputFormat.java b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/AvroTrevniOutputFormat.java index ca71107..5e4c8f6 100644 --- a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/AvroTrevniOutputFormat.java +++ b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/AvroTrevniOutputFormat.java @@ -83,7 +83,7 @@ public class AvroTrevniOutputFormat <T> private int part = 0; private AvroColumnWriter<T> writer = - new AvroColumnWriter<T>(schema, meta, ReflectData.get()); + new AvroColumnWriter<>(schema, meta, ReflectData.get()); private void flush() throws IOException { OutputStream out = fs.create(new Path(dir, "part-"+(part++)+EXT)); @@ -92,7 +92,7 @@ public class AvroTrevniOutputFormat <T> } finally { out.close(); } - writer = new AvroColumnWriter<T>(schema, meta, ReflectData.get()); + writer = new AvroColumnWriter<>(schema, meta, ReflectData.get()); } public void write(AvroWrapper<T> wrapper, NullWritable ignore) http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyInputFormat.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyInputFormat.java b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyInputFormat.java index 30d1682..3f4d249 100644 --- a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyInputFormat.java +++ b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyInputFormat.java @@ -51,7 +51,7 @@ public class AvroTrevniKeyInputFormat<T> extends FileInputFormat<AvroKey<T>, Nul InputSplit split, TaskAttemptContext context) throws IOException, InterruptedException { - return new AvroTrevniKeyRecordReader<T>(); + return new AvroTrevniKeyRecordReader<>(); } } http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyOutputFormat.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyOutputFormat.java b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyOutputFormat.java index cc1f48f..73ceb2a 100644 --- a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyOutputFormat.java +++ b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyOutputFormat.java @@ -51,6 +51,6 @@ public class AvroTrevniKeyOutputFormat <T> extends FileOutputFormat<AvroKey<T>, public RecordWriter<AvroKey<T>, NullWritable> getRecordWriter(TaskAttemptContext context) throws IOException, InterruptedException { - return new AvroTrevniKeyRecordWriter<T>(context ); + return new AvroTrevniKeyRecordWriter<>(context); } } http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyRecordReader.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyRecordReader.java b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyRecordReader.java index 4751983..944e683 100644 --- a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyRecordReader.java +++ b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyRecordReader.java @@ -31,7 +31,7 @@ import org.apache.hadoop.io.NullWritable; public class AvroTrevniKeyRecordReader<T> extends AvroTrevniRecordReaderBase<AvroKey<T>, NullWritable, T> { /** A reusable object to hold records of the Avro container file. */ - private final AvroKey<T> mCurrentKey = new AvroKey<T>(); + private final AvroKey<T> mCurrentKey = new AvroKey<>(); /** {@inheritDoc} */ @Override http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyValueInputFormat.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyValueInputFormat.java b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyValueInputFormat.java index 2fb1b33..cd19542 100644 --- a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyValueInputFormat.java +++ b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyValueInputFormat.java @@ -57,7 +57,7 @@ public class AvroTrevniKeyValueInputFormat<K, V> extends FileInputFormat<AvroKe InputSplit split, TaskAttemptContext context) throws IOException, InterruptedException { - return new AvroTrevniKeyValueRecordReader<K, V>(); + return new AvroTrevniKeyValueRecordReader<>(); } http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyValueOutputFormat.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyValueOutputFormat.java b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyValueOutputFormat.java index 9f6b23f..6e4cc6f 100644 --- a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyValueOutputFormat.java +++ b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyValueOutputFormat.java @@ -59,6 +59,6 @@ public class AvroTrevniKeyValueOutputFormat <K, V> extends FileOutputFormat<Avro public RecordWriter<AvroKey<K>, AvroValue<V>> getRecordWriter(TaskAttemptContext context) throws IOException, InterruptedException { - return new AvroTrevniKeyValueRecordWriter<K, V>(context ); + return new AvroTrevniKeyValueRecordWriter<>(context); } } http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyValueRecordReader.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyValueRecordReader.java b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyValueRecordReader.java index 31fe3f4..b31676f 100644 --- a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyValueRecordReader.java +++ b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyValueRecordReader.java @@ -38,9 +38,9 @@ import org.apache.avro.mapred.AvroValue; public class AvroTrevniKeyValueRecordReader<K, V> extends AvroTrevniRecordReaderBase<AvroKey<K>, AvroValue<V>, GenericRecord> { /** The current key the reader is on. */ - private final AvroKey<K> mCurrentKey = new AvroKey<K>(); + private final AvroKey<K> mCurrentKey = new AvroKey<>(); /** The current value the reader is on. */ - private final AvroValue<V> mCurrentValue = new AvroValue<V>(); + private final AvroValue<V> mCurrentValue = new AvroValue<>(); /** {@inheritDoc} */ @Override @@ -60,7 +60,7 @@ public class AvroTrevniKeyValueRecordReader<K, V> extends AvroTrevniRecordReader @Override public boolean nextKeyValue() throws IOException, InterruptedException { boolean hasNext = super.nextKeyValue(); - AvroKeyValue<K, V> avroKeyValue = new AvroKeyValue<K, V>(getCurrentRecord()); + AvroKeyValue<K, V> avroKeyValue = new AvroKeyValue<>(getCurrentRecord()); mCurrentKey.datum(avroKeyValue.getKey()); mCurrentValue.datum(avroKeyValue.getValue()); return hasNext; http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyValueRecordWriter.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyValueRecordWriter.java b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyValueRecordWriter.java index 9038028..833cd75 100644 --- a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyValueRecordWriter.java +++ b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniKeyValueRecordWriter.java @@ -65,7 +65,7 @@ public class AvroTrevniKeyValueRecordWriter <K, V> extends AvroTrevniRecordWrite super(context); mKeyValuePairSchema = initSchema(context); - keyValueRecord = new AvroKeyValue<Object, Object>(new GenericData.Record(mKeyValuePairSchema)); + keyValueRecord = new AvroKeyValue<>(new GenericData.Record(mKeyValuePairSchema)); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniRecordReaderBase.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniRecordReaderBase.java b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniRecordReaderBase.java index 1a3114f..a9e78d2 100644 --- a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniRecordReaderBase.java +++ b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniRecordReaderBase.java @@ -65,7 +65,7 @@ public abstract class AvroTrevniRecordReaderBase<K, V, T> extends RecordReader<K params.setSchema(AvroJob.getInputKeySchema(context.getConfiguration())); } - reader = new AvroColumnReader<T>(params); + reader = new AvroColumnReader<>(params); rows = reader.getRowCount(); } http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniRecordWriterBase.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniRecordWriterBase.java b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniRecordWriterBase.java index 7f1d57b..fdb9502 100644 --- a/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniRecordWriterBase.java +++ b/lang/java/trevni/avro/src/main/java/org/apache/trevni/avro/mapreduce/AvroTrevniRecordWriterBase.java @@ -81,7 +81,7 @@ public abstract class AvroTrevniRecordWriterBase<K,V, T> extends RecordWriter<K, schema = initSchema(context); meta = filterMetadata(context.getConfiguration()); - writer = new AvroColumnWriter<T>(schema, meta, ReflectData.get()); + writer = new AvroColumnWriter<>(schema, meta, ReflectData.get()); Path outputPath = FileOutputFormat.getOutputPath(context); @@ -110,7 +110,7 @@ public abstract class AvroTrevniRecordWriterBase<K,V, T> extends RecordWriter<K, } finally { out.close(); } - writer = new AvroColumnWriter<T>(schema, meta, ReflectData.get()); + writer = new AvroColumnWriter<>(schema, meta, ReflectData.get()); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/RandomData.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/RandomData.java b/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/RandomData.java index 5d43aae..8b9f18a 100644 --- a/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/RandomData.java +++ b/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/RandomData.java @@ -84,7 +84,7 @@ public class RandomData implements Iterable<Object> { return array; case MAP: length = (random.nextInt(5)+2)-d; - Map<Object,Object> map = new HashMap<Object,Object>(length<=0?0:length); + Map<Object,Object> map = new HashMap<>(length <= 0 ? 0 : length); for (int i = 0; i < length; i++) { map.put(TestUtil.randomString(random), generate(schema.getValueType(), random, d+1)); @@ -116,7 +116,7 @@ public class RandomData implements Iterable<Object> { } Schema sch = Schema.parse(new File(args[0])); DataFileWriter<Object> writer = - new DataFileWriter<Object>(new GenericDatumWriter<Object>()) + new DataFileWriter<>(new GenericDatumWriter<>()) .create(sch, new File(args[1])); try { for (Object datum : new RandomData(sch, Integer.parseInt(args[2]))) { http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestCases.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestCases.java b/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestCases.java index 5d659cb..1634b10 100644 --- a/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestCases.java +++ b/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestCases.java @@ -56,7 +56,7 @@ public class TestCases { // write full data AvroColumnWriter<Object> writer = - new AvroColumnWriter<Object>(schema, new ColumnFileMetaData()); + new AvroColumnWriter<>(schema, new ColumnFileMetaData()); for (Object datum : data) writer.write(datum); writer.writeTo(FILE); @@ -74,7 +74,7 @@ public class TestCases { private void checkRead(Schema s, List<Object> data) throws Exception { AvroColumnReader<Object> reader = - new AvroColumnReader<Object>(new AvroColumnReader.Params(FILE) + new AvroColumnReader<>(new AvroColumnReader.Params(FILE) .setSchema(s)); try { for (Object datum : data) @@ -86,7 +86,7 @@ public class TestCases { private List<Object> fromJson(Schema schema, File file) throws Exception { InputStream in = new FileInputStream(file); - List<Object> data = new ArrayList<Object>(); + List<Object> data = new ArrayList<>(); try { DatumReader reader = new GenericDatumReader(schema); Decoder decoder = DecoderFactory.get().jsonDecoder(schema, in); http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestEvolvedSchema.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestEvolvedSchema.java b/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestEvolvedSchema.java index 2b0fc4a..d08749b 100644 --- a/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestEvolvedSchema.java +++ b/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestEvolvedSchema.java @@ -89,7 +89,7 @@ public class TestEvolvedSchema extends TestCase { @Test public void testTrevniEvolvedRead() throws IOException { AvroColumnWriter<GenericRecord> acw = - new AvroColumnWriter<GenericRecord>(writer, new ColumnFileMetaData()); + new AvroColumnWriter<>(writer, new ColumnFileMetaData()); acw.write(writtenRecord); File serializedTrevni = File.createTempFile("trevni", null); acw.writeTo(serializedTrevni); @@ -97,7 +97,7 @@ public class TestEvolvedSchema extends TestCase { AvroColumnReader.Params params = new Params(serializedTrevni); params.setSchema(evolved); AvroColumnReader<GenericRecord> acr = - new AvroColumnReader<GenericRecord>(params); + new AvroColumnReader<>(params); GenericRecord readRecord = acr.next(); assertEquals(evolvedRecord, readRecord); assertFalse(acr.hasNext()); @@ -107,19 +107,19 @@ public class TestEvolvedSchema extends TestCase { public void testAvroEvolvedRead() throws IOException { File serializedAvro = File.createTempFile("avro", null); DatumWriter<GenericRecord> dw = - new GenericDatumWriter<GenericRecord>(writer); + new GenericDatumWriter<>(writer); DataFileWriter<GenericRecord> dfw = - new DataFileWriter<GenericRecord>(dw); + new DataFileWriter<>(dw); dfw.create(writer, serializedAvro); dfw.append(writtenRecord); dfw.flush(); dfw.close(); GenericDatumReader<GenericRecord> reader = - new GenericDatumReader<GenericRecord>(writer); + new GenericDatumReader<>(writer); reader.setExpected(evolved); DataFileReader<GenericRecord> dfr = - new DataFileReader<GenericRecord>(serializedAvro, reader); + new DataFileReader<>(serializedAvro, reader); GenericRecord readRecord = dfr.next(); assertEquals(evolvedRecord, readRecord); assertFalse(dfr.hasNext()); http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestShredder.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestShredder.java b/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestShredder.java index 9ca7344..66deeb0 100644 --- a/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestShredder.java +++ b/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestShredder.java @@ -255,7 +255,7 @@ public class TestShredder { private void checkWrite(Schema schema) throws IOException { AvroColumnWriter<Object> writer = - new AvroColumnWriter<Object>(schema, new ColumnFileMetaData()); + new AvroColumnWriter<>(schema, new ColumnFileMetaData()); int count = 0; for (Object datum : new RandomData(schema, COUNT)) { //System.out.println("datum="+datum); @@ -266,7 +266,7 @@ public class TestShredder { private void checkRead(Schema schema) throws IOException { AvroColumnReader<Object> reader = - new AvroColumnReader<Object>(new AvroColumnReader.Params(FILE) + new AvroColumnReader<>(new AvroColumnReader.Params(FILE) .setSchema(schema)); for (Object expected : new RandomData(schema, COUNT)) assertEquals(expected, reader.next()); http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestWordCount.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestWordCount.java b/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestWordCount.java index 79a8fff..6a06cc6 100644 --- a/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestWordCount.java +++ b/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestWordCount.java @@ -59,7 +59,7 @@ public class TestWordCount { Reporter reporter) throws IOException { StringTokenizer tokens = new StringTokenizer(text.toString()); while (tokens.hasMoreTokens()) - collector.collect(new Pair<String,Long>(tokens.nextToken(),1L)); + collector.collect(new Pair<>(tokens.nextToken(), 1L)); } } @@ -72,7 +72,7 @@ public class TestWordCount { long sum = 0; for (long count : counts) sum += count; - collector.collect(new Pair<String,Long>(word, sum)); + collector.collect(new Pair<>(word, sum)); } } http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/WordCountUtil.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/WordCountUtil.java b/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/WordCountUtil.java index 775992a..553f509 100644 --- a/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/WordCountUtil.java +++ b/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/WordCountUtil.java @@ -73,7 +73,7 @@ public class WordCountUtil { "the rain in spain falls mainly on the plains" }; - public static final Map<String,Long> COUNTS = new TreeMap<String,Long>(); + public static final Map<String,Long> COUNTS = new TreeMap<>(); public static final long TOTAL; static { long total = 0; @@ -96,8 +96,8 @@ public class WordCountUtil { public void writeLinesFile() throws IOException { FileUtil.fullyDelete(dir); - DatumWriter<String> writer = new GenericDatumWriter<String>(); - DataFileWriter<String> out = new DataFileWriter<String>(writer); + DatumWriter<String> writer = new GenericDatumWriter<>(); + DataFileWriter<String> out = new DataFileWriter<>(writer); linesFiles.getParentFile().mkdirs(); out.create(Schema.create(Schema.Type.STRING), linesFiles); for (String line : LINES) @@ -107,8 +107,8 @@ public class WordCountUtil { public void validateCountsFile() throws Exception { AvroColumnReader<Pair<String,Long>> reader = - new AvroColumnReader<Pair<String,Long>> - (new AvroColumnReader.Params(countFiles).setModel(SpecificData.get())); + new AvroColumnReader<>( + new AvroColumnReader.Params(countFiles).setModel(SpecificData.get())); int numWords = 0; for (Pair<String,Long> wc : reader) { assertEquals(wc.key(), COUNTS.get(wc.key()), wc.value()); @@ -120,8 +120,8 @@ public class WordCountUtil { public void validateCountsFileGenericRecord() throws Exception { AvroColumnReader<GenericRecord > reader = - new AvroColumnReader<GenericRecord > - (new AvroColumnReader.Params(countFiles).setModel(SpecificData.get())); + new AvroColumnReader<> ( + new AvroColumnReader.Params(countFiles).setModel(SpecificData.get())); int numWords = 0; for (GenericRecord wc : reader) { assertEquals((String)wc.get("key"), COUNTS.get(wc.get("key")), (Long)wc.get("value")); http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/mapreduce/TestKeyValueWordCount.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/mapreduce/TestKeyValueWordCount.java b/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/mapreduce/TestKeyValueWordCount.java index 47cbee4..8210204 100644 --- a/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/mapreduce/TestKeyValueWordCount.java +++ b/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/mapreduce/TestKeyValueWordCount.java @@ -79,8 +79,8 @@ public class TestKeyValueWordCount { private static class WordCountReducer extends Reducer< Text, LongWritable, AvroKey<String>, AvroValue<Long>> { - AvroKey<String> resultKey = new AvroKey<String>(); - AvroValue<Long> resultValue = new AvroValue<Long>(); + AvroKey<String> resultKey = new AvroKey<>(); + AvroValue<Long> resultValue = new AvroValue<>(); @Override protected void reduce(Text key, Iterable<LongWritable> values, Context context) throws IOException, InterruptedException { http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/mapreduce/TestKeyWordCount.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/mapreduce/TestKeyWordCount.java b/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/mapreduce/TestKeyWordCount.java index 1ba50ff..c10843b 100644 --- a/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/mapreduce/TestKeyWordCount.java +++ b/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/mapreduce/TestKeyWordCount.java @@ -86,7 +86,7 @@ public class TestKeyWordCount { @Override protected void setup(Context context) { - result = new AvroKey<GenericData.Record>(); + result = new AvroKey<>(); result.datum(new Record(Pair.getPairSchema(STRING,LONG))); } http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnFileReader.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnFileReader.java b/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnFileReader.java index cb475f5..bd9c5f9 100644 --- a/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnFileReader.java +++ b/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnFileReader.java @@ -66,7 +66,7 @@ public class ColumnFileReader implements Closeable { /** Return root columns' metadata. Roots are columns that have no parent. */ public List<ColumnMetaData> getRoots() { - List<ColumnMetaData> result = new ArrayList<ColumnMetaData>(); + List<ColumnMetaData> result = new ArrayList<>(); for (int i = 0; i < columnCount; i++) if (columns[i].metaData.getParent() == null) result.add(columns[i].metaData); @@ -96,7 +96,7 @@ public class ColumnFileReader implements Closeable { this.rowCount = in.readFixed64(); this.columnCount = in.readFixed32(); this.metaData = ColumnFileMetaData.read(in); - this.columnsByName = new HashMap<String,ColumnDescriptor>(columnCount); + this.columnsByName = new HashMap<>(columnCount); columns = new ColumnDescriptor[columnCount]; readColumnMetaData(in); @@ -135,13 +135,13 @@ public class ColumnFileReader implements Closeable { /** Return an iterator over values in the named column. */ public <T extends Comparable> ColumnValues<T> getValues(String columnName) throws IOException { - return new ColumnValues<T>(getColumn(columnName)); + return new ColumnValues<>(getColumn(columnName)); } /** Return an iterator over values in a column. */ public <T extends Comparable> ColumnValues<T> getValues(int column) throws IOException { - return new ColumnValues<T>(columns[column]); + return new ColumnValues<>(columns[column]); } @Override public void close() throws IOException { http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnFileWriter.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnFileWriter.java b/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnFileWriter.java index 5eb92aa..cb88cfd 100644 --- a/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnFileWriter.java +++ b/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnFileWriter.java @@ -58,7 +58,7 @@ public class ColumnFileWriter { } private void checkColumns(ColumnMetaData[] columnMeta) { - Set<String> seen = new HashSet<String>(); + Set<String> seen = new HashSet<>(); for (int i = 0; i < columnMeta.length; i++) { ColumnMetaData c = columnMeta[i]; String name = c.getName(); http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnMetaData.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnMetaData.java b/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnMetaData.java index e079c80..71d70f8 100644 --- a/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnMetaData.java +++ b/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnMetaData.java @@ -38,7 +38,7 @@ public class ColumnMetaData extends MetaData<ColumnMetaData> { private boolean isArray; private transient List<ColumnMetaData> children = - new ArrayList<ColumnMetaData>(0); + new ArrayList<>(0); private transient int number = -1; private ColumnMetaData() {} // non-public ctor http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnOutputBuffer.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnOutputBuffer.java b/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnOutputBuffer.java index 3217753..11c36ad 100644 --- a/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnOutputBuffer.java +++ b/lang/java/trevni/core/src/main/java/org/apache/trevni/ColumnOutputBuffer.java @@ -42,10 +42,10 @@ class ColumnOutputBuffer { this.codec = Codec.get(meta); this.checksum = Checksum.get(meta); this.buffer = new OutputBuffer(); - this.blockDescriptors = new ArrayList<BlockDescriptor>(); - this.blockData = new ArrayList<byte[]>(); + this.blockDescriptors = new ArrayList<>(); + this.blockData = new ArrayList<>(); if (meta.hasIndexValues()) - this.firstValues = new ArrayList<byte[]>(); + this.firstValues = new ArrayList<>(); } public ColumnMetaData getMeta() { return meta; } http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/trevni/core/src/test/java/org/apache/trevni/TestColumnFile.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/core/src/test/java/org/apache/trevni/TestColumnFile.java b/lang/java/trevni/core/src/test/java/org/apache/trevni/TestColumnFile.java index 68b7b61..09b2589 100644 --- a/lang/java/trevni/core/src/test/java/org/apache/trevni/TestColumnFile.java +++ b/lang/java/trevni/core/src/test/java/org/apache/trevni/TestColumnFile.java @@ -194,7 +194,7 @@ public class TestColumnFile { int seekCount = COUNT/1024; int[] seekRows = new int[seekCount]; - Map<Integer,Integer> seekRowMap = new HashMap<Integer,Integer>(seekCount); + Map<Integer,Integer> seekRowMap = new HashMap<>(seekCount); while (seekRowMap.size() < seekCount) { int row = random.nextInt(COUNT); if (!seekRowMap.containsKey(row)) { @@ -233,7 +233,7 @@ public class TestColumnFile { Random random = TestUtil.createRandom(); int seekCount = COUNT/1024; - Map<Integer,Integer> seekRowMap = new HashMap<Integer,Integer>(seekCount); + Map<Integer,Integer> seekRowMap = new HashMap<>(seekCount); while (seekRowMap.size() < seekCount) { int row = random.nextInt(COUNT); if (!seekRowMap.containsKey(row))
