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:20 UTC
[10/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/avro/src/main/java/org/apache/avro/util/ByteBufferOutputStream.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/main/java/org/apache/avro/util/ByteBufferOutputStream.java b/lang/java/avro/src/main/java/org/apache/avro/util/ByteBufferOutputStream.java
index 498a6d4..3080826 100644
--- a/lang/java/avro/src/main/java/org/apache/avro/util/ByteBufferOutputStream.java
+++ b/lang/java/avro/src/main/java/org/apache/avro/util/ByteBufferOutputStream.java
@@ -61,7 +61,7 @@ public class ByteBufferOutputStream extends OutputStream {
}
public void reset() {
- buffers = new LinkedList<ByteBuffer>();
+ buffers = new LinkedList<>();
buffers.add(ByteBuffer.allocate(BUFFER_SIZE));
}
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/main/java/org/apache/avro/util/WeakIdentityHashMap.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/main/java/org/apache/avro/util/WeakIdentityHashMap.java b/lang/java/avro/src/main/java/org/apache/avro/util/WeakIdentityHashMap.java
index 6958798..18a84ee 100644
--- a/lang/java/avro/src/main/java/org/apache/avro/util/WeakIdentityHashMap.java
+++ b/lang/java/avro/src/main/java/org/apache/avro/util/WeakIdentityHashMap.java
@@ -43,9 +43,9 @@ import java.util.Set;
* </b>
*/
public class WeakIdentityHashMap<K, V> implements Map<K, V> {
- private final ReferenceQueue<K> queue = new ReferenceQueue<K>();
+ private final ReferenceQueue<K> queue = new ReferenceQueue<>();
private Map<IdentityWeakReference, V> backingStore
- = new HashMap<IdentityWeakReference, V>();
+ = new HashMap<>();
public WeakIdentityHashMap() {}
@@ -66,7 +66,7 @@ public class WeakIdentityHashMap<K, V> implements Map<K, V> {
public Set<Map.Entry<K, V>> entrySet() {
reap();
- Set<Map.Entry<K, V>> ret = new HashSet<Map.Entry<K, V>>();
+ Set<Map.Entry<K, V>> ret = new HashSet<>();
for (Map.Entry<IdentityWeakReference, V> ref : backingStore.entrySet()) {
final K key = ref.getKey().get();
final V value = ref.getValue();
@@ -88,7 +88,7 @@ public class WeakIdentityHashMap<K, V> implements Map<K, V> {
public Set<K> keySet() {
reap();
- Set<K> ret = new HashSet<K>();
+ Set<K> ret = new HashSet<>();
for (IdentityWeakReference ref : backingStore.keySet()) {
ret.add(ref.get());
}
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/GenerateBlockingData.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/GenerateBlockingData.java b/lang/java/avro/src/test/java/org/apache/avro/GenerateBlockingData.java
index 1e9f895..0ace222 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/GenerateBlockingData.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/GenerateBlockingData.java
@@ -66,7 +66,7 @@ public class GenerateBlockingData {
int numObjects = Integer.parseInt(args[2]);
FileOutputStream out = new FileOutputStream(outputFile, false);
- DatumWriter<Object> dout = new GenericDatumWriter<Object>();
+ DatumWriter<Object> dout = new GenericDatumWriter<>();
dout.setSchema(sch);
Encoder vout = factory.directBinaryEncoder(out, null);
vout.writeLong(numObjects); // metadata:the count of objects in the file
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/RandomData.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/RandomData.java b/lang/java/avro/src/test/java/org/apache/avro/RandomData.java
index 2dad518..379ff78 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/RandomData.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/RandomData.java
@@ -83,7 +83,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(randomUtf8(random, 40),
generate(schema.getValueType(), random, d+1));
@@ -130,7 +130,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<>());
writer.setCodec(CodecFactory.fromString(args.length >= 4 ? args[3] : "null"));
writer.create(sch, new File(args[1]));
try {
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/TestCircularReferences.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestCircularReferences.java b/lang/java/avro/src/test/java/org/apache/avro/TestCircularReferences.java
index 79d8c1e..d6b3058 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/TestCircularReferences.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/TestCircularReferences.java
@@ -145,9 +145,9 @@ public class TestCircularReferences {
void set(Object referenceable);
}
- private final Map<Long, Object> references = new HashMap<Long, Object>();
- private final Map<Object, Long> ids = new IdentityHashMap<Object, Long>();
- private final Map<Long, List<Callback>> callbacksById = new HashMap<Long, List<Callback>>();
+ private final Map<Long, Object> references = new HashMap<>();
+ private final Map<Object, Long> ids = new IdentityHashMap<>();
+ private final Map<Long, List<Callback>> callbacksById = new HashMap<>();
private final ReferenceableTracker tracker = new ReferenceableTracker();
private final ReferenceHandler handler = new ReferenceHandler();
@@ -232,7 +232,7 @@ public class TestCircularReferences {
} else {
List<Callback> callbacks = callbacksById.get(id);
if (callbacks == null) {
- callbacks = new ArrayList<Callback>();
+ callbacks = new ArrayList<>();
callbacksById.put(id, callbacks);
}
// add a callback to resolve this reference when the id is available
@@ -308,13 +308,13 @@ public class TestCircularReferences {
parentSchema);
Reference parentRef = new Reference("parent");
- List<Schema.Field> childFields = new ArrayList<Schema.Field>();
+ List<Schema.Field> childFields = new ArrayList<>();
childFields.add(new Schema.Field("c", Schema.create(Schema.Type.STRING), null, null));
childFields.add(new Schema.Field("parent", parentRefSchema, null, null));
Schema childSchema = parentRef.addToSchema(
Schema.createRecord("Child", null, null, false, childFields));
- List<Schema.Field> parentFields = new ArrayList<Schema.Field>();
+ List<Schema.Field> parentFields = new ArrayList<>();
parentFields.add(new Schema.Field("id", Schema.create(Schema.Type.LONG), null, null));
parentFields.add(new Schema.Field("p", Schema.create(Schema.Type.STRING), null, null));
parentFields.add(new Schema.Field("child", childSchema, null, null));
@@ -363,11 +363,11 @@ public class TestCircularReferences {
private <D> List<D> read(GenericData model, Schema schema, File file) throws IOException {
DatumReader<D> reader = newReader(model, schema);
- List<D> data = new ArrayList<D>();
+ List<D> data = new ArrayList<>();
FileReader<D> fileReader = null;
try {
- fileReader = new DataFileReader<D>(file, reader);
+ fileReader = new DataFileReader<>(file, reader);
for (D datum : fileReader) {
data.add(datum);
}
@@ -389,7 +389,7 @@ public class TestCircularReferences {
private <D> File write(GenericData model, Schema schema, D... data) throws IOException {
File file = temp.newFile();
DatumWriter<D> writer = model.createDatumWriter(schema);
- DataFileWriter<D> fileWriter = new DataFileWriter<D>(writer);
+ DataFileWriter<D> fileWriter = new DataFileWriter<>(writer);
try {
fileWriter.create(schema, file);
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/TestDataFile.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestDataFile.java b/lang/java/avro/src/test/java/org/apache/avro/TestDataFile.java
index 608d960..3809371 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/TestDataFile.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/TestDataFile.java
@@ -60,7 +60,7 @@ public class TestDataFile {
@Parameters
public static List<Object[]> codecs() {
- List<Object[]> r = new ArrayList<Object[]>();
+ List<Object[]> r = new ArrayList<>();
r.add(new Object[] { null });
r.add(new Object[] { CodecFactory.deflateCodec(0) });
r.add(new Object[] { CodecFactory.deflateCodec(1) });
@@ -103,7 +103,7 @@ public class TestDataFile {
public void testGenericWrite() throws IOException {
DataFileWriter<Object> writer =
- new DataFileWriter<Object>(new GenericDatumWriter<Object>())
+ new DataFileWriter<>(new GenericDatumWriter<>())
.setSyncInterval(100);
if (codec != null) {
writer.setCodec(codec);
@@ -148,7 +148,7 @@ public class TestDataFile {
public void testGenericRead() throws IOException {
DataFileReader<Object> reader =
- new DataFileReader<Object>(makeFile(), new GenericDatumReader<Object>());
+ new DataFileReader<>(makeFile(), new GenericDatumReader<>());
try {
Object datum = null;
if (VALIDATE) {
@@ -169,7 +169,7 @@ public class TestDataFile {
public void testSplits() throws IOException {
File file = makeFile();
DataFileReader<Object> reader =
- new DataFileReader<Object>(file, new GenericDatumReader<Object>());
+ new DataFileReader<>(file, new GenericDatumReader<>());
Random rand = new Random(SEED);
try {
int splits = 10; // number of splits
@@ -196,10 +196,10 @@ public class TestDataFile {
public void testSyncDiscovery() throws IOException {
File file = makeFile();
DataFileReader<Object> reader =
- new DataFileReader<Object>(file, new GenericDatumReader<Object>());
+ new DataFileReader<>(file, new GenericDatumReader<>());
try {
// discover the sync points
- ArrayList<Long> syncs = new ArrayList<Long>();
+ ArrayList<Long> syncs = new ArrayList<>();
long previousSync = -1;
while (reader.hasNext()) {
if (reader.previousSync() != previousSync) {
@@ -225,7 +225,7 @@ public class TestDataFile {
File file = makeFile();
long start = file.length();
DataFileWriter<Object> writer =
- new DataFileWriter<Object>(new GenericDatumWriter<Object>())
+ new DataFileWriter<>(new GenericDatumWriter<>())
.appendTo(file);
try {
for (Object datum : new RandomData(SCHEMA, COUNT, SEED+1)) {
@@ -235,7 +235,7 @@ public class TestDataFile {
writer.close();
}
DataFileReader<Object> reader =
- new DataFileReader<Object>(file, new GenericDatumReader<Object>());
+ new DataFileReader<>(file, new GenericDatumReader<>());
try {
reader.seek(start);
Object datum = null;
@@ -257,28 +257,28 @@ public class TestDataFile {
public void testReadWithHeader() throws IOException {
File file = makeFile();
DataFileReader<Object> reader =
- new DataFileReader<Object>(file, new GenericDatumReader<Object>());
+ new DataFileReader<>(file, new GenericDatumReader<>());
// get a header for this file
DataFileStream.Header header = reader.getHeader();
// re-open to an arbitrary position near the middle, with sync == true
SeekableFileInput sin = new SeekableFileInput(file);
sin.seek(sin.length() / 2);
- reader = DataFileReader.<Object>openReader(sin, new GenericDatumReader<Object>(),
+ reader = DataFileReader.<Object>openReader(sin, new GenericDatumReader<>(),
header, true);
assertNotNull("Should be able to reopen from arbitrary point", reader.next());
long validPos = reader.previousSync();
// post sync, we know of a valid sync point: re-open with seek (sync == false)
sin.seek(validPos);
- reader = DataFileReader.<Object>openReader(sin, new GenericDatumReader<Object>(),
+ reader = DataFileReader.<Object>openReader(sin, new GenericDatumReader<>(),
header, false);
assertEquals("Should not move from sync point on reopen", validPos, sin.tell());
assertNotNull("Should be able to reopen at sync point", reader.next());
}
@Test public void testSyncInHeader() throws IOException {
- DataFileReader<Object> reader = new DataFileReader<Object>
+ DataFileReader<Object> reader = new DataFileReader<>
(new File("../../../share/test/data/syncInMeta.avro"),
- new GenericDatumReader<Object>());
+ new GenericDatumReader<>());
reader.sync(0);
for (Object datum : reader)
assertNotNull(datum);
@@ -286,13 +286,13 @@ public class TestDataFile {
@Test public void test12() throws IOException {
readFile(new File("../../../share/test/data/test.avro12"),
- new GenericDatumReader<Object>());
+ new GenericDatumReader<>());
}
@Test
public void testFlushCount() throws IOException {
DataFileWriter<Object> writer =
- new DataFileWriter<Object>(new GenericDatumWriter<Object>());
+ new DataFileWriter<>(new GenericDatumWriter<>());
writer.setFlushOnEveryBlock(false);
TestingByteArrayOutputStream out = new TestingByteArrayOutputStream();
writer.create(SCHEMA, out);
@@ -323,7 +323,7 @@ public class TestDataFile {
private void testFSync(boolean useFile) throws IOException {
DataFileWriter<Object> writer =
- new DataFileWriter<Object>(new GenericDatumWriter<Object>());
+ new DataFileWriter<>(new GenericDatumWriter<>());
try {
writer.setFlushOnEveryBlock(false);
TestingByteArrayOutputStream out = new TestingByteArrayOutputStream();
@@ -369,10 +369,10 @@ public class TestDataFile {
Schema projection = null;
if (args.length > 1)
projection = Schema.parse(new File(args[1]));
- TestDataFile.readFile(input, new GenericDatumReader<Object>(null, projection));
+ TestDataFile.readFile(input, new GenericDatumReader<>(null, projection));
long start = System.currentTimeMillis();
for (int i = 0; i < 4; i++)
- TestDataFile.readFile(input, new GenericDatumReader<Object>(null, projection));
+ TestDataFile.readFile(input, new GenericDatumReader<>(null, projection));
System.out.println("Time: "+(System.currentTimeMillis()-start));
}
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/TestDataFileConcat.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestDataFileConcat.java b/lang/java/avro/src/test/java/org/apache/avro/TestDataFileConcat.java
index b30c7b1..cfd71c4 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/TestDataFileConcat.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/TestDataFileConcat.java
@@ -54,7 +54,7 @@ public class TestDataFileConcat {
@Parameters
public static List<Object[]> codecs() {
- List<Object[]> r = new ArrayList<Object[]>();
+ List<Object[]> r = new ArrayList<>();
r.add(new Object[] { null , null, false});
r.add(new Object[] { null , null, true});
r.add(new Object[]
@@ -107,7 +107,7 @@ public class TestDataFileConcat {
File file1 = makeFile((codec == null ? "null" : codec.toString()) + "-A");
File file2 = makeFile((codec2 == null ? "null" : codec2.toString()) + "-B");
DataFileWriter<Object> writer =
- new DataFileWriter<Object>(new GenericDatumWriter<Object>())
+ new DataFileWriter<>(new GenericDatumWriter<>())
.setSyncInterval(syncInterval);
if (codec != null) {
writer.setCodec(codec);
@@ -121,7 +121,7 @@ public class TestDataFileConcat {
writer.close();
}
DataFileWriter<Object> writer2 =
- new DataFileWriter<Object>(new GenericDatumWriter<Object>())
+ new DataFileWriter<>(new GenericDatumWriter<>())
.setSyncInterval(syncInterval);
if (codec2 != null) {
writer2.setCodec(codec2);
@@ -135,20 +135,20 @@ public class TestDataFileConcat {
writer2.close();
}
DataFileWriter<Object> concatinto =
- new DataFileWriter<Object>(new GenericDatumWriter<Object>())
+ new DataFileWriter<>(new GenericDatumWriter<>())
.setSyncInterval(syncInterval);
concatinto.appendTo(file1);
DataFileReader<Object> concatfrom =
- new DataFileReader<Object>(file2, new GenericDatumReader<Object>());
+ new DataFileReader<>(file2, new GenericDatumReader<>());
concatinto.appendAllFrom(concatfrom, recompress);
concatinto.close();
concatfrom.close();
- concatfrom = new DataFileReader<Object>(file2, new GenericDatumReader<Object>());
+ concatfrom = new DataFileReader<>(file2, new GenericDatumReader<>());
DataFileReader<Object> concat =
- new DataFileReader<Object>(file1, new GenericDatumReader<Object>());
+ new DataFileReader<>(file1, new GenericDatumReader<>());
int count = 0;
try {
Object datum = null;
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/TestDataFileCorruption.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestDataFileCorruption.java b/lang/java/avro/src/test/java/org/apache/avro/TestDataFileCorruption.java
index e76251c..daa7eb1 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/TestDataFileCorruption.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/TestDataFileCorruption.java
@@ -48,7 +48,7 @@ public class TestDataFileCorruption {
Schema schema = Schema.create(Type.STRING);
// Write a data file
- DataFileWriter<Utf8> w = new DataFileWriter<Utf8>(new GenericDatumWriter<Utf8>(schema));
+ DataFileWriter<Utf8> w = new DataFileWriter<>(new GenericDatumWriter<>(schema));
ByteArrayOutputStream baos = new ByteArrayOutputStream();
w.create(schema, baos);
w.append(new Utf8("apple"));
@@ -78,8 +78,8 @@ public class TestDataFileCorruption {
out.close();
// Read the data file
- DataFileReader r = new DataFileReader<Utf8>(file,
- new GenericDatumReader<Utf8>(schema));
+ DataFileReader r = new DataFileReader<>(file,
+ new GenericDatumReader<>(schema));
assertEquals("apple", r.next().toString());
assertEquals("banana", r.next().toString());
long prevSync = r.previousSync();
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/TestDataFileCustomSync.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestDataFileCustomSync.java b/lang/java/avro/src/test/java/org/apache/avro/TestDataFileCustomSync.java
index e3f3791..9104188 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/TestDataFileCustomSync.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/TestDataFileCustomSync.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertTrue;
public class TestDataFileCustomSync {
private byte[] createDataFile(byte[] sync) throws IOException {
Schema schema = Schema.create(Type.STRING);
- DataFileWriter<Utf8> w = new DataFileWriter<Utf8>(new GenericDatumWriter<Utf8>(schema));
+ DataFileWriter<Utf8> w = new DataFileWriter<>(new GenericDatumWriter<>(schema));
ByteArrayOutputStream baos = new ByteArrayOutputStream();
w.create(schema, baos, sync);
w.append(new Utf8("apple"));
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/TestDataFileDeflate.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestDataFileDeflate.java b/lang/java/avro/src/test/java/org/apache/avro/TestDataFileDeflate.java
index 12efbf3..a3b3dfa 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/TestDataFileDeflate.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/TestDataFileDeflate.java
@@ -40,7 +40,7 @@ public class TestDataFileDeflate {
Schema schema = Schema.create(Type.STRING);
// Write it
- DataFileWriter<Utf8> w = new DataFileWriter<Utf8>(new GenericDatumWriter<Utf8>(schema));
+ DataFileWriter<Utf8> w = new DataFileWriter<>(new GenericDatumWriter<>(schema));
w.setCodec(CodecFactory.deflateCodec(6));
ByteArrayOutputStream baos = new ByteArrayOutputStream();
w.create(schema, baos);
@@ -52,9 +52,9 @@ public class TestDataFileDeflate {
w.close();
// Read it
- DataFileStream<Utf8> r = new DataFileStream<Utf8>(
+ DataFileStream<Utf8> r = new DataFileStream<>(
new ByteArrayInputStream(baos.toByteArray()),
- new GenericDatumReader<Utf8>(schema));
+ new GenericDatumReader<>(schema));
assertEquals("hello world", r.next().toString());
assertEquals("hello moon", r.next().toString());
assertEquals("bye bye world", r.next().toString());
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/TestDataFileMeta.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestDataFileMeta.java b/lang/java/avro/src/test/java/org/apache/avro/TestDataFileMeta.java
index 5d5b2d3..48aaf7e 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/TestDataFileMeta.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/TestDataFileMeta.java
@@ -37,19 +37,19 @@ import org.junit.Test;
public class TestDataFileMeta {
@Test(expected=AvroRuntimeException.class)
public void testUseReservedMeta() {
- DataFileWriter<?> w = new DataFileWriter<Object>(new GenericDatumWriter<Object>());
+ DataFileWriter<?> w = new DataFileWriter<>(new GenericDatumWriter<>());
w.setMeta("avro.foo", "bar");
}
@Test()
public void testUseMeta() throws IOException {
- DataFileWriter<?> w = new DataFileWriter<Object>(new GenericDatumWriter<Object>());
+ DataFileWriter<?> w = new DataFileWriter<>(new GenericDatumWriter<>());
File f = AvroTestUtil.tempFile(getClass(), "testDataFileMeta.avro");
w.setMeta("hello", "bar");
w.create(Schema.create(Type.NULL), f);
w.close();
- DataFileStream<Void> r = new DataFileStream<Void>(new FileInputStream(f), new GenericDatumReader<Void>());
+ DataFileStream<Void> r = new DataFileStream<>(new FileInputStream(f), new GenericDatumReader<>());
assertTrue(r.getMetaKeys().contains("hello"));
@@ -58,7 +58,7 @@ public class TestDataFileMeta {
@Test(expected=AvroRuntimeException.class)
public void testUseMetaAfterCreate() throws IOException {
- DataFileWriter<?> w = new DataFileWriter<Object>(new GenericDatumWriter<Object>());
+ DataFileWriter<?> w = new DataFileWriter<>(new GenericDatumWriter<>());
w.create(Schema.create(Type.NULL), new ByteArrayOutputStream());
w.setMeta("foo", "bar");
}
@@ -69,7 +69,7 @@ public class TestDataFileMeta {
for (int i = -1; i < 33; i++) {
// 33 invalid, one valid
try {
- new DataFileWriter<Object>(new GenericDatumWriter<Object>()).setSyncInterval(i);
+ new DataFileWriter<>(new GenericDatumWriter<>()).setSyncInterval(i);
} catch (IllegalArgumentException iae) {
exceptions++;
}
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/TestDataFileReflect.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestDataFileReflect.java b/lang/java/avro/src/test/java/org/apache/avro/TestDataFileReflect.java
index 78ff014..08b7f40 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/TestDataFileReflect.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/TestDataFileReflect.java
@@ -53,20 +53,20 @@ public class TestDataFileReflect {
reflectData.getSchema(BarRecord.class) });
Schema union = Schema.createUnion(schemas);
DataFileWriter<Object> writer =
- new DataFileWriter<Object>(new ReflectDatumWriter<Object>(union))
+ new DataFileWriter<>(new ReflectDatumWriter<>(union))
.create(union, fos);
// test writing to a file
- CheckList<Object> check = new CheckList<Object>();
+ CheckList<Object> check = new CheckList<>();
write(writer, new BarRecord("One beer please"), check);
write(writer, new FooRecord(10), check);
write(writer, new BarRecord("Two beers please"), check);
write(writer, new FooRecord(20), check);
writer.close();
- ReflectDatumReader<Object> din = new ReflectDatumReader<Object>();
+ ReflectDatumReader<Object> din = new ReflectDatumReader<>();
SeekableFileInput sin = new SeekableFileInput(FILE);
- DataFileReader<Object> reader = new DataFileReader<Object>(sin, din);
+ DataFileReader<Object> reader = new DataFileReader<>(sin, din);
int count = 0;
for (Object datum : reader)
check.assertEquals(datum, count++);
@@ -83,21 +83,21 @@ public class TestDataFileReflect {
ReflectData reflectData = ReflectData.AllowNull.get();
Schema schema = reflectData.getSchema(BarRecord.class);
- DataFileWriter<BarRecord> writer = new DataFileWriter<BarRecord>
- (new ReflectDatumWriter<BarRecord>(BarRecord.class, reflectData))
+ DataFileWriter<BarRecord> writer = new DataFileWriter<>
+ (new ReflectDatumWriter<>(BarRecord.class, reflectData))
.create(schema, fos);
// test writing to a file
- CheckList<BarRecord> check = new CheckList<BarRecord>();
+ CheckList<BarRecord> check = new CheckList<>();
write(writer, new BarRecord("One beer please"), check);
// null record here, fails when using the default reflectData instance
write(writer, new BarRecord(), check);
write(writer, new BarRecord("Two beers please"), check);
writer.close();
- ReflectDatumReader<BarRecord> din = new ReflectDatumReader<BarRecord>();
+ ReflectDatumReader<BarRecord> din = new ReflectDatumReader<>();
SeekableFileInput sin = new SeekableFileInput(FILE);
- DataFileReader<BarRecord> reader = new DataFileReader<BarRecord>(sin, din);
+ DataFileReader<BarRecord> reader = new DataFileReader<>(sin, din);
int count = 0;
for (BarRecord datum : reader)
check.assertEquals(datum, count++);
@@ -114,18 +114,18 @@ public class TestDataFileReflect {
Schema schema = ReflectData.get().getSchema(BazRecord.class);
DataFileWriter<BazRecord> writer =
- new DataFileWriter<BazRecord>(new ReflectDatumWriter<BazRecord>(schema))
+ new DataFileWriter<>(new ReflectDatumWriter<BazRecord>(schema))
.create(schema, fos);
// test writing to a file
- CheckList<BazRecord> check = new CheckList<BazRecord>();
+ CheckList<BazRecord> check = new CheckList<>();
write(writer, new BazRecord(10), check);
write(writer, new BazRecord(20), check);
writer.close();
- ReflectDatumReader<BazRecord> din = new ReflectDatumReader<BazRecord>();
+ ReflectDatumReader<BazRecord> din = new ReflectDatumReader<>();
SeekableFileInput sin = new SeekableFileInput(FILE);
- DataFileReader<BazRecord> reader = new DataFileReader<BazRecord>(sin, din);
+ DataFileReader<BazRecord> reader = new DataFileReader<>(sin, din);
int count = 0;
for (BazRecord datum : reader)
check.assertEquals(datum, count++);
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/TestSchema.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestSchema.java b/lang/java/avro/src/test/java/org/apache/avro/TestSchema.java
index 242ee8c..7e813e1 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/TestSchema.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/TestSchema.java
@@ -54,7 +54,7 @@ public class TestSchema {
@Test
public void testDuplicateRecordFieldName() {
final Schema schema = Schema.createRecord("RecordName", null, null, false);
- final List<Field> fields = new ArrayList<Field>();
+ final List<Field> fields = new ArrayList<>();
fields.add(new Field("field_name", Schema.create(Type.NULL), null, null));
fields.add(new Field("field_name", Schema.create(Type.INT), null, null));
try {
@@ -67,7 +67,7 @@ public class TestSchema {
@Test
public void testCreateUnionVarargs() {
- List<Schema> types = new ArrayList<Schema>();
+ List<Schema> types = new ArrayList<>();
types.add(Schema.create(Type.NULL));
types.add(Schema.create(Type.LONG));
Schema expected = Schema.createUnion(types);
@@ -85,7 +85,7 @@ public class TestSchema {
@Test
public void testSchemaWithFields() {
- List<Field> fields = new ArrayList<Field>();
+ List<Field> fields = new ArrayList<>();
fields.add(new Field("field_name1", Schema.create(Type.NULL), null, null));
fields.add(new Field("field_name2", Schema.create(Type.INT), null, null));
Schema schema = Schema.createRecord("foobar", null, null, false, fields);
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/TestSchemaBuilder.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaBuilder.java b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaBuilder.java
index 74d3022..622df16 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaBuilder.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaBuilder.java
@@ -65,7 +65,7 @@ public class TestSchemaBuilder {
new Schema.Field("f1", Schema.create(Schema.Type.LONG), "This is f1", null),
fields.get(1));
- List<Schema> types = new ArrayList<Schema>();
+ List<Schema> types = new ArrayList<>();
types.add(Schema.create(Schema.Type.BOOLEAN));
types.add(Schema.create(Schema.Type.NULL));
Schema optional = Schema.createUnion(types);
@@ -324,7 +324,7 @@ public class TestSchemaBuilder {
@Test
public void testUnionAndNullable() {
- List<Schema> types = new ArrayList<Schema>();
+ List<Schema> types = new ArrayList<>();
types.add(Schema.create(Schema.Type.LONG));
types.add(Schema.create(Schema.Type.NULL));
Schema expected = Schema.createUnion(types);
@@ -509,9 +509,9 @@ public class TestSchemaBuilder {
byte[] bytedef = new byte[]{3};
ByteBuffer bufdef = ByteBuffer.wrap(bytedef);
String strdef = "\u0003";
- HashMap<String, String> mapdef = new HashMap<String, String>();
+ HashMap<String, String> mapdef = new HashMap<>();
mapdef.put("a", "A");
- ArrayList<String> arrdef = new ArrayList<String>();
+ ArrayList<String> arrdef = new ArrayList<>();
arrdef.add("arr");
Schema rec = SchemaBuilder.record("inner").fields()
@@ -692,7 +692,7 @@ public class TestSchemaBuilder {
// write to file
DataFileWriter<Object> writer =
- new DataFileWriter<Object>(new GenericDatumWriter<Object>());
+ new DataFileWriter<>(new GenericDatumWriter<>());
writer.create(writeSchema, FILE);
writer.append(rec1);
writer.append(rec2);
@@ -707,8 +707,8 @@ public class TestSchemaBuilder {
.endRecord();
DataFileReader<GenericData.Record> reader =
- new DataFileReader<GenericData.Record>(FILE,
- new GenericDatumReader<GenericData.Record>(writeSchema, readSchema));
+ new DataFileReader<>(FILE,
+ new GenericDatumReader<>(writeSchema, readSchema));
GenericData.Record rec1read = reader.iterator().next();
Assert.assertEquals(1, rec1read.get("requiredInt"));
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibility.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibility.java b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibility.java
index f271a9d..4b32690 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibility.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibility.java
@@ -527,7 +527,7 @@ public class TestSchemaCompatibility {
LOG.debug("Encode datum {} with writer {}.", datum, writerSchema);
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
final Encoder encoder = EncoderFactory.get().binaryEncoder(baos, null);
- final DatumWriter<Object> datumWriter = new GenericDatumWriter<Object>(writerSchema);
+ final DatumWriter<Object> datumWriter = new GenericDatumWriter<>(writerSchema);
datumWriter.write(datum, encoder);
encoder.flush();
@@ -538,7 +538,7 @@ public class TestSchemaCompatibility {
final Decoder decoder = DecoderFactory.get().resolvingDecoder(
writerSchema, readerSchema,
DecoderFactory.get().binaryDecoder(bytes, null));
- final DatumReader<Object> datumReader = new GenericDatumReader<Object>(readerSchema);
+ final DatumReader<Object> datumReader = new GenericDatumReader<>(readerSchema);
final Object decodedDatum = datumReader.read(null, decoder);
assertEquals(String.format(
@@ -550,7 +550,7 @@ public class TestSchemaCompatibility {
}
Deque<String> asDeqeue(String... args) {
- Deque<String> dq = new ArrayDeque<String>();
+ Deque<String> dq = new ArrayDeque<>();
List<String> x = Arrays.asList(args);
Collections.reverse(x);
dq.addAll(x);
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityFixedSizeMismatch.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityFixedSizeMismatch.java b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityFixedSizeMismatch.java
index cc201ab..a786278 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityFixedSizeMismatch.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityFixedSizeMismatch.java
@@ -41,7 +41,7 @@ public class TestSchemaCompatibilityFixedSizeMismatch {
{ FIXED_8_BYTES, FIXED_4_BYTES, "expected: 4, found: 8", "/size" },
{ A_DINT_B_DFIXED_8_BYTES_RECORD1, A_DINT_B_DFIXED_4_BYTES_RECORD1, "expected: 4, found: 8", "/fields/1/type/size" },
{ A_DINT_B_DFIXED_4_BYTES_RECORD1, A_DINT_B_DFIXED_8_BYTES_RECORD1, "expected: 8, found: 4", "/fields/1/type/size" }, };
- List<Object[]> list = new ArrayList<Object[]>(fields.length);
+ List<Object[]> list = new ArrayList<>(fields.length);
for (Object[] schemas : fields) {
list.add(schemas);
}
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityMissingEnumSymbols.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityMissingEnumSymbols.java b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityMissingEnumSymbols.java
index 893c4a6..a07be7f 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityMissingEnumSymbols.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityMissingEnumSymbols.java
@@ -45,7 +45,7 @@ public class TestSchemaCompatibilityMissingEnumSymbols {
Object[][] fields = { //
{ ENUM1_AB_SCHEMA, ENUM1_ABC_SCHEMA, "[C]", "/symbols" }, { ENUM1_BC_SCHEMA, ENUM1_ABC_SCHEMA, "[A]", "/symbols" },
{ RECORD1_WITH_ENUM_AB, RECORD1_WITH_ENUM_ABC, "[C]", "/fields/0/type/symbols" } };
- List<Object[]> list = new ArrayList<Object[]>(fields.length);
+ List<Object[]> list = new ArrayList<>(fields.length);
for (Object[] schemas : fields) {
list.add(schemas);
}
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityMissingUnionBranch.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityMissingUnionBranch.java b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityMissingUnionBranch.java
index fb47ef3..58590b1 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityMissingUnionBranch.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityMissingUnionBranch.java
@@ -96,7 +96,7 @@ public class TestSchemaCompatibilityMissingUnionBranch {
asList("/1", "/2", "/3") },
{ A_DINT_B_DINT_UNION_RECORD1, A_DINT_B_DINT_STRING_UNION_RECORD1,
asList("reader union lacking writer type: STRING"), asList("/fields/1/type/1") } };
- List<Object[]> list = new ArrayList<Object[]>(fields.length);
+ List<Object[]> list = new ArrayList<>(fields.length);
for (Object[] schemas : fields) {
list.add(schemas);
}
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityNameMismatch.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityNameMismatch.java b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityNameMismatch.java
index ebc2309..2a04ee8 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityNameMismatch.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityNameMismatch.java
@@ -52,7 +52,7 @@ public class TestSchemaCompatibilityNameMismatch {
{ FIXED_4_BYTES, FIXED_4_ANOTHER_NAME, "expected: AnotherName", "/name" }, { FIXED_4_NAMESPACE_V1,
FIXED_4_NAMESPACE_V2, "expected: org.apache.avro.tests.v_2_0.Fixed", "/name" },
{ A_DINT_B_DENUM_1_RECORD1, A_DINT_B_DENUM_2_RECORD1, "expected: Enum2", "/fields/1/type/name" } };
- List<Object[]> list = new ArrayList<Object[]>(fields.length);
+ List<Object[]> list = new ArrayList<>(fields.length);
for (Object[] schemas : fields) {
list.add(schemas);
}
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityReaderFieldMissingDefaultValue.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityReaderFieldMissingDefaultValue.java b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityReaderFieldMissingDefaultValue.java
index b011bc9..4b4d8c8 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityReaderFieldMissingDefaultValue.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityReaderFieldMissingDefaultValue.java
@@ -36,7 +36,7 @@ public class TestSchemaCompatibilityReaderFieldMissingDefaultValue {
public static Iterable<Object[]> data() {
Object[][] fields = { //
{ A_INT_RECORD1, EMPTY_RECORD1, "a", "/fields/0" }, { A_INT_B_DINT_RECORD1, EMPTY_RECORD1, "a", "/fields/0" } };
- List<Object[]> list = new ArrayList<Object[]>(fields.length);
+ List<Object[]> list = new ArrayList<>(fields.length);
for (Object[] schemas : fields) {
list.add(schemas);
}
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityTypeMismatch.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityTypeMismatch.java b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityTypeMismatch.java
index 92db53c..640d052 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityTypeMismatch.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityTypeMismatch.java
@@ -107,7 +107,7 @@ public class TestSchemaCompatibilityTypeMismatch {
{ NULL_SCHEMA, INT_SCHEMA, "reader type: NULL not compatible with writer type: INT", "/" }
};
- List<Object[]> list = new ArrayList<Object[]>(fields.length);
+ List<Object[]> list = new ArrayList<>(fields.length);
for (Object[] schemas : fields) {
list.add(schemas);
}
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/TestSchemaNormalization.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaNormalization.java b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaNormalization.java
index f05bf90..fef6eb0 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaNormalization.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaNormalization.java
@@ -45,7 +45,7 @@ public class TestSchemaNormalization {
public TestCanonical(String i, String o) { input=i; expectedOutput=o; }
@Parameters public static List<Object[]> cases() throws IOException
- { return CaseFinder.find(data(), "canonical", new ArrayList<Object[]>()); }
+ { return CaseFinder.find(data(), "canonical", new ArrayList<>()); }
@Test public void testCanonicalization() throws Exception {
assertEquals(SchemaNormalization.toParsingForm(Schema.parse(input)),
@@ -59,7 +59,7 @@ public class TestSchemaNormalization {
public TestFingerprint(String i, String o) { input=i; expectedOutput=o; }
@Parameters public static List<Object[]> cases() throws IOException
- { return CaseFinder.find(data(),"fingerprint",new ArrayList<Object[]>()); }
+ { return CaseFinder.find(data(),"fingerprint", new ArrayList<>()); }
@Test public void testCanonicalization() throws Exception {
Schema s = Schema.parse(input);
@@ -76,7 +76,7 @@ public class TestSchemaNormalization {
public TestFingerprintInternationalization(String i, String o) { input=i; expectedOutput=o; }
@Parameters public static List<Object[]> cases() throws IOException
- { return CaseFinder.find(data(),"fingerprint",new ArrayList<Object[]>()); }
+ { return CaseFinder.find(data(),"fingerprint", new ArrayList<>()); }
@Test public void testCanonicalization() throws Exception {
Locale originalDefaultLocale = Locale.getDefault();
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/TestSchemaValidation.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaValidation.java b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaValidation.java
index 4654979..d756448 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaValidation.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaValidation.java
@@ -385,7 +385,7 @@ public class TestSchemaValidation {
private void testValidatorPasses(SchemaValidator validator,
Schema schema, Schema... prev) throws SchemaValidationException {
- ArrayList<Schema> prior = new ArrayList<Schema>();
+ ArrayList<Schema> prior = new ArrayList<>();
for(int i = prev.length - 1; i >= 0; i--) {
prior.add(prev[i]);
}
@@ -394,7 +394,7 @@ public class TestSchemaValidation {
private void testValidatorFails(SchemaValidator validator,
Schema schemaFails, Schema... prev) throws SchemaValidationException {
- ArrayList<Schema> prior = new ArrayList<Schema>();
+ ArrayList<Schema> prior = new ArrayList<>();
for(int i = prev.length - 1; i >= 0; i--) {
prior.add(prev[i]);
}
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/TestSchemas.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestSchemas.java b/lang/java/avro/src/test/java/org/apache/avro/TestSchemas.java
index d69dce9..6f7fc4a 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/TestSchemas.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/TestSchemas.java
@@ -48,7 +48,7 @@ public class TestSchemas {
static final Schema ENUM1_BC_SCHEMA = Schema.createEnum("Enum1", null, null, list("B", "C"));
static final Schema ENUM2_AB_SCHEMA = Schema.createEnum("Enum2", null, null, list("A", "B"));
- static final Schema EMPTY_UNION_SCHEMA = Schema.createUnion(new ArrayList<Schema>());
+ static final Schema EMPTY_UNION_SCHEMA = Schema.createUnion(new ArrayList<>());
static final Schema NULL_UNION_SCHEMA = Schema.createUnion(list(NULL_SCHEMA));
static final Schema INT_UNION_SCHEMA = Schema.createUnion(list(INT_SCHEMA));
static final Schema LONG_UNION_SCHEMA = Schema.createUnion(list(LONG_SCHEMA));
@@ -148,7 +148,7 @@ public class TestSchemas {
/** Borrowed from the Guava library. */
static <E> ArrayList<E> list(E... elements) {
- final ArrayList<E> list = new ArrayList<E>();
+ final ArrayList<E> list = new ArrayList<>();
Collections.addAll(list, elements);
return list;
}
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/data/RecordBuilderBaseTest.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/data/RecordBuilderBaseTest.java b/lang/java/avro/src/test/java/org/apache/avro/data/RecordBuilderBaseTest.java
index 0a47e73..c084e06 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/data/RecordBuilderBaseTest.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/data/RecordBuilderBaseTest.java
@@ -37,12 +37,12 @@ public class RecordBuilderBaseTest {
@BeforeClass()
public static void setUpBeforeClass() {
- primitives = new HashSet<Type>(Arrays.asList(Type.values()));
+ primitives = new HashSet<>(Arrays.asList(Type.values()));
primitives.removeAll(Arrays.asList(new Type[] {
Type.RECORD, Type.ENUM, Type.ARRAY, Type.MAP, Type.UNION, Type.FIXED
}));
- nonNullPrimitives = new HashSet<Type>(primitives);
+ nonNullPrimitives = new HashSet<>(primitives);
nonNullPrimitives.remove(Type.NULL);
}
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/file/TestSeekableByteArrayInput.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/file/TestSeekableByteArrayInput.java b/lang/java/avro/src/test/java/org/apache/avro/file/TestSeekableByteArrayInput.java
index 9c5e3ff..5f7b6f6 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/file/TestSeekableByteArrayInput.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/file/TestSeekableByteArrayInput.java
@@ -37,10 +37,10 @@ public class TestSeekableByteArrayInput {
private byte[] getSerializedMessage(IndexedRecord message, Schema schema) throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream(4096);
- SpecificDatumWriter<IndexedRecord> writer = new SpecificDatumWriter<IndexedRecord>();
+ SpecificDatumWriter<IndexedRecord> writer = new SpecificDatumWriter<>();
DataFileWriter<IndexedRecord> dfw = null;
try {
- dfw = new DataFileWriter<IndexedRecord>(writer).create(schema, baos);
+ dfw = new DataFileWriter<>(writer).create(schema, baos);
dfw.append(message);
} finally {
if (dfw != null) {
@@ -52,7 +52,7 @@ public class TestSeekableByteArrayInput {
private Schema getTestSchema() throws Exception {
Schema schema = Schema.createRecord("TestRecord", "this is a test record", "org.apache.avro.file", false);
- List<Field> fields = new ArrayList<Field>();
+ List<Field> fields = new ArrayList<>();
fields.add(new Field("name", Schema.create(Type.STRING), "this is a test field", null));
schema.setFields(fields);
return schema;
@@ -66,7 +66,7 @@ public class TestSeekableByteArrayInput {
byte[] data = getSerializedMessage(message, testSchema);
- GenericDatumReader<IndexedRecord> reader = new GenericDatumReader<IndexedRecord>(testSchema);
+ GenericDatumReader<IndexedRecord> reader = new GenericDatumReader<>(testSchema);
SeekableInput in = new SeekableByteArrayInput(data);
FileReader<IndexedRecord> dfr = null;
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericData.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericData.java b/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericData.java
index fe01ad3..d95abb3 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericData.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericData.java
@@ -65,12 +65,12 @@ public class TestGenericData {
@Test(expected=AvroRuntimeException.class)
public void testArrayConstructorNullSchema() throws Exception {
- new GenericData.Array<Object>(1, null);
+ new GenericData.Array<>(1, null);
}
@Test(expected=AvroRuntimeException.class)
public void testArrayConstructorWrongSchema() throws Exception {
- new GenericData.Array<Object>(1, Schema.create(Schema.Type.INT));
+ new GenericData.Array<>(1, Schema.create(Schema.Type.INT));
}
@Test(expected=AvroRuntimeException.class)
@@ -94,7 +94,7 @@ public class TestGenericData {
@Test(expected=AvroRuntimeException.class)
public void testRecordPutInvalidField() throws Exception {
Schema s = Schema.createRecord("schemaName", "schemaDoc", "namespace", false);
- List<Schema.Field> fields = new ArrayList<Schema.Field>();
+ List<Schema.Field> fields = new ArrayList<>();
fields.add(new Schema.Field("someFieldName", s, "docs", null));
s.setFields(fields);
Record r = new GenericData.Record(s);
@@ -107,7 +107,7 @@ public class TestGenericData {
GenericData.get().hashCode(null, Schema.create(Type.NULL));
GenericData.get().hashCode(null, Schema.createUnion(
Arrays.asList(Schema.create(Type.BOOLEAN), Schema.create(Type.STRING))));
- List<CharSequence> stuff = new ArrayList<CharSequence>();
+ List<CharSequence> stuff = new ArrayList<>();
stuff.add("string");
Schema schema = recordSchema();
GenericRecord r = new GenericData.Record(schema);
@@ -121,10 +121,10 @@ public class TestGenericData {
GenericRecord r0 = new GenericData.Record(s);
GenericRecord r1 = new GenericData.Record(s);
GenericRecord r2 = new GenericData.Record(s);
- Collection<CharSequence> l0 = new ArrayDeque<CharSequence>();
- List<CharSequence> l1 = new ArrayList<CharSequence>();
+ Collection<CharSequence> l0 = new ArrayDeque<>();
+ List<CharSequence> l1 = new ArrayList<>();
GenericArray<CharSequence> l2 =
- new GenericData.Array<CharSequence>(1,s.getFields().get(0).schema());
+ new GenericData.Array<>(1, s.getFields().get(0).schema());
String foo = "foo";
l0.add(new StringBuffer(foo));
l1.add(foo);
@@ -138,7 +138,7 @@ public class TestGenericData {
}
private Schema recordSchema() {
- List<Field> fields = new ArrayList<Field>();
+ List<Field> fields = new ArrayList<>();
fields.add(new Field("anArray", Schema.createArray(Schema.create(Type.STRING)), null, null));
Schema schema = Schema.createRecord("arrayFoo", "test", "mytest", false);
schema.setFields(fields);
@@ -148,14 +148,14 @@ public class TestGenericData {
@Test public void testEquals2() {
Schema schema1 = Schema.createRecord("r", null, "x", false);
- List<Field> fields1 = new ArrayList<Field>();
+ List<Field> fields1 = new ArrayList<>();
fields1.add(new Field("a", Schema.create(Schema.Type.STRING), null, null,
Field.Order.IGNORE));
schema1.setFields(fields1);
// only differs in field order
Schema schema2 = Schema.createRecord("r", null, "x", false);
- List<Field> fields2 = new ArrayList<Field>();
+ List<Field> fields2 = new ArrayList<>();
fields2.add(new Field("a", Schema.create(Schema.Type.STRING), null, null,
Field.Order.ASCENDING));
schema2.setFields(fields2);
@@ -172,7 +172,7 @@ public class TestGenericData {
@Test
public void testRecordGetFieldDoesntExist() throws Exception {
- List<Field> fields = new ArrayList<Field>();
+ List<Field> fields = new ArrayList<>();
Schema schema = Schema.createRecord(fields);
GenericData.Record record = new GenericData.Record(schema);
assertNull(record.get("does not exist"));
@@ -181,8 +181,8 @@ public class TestGenericData {
@Test
public void testArrayReversal() {
Schema schema = Schema.createArray(Schema.create(Schema.Type.INT));
- GenericArray<Integer> forward = new GenericData.Array<Integer>(10, schema);
- GenericArray<Integer> backward = new GenericData.Array<Integer>(10, schema);
+ GenericArray<Integer> forward = new GenericData.Array<>(10, schema);
+ GenericArray<Integer> backward = new GenericData.Array<>(10, schema);
for (int i = 0; i <= 9; i++) {
forward.add(i);
}
@@ -196,10 +196,10 @@ public class TestGenericData {
@Test
public void testArrayListInterface() {
Schema schema = Schema.createArray(Schema.create(Schema.Type.INT));
- GenericArray<Integer> array = new GenericData.Array<Integer>(1, schema);
+ GenericArray<Integer> array = new GenericData.Array<>(1, schema);
array.add(99);
assertEquals(new Integer(99), array.get(0));
- List<Integer> list = new ArrayList<Integer>();
+ List<Integer> list = new ArrayList<>();
list.add(99);
assertEquals(array, list);
assertEquals(list, array);
@@ -220,7 +220,7 @@ public class TestGenericData {
public void testArrayAddAtLocation()
{
Schema schema = Schema.createArray(Schema.create(Schema.Type.INT));
- GenericArray<Integer> array = new GenericData.Array<Integer>(6, schema);
+ GenericArray<Integer> array = new GenericData.Array<>(6, schema);
array.clear();
for(int i=0; i<5; ++i)
array.add(i);
@@ -249,7 +249,7 @@ public class TestGenericData {
public void testArrayRemove()
{
Schema schema = Schema.createArray(Schema.create(Schema.Type.INT));
- GenericArray<Integer> array = new GenericData.Array<Integer>(10, schema);
+ GenericArray<Integer> array = new GenericData.Array<>(10, schema);
array.clear();
for(int i=0; i<10; ++i)
array.add(i);
@@ -290,7 +290,7 @@ public class TestGenericData {
public void testArraySet()
{
Schema schema = Schema.createArray(Schema.create(Schema.Type.INT));
- GenericArray<Integer> array = new GenericData.Array<Integer>(10, schema);
+ GenericArray<Integer> array = new GenericData.Array<>(10, schema);
array.clear();
for(int i=0; i<10; ++i)
array.add(i);
@@ -357,7 +357,7 @@ public class TestGenericData {
public void testCompare() {
// Prepare a schema for testing.
Field integerField = new Field("test", Schema.create(Type.INT), null, null);
- List<Field> fields = new ArrayList<Field>();
+ List<Field> fields = new ArrayList<>();
fields.add(integerField);
Schema record = Schema.createRecord("test", null, null, false);
record.setFields(fields);
@@ -371,7 +371,7 @@ public class TestGenericData {
testDatum1.put(0, 1);
Record testDatum2 = new Record(record);
testDatum2.put(0, 2);
- GenericDatumWriter<Record> gWriter = new GenericDatumWriter<Record>(record);
+ GenericDatumWriter<Record> gWriter = new GenericDatumWriter<>(record);
Integer start1 = 0, start2 = 0;
try {
// Write two datums in each stream
@@ -427,7 +427,7 @@ public class TestGenericData {
@Test
public void testValidateNullableEnum() {
- List<Schema> unionTypes = new ArrayList<Schema>();
+ List<Schema> unionTypes = new ArrayList<>();
Schema schema;
Schema nullSchema = Schema.create(Type.NULL);
Schema enumSchema = Schema.createEnum("AnEnum", null, null, Arrays.asList("X","Y","Z"));
@@ -505,7 +505,7 @@ public class TestGenericData {
*/
@Test
public void testToStringSameValues() throws IOException {
- List<Field> fields = new ArrayList<Field>();
+ List<Field> fields = new ArrayList<>();
fields.add(new Field("nullstring1", Schema.create(Type.STRING), null, (Object)null));
fields.add(new Field("nullstring2", Schema.create(Type.STRING), null, (Object)null));
@@ -530,7 +530,7 @@ public class TestGenericData {
fields.add(new Field("boolean1",Schema.create(Type.BOOLEAN ), null, (Object)null));
fields.add(new Field("boolean2",Schema.create(Type.BOOLEAN ), null, (Object)null));
- List<String> enumValues = new ArrayList<String>();
+ List<String> enumValues = new ArrayList<>();
enumValues.add("One");
enumValues.add("Two");
Schema enumSchema = Schema.createEnum("myEnum", null, null, enumValues);
@@ -581,13 +581,13 @@ public class TestGenericData {
testRecord.put("record1", record);
testRecord.put("record2", record);
- GenericArray<String> array = new GenericData.Array<String>(1, arraySchema);
+ GenericArray<String> array = new GenericData.Array<>(1, arraySchema);
array.clear();
array.add("42");
testRecord.put("array1", array);
testRecord.put("array2", array);
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("42", "42");
testRecord.put("map1", map);
testRecord.put("map2", map);
@@ -607,7 +607,7 @@ public class TestGenericData {
Schema parentSchema = Schema.createRecord("Parent", null, null, false);
Schema placeholderSchema = Schema.createRecord("Placeholder", null, null, false);
- List<Schema.Field> placeholderFields = new ArrayList<Schema.Field>();
+ List<Schema.Field> placeholderFields = new ArrayList<>();
placeholderFields.add( // at least one field is needed to be a valid schema
new Schema.Field("id", Schema.create(Schema.Type.LONG), null, (Object)null));
placeholderSchema.setFields(placeholderFields);
@@ -621,13 +621,13 @@ public class TestGenericData {
Reference parentRef = new Reference("parent");
- List<Schema.Field> childFields = new ArrayList<Schema.Field>();
+ List<Schema.Field> childFields = new ArrayList<>();
childFields.add(new Schema.Field("c", Schema.create(Schema.Type.STRING), null, (Object)null));
childFields.add(new Schema.Field("parent", parentRefSchema, null, (Object)null));
Schema childSchema = parentRef.addToSchema(
Schema.createRecord("Child", null, null, false, childFields));
- List<Schema.Field> parentFields = new ArrayList<Schema.Field>();
+ List<Schema.Field> parentFields = new ArrayList<>();
parentFields.add(new Schema.Field("id", Schema.create(Schema.Type.LONG), null, (Object)null));
parentFields.add(new Schema.Field("p", Schema.create(Schema.Type.STRING), null, (Object)null));
parentFields.add(new Schema.Field("child", childSchema, null, (Object)null));
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericDatumWriter.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericDatumWriter.java b/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericDatumWriter.java
index 8f99cdf..35d94b6 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericDatumWriter.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericDatumWriter.java
@@ -55,7 +55,7 @@ public class TestGenericDatumWriter {
r.put("f1", 100L);
ByteArrayOutputStream bao = new ByteArrayOutputStream();
GenericDatumWriter<GenericRecord> w =
- new GenericDatumWriter<GenericRecord>(s);
+ new GenericDatumWriter<>(s);
Encoder e = EncoderFactory.get().jsonEncoder(s, bao);
w.write(r, e);
e.flush();
@@ -69,10 +69,10 @@ public class TestGenericDatumWriter {
public void testArrayConcurrentModification() throws Exception {
String json = "{\"type\": \"array\", \"items\": \"int\" }";
Schema s = Schema.parse(json);
- final GenericArray<Integer> a = new GenericData.Array<Integer>(1, s);
+ final GenericArray<Integer> a = new GenericData.Array<>(1, s);
ByteArrayOutputStream bao = new ByteArrayOutputStream();
final GenericDatumWriter<GenericArray<Integer>> w =
- new GenericDatumWriter<GenericArray<Integer>>(s);
+ new GenericDatumWriter<>(s);
CountDownLatch sizeWrittenSignal = new CountDownLatch(1);
CountDownLatch eltAddedSignal = new CountDownLatch(1);
@@ -107,10 +107,10 @@ public class TestGenericDatumWriter {
public void testMapConcurrentModification() throws Exception {
String json = "{\"type\": \"map\", \"values\": \"int\" }";
Schema s = Schema.parse(json);
- final Map<String, Integer> m = new HashMap<String, Integer>();
+ final Map<String, Integer> m = new HashMap<>();
ByteArrayOutputStream bao = new ByteArrayOutputStream();
final GenericDatumWriter<Map<String, Integer>> w =
- new GenericDatumWriter<Map<String, Integer>>(s);
+ new GenericDatumWriter<>(s);
CountDownLatch sizeWrittenSignal = new CountDownLatch(1);
CountDownLatch eltAddedSignal = new CountDownLatch(1);
@@ -227,7 +227,7 @@ public class TestGenericDatumWriter {
ByteArrayOutputStream bao = new ByteArrayOutputStream();
GenericDatumWriter<GenericRecord> writer =
- new GenericDatumWriter<GenericRecord>(schema);
+ new GenericDatumWriter<>(schema);
Encoder encoder = EncoderFactory.get().jsonEncoder(schema, bao);
writer.write(record, encoder);
@@ -250,7 +250,7 @@ public class TestGenericDatumWriter {
ByteArrayOutputStream bao = new ByteArrayOutputStream();
GenericDatumWriter<GenericRecord> writer =
- new GenericDatumWriter<GenericRecord>(schema);
+ new GenericDatumWriter<>(schema);
Encoder encoder = EncoderFactory.get().jsonEncoder(schema, bao);
writer.write(record, encoder);
@@ -285,7 +285,7 @@ public class TestGenericDatumWriter {
private void writeObject(Schema schema, GenericRecord datum) throws Exception {
BinaryEncoder encoder = EncoderFactory.get().binaryEncoder(new ByteArrayOutputStream(), null);
- GenericDatumWriter<GenericData.Record> writer = new GenericDatumWriter<GenericData.Record>(schema);
+ GenericDatumWriter<GenericData.Record> writer = new GenericDatumWriter<>(schema);
writer.write(schema, datum, encoder);
}
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericLogicalTypes.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericLogicalTypes.java b/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericLogicalTypes.java
index 70cab88..5aee2a2 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericLogicalTypes.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericLogicalTypes.java
@@ -194,11 +194,11 @@ public class TestGenericLogicalTypes {
}
private <D> List<D> read(DatumReader<D> reader, File file) throws IOException {
- List<D> data = new ArrayList<D>();
+ List<D> data = new ArrayList<>();
FileReader<D> fileReader = null;
try {
- fileReader = new DataFileReader<D>(file, reader);
+ fileReader = new DataFileReader<>(file, reader);
for (D datum : fileReader) {
data.add(datum);
}
@@ -219,7 +219,7 @@ public class TestGenericLogicalTypes {
private <D> File write(GenericData model, Schema schema, D... data) throws IOException {
File file = temp.newFile();
DatumWriter<D> writer = model.createDatumWriter(schema);
- DataFileWriter<D> fileWriter = new DataFileWriter<D>(writer);
+ DataFileWriter<D> fileWriter = new DataFileWriter<>(writer);
try {
fileWriter.create(schema, file);
@@ -267,7 +267,7 @@ public class TestGenericLogicalTypes {
// test nested in a record
Schema recordSchema = Schema.createRecord("X", "", "test", false);
- List<Schema.Field> fields = new ArrayList<Schema.Field>();
+ List<Schema.Field> fields = new ArrayList<>();
fields.add(new Schema.Field("x", schema, "", null));
recordSchema.setFields(fields);
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericRecordBuilder.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericRecordBuilder.java b/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericRecordBuilder.java
index cc641f7..9595036 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericRecordBuilder.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericRecordBuilder.java
@@ -97,7 +97,7 @@ public class TestGenericRecordBuilder {
/** Creates a test record schema */
private static Schema recordSchema() {
- List<Field> fields = new ArrayList<Field>();
+ List<Field> fields = new ArrayList<>();
fields.add(new Field("id", Schema.create(Type.STRING), null, "0"));
fields.add(new Field("intField", Schema.create(Type.INT), null, null));
fields.add(new Field("anArray", Schema.createArray(Schema.create(Type.STRING)), null, null));
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/io/TestBinaryDecoder.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/io/TestBinaryDecoder.java b/lang/java/avro/src/test/java/org/apache/avro/io/TestBinaryDecoder.java
index fe5e4be..8ddc613 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/io/TestBinaryDecoder.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/io/TestBinaryDecoder.java
@@ -159,7 +159,7 @@ public class TestBinaryDecoder {
private static int seed = -1;
private static Schema schema = null;
private static int count = 200;
- private static ArrayList<Object> records = new ArrayList<Object>(count);
+ private static ArrayList<Object> records = new ArrayList<>(count);
@BeforeClass
public static void generateData() throws IOException {
seed = (int)System.currentTimeMillis();
@@ -176,7 +176,7 @@ public class TestBinaryDecoder {
"{\"type\":\"array\", \"items\":\"boolean\"}},"
+"{\"name\":\"longField\", \"type\":\"long\"}]}";
schema = Schema.parse(jsonSchema);
- GenericDatumWriter<Object> writer = new GenericDatumWriter<Object>();
+ GenericDatumWriter<Object> writer = new GenericDatumWriter<>();
writer.setSchema(schema);
ByteArrayOutputStream baos = new ByteArrayOutputStream(8192);
BinaryEncoder encoder = e_factory.binaryEncoder(baos, null);
@@ -191,7 +191,7 @@ public class TestBinaryDecoder {
@Test
public void testDecodeFromSources() throws IOException {
- GenericDatumReader<Object> reader = new GenericDatumReader<Object>();
+ GenericDatumReader<Object> reader = new GenericDatumReader<>();
reader.setSchema(schema);
ByteArrayInputStream is = new ByteArrayInputStream(data);
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/io/TestBlockingIO.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/io/TestBlockingIO.java b/lang/java/avro/src/test/java/org/apache/avro/io/TestBlockingIO.java
index f6cb76b..1b110f4 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/io/TestBlockingIO.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/io/TestBlockingIO.java
@@ -75,7 +75,7 @@ public class TestBlockingIO {
}
public void scan() throws IOException {
- Stack<S> countStack = new Stack<S>();
+ Stack<S> countStack = new Stack<>();
long count = 0;
while (parser.nextToken() != null) {
switch (parser.getCurrentToken()) {
@@ -127,7 +127,7 @@ public class TestBlockingIO {
}
public void skip(int skipLevel) throws IOException {
- Stack<S> countStack = new Stack<S>();
+ Stack<S> countStack = new Stack<>();
long count = 0;
while (parser.nextToken() != null) {
switch (parser.getCurrentToken()) {
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/io/TestEncoders.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/io/TestEncoders.java b/lang/java/avro/src/test/java/org/apache/avro/io/TestEncoders.java
index c54e2c6..a14861c 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/io/TestEncoders.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/io/TestEncoders.java
@@ -113,7 +113,7 @@ public class TestEncoders {
Schema ints = Schema.create(Type.INT);
Encoder e = factory.jsonEncoder(ints, out);
String separator = System.getProperty("line.separator");
- GenericDatumWriter<Integer> writer = new GenericDatumWriter<Integer>(ints);
+ GenericDatumWriter<Integer> writer = new GenericDatumWriter<>(ints);
writer.write(1, e);
writer.write(2, e);
e.flush();
@@ -134,7 +134,7 @@ public class TestEncoders {
Schema schema = new Schema.Parser().parse("{\"type\": \"record\", \"name\": \"ab\", \"fields\": [" +
"{\"name\": \"a\", \"type\": \"int\"}, {\"name\": \"b\", \"type\": \"int\"}" +
"]}");
- GenericDatumReader<Object> reader = new GenericDatumReader<Object>(schema);
+ GenericDatumReader<Object> reader = new GenericDatumReader<>(schema);
Decoder decoder = DecoderFactory.get().jsonDecoder(schema, value);
Object o = reader.read(null, decoder);
Assert.assertEquals("{\"a\": 1, \"b\": 2}", o.toString());
@@ -149,7 +149,7 @@ public class TestEncoders {
"{\"name\": \"b\", \"type\": {\"type\":\"record\",\"name\":\"B\",\"fields\":\n" +
"[{\"name\":\"b1\", \"type\":\"string\"}, {\"name\":\"b2\", \"type\":\"float\"}, {\"name\":\"b3\", \"type\":\"double\"}]}}\n" +
"]}");
- GenericDatumReader<Object> reader = new GenericDatumReader<Object>(schema);
+ GenericDatumReader<Object> reader = new GenericDatumReader<>(schema);
Decoder decoder = DecoderFactory.get().jsonDecoder(schema, value);
reader.read(null, decoder);
}
@@ -163,7 +163,7 @@ public class TestEncoders {
"{\"name\": \"b\", \"type\": {\"type\":\"record\",\"name\":\"B\",\"fields\":\n" +
"[{\"name\":\"b1\", \"type\":\"string\"}, {\"name\":\"b2\", \"type\":\"float\"}, {\"name\":\"b3\", \"type\":\"double\"}]}}\n" +
"]}");
- GenericDatumReader<Object> reader = new GenericDatumReader<Object>(schema);
+ GenericDatumReader<Object> reader = new GenericDatumReader<>(schema);
Decoder decoder = DecoderFactory.get().jsonDecoder(schema, value);
Object o = reader.read(null, decoder);
Assert.assertEquals("{\"a\": {\"a1\": null, \"a2\": true}, \"b\": {\"b1\": \"h\", \"b2\": 3.14, \"b3\": 1.4}}", o.toString());
@@ -182,7 +182,7 @@ public class TestEncoders {
"{\"name\": \"a\", \"type\": {\"type\":\"record\",\"name\":\"A\",\"fields\":\n" +
"[{\"name\":\"a1\", \"type\":\"null\"}, {\"name\":\"a2\", \"type\":\"boolean\"}]}}\n" +
"]}");
- GenericDatumReader<Object> reader = new GenericDatumReader<Object>(writerSchema, readerSchema);
+ GenericDatumReader<Object> reader = new GenericDatumReader<>(writerSchema, readerSchema);
Decoder decoder = DecoderFactory.get().jsonDecoder(writerSchema, value);
Object o = reader.read(null, decoder);
Assert.assertEquals("{\"a\": {\"a1\": null, \"a2\": true}}", o.toString());
@@ -201,7 +201,7 @@ public class TestEncoders {
"{\"name\": \"a\", \"type\": {\"type\":\"record\",\"name\":\"A\",\"fields\":\n" +
"[{\"name\":\"a1\", \"type\":\"null\"}, {\"name\":\"a2\", \"type\":\"boolean\"}]}}\n" +
"]}");
- GenericDatumReader<Object> reader = new GenericDatumReader<Object>(writerSchema, readerSchema);
+ GenericDatumReader<Object> reader = new GenericDatumReader<>(writerSchema, readerSchema);
Decoder decoder = DecoderFactory.get().jsonDecoder(writerSchema, value);
Object o = reader.read(null, decoder);
Assert.assertEquals("{\"a\": {\"a1\": null, \"a2\": true}}", o.toString());
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/io/TestJsonDecoder.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/io/TestJsonDecoder.java b/lang/java/avro/src/test/java/org/apache/avro/io/TestJsonDecoder.java
index 6ee6fcb..464d3a9 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/io/TestJsonDecoder.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/io/TestJsonDecoder.java
@@ -49,7 +49,7 @@ public class TestJsonDecoder {
+"[{\"type\":\""+type+"\",\"name\":\"n\"}]}";
Schema schema = Schema.parse(def);
DatumReader<GenericRecord> reader =
- new GenericDatumReader<GenericRecord>(schema);
+ new GenericDatumReader<>(schema);
String[] records = {"{\"n\":1}", "{\"n\":1.0}"};
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/io/TestValidatingIO.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/io/TestValidatingIO.java b/lang/java/avro/src/test/java/org/apache/avro/io/TestValidatingIO.java
index 792a987..ff62383 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/io/TestValidatingIO.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/io/TestValidatingIO.java
@@ -226,7 +226,7 @@ public class TestValidatingIO {
public static Object[] randomValues(String calls) {
Random r = new Random(0L);
InputScanner cs = new InputScanner(calls.toCharArray());
- List<Object> result = new ArrayList<Object>();
+ List<Object> result = new ArrayList<>();
while (! cs.isDone()) {
char c = cs.cur();
cs.next();
@@ -534,7 +534,7 @@ public class TestValidatingIO {
};
public static Object[][] convertTo2dArray(final Object[][]... values) {
- ArrayList<Object[]> ret = new ArrayList<Object[]>();
+ ArrayList<Object[]> ret = new ArrayList<>();
Iterator<Object[]> iter = cartesian(values);
while (iter.hasNext()) {
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/io/parsing/SymbolTest.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/io/parsing/SymbolTest.java b/lang/java/avro/src/test/java/org/apache/avro/io/parsing/SymbolTest.java
index ac372bb..68a7bc6 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/io/parsing/SymbolTest.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/io/parsing/SymbolTest.java
@@ -51,8 +51,8 @@ public class SymbolTest {
Schema schema = new Schema.Parser().parse(SCHEMA);
Symbol root = Symbol.root(new ResolvingGrammarGenerator()
- .generate(schema, schema, new HashMap<ValidatingGrammarGenerator.LitS, Symbol>()));
- validateNonNull(root, new HashSet<Symbol>());
+ .generate(schema, schema, new HashMap<>()));
+ validateNonNull(root, new HashSet<>());
}
private static void validateNonNull(final Symbol symb, Set<Symbol> seen) {
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/io/parsing/TestResolvingGrammarGenerator.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/io/parsing/TestResolvingGrammarGenerator.java b/lang/java/avro/src/test/java/org/apache/avro/io/parsing/TestResolvingGrammarGenerator.java
index 2d9a83e..2253e96 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/io/parsing/TestResolvingGrammarGenerator.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/io/parsing/TestResolvingGrammarGenerator.java
@@ -128,8 +128,8 @@ public class TestResolvingGrammarGenerator {
private byte[] writeRecord(Schema schema, GenericData.Record record) throws Exception {
ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
- GenericDatumWriter<GenericData.Record> datumWriter = new GenericDatumWriter<GenericData.Record>(schema);
- DataFileWriter<GenericData.Record> writer = new DataFileWriter<GenericData.Record>(datumWriter);
+ GenericDatumWriter<GenericData.Record> datumWriter = new GenericDatumWriter<>(schema);
+ DataFileWriter<GenericData.Record> writer = new DataFileWriter<>(datumWriter);
try {
writer.create(schema, byteStream);
writer.append(record);
@@ -141,8 +141,8 @@ public class TestResolvingGrammarGenerator {
private GenericData.Record readRecord(Schema schema, byte[] data) throws Exception {
ByteArrayInputStream byteStream = new ByteArrayInputStream(data);
- GenericDatumReader<GenericData.Record> datumReader = new GenericDatumReader<GenericData.Record>(schema);
- DataFileStream<GenericData.Record> reader = new DataFileStream<GenericData.Record>(byteStream, datumReader);
+ GenericDatumReader<GenericData.Record> datumReader = new GenericDatumReader<>(schema);
+ DataFileStream<GenericData.Record> reader = new DataFileStream<>(byteStream, datumReader);
try {
return reader.next();
} finally {
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/message/TestBinaryMessageEncoding.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/message/TestBinaryMessageEncoding.java b/lang/java/avro/src/test/java/org/apache/avro/message/TestBinaryMessageEncoding.java
index 91e8eea..0685964 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/message/TestBinaryMessageEncoding.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/message/TestBinaryMessageEncoding.java
@@ -72,9 +72,9 @@ public class TestBinaryMessageEncoding {
@Test
public void testByteBufferRoundTrip() throws Exception {
- MessageEncoder<Record> encoder = new BinaryMessageEncoder<Record>(
+ MessageEncoder<Record> encoder = new BinaryMessageEncoder<>(
GenericData.get(), SCHEMA_V2);
- MessageDecoder<Record> decoder = new BinaryMessageDecoder<Record>(
+ MessageDecoder<Record> decoder = new BinaryMessageDecoder<>(
GenericData.get(), SCHEMA_V2);
Record copy = decoder.decode(encoder.encode(V2_RECORDS.get(0)));
@@ -91,9 +91,9 @@ public class TestBinaryMessageEncoding {
List<Record> records = Ordering.usingToString().sortedCopy(
Iterables.concat(V1_RECORDS, V2_RECORDS));
- MessageEncoder<Record> v1Encoder = new BinaryMessageEncoder<Record>(
+ MessageEncoder<Record> v1Encoder = new BinaryMessageEncoder<>(
GenericData.get(), SCHEMA_V1);
- MessageEncoder<Record> v2Encoder = new BinaryMessageEncoder<Record>(
+ MessageEncoder<Record> v2Encoder = new BinaryMessageEncoder<>(
GenericData.get(), SCHEMA_V2);
for (Record record : records) {
@@ -114,7 +114,7 @@ public class TestBinaryMessageEncoding {
allAsV2.add(
V2_BUILDER.set("id", 6L).set("message", "m-6").clear("data").build());
- BinaryMessageDecoder<Record> v2Decoder = new BinaryMessageDecoder<Record>(
+ BinaryMessageDecoder<Record> v2Decoder = new BinaryMessageDecoder<>(
GenericData.get(), SCHEMA_V2);
v2Decoder.addSchema(SCHEMA_V1);
@@ -128,9 +128,9 @@ public class TestBinaryMessageEncoding {
@Test(expected = MissingSchemaException.class)
public void testCompatibleReadFailsWithoutSchema() throws Exception {
- MessageEncoder<Record> v1Encoder = new BinaryMessageEncoder<Record>(
+ MessageEncoder<Record> v1Encoder = new BinaryMessageEncoder<>(
GenericData.get(), SCHEMA_V1);
- BinaryMessageDecoder<Record> v2Decoder = new BinaryMessageDecoder<Record>(
+ BinaryMessageDecoder<Record> v2Decoder = new BinaryMessageDecoder<>(
GenericData.get(), SCHEMA_V2);
ByteBuffer v1Buffer = v1Encoder.encode(V1_RECORDS.get(3));
@@ -140,9 +140,9 @@ public class TestBinaryMessageEncoding {
@Test
public void testCompatibleReadWithSchema() throws Exception {
- MessageEncoder<Record> v1Encoder = new BinaryMessageEncoder<Record>(
+ MessageEncoder<Record> v1Encoder = new BinaryMessageEncoder<>(
GenericData.get(), SCHEMA_V1);
- BinaryMessageDecoder<Record> v2Decoder = new BinaryMessageDecoder<Record>(
+ BinaryMessageDecoder<Record> v2Decoder = new BinaryMessageDecoder<>(
GenericData.get(), SCHEMA_V2);
v2Decoder.addSchema(SCHEMA_V1);
@@ -157,12 +157,12 @@ public class TestBinaryMessageEncoding {
@Test
public void testCompatibleReadWithSchemaFromLookup() throws Exception {
- MessageEncoder<Record> v1Encoder = new BinaryMessageEncoder<Record>(
+ MessageEncoder<Record> v1Encoder = new BinaryMessageEncoder<>(
GenericData.get(), SCHEMA_V1);
SchemaStore.Cache schemaCache = new SchemaStore.Cache();
schemaCache.addSchema(SCHEMA_V1);
- BinaryMessageDecoder<Record> v2Decoder = new BinaryMessageDecoder<Record>(
+ BinaryMessageDecoder<Record> v2Decoder = new BinaryMessageDecoder<>(
GenericData.get(), SCHEMA_V2, schemaCache);
ByteBuffer v1Buffer = v1Encoder.encode(V1_RECORDS.get(2));
@@ -179,7 +179,7 @@ public class TestBinaryMessageEncoding {
// This test depends on the serialized version of record 1 being smaller or
// the same size as record 0 so that the reused ByteArrayOutputStream won't
// expand its internal buffer.
- MessageEncoder<Record> encoder = new BinaryMessageEncoder<Record>(
+ MessageEncoder<Record> encoder = new BinaryMessageEncoder<>(
GenericData.get(), SCHEMA_V1, false);
ByteBuffer b0 = encoder.encode(V1_RECORDS.get(0));
@@ -187,7 +187,7 @@ public class TestBinaryMessageEncoding {
Assert.assertEquals(b0.array(), b1.array());
- MessageDecoder<Record> decoder = new BinaryMessageDecoder<Record>(
+ MessageDecoder<Record> decoder = new BinaryMessageDecoder<>(
GenericData.get(), SCHEMA_V1);
Assert.assertEquals("Buffer was reused, decode(b0) should be record 1",
V1_RECORDS.get(1), decoder.decode(b0));
@@ -195,7 +195,7 @@ public class TestBinaryMessageEncoding {
@Test
public void testBufferCopy() throws Exception {
- MessageEncoder<Record> encoder = new BinaryMessageEncoder<Record>(
+ MessageEncoder<Record> encoder = new BinaryMessageEncoder<>(
GenericData.get(), SCHEMA_V1);
ByteBuffer b0 = encoder.encode(V1_RECORDS.get(0));
@@ -203,7 +203,7 @@ public class TestBinaryMessageEncoding {
Assert.assertNotEquals(b0.array(), b1.array());
- MessageDecoder<Record> decoder = new BinaryMessageDecoder<Record>(
+ MessageDecoder<Record> decoder = new BinaryMessageDecoder<>(
GenericData.get(), SCHEMA_V1);
// bytes are not changed by reusing the encoder
Assert.assertEquals("Buffer was copied, decode(b0) should be record 0",
@@ -212,9 +212,9 @@ public class TestBinaryMessageEncoding {
@Test(expected = AvroRuntimeException.class)
public void testByteBufferMissingPayload() throws Exception {
- MessageEncoder<Record> encoder = new BinaryMessageEncoder<Record>(
+ MessageEncoder<Record> encoder = new BinaryMessageEncoder<>(
GenericData.get(), SCHEMA_V2);
- MessageDecoder<Record> decoder = new BinaryMessageDecoder<Record>(
+ MessageDecoder<Record> decoder = new BinaryMessageDecoder<>(
GenericData.get(), SCHEMA_V2);
ByteBuffer buffer = encoder.encode(V2_RECORDS.get(0));
@@ -226,9 +226,9 @@ public class TestBinaryMessageEncoding {
@Test(expected = BadHeaderException.class)
public void testByteBufferMissingFullHeader() throws Exception {
- MessageEncoder<Record> encoder = new BinaryMessageEncoder<Record>(
+ MessageEncoder<Record> encoder = new BinaryMessageEncoder<>(
GenericData.get(), SCHEMA_V2);
- MessageDecoder<Record> decoder = new BinaryMessageDecoder<Record>(
+ MessageDecoder<Record> decoder = new BinaryMessageDecoder<>(
GenericData.get(), SCHEMA_V2);
ByteBuffer buffer = encoder.encode(V2_RECORDS.get(0));
@@ -240,9 +240,9 @@ public class TestBinaryMessageEncoding {
@Test(expected = BadHeaderException.class)
public void testByteBufferBadMarkerByte() throws Exception {
- MessageEncoder<Record> encoder = new BinaryMessageEncoder<Record>(
+ MessageEncoder<Record> encoder = new BinaryMessageEncoder<>(
GenericData.get(), SCHEMA_V2);
- MessageDecoder<Record> decoder = new BinaryMessageDecoder<Record>(
+ MessageDecoder<Record> decoder = new BinaryMessageDecoder<>(
GenericData.get(), SCHEMA_V2);
ByteBuffer buffer = encoder.encode(V2_RECORDS.get(0));
@@ -253,9 +253,9 @@ public class TestBinaryMessageEncoding {
@Test(expected = BadHeaderException.class)
public void testByteBufferBadVersionByte() throws Exception {
- MessageEncoder<Record> encoder = new BinaryMessageEncoder<Record>(
+ MessageEncoder<Record> encoder = new BinaryMessageEncoder<>(
GenericData.get(), SCHEMA_V2);
- MessageDecoder<Record> decoder = new BinaryMessageDecoder<Record>(
+ MessageDecoder<Record> decoder = new BinaryMessageDecoder<>(
GenericData.get(), SCHEMA_V2);
ByteBuffer buffer = encoder.encode(V2_RECORDS.get(0));
@@ -266,9 +266,9 @@ public class TestBinaryMessageEncoding {
@Test(expected = MissingSchemaException.class)
public void testByteBufferUnknownSchema() throws Exception {
- MessageEncoder<Record> encoder = new BinaryMessageEncoder<Record>(
+ MessageEncoder<Record> encoder = new BinaryMessageEncoder<>(
GenericData.get(), SCHEMA_V2);
- MessageDecoder<Record> decoder = new BinaryMessageDecoder<Record>(
+ MessageDecoder<Record> decoder = new BinaryMessageDecoder<>(
GenericData.get(), SCHEMA_V2);
ByteBuffer buffer = encoder.encode(V2_RECORDS.get(0));
http://git-wip-us.apache.org/repos/asf/avro/blob/8bc49510/lang/java/avro/src/test/java/org/apache/avro/reflect/TestByteBuffer.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/reflect/TestByteBuffer.java b/lang/java/avro/src/test/java/org/apache/avro/reflect/TestByteBuffer.java
index 602d39e..ef14dea 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/reflect/TestByteBuffer.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/reflect/TestByteBuffer.java
@@ -78,7 +78,7 @@ public class TestByteBuffer {
private X readOneXFromAvro(Schema schema, ByteArrayOutputStream bout)
throws IOException {
SeekableByteArrayInput input = new SeekableByteArrayInput(bout.toByteArray());
- ReflectDatumReader<X> datumReader = new ReflectDatumReader<X>(schema);
+ ReflectDatumReader<X> datumReader = new ReflectDatumReader<>(schema);
FileReader<X> reader = DataFileReader.openReader(input, datumReader);
Iterator<X> it = reader.iterator();
assertTrue("missing first record",it.hasNext());
@@ -89,8 +89,8 @@ public class TestByteBuffer {
private void writeOneXAsAvro(Schema schema, ByteArrayOutputStream bout)
throws IOException, FileNotFoundException {
- DatumWriter<X> datumWriter = new ReflectDatumWriter<X>(schema);
- DataFileWriter<X> writer = new DataFileWriter<X>(datumWriter);
+ DatumWriter<X> datumWriter = new ReflectDatumWriter<>(schema);
+ DataFileWriter<X> writer = new DataFileWriter<>(datumWriter);
writer.create(schema, bout);
X x = new X();
x.name = "xxx";