From 61bde83299cc77e0e2152fb63410439d57198c1d Mon Sep 17 00:00:00 2001
From: Laurent Goujon <laurent.goujon@online.fr>
Date: Wed, 13 Apr 2016 21:37:02 -0700
Subject: [PATCH] [ARROW-101] Fix java compiler rawtypes warnings

Java compiler emits several warnings regarding the use of raw types.
This fixes the warnings by using generic types instead.
---
 .../src/main/java/org/apache/arrow/vector/ZeroVector.java | 5 +++--
 .../arrow/vector/complex/impl/PromotableWriter.java       | 8 ++++----
 .../org/apache/arrow/vector/util/JsonStringArrayList.java | 2 +-
 .../org/apache/arrow/vector/util/JsonStringHashMap.java   | 2 +-
 .../java/org/apache/arrow/vector/TestValueVector.java     | 4 ++--
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ZeroVector.java b/java/vector/src/main/java/org/apache/arrow/vector/ZeroVector.java
index 78de8706fb7d4..c94e8d1db090c 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ZeroVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ZeroVector.java
@@ -19,6 +19,7 @@
 
 import io.netty.buffer.ArrowBuf;
 
+import java.util.Collections;
 import java.util.Iterator;
 
 import org.apache.arrow.memory.BufferAllocator;
@@ -109,8 +110,8 @@ public TransferPair getTransferPair(BufferAllocator allocator) {
 //  }
 
   @Override
-  public Iterator iterator() {
-    return Iterators.emptyIterator();
+  public Iterator<ValueVector> iterator() {
+    return Collections.emptyIterator();
   }
 
   @Override
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/PromotableWriter.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/PromotableWriter.java
index ea62e02360802..45509f688ba88 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/PromotableWriter.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/PromotableWriter.java
@@ -85,16 +85,16 @@ private void setWriter(ValueVector v) {
     state = State.SINGLE;
     vector = v;
     type = v.getField().getType().getMinorType();
-    Class writerClass = BasicTypeHelper
+    Class<?> writerClass = BasicTypeHelper
         .getWriterImpl(v.getField().getType().getMinorType(), v.getField().getDataMode());
     if (writerClass.equals(SingleListWriter.class)) {
       writerClass = UnionListWriter.class;
     }
-    Class vectorClass = BasicTypeHelper.getValueVectorClass(v.getField().getType().getMinorType(), v.getField()
+    Class<?> vectorClass = BasicTypeHelper.getValueVectorClass(v.getField().getType().getMinorType(), v.getField()
         .getDataMode());
     try {
-      Constructor constructor = null;
-      for (Constructor c : writerClass.getConstructors()) {
+      Constructor<?> constructor = null;
+      for (Constructor<?> c : writerClass.getConstructors()) {
         if (c.getParameterTypes().length == 3) {
           constructor = c;
         }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/JsonStringArrayList.java b/java/vector/src/main/java/org/apache/arrow/vector/util/JsonStringArrayList.java
index 7aeaa12ef9fcf..6291bfeaee666 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/JsonStringArrayList.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/JsonStringArrayList.java
@@ -42,7 +42,7 @@ public boolean equals(Object obj) {
     if (!(obj instanceof List)) {
       return false;
     }
-    List other = (List) obj;
+    List<?> other = (List<?>) obj;
     return this.size() == other.size() && this.containsAll(other);
   }
 
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/JsonStringHashMap.java b/java/vector/src/main/java/org/apache/arrow/vector/util/JsonStringHashMap.java
index 750dd592aa49c..e8ce5221eebd9 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/JsonStringHashMap.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/JsonStringHashMap.java
@@ -46,7 +46,7 @@ public boolean equals(Object obj) {
     if (!(obj instanceof Map)) {
       return false;
     }
-    Map other = (Map) obj;
+    Map<?, ?> other = (Map<?, ?>) obj;
     if (this.size() != other.size()) {
       return false;
     }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java
index ac3eebe98eab7..5127e309d4a75 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java
@@ -535,7 +535,7 @@ public void testListVectorShouldNotThrowOversizedAllocationException() throws Ex
       vector.clear();
     }
 
-    vectorFrom.clear();
-    vector.clear();
+    vectorFrom.close();
+    vector.close();
   }
 }