You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by ni...@apache.org on 2017/12/29 17:10:17 UTC
[07/19] avro git commit: AVRO-2117: Cleanup Java - Explicit types
replaced with <>
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/hadoop/file/TestSortedKeyValueFile.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/hadoop/file/TestSortedKeyValueFile.java b/lang/java/mapred/src/test/java/org/apache/avro/hadoop/file/TestSortedKeyValueFile.java
index 74f65ac..1653a66 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/hadoop/file/TestSortedKeyValueFile.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/hadoop/file/TestSortedKeyValueFile.java
@@ -65,7 +65,7 @@ public class TestSortedKeyValueFile {
.withIndexInterval(2); // Index every other record.
SortedKeyValueFile.Writer<CharSequence, CharSequence> writer
- = new SortedKeyValueFile.Writer<CharSequence, CharSequence>(options);
+ = new SortedKeyValueFile.Writer<>(options);
Utf8 key = new Utf8(); // re-use key, to test copied
@@ -100,11 +100,11 @@ public class TestSortedKeyValueFile {
options.withCodec(codec);
- writer = new SortedKeyValueFile.Writer<CharSequence, CharSequence>(options);
+ writer = new SortedKeyValueFile.Writer<>(options);
writer.close();
- reader = new DataFileReader<GenericRecord>(
- new FsInput(new Path(myfile,SortedKeyValueFile.DATA_FILENAME), conf),
+ reader = new DataFileReader<>(
+ new FsInput(new Path(myfile, SortedKeyValueFile.DATA_FILENAME), conf),
datumReader);
assertEquals(codec, reader.getMetaString("avro.codec"));
@@ -131,11 +131,11 @@ public class TestSortedKeyValueFile {
.withCodec(CodecFactory.deflateCodec(9));
SortedKeyValueFile.Writer<CharSequence, CharSequence> writer =
- new SortedKeyValueFile.Writer<CharSequence, CharSequence>(options);
+ new SortedKeyValueFile.Writer<>(options);
writer.close();
- reader = new DataFileReader<GenericRecord>(
- new FsInput(new Path(myfile,SortedKeyValueFile.DATA_FILENAME), conf),
+ reader = new DataFileReader<>(
+ new FsInput(new Path(myfile, SortedKeyValueFile.DATA_FILENAME), conf),
datumReader);
assertEquals("deflate", reader.getMetaString("avro.codec"));
@@ -167,7 +167,7 @@ public class TestSortedKeyValueFile {
.withIndexInterval(2); // Index every other record.
SortedKeyValueFile.Writer<CharSequence, CharSequence> writer
- = new SortedKeyValueFile.Writer<CharSequence, CharSequence>(options);
+ = new SortedKeyValueFile.Writer<>(options);
try {
writer.append("apple", "Apple"); // Will be indexed.
@@ -186,15 +186,15 @@ public class TestSortedKeyValueFile {
LOG.debug("Checking the generated index file...");
File indexFile = new File(directory, SortedKeyValueFile.INDEX_FILENAME);
- DatumReader<GenericRecord> indexReader = new GenericDatumReader<GenericRecord>(
+ DatumReader<GenericRecord> indexReader = new GenericDatumReader<>(
AvroKeyValue.getSchema(options.getKeySchema(), Schema.create(Schema.Type.LONG)));
FileReader<GenericRecord> indexFileReader = DataFileReader.openReader(indexFile, indexReader);
List<AvroKeyValue<CharSequence, Long>> indexRecords
- = new ArrayList<AvroKeyValue<CharSequence, Long>>();
+ = new ArrayList<>();
try {
for (GenericRecord indexRecord : indexFileReader) {
- indexRecords.add(new AvroKeyValue<CharSequence, Long>(indexRecord));
+ indexRecords.add(new AvroKeyValue<>(indexRecord));
}
} finally {
indexFileReader.close();
@@ -208,29 +208,29 @@ public class TestSortedKeyValueFile {
LOG.debug("Checking the generated data file...");
File dataFile = new File(directory, SortedKeyValueFile.DATA_FILENAME);
- DatumReader<GenericRecord> dataReader = new GenericDatumReader<GenericRecord>(
+ DatumReader<GenericRecord> dataReader = new GenericDatumReader<>(
AvroKeyValue.getSchema(options.getKeySchema(), options.getValueSchema()));
DataFileReader<GenericRecord> dataFileReader
- = new DataFileReader<GenericRecord>(dataFile, dataReader);
+ = new DataFileReader<>(dataFile, dataReader);
try {
dataFileReader.seek(indexRecords.get(0).getValue());
assertTrue(dataFileReader.hasNext());
AvroKeyValue<CharSequence, CharSequence> appleRecord
- = new AvroKeyValue<CharSequence, CharSequence>(dataFileReader.next());
+ = new AvroKeyValue<>(dataFileReader.next());
assertEquals("apple", appleRecord.getKey().toString());
assertEquals("Apple", appleRecord.getValue().toString());
dataFileReader.seek(indexRecords.get(1).getValue());
assertTrue(dataFileReader.hasNext());
AvroKeyValue<CharSequence, CharSequence> carrotRecord
- = new AvroKeyValue<CharSequence, CharSequence>(dataFileReader.next());
+ = new AvroKeyValue<>(dataFileReader.next());
assertEquals("carrot", carrotRecord.getKey().toString());
assertEquals("Carrot", carrotRecord.getValue().toString());
assertTrue(dataFileReader.hasNext());
AvroKeyValue<CharSequence, CharSequence> durianRecord
- = new AvroKeyValue<CharSequence, CharSequence>(dataFileReader.next());
+ = new AvroKeyValue<>(dataFileReader.next());
assertEquals("durian", durianRecord.getKey().toString());
assertEquals("Durian", durianRecord.getValue().toString());
} finally {
@@ -249,7 +249,7 @@ public class TestSortedKeyValueFile {
.withIndexInterval(2); // Index every other record.
SortedKeyValueFile.Writer<CharSequence, CharSequence> writer
- = new SortedKeyValueFile.Writer<CharSequence, CharSequence>(writerOptions);
+ = new SortedKeyValueFile.Writer<>(writerOptions);
try {
writer.append("apple", "Apple"); // Will be indexed.
@@ -268,7 +268,7 @@ public class TestSortedKeyValueFile {
.withPath(new Path(mTempDir.getRoot().getPath(), "myfile"));
SortedKeyValueFile.Reader<CharSequence, CharSequence> reader
- = new SortedKeyValueFile.Reader<CharSequence, CharSequence>(readerOptions);
+ = new SortedKeyValueFile.Reader<>(readerOptions);
try {
assertEquals("Carrot", reader.get("carrot").toString());
@@ -311,7 +311,7 @@ public class TestSortedKeyValueFile {
.withIndexInterval(2);
SortedKeyValueFile.Writer<Stringy,Stringy> writer
- = new SortedKeyValueFile.Writer<Stringy,Stringy>(options);
+ = new SortedKeyValueFile.Writer<>(options);
try {
writer.append(new Stringy("apple"), new Stringy("Apple"));
@@ -332,7 +332,7 @@ public class TestSortedKeyValueFile {
.withDataModel(model);
SortedKeyValueFile.Reader<Stringy,Stringy> reader
- = new SortedKeyValueFile.Reader<Stringy,Stringy>(readerOptions);
+ = new SortedKeyValueFile.Reader<>(readerOptions);
try {
assertEquals(new Stringy("Carrot"), reader.get(new Stringy("carrot")));
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroDatumConverterFactory.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroDatumConverterFactory.java b/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroDatumConverterFactory.java
index 92e45b5..261c93a 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroDatumConverterFactory.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroDatumConverterFactory.java
@@ -55,7 +55,7 @@ public class TestAvroDatumConverterFactory {
public void testConvertAvroKey() throws IOException {
AvroJob.setOutputKeySchema(mJob, Schema.create(Schema.Type.STRING));
- AvroKey<CharSequence> avroKey = new AvroKey<CharSequence>("foo");
+ AvroKey<CharSequence> avroKey = new AvroKey<>("foo");
@SuppressWarnings("unchecked")
AvroDatumConverter<AvroKey<CharSequence>, ?> converter = mFactory.create(
(Class<AvroKey<CharSequence>>) avroKey.getClass());
@@ -66,7 +66,7 @@ public class TestAvroDatumConverterFactory {
public void testConvertAvroValue() throws IOException {
AvroJob.setOutputValueSchema(mJob, Schema.create(Schema.Type.INT));
- AvroValue<Integer> avroValue = new AvroValue<Integer>(42);
+ AvroValue<Integer> avroValue = new AvroValue<>(42);
@SuppressWarnings("unchecked")
AvroDatumConverter<AvroValue<Integer>, Integer> converter = mFactory.create(
(Class<AvroValue<Integer>>) avroValue.getClass());
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroKeyDeserializer.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroKeyDeserializer.java b/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroKeyDeserializer.java
index 92dc129..9c2a8ee 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroKeyDeserializer.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroKeyDeserializer.java
@@ -39,16 +39,15 @@ public class TestAvroKeyDeserializer {
Schema writerSchema = Schema.create(Schema.Type.STRING);
Schema readerSchema = Schema.create(Schema.Type.STRING);
ClassLoader classLoader = this.getClass().getClassLoader();
- AvroKeyDeserializer<CharSequence> deserializer
- = new AvroKeyDeserializer<CharSequence>(writerSchema, readerSchema,
- classLoader);
+ AvroKeyDeserializer<CharSequence> deserializer =
+ new AvroKeyDeserializer<>(writerSchema, readerSchema, classLoader);
// Check the schemas.
assertEquals(writerSchema, deserializer.getWriterSchema());
assertEquals(readerSchema, deserializer.getReaderSchema());
// Write some records to deserialize.
- DatumWriter<CharSequence> datumWriter = new GenericDatumWriter<CharSequence>(writerSchema);
+ DatumWriter<CharSequence> datumWriter = new GenericDatumWriter<>(writerSchema);
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
Encoder encoder = EncoderFactory.get().binaryEncoder(outputStream, null);
datumWriter.write("record1", encoder);
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroSequenceFile.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroSequenceFile.java b/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroSequenceFile.java
index 44298b2..c98ce8e 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroSequenceFile.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroSequenceFile.java
@@ -52,8 +52,8 @@ public class TestAvroSequenceFile {
writeSequenceFile(sequenceFilePath, AvroKey.class, AvroValue.class,
Schema.create(Schema.Type.STRING), Schema.create(Schema.Type.INT),
- new AvroKey<CharSequence>("one"), new AvroValue<Integer>(1),
- new AvroKey<CharSequence>("two"), new AvroValue<Integer>(2));
+ new AvroKey<CharSequence>("one"), new AvroValue<>(1),
+ new AvroKey<CharSequence>("two"), new AvroValue<>(2));
Configuration conf = new Configuration();
FileSystem fs = FileSystem.get(conf);
@@ -65,8 +65,8 @@ public class TestAvroSequenceFile {
.withConfiguration(conf);
SequenceFile.Reader reader = new AvroSequenceFile.Reader(options);
- AvroKey<CharSequence> key = new AvroKey<CharSequence>();
- AvroValue<Integer> value = new AvroValue<Integer>();
+ AvroKey<CharSequence> key = new AvroKey<>();
+ AvroValue<Integer> value = new AvroValue<>();
// Read the first record.
key = (AvroKey<CharSequence>) reader.next(key);
@@ -95,8 +95,8 @@ public class TestAvroSequenceFile {
writeSequenceFile(sequenceFilePath, AvroKey.class, AvroValue.class,
Schema.create(Schema.Type.STRING), Schema.create(Schema.Type.INT),
- new AvroKey<CharSequence>("one"), new AvroValue<Integer>(1),
- new AvroKey<CharSequence>("two"), new AvroValue<Integer>(2));
+ new AvroKey<CharSequence>("one"), new AvroValue<>(1),
+ new AvroKey<CharSequence>("two"), new AvroValue<>(2));
Configuration conf = new Configuration();
FileSystem fs = FileSystem.get(conf);
@@ -106,8 +106,8 @@ public class TestAvroSequenceFile {
.withConfiguration(conf);
SequenceFile.Reader reader = new AvroSequenceFile.Reader(options);
- AvroKey<CharSequence> key = new AvroKey<CharSequence>();
- AvroValue<Integer> value = new AvroValue<Integer>();
+ AvroKey<CharSequence> key = new AvroKey<>();
+ AvroValue<Integer> value = new AvroValue<>();
// Read the first record.
key = (AvroKey<CharSequence>) reader.next(key);
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroSerialization.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroSerialization.java b/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroSerialization.java
index ea774cb..c3ac9ff 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroSerialization.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroSerialization.java
@@ -50,7 +50,7 @@ import org.junit.Assert;
public class TestAvroSerialization {
@Test
public void testAccept() {
- AvroSerialization<CharSequence> serialization = new AvroSerialization<CharSequence>();
+ AvroSerialization<CharSequence> serialization = new AvroSerialization<>();
assertTrue(serialization.accept(AvroKey.class));
assertTrue(serialization.accept(AvroValue.class));
@@ -158,7 +158,7 @@ public class TestAvroSerialization {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
serializer.open(baos);
- serializer.serialize(new AvroKey<T>(data));
+ serializer.serialize(new AvroKey<>(data));
serializer.close();
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroSerializer.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroSerializer.java b/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroSerializer.java
index 0f3806d..dec4f0f 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroSerializer.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroSerializer.java
@@ -37,7 +37,7 @@ public class TestAvroSerializer {
public void testSerialize() throws IOException {
// Create a serializer.
Schema writerSchema = Schema.create(Schema.Type.STRING);
- AvroSerializer<CharSequence> serializer = new AvroSerializer<CharSequence>(writerSchema);
+ AvroSerializer<CharSequence> serializer = new AvroSerializer<>(writerSchema);
// Check the writer schema.
assertEquals(writerSchema, serializer.getWriterSchema());
@@ -45,14 +45,14 @@ public class TestAvroSerializer {
// Serialize two records, 'record1' and 'record2'.
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
serializer.open(outputStream);
- serializer.serialize(new AvroKey<CharSequence>("record1"));
- serializer.serialize(new AvroKey<CharSequence>("record2"));
+ serializer.serialize(new AvroKey<>("record1"));
+ serializer.serialize(new AvroKey<>("record2"));
serializer.close();
// Make sure the records were serialized correctly.
ByteArrayInputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
Schema readerSchema = Schema.create(Schema.Type.STRING);
- DatumReader<CharSequence> datumReader = new GenericDatumReader<CharSequence>(readerSchema);
+ DatumReader<CharSequence> datumReader = new GenericDatumReader<>(readerSchema);
Decoder decoder = DecoderFactory.get().binaryDecoder(inputStream, null);
CharSequence record = null;
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroValueDeserializer.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroValueDeserializer.java b/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroValueDeserializer.java
index ddbd831..a4a90ce 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroValueDeserializer.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/hadoop/io/TestAvroValueDeserializer.java
@@ -39,16 +39,15 @@ public class TestAvroValueDeserializer {
Schema writerSchema = Schema.create(Schema.Type.STRING);
Schema readerSchema = Schema.create(Schema.Type.STRING);
ClassLoader classLoader = this.getClass().getClassLoader();
- AvroValueDeserializer<CharSequence> deserializer
- = new AvroValueDeserializer<CharSequence>(writerSchema, readerSchema,
- classLoader);
+ AvroValueDeserializer<CharSequence> deserializer =
+ new AvroValueDeserializer<>(writerSchema, readerSchema, classLoader);
// Check the schemas.
assertEquals(writerSchema, deserializer.getWriterSchema());
assertEquals(readerSchema, deserializer.getReaderSchema());
// Write some records to deserialize.
- DatumWriter<CharSequence> datumWriter = new GenericDatumWriter<CharSequence>(writerSchema);
+ DatumWriter<CharSequence> datumWriter = new GenericDatumWriter<>(writerSchema);
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
Encoder encoder = EncoderFactory.get().binaryEncoder(outputStream, null);
datumWriter.write("record1", encoder);
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/hadoop/util/TestAvroCharSequenceComparator.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/hadoop/util/TestAvroCharSequenceComparator.java b/lang/java/mapred/src/test/java/org/apache/avro/hadoop/util/TestAvroCharSequenceComparator.java
index bf17a0e..b4acd1e 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/hadoop/util/TestAvroCharSequenceComparator.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/hadoop/util/TestAvroCharSequenceComparator.java
@@ -31,7 +31,7 @@ public class TestAvroCharSequenceComparator {
@Before
public void setup() {
- mComparator = new AvroCharSequenceComparator<CharSequence>();
+ mComparator = new AvroCharSequenceComparator<>();
}
@Test
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroInputFormat.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroInputFormat.java b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroInputFormat.java
index 9961814..dee6f63 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroInputFormat.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroInputFormat.java
@@ -74,7 +74,7 @@ public class TestAvroInputFormat {
conf.setBoolean(AvroInputFormat.IGNORE_FILES_WITHOUT_EXTENSION_KEY, false);
statuses = inputFormat.listStatus(conf);
Assert.assertEquals(2, statuses.length);
- Set<String> names = new HashSet<String>();
+ Set<String> names = new HashSet<>();
names.add(statuses[0].getPath().getName());
names.add(statuses[1].getPath().getName());
Assert.assertTrue(names.contains("somefile.avro"));
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroMultipleInputs.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroMultipleInputs.java b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroMultipleInputs.java
index 278d5c7..a6a43b0 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroMultipleInputs.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroMultipleInputs.java
@@ -159,7 +159,7 @@ public class TestAvroMultipleInputs {
AvroCollector<Pair<KeyRecord, JoinableRecord>> collector,
Reporter reporter) throws IOException {
collector.collect(
- new Pair<KeyRecord, JoinableRecord>(
+ new Pair<>(
new KeyRecord(nameRecord.id),
new JoinableRecord(nameRecord.getClass().getName(),
nameRecord.id, nameRecord.name, -1L)));
@@ -176,7 +176,7 @@ public class TestAvroMultipleInputs {
AvroCollector<Pair<KeyRecord, JoinableRecord>> collector,
Reporter reporter) throws IOException {
collector.collect(
- new Pair<KeyRecord, JoinableRecord>(
+ new Pair<>(
new KeyRecord(balanceRecord.id),
new JoinableRecord(balanceRecord.getClass().getName(),
balanceRecord.id, "", balanceRecord.balance)));
@@ -229,8 +229,8 @@ public class TestAvroMultipleInputs {
Schema keySchema = ReflectData.get().getSchema(KeyRecord.class);
Schema valueSchema = ReflectData.get().getSchema(JoinableRecord.class);
- AvroJob.setMapOutputSchema
- (job, Pair.getPairSchema(keySchema, valueSchema));
+ AvroJob.setMapOutputSchema(job,
+ Pair.getPairSchema(keySchema, valueSchema));
AvroJob.setOutputSchema(job,
ReflectData.get().getSchema(CompleteRecord.class));
@@ -250,8 +250,8 @@ public class TestAvroMultipleInputs {
* Writes a "names.avro" file with five sequential <id, name> pairs.
*/
private void writeNamesFiles(File dir) throws IOException {
- DatumWriter<NamesRecord> writer = new ReflectDatumWriter<NamesRecord>();
- DataFileWriter<NamesRecord> out = new DataFileWriter<NamesRecord>(writer);
+ DatumWriter<NamesRecord> writer = new ReflectDatumWriter<>();
+ DataFileWriter<NamesRecord> out = new DataFileWriter<>(writer);
File namesFile = new File(dir+"/names.avro");
dir.mkdirs();
out.create(ReflectData.get().getSchema(NamesRecord.class), namesFile);
@@ -265,9 +265,9 @@ public class TestAvroMultipleInputs {
*/
private void writeBalancesFiles(File dir) throws IOException {
DatumWriter<BalancesRecord> writer =
- new ReflectDatumWriter<BalancesRecord>();
+ new ReflectDatumWriter<>();
DataFileWriter<BalancesRecord> out =
- new DataFileWriter<BalancesRecord>(writer);
+ new DataFileWriter<>(writer);
File namesFile = new File(dir+"/balances.avro");
dir.mkdirs();
out.create(ReflectData.get().getSchema(BalancesRecord.class), namesFile);
@@ -278,10 +278,10 @@ public class TestAvroMultipleInputs {
private void validateCompleteFile(File file) throws Exception {
DatumReader<CompleteRecord> reader =
- new ReflectDatumReader<CompleteRecord>();
+ new ReflectDatumReader<>();
InputStream in = new BufferedInputStream(new FileInputStream(file));
DataFileStream<CompleteRecord> records =
- new DataFileStream<CompleteRecord>(in,reader);
+ new DataFileStream<>(in, reader);
int numRecs = 0;
for (CompleteRecord rec : records) {
assertEquals(rec.id, numRecs);
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroMultipleOutputs.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroMultipleOutputs.java b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroMultipleOutputs.java
index 6d57630..a77ac46 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroMultipleOutputs.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroMultipleOutputs.java
@@ -60,7 +60,7 @@ public class TestAvroMultipleOutputs {
StringTokenizer tokens = new StringTokenizer(text.toString());
while (tokens.hasMoreTokens()) {
String tok = tokens.nextToken();
- collector.collect(new Pair<Utf8,Long>(new Utf8(tok),1L));
+ collector.collect(new Pair<>(new Utf8(tok), 1L));
amos.getCollector("myavro2",reporter)
.collect(new Pair<Utf8,Long>(new Utf8(tok),1L).toString());
}
@@ -88,12 +88,12 @@ public class TestAvroMultipleOutputs {
long sum = 0;
for (long count : counts)
sum += count;
- Pair<Utf8,Long> outputvalue= new Pair<Utf8,Long>(word,sum);
+ Pair<Utf8,Long> outputvalue= new Pair<>(word, sum);
amos.getCollector("myavro",reporter).collect(outputvalue);
amos.collect("myavro1",reporter,outputvalue.toString());
amos.collect("myavro",reporter,new Pair<Utf8,Long>(new Utf8(""), 0L).getSchema(),outputvalue,"testavrofile");
amos.collect("myavro",reporter,Schema.create(Schema.Type.STRING),outputvalue.toString(),"testavrofile1");
- collector.collect(new Pair<Utf8,Long>(word, sum));
+ collector.collect(new Pair<>(word, sum));
}
public void close() throws IOException
{
@@ -169,9 +169,9 @@ public class TestAvroMultipleOutputs {
FileSplit fileSplit = new FileSplit(inputPath, 0, fileStatus.getLen(), job);
- AvroRecordReader<Pair<Integer, Long>> recordReader = new AvroRecordReader<Pair<Integer, Long>>(job, fileSplit);
+ AvroRecordReader<Pair<Integer, Long>> recordReader = new AvroRecordReader<>(job, fileSplit);
- AvroWrapper<Pair<Integer, Long>> inputPair = new AvroWrapper<Pair<Integer, Long>>(null);
+ AvroWrapper<Pair<Integer, Long>> inputPair = new AvroWrapper<>(null);
NullWritable ignore = NullWritable.get();
long sumOfCounts = 0;
@@ -217,9 +217,9 @@ public class TestAvroMultipleOutputs {
FileSplit fileSplit = new FileSplit(inputPath, 0, fileStatus.getLen(), job);
- AvroRecordReader<Pair<Integer, Long>> recordReader = new AvroRecordReader<Pair<Integer, Long>>(job, fileSplit);
+ AvroRecordReader<Pair<Integer, Long>> recordReader = new AvroRecordReader<>(job, fileSplit);
- AvroWrapper<Pair<Integer, Long>> inputPair = new AvroWrapper<Pair<Integer, Long>>(null);
+ AvroWrapper<Pair<Integer, Long>> inputPair = new AvroWrapper<>(null);
NullWritable ignore = NullWritable.get();
long sumOfCounts = 0;
@@ -253,9 +253,9 @@ public class TestAvroMultipleOutputs {
Path inputPath = new Path(dir + "/out" + "/myavro1-r-00000.avro");
FileStatus fileStatus = FileSystem.get(job).getFileStatus(inputPath);
FileSplit fileSplit = new FileSplit(inputPath, 0, fileStatus.getLen(), job);
- AvroWrapper<Utf8> inputPair = new AvroWrapper<Utf8>(null);
+ AvroWrapper<Utf8> inputPair = new AvroWrapper<>(null);
NullWritable ignore = NullWritable.get();
- AvroRecordReader<Utf8> recordReader = new AvroRecordReader<Utf8>(job, fileSplit);
+ AvroRecordReader<Utf8> recordReader = new AvroRecordReader<>(job, fileSplit);
long sumOfCounts = 0;
long numOfCounts = 0;
while(recordReader.next(inputPair, ignore)) {
@@ -281,9 +281,9 @@ public class TestAvroMultipleOutputs {
Path inputPath = new Path(dir + "/out" + "/testavrofile1-r-00000.avro");
FileStatus fileStatus = FileSystem.get(job).getFileStatus(inputPath);
FileSplit fileSplit = new FileSplit(inputPath, 0, fileStatus.getLen(), job);
- AvroWrapper<Utf8> inputPair = new AvroWrapper<Utf8>(null);
+ AvroWrapper<Utf8> inputPair = new AvroWrapper<>(null);
NullWritable ignore = NullWritable.get();
- AvroRecordReader<Utf8> recordReader = new AvroRecordReader<Utf8>(job, fileSplit);
+ AvroRecordReader<Utf8> recordReader = new AvroRecordReader<>(job, fileSplit);
long sumOfCounts = 0;
long numOfCounts = 0;
while(recordReader.next(inputPair, ignore)) {
@@ -333,8 +333,8 @@ public class TestAvroMultipleOutputs {
Path inputPath = new Path(dir + "/out" + "/myavro2-m-00000.avro");
FileStatus fileStatus = FileSystem.get(job).getFileStatus(inputPath);
FileSplit fileSplit = new FileSplit(inputPath, 0, fileStatus.getLen(), job);
- AvroRecordReader<Utf8> recordReader_new = new AvroRecordReader<Utf8>(job, fileSplit);
- AvroWrapper<Utf8> inputPair_new = new AvroWrapper<Utf8>(null);
+ AvroRecordReader<Utf8> recordReader_new = new AvroRecordReader<>(job, fileSplit);
+ AvroWrapper<Utf8> inputPair_new = new AvroWrapper<>(null);
NullWritable ignore = NullWritable.get();
long testl=0;
while(recordReader_new.next(inputPair_new, ignore)) {
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroTextOutputFormat.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroTextOutputFormat.java b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroTextOutputFormat.java
index e4743cc..d73e8c8 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroTextOutputFormat.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroTextOutputFormat.java
@@ -46,11 +46,11 @@ public class TestAvroTextOutputFormat {
File file = new File(System.getProperty("test.dir", "."), "writer");
Schema schema = Schema.create(Schema.Type.BYTES);
DatumWriter<ByteBuffer> datumWriter =
- new GenericDatumWriter<ByteBuffer>(schema);
+ new GenericDatumWriter<>(schema);
DataFileWriter<ByteBuffer> fileWriter =
- new DataFileWriter<ByteBuffer>(datumWriter);
+ new DataFileWriter<>(datumWriter);
fileWriter.create(schema, file);
- RecordWriter<Object, Object> rw = new AvroTextOutputFormat<Object, Object>()
+ RecordWriter<Object, Object> rw = new AvroTextOutputFormat<>()
.new AvroTextRecordWriter(fileWriter, "\t".getBytes(UTF8));
rw.write(null, null);
@@ -69,9 +69,9 @@ public class TestAvroTextOutputFormat {
rw.close(null);
- DatumReader<ByteBuffer> reader = new GenericDatumReader<ByteBuffer>();
+ DatumReader<ByteBuffer> reader = new GenericDatumReader<>();
DataFileReader<ByteBuffer> fileReader =
- new DataFileReader<ByteBuffer>(file, reader);
+ new DataFileReader<>(file, reader);
assertEquals("k1", asString(fileReader.next()));
assertEquals("k2", asString(fileReader.next()));
assertEquals("v1", asString(fileReader.next()));
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroWrapper.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroWrapper.java b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroWrapper.java
index 4fd71c7..c832566 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroWrapper.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroWrapper.java
@@ -26,7 +26,7 @@ public class TestAvroWrapper {
@Test
public void testToString() {
String datum = "my string";
- AvroWrapper<CharSequence> wrapper = new AvroWrapper<CharSequence>(datum);
+ AvroWrapper<CharSequence> wrapper = new AvroWrapper<>(datum);
assertEquals(datum, wrapper.toString());
}
}
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestGenericJob.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestGenericJob.java b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestGenericJob.java
index 2c61598..bcff59e 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestGenericJob.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestGenericJob.java
@@ -57,10 +57,9 @@ public class TestGenericJob {
System.getProperty("test.dir", ".") + "target/testGenericJob";
private static Schema createSchema() {
- List<Field> fields = new ArrayList<Schema.Field>();
+ List<Field> fields = new ArrayList<>();
-
- fields.add(new Field("Optional", createArraySchema(), "", new ArrayList<Object>()));
+ fields.add(new Field("Optional", createArraySchema(), "", new ArrayList<>()));
Schema recordSchema =
Schema.createRecord("Container", "", "org.apache.avro.mapred", false);
@@ -69,7 +68,7 @@ public class TestGenericJob {
}
private static Schema createArraySchema() {
- List<Schema> schemas = new ArrayList<Schema>();
+ List<Schema> schemas = new ArrayList<>();
for (int i = 0; i < 5; i++) {
schemas.add(createInnerSchema("optional_field_" + i));
}
@@ -111,17 +110,16 @@ public class TestGenericJob {
OutputCollector<AvroWrapper<Pair<Long,GenericData.Record>>,NullWritable> out,
Reporter reporter) throws IOException {
GenericData.Record optional_entry =
- new GenericData.Record(createInnerSchema("optional_field_1"));
+ new GenericData.Record(createInnerSchema("optional_field_1"));
optional_entry.put("optional_field_1", 0l);
GenericData.Array<GenericData.Record> array =
- new GenericData.Array<GenericData.Record>(1, createArraySchema());
+ new GenericData.Array<>(1, createArraySchema());
array.add(optional_entry);
GenericData.Record container = new GenericData.Record(createSchema());
container.put("Optional", array);
- out.collect(new AvroWrapper<Pair<Long,GenericData.Record>>
- (new Pair<Long,GenericData.Record>(key.get(), container)),
+ out.collect(new AvroWrapper<>(new Pair<>(key.get(), container)),
NullWritable.get());
}
}
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestReflectJob.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestReflectJob.java b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestReflectJob.java
index 1b6ab68..7001fcb 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestReflectJob.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestReflectJob.java
@@ -77,8 +77,8 @@ public class TestReflectJob {
Reporter reporter) throws IOException {
StringTokenizer tokens = new StringTokenizer(text.toString());
while (tokens.hasMoreTokens())
- collector.collect(new Pair<Text,Count>(new Text(tokens.nextToken()),
- new Count(1L)));
+ collector.collect(new Pair<>(new Text(tokens.nextToken()),
+ new Count(1L)));
}
}
@@ -130,8 +130,8 @@ public class TestReflectJob {
}
private void writeLinesFile(File dir) throws IOException {
- DatumWriter<Text> writer = new ReflectDatumWriter<Text>();
- DataFileWriter<Text> out = new DataFileWriter<Text>(writer);
+ DatumWriter<Text> writer = new ReflectDatumWriter<>();
+ DataFileWriter<Text> out = new DataFileWriter<>(writer);
File linesFile = new File(dir+"/lines.avro");
dir.mkdirs();
out.create(ReflectData.get().getSchema(Text.class), linesFile);
@@ -141,9 +141,9 @@ public class TestReflectJob {
}
private void validateCountsFile(File file) throws Exception {
- DatumReader<WordCount> reader = new ReflectDatumReader<WordCount>();
+ DatumReader<WordCount> reader = new ReflectDatumReader<>();
InputStream in = new BufferedInputStream(new FileInputStream(file));
- DataFileStream<WordCount> counts = new DataFileStream<WordCount>(in,reader);
+ DataFileStream<WordCount> counts = new DataFileStream<>(in, reader);
int numWords = 0;
for (WordCount wc : counts) {
assertEquals(wc.word,
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestSequenceFileReader.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestSequenceFileReader.java b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestSequenceFileReader.java
index 9d3bda2..25820ea 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestSequenceFileReader.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestSequenceFileReader.java
@@ -84,7 +84,7 @@ public class TestSequenceFileReader {
@Test
public void testReadSequenceFile() throws Exception {
- checkFile(new SequenceFileReader<Long,CharSequence>(FILE));
+ checkFile(new SequenceFileReader<>(FILE));
}
public void checkFile(FileReader<Pair<Long,CharSequence>> reader) throws Exception {
@@ -119,9 +119,9 @@ public class TestSequenceFileReader {
JobClient.runJob(job);
- checkFile(new DataFileReader<Pair<Long,CharSequence>>
- (new File(output.toString()+"/part-00000.avro"),
- new SpecificDatumReader<Pair<Long,CharSequence>>()));
+ checkFile(new DataFileReader<>
+ (new File(output.toString() + "/part-00000.avro"),
+ new SpecificDatumReader<>()));
}
private static class NonAvroMapper
@@ -131,8 +131,8 @@ public class TestSequenceFileReader {
public void map(LongWritable key, Text value,
OutputCollector<AvroKey<Long>,AvroValue<Utf8>> out,
Reporter reporter) throws IOException {
- out.collect(new AvroKey<Long>(key.get()),
- new AvroValue<Utf8>(new Utf8(value.toString())));
+ out.collect(new AvroKey<>(key.get()),
+ new AvroValue<>(new Utf8(value.toString())));
}
}
@@ -158,9 +158,9 @@ public class TestSequenceFileReader {
JobClient.runJob(job);
- checkFile(new DataFileReader<Pair<Long,CharSequence>>
- (new File(output.toString()+"/part-00000.avro"),
- new SpecificDatumReader<Pair<Long,CharSequence>>()));
+ checkFile(new DataFileReader<>
+ (new File(output.toString() + "/part-00000.avro"),
+ new SpecificDatumReader<>()));
}
private static class NonAvroOnlyMapper
@@ -170,7 +170,7 @@ public class TestSequenceFileReader {
public void map(LongWritable key, Text value,
OutputCollector<AvroWrapper<Pair<Long,Utf8>>,NullWritable> out,
Reporter reporter) throws IOException {
- out.collect(new AvroWrapper<Pair<Long,Utf8>>(new Pair<Long,Utf8>(key.get(), new Utf8(value.toString()))),
+ out.collect(new AvroWrapper<>(new Pair<>(key.get(), new Utf8(value.toString()))),
NullWritable.get());
}
}
@@ -197,9 +197,9 @@ public class TestSequenceFileReader {
JobClient.runJob(job);
- checkFile(new DataFileReader<Pair<Long,CharSequence>>
- (new File(output.toString()+"/part-00000.avro"),
- new SpecificDatumReader<Pair<Long,CharSequence>>()));
+ checkFile(new DataFileReader<>
+ (new File(output.toString() + "/part-00000.avro"),
+ new SpecificDatumReader<>()));
}
private static class NonAvroReducer
@@ -243,8 +243,8 @@ public class TestSequenceFileReader {
JobClient.runJob(job);
- checkFile(new SequenceFileReader<Long,CharSequence>
- (new File(output.toString()+"/part-00000")));
+ checkFile(new SequenceFileReader<>
+ (new File(output.toString() + "/part-00000")));
}
}
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestWeather.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestWeather.java b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestWeather.java
index 49ac89f..d5cbd96 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestWeather.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestWeather.java
@@ -85,11 +85,11 @@ public class TestWeather {
JobClient.runJob(job);
// check output is correct
- DatumReader<Weather> reader = new SpecificDatumReader<Weather>();
- DataFileReader<Weather> check = new DataFileReader<Weather>
- (new File(inDir+"/weather.avro"), reader);
- DataFileReader<Weather> sorted = new DataFileReader<Weather>
- (new File(output.toString()+"/part-00000.avro"), reader);
+ DatumReader<Weather> reader = new SpecificDatumReader<>();
+ DataFileReader<Weather> check = new DataFileReader<>
+ (new File(inDir + "/weather.avro"), reader);
+ DataFileReader<Weather> sorted = new DataFileReader<>
+ (new File(output.toString() + "/part-00000.avro"), reader);
for (Weather w : sorted)
assertEquals(check.next(), w);
@@ -103,7 +103,7 @@ public class TestWeather {
@Override
public void map(Weather w, AvroCollector<Pair<Weather,Void>> collector,
Reporter reporter) throws IOException {
- collector.collect(new Pair<Weather,Void>(w, (Void)null));
+ collector.collect(new Pair<>(w, (Void) null));
}
@Override
@@ -166,11 +166,11 @@ public class TestWeather {
JobClient.runJob(job);
// check output is correct
- DatumReader<Weather> reader = new SpecificDatumReader<Weather>();
- DataFileReader<Weather> check = new DataFileReader<Weather>
- (new File(inDir+"/weather-sorted.avro"), reader);
- DataFileReader<Weather> sorted = new DataFileReader<Weather>
- (new File(output.toString()+"/part-00000.avro"), reader);
+ DatumReader<Weather> reader = new SpecificDatumReader<>();
+ DataFileReader<Weather> check = new DataFileReader<>
+ (new File(inDir + "/weather-sorted.avro"), reader);
+ DataFileReader<Weather> sorted = new DataFileReader<>
+ (new File(output.toString() + "/part-00000.avro"), reader);
for (Weather w : sorted)
assertEquals(check.next(), w);
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestWordCount.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestWordCount.java b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestWordCount.java
index a0b61cf..64fd711 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestWordCount.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestWordCount.java
@@ -46,7 +46,7 @@ public class TestWordCount {
Reporter reporter) throws IOException {
StringTokenizer tokens = new StringTokenizer(text.toString());
while (tokens.hasMoreTokens())
- collector.collect(new Pair<Utf8,Long>(new Utf8(tokens.nextToken()),1L));
+ collector.collect(new Pair<>(new Utf8(tokens.nextToken()), 1L));
}
}
@@ -59,7 +59,7 @@ public class TestWordCount {
long sum = 0;
for (long count : counts)
sum += count;
- collector.collect(new Pair<Utf8,Long>(word, sum));
+ collector.collect(new Pair<>(word, sum));
}
}
@@ -121,9 +121,9 @@ public class TestWordCount {
FileStatus fileStatus = FileSystem.get(job).getFileStatus(inputPath);
FileSplit fileSplit = new FileSplit(inputPath, 0, fileStatus.getLen(), job);
- AvroRecordReader<Pair<Integer, Long>> recordReader = new AvroRecordReader<Pair<Integer, Long>>(job, fileSplit);
+ AvroRecordReader<Pair<Integer, Long>> recordReader = new AvroRecordReader<>(job, fileSplit);
- AvroWrapper<Pair<Integer, Long>> inputPair = new AvroWrapper<Pair<Integer, Long>>(null);
+ AvroWrapper<Pair<Integer, Long>> inputPair = new AvroWrapper<>(null);
NullWritable ignore = NullWritable.get();
long sumOfCounts = 0;
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/mapred/WordCountUtil.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapred/WordCountUtil.java b/lang/java/mapred/src/test/java/org/apache/avro/mapred/WordCountUtil.java
index 8d88bd3..e986564 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/mapred/WordCountUtil.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/mapred/WordCountUtil.java
@@ -70,7 +70,7 @@ public class WordCountUtil {
};
public static final Map<String,Long> COUNTS =
- new TreeMap<String,Long>();
+ new TreeMap<>();
static {
for (String line : LINES) {
StringTokenizer tokens = new StringTokenizer(line);
@@ -85,8 +85,8 @@ public class WordCountUtil {
public static void writeLinesFile() throws IOException {
FileUtil.fullyDelete(DIR);
- DatumWriter<Utf8> writer = new GenericDatumWriter<Utf8>();
- DataFileWriter<Utf8> out = new DataFileWriter<Utf8>(writer);
+ DatumWriter<Utf8> writer = new GenericDatumWriter<>();
+ DataFileWriter<Utf8> out = new DataFileWriter<>(writer);
LINES_FILE.getParentFile().mkdirs();
out.create(Schema.create(Schema.Type.STRING), LINES_FILE);
for (String line : LINES)
@@ -96,8 +96,8 @@ public class WordCountUtil {
public static void writeLinesBytesFile() throws IOException {
FileUtil.fullyDelete(DIR);
- DatumWriter<ByteBuffer> writer = new GenericDatumWriter<ByteBuffer>();
- DataFileWriter<ByteBuffer> out = new DataFileWriter<ByteBuffer>(writer);
+ DatumWriter<ByteBuffer> writer = new GenericDatumWriter<>();
+ DataFileWriter<ByteBuffer> out = new DataFileWriter<>(writer);
LINES_FILE.getParentFile().mkdirs();
out.create(Schema.create(Schema.Type.BYTES), LINES_FILE);
for (String line : LINES)
@@ -116,10 +116,10 @@ public class WordCountUtil {
public static void validateCountsFile() throws Exception {
DatumReader<Pair<Utf8,Long>> reader
- = new SpecificDatumReader<Pair<Utf8,Long>>();
+ = new SpecificDatumReader<>();
InputStream in = new BufferedInputStream(new FileInputStream(COUNTS_FILE));
DataFileStream<Pair<Utf8,Long>> counts
- = new DataFileStream<Pair<Utf8,Long>>(in,reader);
+ = new DataFileStream<>(in, reader);
int numWords = 0;
for (Pair<Utf8,Long> wc : counts) {
assertEquals(wc.key().toString(),
@@ -132,12 +132,12 @@ public class WordCountUtil {
}
public static void validateSortedFile() throws Exception {
- DatumReader<ByteBuffer> reader = new GenericDatumReader<ByteBuffer>();
+ DatumReader<ByteBuffer> reader = new GenericDatumReader<>();
InputStream in = new BufferedInputStream(
new FileInputStream(SORTED_FILE));
DataFileStream<ByteBuffer> lines =
- new DataFileStream<ByteBuffer>(in,reader);
- List<String> sortedLines = new ArrayList<String>();
+ new DataFileStream<>(in, reader);
+ List<String> sortedLines = new ArrayList<>();
for (String line : LINES) {
sortedLines.add(line);
}
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/TestWordCountTether.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/TestWordCountTether.java b/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/TestWordCountTether.java
index a7f8b2c..bc714de 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/TestWordCountTether.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/TestWordCountTether.java
@@ -73,7 +73,7 @@ public class TestWordCountTether {
String in=dir+"/in";
//create a string of the arguments
- List<String> execargs = new ArrayList<String>();
+ List<String> execargs = new ArrayList<>();
execargs.add("-classpath");
execargs.add(System.getProperty("java.class.path"));
execargs.add("org.apache.avro.mapred.tether.WordCountTask");
@@ -91,10 +91,10 @@ public class TestWordCountTether {
// validate the output
DatumReader<Pair<Utf8,Long>> reader
- = new SpecificDatumReader<Pair<Utf8,Long>>();
+ = new SpecificDatumReader<>();
InputStream cin = new BufferedInputStream(new FileInputStream(WordCountUtil.COUNTS_FILE));
DataFileStream<Pair<Utf8,Long>> counts
- = new DataFileStream<Pair<Utf8,Long>>(cin,reader);
+ = 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/mapred/src/test/java/org/apache/avro/mapred/tether/TetherTask.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/TetherTask.java b/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/TetherTask.java
index e17de83..429e36d 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/TetherTask.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/TetherTask.java
@@ -79,7 +79,7 @@ public abstract class TetherTask<IN,MID,OUT> {
.configureBlockSize(512).binaryEncoder(buffer, null);
private Collector(Schema schema) {
- this.writer = new SpecificDatumWriter<T>(schema);
+ this.writer = new SpecificDatumWriter<>(schema);
}
/** Collect a map or reduce output value. */
@@ -145,12 +145,12 @@ public abstract class TetherTask<IN,MID,OUT> {
Schema outSchema = Schema.parse(outSchemaText.toString());
switch (taskType) {
case MAP:
- this.inReader = new SpecificDatumReader<IN>(inSchema);
- this.midCollector = new Collector<MID>(outSchema);
+ this.inReader = new SpecificDatumReader<>(inSchema);
+ this.midCollector = new Collector<>(outSchema);
break;
case REDUCE:
- this.midReader = new SpecificDatumReader<MID>(inSchema);
- this.outCollector = new Collector<OUT>(outSchema);
+ this.midReader = new SpecificDatumReader<>(inSchema);
+ this.outCollector = new Collector<>(outSchema);
break;
}
} catch (Throwable e) {
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/WordCountTask.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/WordCountTask.java b/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/WordCountTask.java
index 58df52c..5e859ad 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/WordCountTask.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/WordCountTask.java
@@ -37,7 +37,7 @@ public class WordCountTask
throws IOException {
StringTokenizer tokens = new StringTokenizer(text.toString());
while (tokens.hasMoreTokens())
- collector.collect(new Pair<Utf8,Long>(new Utf8(tokens.nextToken()),1L));
+ collector.collect(new Pair<>(new Utf8(tokens.nextToken()), 1L));
}
private long sum;
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/AvroFiles.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/AvroFiles.java b/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/AvroFiles.java
index 11aa9d6..628c28f 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/AvroFiles.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/AvroFiles.java
@@ -43,8 +43,8 @@ public final class AvroFiles {
*/
public static <T> File createFile(File file, Schema schema, T... records)
throws IOException {
- DatumWriter<T> datumWriter = new GenericDatumWriter<T>(schema);
- DataFileWriter<T> fileWriter = new DataFileWriter<T>(datumWriter);
+ DatumWriter<T> datumWriter = new GenericDatumWriter<>(schema);
+ DataFileWriter<T> fileWriter = new DataFileWriter<>(datumWriter);
fileWriter.create(schema, file);
for (T record : records) {
fileWriter.append(record);
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroKeyOutputFormat.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroKeyOutputFormat.java b/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroKeyOutputFormat.java
index 9a46d44..e08ba0c 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroKeyOutputFormat.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroKeyOutputFormat.java
@@ -134,7 +134,7 @@ public class TestAvroKeyOutputFormat {
= createMock(AvroKeyOutputFormat.RecordWriterFactory.class);
// Expect the record writer factory to be called with appropriate parameters.
- Capture<CodecFactory> capturedCodecFactory = new Capture<CodecFactory>();
+ Capture<CodecFactory> capturedCodecFactory = new Capture<>();
expect(recordWriterFactory.create(eq(writerSchema),
anyObject(GenericData.class),
capture(capturedCodecFactory), // Capture for comparison later.
@@ -146,7 +146,7 @@ public class TestAvroKeyOutputFormat {
replay(recordWriterFactory);
AvroKeyOutputFormat<Integer> outputFormat
- = new AvroKeyOutputFormat<Integer>(recordWriterFactory);
+ = new AvroKeyOutputFormat<>(recordWriterFactory);
RecordWriter<AvroKey<Integer>, NullWritable> recordWriter
= outputFormat.getRecordWriter(context);
// Make sure the expected codec was used.
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroKeyRecordWriter.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroKeyRecordWriter.java b/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroKeyRecordWriter.java
index a2779a0..dd06062 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroKeyRecordWriter.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroKeyRecordWriter.java
@@ -60,10 +60,10 @@ public class TestAvroKeyRecordWriter {
replay(context);
// Write an avro container file with two records: 1 and 2.
- AvroKeyRecordWriter<Integer> recordWriter = new AvroKeyRecordWriter<Integer>(
+ AvroKeyRecordWriter<Integer> recordWriter = new AvroKeyRecordWriter<>(
writerSchema, dataModel, compressionCodec, outputStream);
- recordWriter.write(new AvroKey<Integer>(1), NullWritable.get());
- recordWriter.write(new AvroKey<Integer>(2), NullWritable.get());
+ recordWriter.write(new AvroKey<>(1), NullWritable.get());
+ recordWriter.write(new AvroKey<>(2), NullWritable.get());
recordWriter.close(context);
verify(context);
@@ -71,8 +71,8 @@ public class TestAvroKeyRecordWriter {
// Verify that the file was written as expected.
InputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
Schema readerSchema = Schema.create(Schema.Type.INT);
- DatumReader<Integer> datumReader = new SpecificDatumReader<Integer>(readerSchema);
- DataFileStream<Integer> dataFileReader = new DataFileStream<Integer>(inputStream, datumReader);
+ DatumReader<Integer> datumReader = new SpecificDatumReader<>(readerSchema);
+ DataFileStream<Integer> dataFileReader = new DataFileStream<>(inputStream, datumReader);
assertTrue(dataFileReader.hasNext()); // Record 1.
assertEquals(1, dataFileReader.next().intValue());
@@ -94,12 +94,12 @@ public class TestAvroKeyRecordWriter {
replay(context);
// Write an avro container file with two records: 1 and 2.
- AvroKeyRecordWriter<Integer> recordWriter = new AvroKeyRecordWriter<Integer>(
+ AvroKeyRecordWriter<Integer> recordWriter = new AvroKeyRecordWriter<>(
writerSchema, dataModel, compressionCodec, outputStream);
long positionOne = recordWriter.sync();
- recordWriter.write(new AvroKey<Integer>(1), NullWritable.get());
+ recordWriter.write(new AvroKey<>(1), NullWritable.get());
long positionTwo = recordWriter.sync();
- recordWriter.write(new AvroKey<Integer>(2), NullWritable.get());
+ recordWriter.write(new AvroKey<>(2), NullWritable.get());
recordWriter.close(context);
verify(context);
@@ -108,8 +108,8 @@ public class TestAvroKeyRecordWriter {
Configuration conf = new Configuration();
conf.set("fs.default.name", "file:///");
Path avroFile = new Path("target/temp.avro");
- DataFileReader<GenericData.Record> dataFileReader = new DataFileReader<GenericData.Record>(new FsInput(avroFile,
- conf), new SpecificDatumReader<GenericData.Record>());
+ DataFileReader<GenericData.Record> dataFileReader = new DataFileReader<>(new FsInput(avroFile,
+ conf), new SpecificDatumReader<>());
dataFileReader.seek(positionTwo);
assertTrue(dataFileReader.hasNext()); // Record 2.
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroKeyValueRecordReader.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroKeyValueRecordReader.java b/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroKeyValueRecordReader.java
index 051d0e4..11749fb 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroKeyValueRecordReader.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroKeyValueRecordReader.java
@@ -57,12 +57,12 @@ public class TestAvroKeyValueRecordReader {
Schema.create(Schema.Type.STRING), Schema.create(Schema.Type.INT));
AvroKeyValue<CharSequence, Integer> firstInputRecord
- = new AvroKeyValue<CharSequence, Integer>(new GenericData.Record(keyValueSchema));
+ = new AvroKeyValue<>(new GenericData.Record(keyValueSchema));
firstInputRecord.setKey("first");
firstInputRecord.setValue(1);
AvroKeyValue<CharSequence, Integer> secondInputRecord
- = new AvroKeyValue<CharSequence, Integer>(new GenericData.Record(keyValueSchema));
+ = new AvroKeyValue<>(new GenericData.Record(keyValueSchema));
secondInputRecord.setKey("second");
secondInputRecord.setValue(2);
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroKeyValueRecordWriter.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroKeyValueRecordWriter.java b/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroKeyValueRecordWriter.java
index 2de056f..92587dd 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroKeyValueRecordWriter.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroKeyValueRecordWriter.java
@@ -65,7 +65,7 @@ public class TestAvroKeyValueRecordWriter {
AvroDatumConverterFactory factory = new AvroDatumConverterFactory(job.getConfiguration());
AvroDatumConverter<Text, ?> keyConverter = factory.create(Text.class);
- AvroValue<TextStats> avroValue = new AvroValue<TextStats>(null);
+ AvroValue<TextStats> avroValue = new AvroValue<>(null);
@SuppressWarnings("unchecked")
AvroDatumConverter<AvroValue<TextStats>, ?> valueConverter
= factory.create((Class<AvroValue<TextStats>>) avroValue.getClass());
@@ -75,14 +75,14 @@ public class TestAvroKeyValueRecordWriter {
// Use a writer to generate a Avro container file in memory.
// Write two records: <'apple', TextStats('apple')> and <'banana', TextStats('banana')>.
AvroKeyValueRecordWriter<Text, AvroValue<TextStats>> writer
- = new AvroKeyValueRecordWriter<Text, AvroValue<TextStats>>(keyConverter, valueConverter,
+ = new AvroKeyValueRecordWriter<>(keyConverter, valueConverter,
new ReflectData(), compressionCodec, outputStream);
TextStats appleStats = new TextStats();
appleStats.name = "apple";
- writer.write(new Text("apple"), new AvroValue<TextStats>(appleStats));
+ writer.write(new Text("apple"), new AvroValue<>(appleStats));
TextStats bananaStats = new TextStats();
bananaStats.name = "banana";
- writer.write(new Text("banana"), new AvroValue<TextStats>(bananaStats));
+ writer.write(new Text("banana"), new AvroValue<>(bananaStats));
writer.close(context);
verify(context);
@@ -91,14 +91,14 @@ public class TestAvroKeyValueRecordWriter {
Schema readerSchema = AvroKeyValue.getSchema(
Schema.create(Schema.Type.STRING), TextStats.SCHEMA$);
DatumReader<GenericRecord> datumReader
- = new SpecificDatumReader<GenericRecord>(readerSchema);
+ = new SpecificDatumReader<>(readerSchema);
DataFileStream<GenericRecord> avroFileReader
- = new DataFileStream<GenericRecord>(inputStream, datumReader);
+ = new DataFileStream<>(inputStream, datumReader);
// Verify that the first record was written.
assertTrue(avroFileReader.hasNext());
AvroKeyValue<CharSequence, TextStats> firstRecord
- = new AvroKeyValue<CharSequence, TextStats>(avroFileReader.next());
+ = new AvroKeyValue<>(avroFileReader.next());
assertNotNull(firstRecord.get());
assertEquals("apple", firstRecord.getKey().toString());
assertEquals("apple", firstRecord.getValue().name.toString());
@@ -106,7 +106,7 @@ public class TestAvroKeyValueRecordWriter {
// Verify that the second record was written;
assertTrue(avroFileReader.hasNext());
AvroKeyValue<CharSequence, TextStats> secondRecord
- = new AvroKeyValue<CharSequence, TextStats>(avroFileReader.next());
+ = new AvroKeyValue<>(avroFileReader.next());
assertNotNull(secondRecord.get());
assertEquals("banana", secondRecord.getKey().toString());
assertEquals("banana", secondRecord.getValue().name.toString());
@@ -128,7 +128,7 @@ public class TestAvroKeyValueRecordWriter {
R1 record = new R1();
record.attribute = "test";
- AvroValue<R1> avroValue = new AvroValue<R1>(record);
+ AvroValue<R1> avroValue = new AvroValue<>(record);
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
AvroDatumConverterFactory factory =
@@ -141,7 +141,7 @@ public class TestAvroKeyValueRecordWriter {
factory.create((Class<AvroValue<R1>>) avroValue.getClass());
AvroKeyValueRecordWriter<Text, AvroValue<R1>> writer =
- new AvroKeyValueRecordWriter<Text, AvroValue<R1>>(
+ new AvroKeyValueRecordWriter<>(
keyConverter, valueConverter, new ReflectData(),
CodecFactory.nullCodec(), outputStream);
@@ -154,16 +154,16 @@ public class TestAvroKeyValueRecordWriter {
Schema readerSchema = AvroKeyValue.getSchema(
Schema.create(Schema.Type.STRING), schema);
DatumReader<GenericRecord> datumReader =
- new ReflectDatumReader<GenericRecord>(readerSchema);
+ new ReflectDatumReader<>(readerSchema);
DataFileStream<GenericRecord> avroFileReader =
- new DataFileStream<GenericRecord>(inputStream, datumReader);
+ new DataFileStream<>(inputStream, datumReader);
// Verify that the first record was written.
assertTrue(avroFileReader.hasNext());
// Verify that the record holds the same data that we've written
AvroKeyValue<CharSequence, R1> firstRecord =
- new AvroKeyValue<CharSequence, R1>(avroFileReader.next());
+ new AvroKeyValue<>(avroFileReader.next());
assertNotNull(firstRecord.get());
assertEquals("reflectionData", firstRecord.getKey().toString());
assertEquals(record.attribute, firstRecord.getValue().attribute);
@@ -179,7 +179,7 @@ public class TestAvroKeyValueRecordWriter {
AvroDatumConverterFactory factory = new AvroDatumConverterFactory(job.getConfiguration());
AvroDatumConverter<Text, ?> keyConverter = factory.create(Text.class);
- AvroValue<TextStats> avroValue = new AvroValue<TextStats>(null);
+ AvroValue<TextStats> avroValue = new AvroValue<>(null);
@SuppressWarnings("unchecked")
AvroDatumConverter<AvroValue<TextStats>, ?> valueConverter
= factory.create((Class<AvroValue<TextStats>>) avroValue.getClass());
@@ -188,16 +188,16 @@ public class TestAvroKeyValueRecordWriter {
// Write a marker followed by each record: <'apple', TextStats('apple')> and <'banana', TextStats('banana')>.
AvroKeyValueRecordWriter<Text, AvroValue<TextStats>> writer
- = new AvroKeyValueRecordWriter<Text, AvroValue<TextStats>>(keyConverter, valueConverter,
+ = new AvroKeyValueRecordWriter<>(keyConverter, valueConverter,
new ReflectData(), compressionCodec, outputStream);
TextStats appleStats = new TextStats();
appleStats.name = "apple";
long pointOne = writer.sync();
- writer.write(new Text("apple"), new AvroValue<TextStats>(appleStats));
+ writer.write(new Text("apple"), new AvroValue<>(appleStats));
TextStats bananaStats = new TextStats();
bananaStats.name = "banana";
long pointTwo = writer.sync();
- writer.write(new Text("banana"), new AvroValue<TextStats>(bananaStats));
+ writer.write(new Text("banana"), new AvroValue<>(bananaStats));
writer.close(context);
verify(context);
@@ -205,15 +205,15 @@ public class TestAvroKeyValueRecordWriter {
Configuration conf = new Configuration();
conf.set("fs.default.name", "file:///");
Path avroFile = new Path("target/temp.avro");
- DataFileReader<GenericData.Record> avroFileReader = new DataFileReader<GenericData.Record>(new FsInput(avroFile,
- conf), new SpecificDatumReader<GenericData.Record>());
+ DataFileReader<GenericData.Record> avroFileReader = new DataFileReader<>(new FsInput(avroFile,
+ conf), new SpecificDatumReader<>());
avroFileReader.seek(pointTwo);
// Verify that the second record was written;
assertTrue(avroFileReader.hasNext());
AvroKeyValue<CharSequence, TextStats> secondRecord
- = new AvroKeyValue<CharSequence, TextStats>(avroFileReader.next());
+ = new AvroKeyValue<>(avroFileReader.next());
assertNotNull(secondRecord.get());
assertEquals("banana", secondRecord.getKey().toString());
assertEquals("banana", secondRecord.getValue().name.toString());
@@ -223,7 +223,7 @@ public class TestAvroKeyValueRecordWriter {
// Verify that the first record was written.
assertTrue(avroFileReader.hasNext());
AvroKeyValue<CharSequence, TextStats> firstRecord
- = new AvroKeyValue<CharSequence, TextStats>(avroFileReader.next());
+ = new AvroKeyValue<>(avroFileReader.next());
assertNotNull(firstRecord.get());
assertEquals("apple", firstRecord.getKey().toString());
assertEquals("apple", firstRecord.getValue().name.toString());
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroMultipleOutputs.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroMultipleOutputs.java b/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroMultipleOutputs.java
index 13c7cc1..1979c1e 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroMultipleOutputs.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroMultipleOutputs.java
@@ -106,7 +106,7 @@ public class TestAvroMultipleOutputs {
@Override
protected void setup(Context context) {
- mStats = new AvroKey<GenericData.Record>(null);
+ mStats = new AvroKey<>(null);
amos = new AvroMultipleOutputs(context);
}
@@ -146,7 +146,7 @@ public class TestAvroMultipleOutputs {
private AvroMultipleOutputs amos;
@Override
protected void setup(Context context) {
- mStats = new AvroKey<TextStats>(null);
+ mStats = new AvroKey<>(null);
amos = new AvroMultipleOutputs(context);
}
@@ -217,10 +217,10 @@ public class TestAvroMultipleOutputs {
FileSystem fileSystem = FileSystem.get(job.getConfiguration());
FileStatus[] outputFiles = fileSystem.globStatus(outputPath.suffix("/myavro-r-00000.avro"));
Assert.assertEquals(1, outputFiles.length);
- DataFileReader<GenericData.Record> reader = new DataFileReader<GenericData.Record>(
+ DataFileReader<GenericData.Record> reader = new DataFileReader<>(
new FsInput(outputFiles[0].getPath(), job.getConfiguration()),
- new GenericDatumReader<GenericData.Record>(STATS_SCHEMA));
- Map<String, Integer> counts = new HashMap<String, Integer>();
+ new GenericDatumReader<>(STATS_SCHEMA));
+ Map<String, Integer> counts = new HashMap<>();
for (GenericData.Record record : reader) {
counts.put(((Utf8) record.get("name")).toString(), (Integer) record.get("count"));
}
@@ -232,10 +232,10 @@ public class TestAvroMultipleOutputs {
outputFiles = fileSystem.globStatus(outputPath.suffix("/myavro1-r-00000.avro"));
Assert.assertEquals(1, outputFiles.length);
- reader = new DataFileReader<GenericData.Record>(
+ reader = new DataFileReader<>(
new FsInput(outputFiles[0].getPath(), job.getConfiguration()),
- new GenericDatumReader<GenericData.Record>(STATS_SCHEMA_2));
- counts = new HashMap<String, Integer>();
+ new GenericDatumReader<>(STATS_SCHEMA_2));
+ counts = new HashMap<>();
for (GenericData.Record record : reader) {
counts.put(((Utf8) record.get("name1")).toString(), (Integer) record.get("count1"));
}
@@ -247,10 +247,10 @@ public class TestAvroMultipleOutputs {
outputFiles = fileSystem.globStatus(outputPath.suffix("/testnewwrite-r-00000.avro"));
Assert.assertEquals(1, outputFiles.length);
- reader = new DataFileReader<GenericData.Record>(
+ reader = new DataFileReader<>(
new FsInput(outputFiles[0].getPath(), job.getConfiguration()),
- new GenericDatumReader<GenericData.Record>(STATS_SCHEMA));
- counts = new HashMap<String, Integer>();
+ new GenericDatumReader<>(STATS_SCHEMA));
+ counts = new HashMap<>();
for (GenericData.Record record : reader) {
counts.put(((Utf8) record.get("name")).toString(), (Integer) record.get("count"));
}
@@ -262,10 +262,10 @@ public class TestAvroMultipleOutputs {
outputFiles = fileSystem.globStatus(outputPath.suffix("/testnewwrite2-r-00000.avro"));
Assert.assertEquals(1, outputFiles.length);
- reader = new DataFileReader<GenericData.Record>(
+ reader = new DataFileReader<>(
new FsInput(outputFiles[0].getPath(), job.getConfiguration()),
- new GenericDatumReader<GenericData.Record>(STATS_SCHEMA_2));
- counts = new HashMap<String, Integer>();
+ new GenericDatumReader<>(STATS_SCHEMA_2));
+ counts = new HashMap<>();
for (GenericData.Record record : reader) {
counts.put(((Utf8) record.get("name1")).toString(), (Integer) record.get("count1"));
}
@@ -276,10 +276,10 @@ public class TestAvroMultipleOutputs {
outputFiles = fileSystem.globStatus(outputPath.suffix("/testwritenonschema-r-00000.avro"));
Assert.assertEquals(1, outputFiles.length);
- reader = new DataFileReader<GenericData.Record>(
+ reader = new DataFileReader<>(
new FsInput(outputFiles[0].getPath(), job.getConfiguration()),
- new GenericDatumReader<GenericData.Record>(STATS_SCHEMA));
- counts = new HashMap<String, Integer>();
+ new GenericDatumReader<>(STATS_SCHEMA));
+ counts = new HashMap<>();
for (GenericData.Record record : reader) {
counts.put(((Utf8) record.get("name")).toString(), (Integer) record.get("count"));
}
@@ -319,10 +319,10 @@ public class TestAvroMultipleOutputs {
FileSystem fileSystem = FileSystem.get(job.getConfiguration());
FileStatus[] outputFiles = fileSystem.globStatus(outputPath.suffix("/myavro3-*"));
Assert.assertEquals(1, outputFiles.length);
- DataFileReader<TextStats> reader = new DataFileReader<TextStats>(
+ DataFileReader<TextStats> reader = new DataFileReader<>(
new FsInput(outputFiles[0].getPath(), job.getConfiguration()),
- new SpecificDatumReader<TextStats>());
- Map<String, Integer> counts = new HashMap<String, Integer>();
+ new SpecificDatumReader<>());
+ Map<String, Integer> counts = new HashMap<>();
for (TextStats record : reader) {
counts.put(record.name.toString(), record.count);
}
@@ -361,10 +361,10 @@ public class TestAvroMultipleOutputs {
FileSystem fileSystem = FileSystem.get(job.getConfiguration());
FileStatus[] outputFiles = fileSystem.globStatus(outputPath.suffix("/myavro3-*"));
Assert.assertEquals(1, outputFiles.length);
- DataFileReader<TextStats> reader = new DataFileReader<TextStats>(
+ DataFileReader<TextStats> reader = new DataFileReader<>(
new FsInput(outputFiles[0].getPath(), job.getConfiguration()),
- new SpecificDatumReader<TextStats>());
- Map<String, Integer> counts = new HashMap<String, Integer>();
+ new SpecificDatumReader<>());
+ Map<String, Integer> counts = new HashMap<>();
for (TextStats record : reader) {
counts.put(record.name.toString(), record.count);
}
@@ -402,10 +402,10 @@ public class TestAvroMultipleOutputs {
FileSystem fileSystem = FileSystem.get(job.getConfiguration());
FileStatus[] outputFiles = fileSystem.globStatus(outputPath.suffix("/part-*"));
Assert.assertEquals(1, outputFiles.length);
- DataFileReader<TextStats> reader = new DataFileReader<TextStats>(
+ DataFileReader<TextStats> reader = new DataFileReader<>(
new FsInput(outputFiles[0].getPath(), job.getConfiguration()),
- new SpecificDatumReader<TextStats>());
- Map<String, Integer> counts = new HashMap<String, Integer>();
+ new SpecificDatumReader<>());
+ Map<String, Integer> counts = new HashMap<>();
for (TextStats record : reader) {
counts.put(record.name.toString(), record.count);
}
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroMultipleOutputsSyncable.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroMultipleOutputsSyncable.java b/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroMultipleOutputsSyncable.java
index 058f73b..59d2001 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroMultipleOutputsSyncable.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestAvroMultipleOutputsSyncable.java
@@ -103,7 +103,7 @@ public class TestAvroMultipleOutputsSyncable {
@Override
protected void setup(Context context) {
- mStats = new AvroKey<GenericData.Record>(null);
+ mStats = new AvroKey<>(null);
amos = new AvroMultipleOutputs(context);
}
@@ -145,7 +145,7 @@ public class TestAvroMultipleOutputsSyncable {
private AvroMultipleOutputs amos;
@Override
protected void setup(Context context) {
- mStats = new AvroKey<TextStats>(null);
+ mStats = new AvroKey<>(null);
amos = new AvroMultipleOutputs(context);
}
@@ -217,10 +217,10 @@ public class TestAvroMultipleOutputsSyncable {
FileSystem fileSystem = FileSystem.get(job.getConfiguration());
FileStatus[] outputFiles = fileSystem.globStatus(outputPath.suffix("/myavro-r-00000.avro"));
Assert.assertEquals(1, outputFiles.length);
- DataFileReader<GenericData.Record> reader = new DataFileReader<GenericData.Record>(
+ DataFileReader<GenericData.Record> reader = new DataFileReader<>(
new FsInput(outputFiles[0].getPath(), job.getConfiguration()),
- new GenericDatumReader<GenericData.Record>(STATS_SCHEMA));
- Map<String, Integer> counts = new HashMap<String, Integer>();
+ new GenericDatumReader<>(STATS_SCHEMA));
+ Map<String, Integer> counts = new HashMap<>();
for (GenericData.Record record : reader) {
counts.put(((Utf8) record.get("name")).toString(), (Integer) record.get("count"));
}
@@ -232,10 +232,10 @@ public class TestAvroMultipleOutputsSyncable {
outputFiles = fileSystem.globStatus(outputPath.suffix("/myavro1-r-00000.avro"));
Assert.assertEquals(1, outputFiles.length);
- reader = new DataFileReader<GenericData.Record>(
+ reader = new DataFileReader<>(
new FsInput(outputFiles[0].getPath(), job.getConfiguration()),
- new GenericDatumReader<GenericData.Record>(STATS_SCHEMA_2));
- counts = new HashMap<String, Integer>();
+ new GenericDatumReader<>(STATS_SCHEMA_2));
+ counts = new HashMap<>();
for (GenericData.Record record : reader) {
counts.put(((Utf8) record.get("name1")).toString(), (Integer) record.get("count1"));
}
@@ -247,10 +247,10 @@ public class TestAvroMultipleOutputsSyncable {
outputFiles = fileSystem.globStatus(outputPath.suffix("/testnewwrite-r-00000.avro"));
Assert.assertEquals(1, outputFiles.length);
- reader = new DataFileReader<GenericData.Record>(
+ reader = new DataFileReader<>(
new FsInput(outputFiles[0].getPath(), job.getConfiguration()),
- new GenericDatumReader<GenericData.Record>(STATS_SCHEMA));
- counts = new HashMap<String, Integer>();
+ new GenericDatumReader<>(STATS_SCHEMA));
+ counts = new HashMap<>();
for (GenericData.Record record : reader) {
counts.put(((Utf8) record.get("name")).toString(), (Integer) record.get("count"));
}
@@ -262,10 +262,10 @@ public class TestAvroMultipleOutputsSyncable {
outputFiles = fileSystem.globStatus(outputPath.suffix("/testnewwrite2-r-00000.avro"));
Assert.assertEquals(1, outputFiles.length);
- reader = new DataFileReader<GenericData.Record>(
+ reader = new DataFileReader<>(
new FsInput(outputFiles[0].getPath(), job.getConfiguration()),
- new GenericDatumReader<GenericData.Record>(STATS_SCHEMA_2));
- counts = new HashMap<String, Integer>();
+ new GenericDatumReader<>(STATS_SCHEMA_2));
+ counts = new HashMap<>();
for (GenericData.Record record : reader) {
counts.put(((Utf8) record.get("name1")).toString(), (Integer) record.get("count1"));
}
@@ -276,10 +276,10 @@ public class TestAvroMultipleOutputsSyncable {
outputFiles = fileSystem.globStatus(outputPath.suffix("/testwritenonschema-r-00000.avro"));
Assert.assertEquals(1, outputFiles.length);
- reader = new DataFileReader<GenericData.Record>(
+ reader = new DataFileReader<>(
new FsInput(outputFiles[0].getPath(), job.getConfiguration()),
- new GenericDatumReader<GenericData.Record>(STATS_SCHEMA));
- counts = new HashMap<String, Integer>();
+ new GenericDatumReader<>(STATS_SCHEMA));
+ counts = new HashMap<>();
for (GenericData.Record record : reader) {
counts.put(((Utf8) record.get("name")).toString(), (Integer) record.get("count"));
}
@@ -319,10 +319,10 @@ public class TestAvroMultipleOutputsSyncable {
FileSystem fileSystem = FileSystem.get(job.getConfiguration());
FileStatus[] outputFiles = fileSystem.globStatus(outputPath.suffix("/myavro3-*"));
Assert.assertEquals(1, outputFiles.length);
- DataFileReader<TextStats> reader = new DataFileReader<TextStats>(
+ DataFileReader<TextStats> reader = new DataFileReader<>(
new FsInput(outputFiles[0].getPath(), job.getConfiguration()),
- new SpecificDatumReader<TextStats>());
- Map<String, Integer> counts = new HashMap<String, Integer>();
+ new SpecificDatumReader<>());
+ Map<String, Integer> counts = new HashMap<>();
for (TextStats record : reader) {
counts.put(record.name.toString(), record.count);
}
@@ -361,10 +361,10 @@ public class TestAvroMultipleOutputsSyncable {
FileSystem fileSystem = FileSystem.get(job.getConfiguration());
FileStatus[] outputFiles = fileSystem.globStatus(outputPath.suffix("/myavro3-*"));
Assert.assertEquals(1, outputFiles.length);
- DataFileReader<TextStats> reader = new DataFileReader<TextStats>(
+ DataFileReader<TextStats> reader = new DataFileReader<>(
new FsInput(outputFiles[0].getPath(), job.getConfiguration()),
- new SpecificDatumReader<TextStats>());
- Map<String, Integer> counts = new HashMap<String, Integer>();
+ new SpecificDatumReader<>());
+ Map<String, Integer> counts = new HashMap<>();
for (TextStats record : reader) {
counts.put(record.name.toString(), record.count);
}
@@ -402,10 +402,10 @@ public class TestAvroMultipleOutputsSyncable {
FileSystem fileSystem = FileSystem.get(job.getConfiguration());
FileStatus[] outputFiles = fileSystem.globStatus(outputPath.suffix("/part-*"));
Assert.assertEquals(1, outputFiles.length);
- DataFileReader<TextStats> reader = new DataFileReader<TextStats>(
+ DataFileReader<TextStats> reader = new DataFileReader<>(
new FsInput(outputFiles[0].getPath(), job.getConfiguration()),
- new SpecificDatumReader<TextStats>());
- Map<String, Integer> counts = new HashMap<String, Integer>();
+ new SpecificDatumReader<>());
+ Map<String, Integer> counts = new HashMap<>();
for (TextStats record : reader) {
counts.put(record.name.toString(), record.count);
}
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestKeyValueInput.java
----------------------------------------------------------------------
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestKeyValueInput.java b/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestKeyValueInput.java
index 5de75ed..54be9fe 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestKeyValueInput.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestKeyValueInput.java
@@ -72,17 +72,17 @@ public class TestKeyValueInput {
Schema.create(Schema.Type.INT), Schema.create(Schema.Type.STRING));
AvroKeyValue<Integer, CharSequence> record1
- = new AvroKeyValue<Integer, CharSequence>(new GenericData.Record(keyValueSchema));
+ = new AvroKeyValue<>(new GenericData.Record(keyValueSchema));
record1.setKey(1);
record1.setValue("apple banana carrot");
AvroKeyValue<Integer, CharSequence> record2
- = new AvroKeyValue<Integer, CharSequence>(new GenericData.Record(keyValueSchema));
+ = new AvroKeyValue<>(new GenericData.Record(keyValueSchema));
record2.setKey(2);
record2.setValue("apple banana");
AvroKeyValue<Integer, CharSequence> record3
- = new AvroKeyValue<Integer, CharSequence>(new GenericData.Record(keyValueSchema));
+ = new AvroKeyValue<>(new GenericData.Record(keyValueSchema));
record3.setKey(3);
record3.setValue("apple");
@@ -108,11 +108,11 @@ public class TestKeyValueInput {
@Override
protected void reduce(Text token, Iterable<IntWritable> docids, Context context)
throws IOException, InterruptedException {
- List<Integer> hitlist = new ArrayList<Integer>();
+ List<Integer> hitlist = new ArrayList<>();
for (IntWritable docid : docids) {
hitlist.add(docid.get());
}
- context.write(token, new AvroValue<List<Integer>>(hitlist));
+ context.write(token, new AvroValue<>(hitlist));
}
}
@@ -150,15 +150,15 @@ public class TestKeyValueInput {
// Verify that the output Avro container file has the expected data.
File avroFile = new File(outputPath.toString(), "part-r-00000.avro");
- DatumReader<GenericRecord> datumReader = new SpecificDatumReader<GenericRecord>(
+ DatumReader<GenericRecord> datumReader = new SpecificDatumReader<>(
AvroKeyValue.getSchema(Schema.create(Schema.Type.STRING),
Schema.createArray(Schema.create(Schema.Type.INT))));
DataFileReader<GenericRecord> avroFileReader
- = new DataFileReader<GenericRecord>(avroFile, datumReader);
+ = new DataFileReader<>(avroFile, datumReader);
assertTrue(avroFileReader.hasNext());
AvroKeyValue<CharSequence, List<Integer>> appleRecord
- = new AvroKeyValue<CharSequence, List<Integer>>(avroFileReader.next());
+ = new AvroKeyValue<>(avroFileReader.next());
assertNotNull(appleRecord.get());
assertEquals("apple", appleRecord.getKey().toString());
List<Integer> appleDocs = appleRecord.getValue();
@@ -169,7 +169,7 @@ public class TestKeyValueInput {
assertTrue(avroFileReader.hasNext());
AvroKeyValue<CharSequence, List<Integer>> bananaRecord
- = new AvroKeyValue<CharSequence, List<Integer>>(avroFileReader.next());
+ = new AvroKeyValue<>(avroFileReader.next());
assertNotNull(bananaRecord.get());
assertEquals("banana", bananaRecord.getKey().toString());
List<Integer> bananaDocs = bananaRecord.getValue();
@@ -179,7 +179,7 @@ public class TestKeyValueInput {
assertTrue(avroFileReader.hasNext());
AvroKeyValue<CharSequence, List<Integer>> carrotRecord
- = new AvroKeyValue<CharSequence, List<Integer>>(avroFileReader.next());
+ = new AvroKeyValue<>(avroFileReader.next());
assertEquals("carrot", carrotRecord.getKey().toString());
List<Integer> carrotDocs = carrotRecord.getValue();
assertEquals(1, carrotDocs.size());
@@ -221,29 +221,29 @@ public class TestKeyValueInput {
// Verify that the output Avro container file has the expected data.
File avroFile = new File(outputPath.toString(), "part-m-00000.avro");
- DatumReader<GenericRecord> datumReader = new SpecificDatumReader<GenericRecord>(
+ DatumReader<GenericRecord> datumReader = new SpecificDatumReader<>(
AvroKeyValue.getSchema(Schema.create(Schema.Type.INT),
Schema.create(Schema.Type.STRING)));
DataFileReader<GenericRecord> avroFileReader
- = new DataFileReader<GenericRecord>(avroFile, datumReader);
+ = new DataFileReader<>(avroFile, datumReader);
assertTrue(avroFileReader.hasNext());
AvroKeyValue<Integer, CharSequence> record1
- = new AvroKeyValue<Integer, CharSequence>(avroFileReader.next());
+ = new AvroKeyValue<>(avroFileReader.next());
assertNotNull(record1.get());
assertEquals(1, record1.getKey().intValue());
assertEquals("apple banana carrot", record1.getValue().toString());
assertTrue(avroFileReader.hasNext());
AvroKeyValue<Integer, CharSequence> record2
- = new AvroKeyValue<Integer, CharSequence>(avroFileReader.next());
+ = new AvroKeyValue<>(avroFileReader.next());
assertNotNull(record2.get());
assertEquals(2, record2.getKey().intValue());
assertEquals("apple banana", record2.getValue().toString());
assertTrue(avroFileReader.hasNext());
AvroKeyValue<Integer, CharSequence> record3
- = new AvroKeyValue<Integer, CharSequence>(avroFileReader.next());
+ = new AvroKeyValue<>(avroFileReader.next());
assertNotNull(record3.get());
assertEquals(3, record3.getKey().intValue());
assertEquals("apple", record3.getValue().toString());