tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hyun...@apache.org
Subject [1/5] tajo git commit: TAJO-1844: Eliminate explicit diamond expressions.
Date Wed, 23 Sep 2015 04:28:51 GMT
Repository: tajo
Updated Branches:
  refs/heads/master 1eb100459 -> aa699c709


http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/rcfile/ColumnProjectionUtils.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/rcfile/ColumnProjectionUtils.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/rcfile/ColumnProjectionUtils.java
index 352776f..fc106f2 100644
--- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/rcfile/ColumnProjectionUtils.java
+++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/rcfile/ColumnProjectionUtils.java
@@ -89,11 +89,11 @@ public final class ColumnProjectionUtils {
    */
   public static ArrayList<Integer> getReadColumnIDs(Configuration conf) {
     if (conf == null) {
-      return new ArrayList<Integer>(0);
+      return new ArrayList<>(0);
     }
     String skips = conf.get(READ_COLUMN_IDS_CONF_STR, "");
     String[] list = StringUtils.split(skips);
-    ArrayList<Integer> result = new ArrayList<Integer>(list.length);
+    ArrayList<Integer> result = new ArrayList<>(list.length);
     for (String element : list) {
       // it may contain duplicates, remove duplicates
       Integer toAdd = Integer.parseInt(element);

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/text/DelimitedTextFile.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/text/DelimitedTextFile.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/text/DelimitedTextFile.java
index bc1d7ba..b5155d4 100644
--- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/text/DelimitedTextFile.java
+++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/text/DelimitedTextFile.java
@@ -66,7 +66,7 @@ public class DelimitedTextFile {
 
   /** it caches line serde classes. */
   private static final Map<String, Class<? extends TextLineSerDe>> serdeClassCache =
-      new ConcurrentHashMap<String, Class<? extends TextLineSerDe>>();
+          new ConcurrentHashMap<>();
 
   /**
    * By default, DelimitedTextFileScanner uses CSVLineSerder. If a table property 'text.serde.class' is given,

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/FileOrcDataSource.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/FileOrcDataSource.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/FileOrcDataSource.java
index dcc1347..de7c802 100644
--- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/FileOrcDataSource.java
+++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/FileOrcDataSource.java
@@ -109,7 +109,7 @@ public class FileOrcDataSource
         Iterable<DiskRange> mergedRanges = mergeAdjacentDiskRanges(diskRanges.values(), maxMergeDistance);
 
         // read ranges
-        Map<DiskRange, byte[]> buffers = new LinkedHashMap<DiskRange, byte[]>();
+        Map<DiskRange, byte[]> buffers = new LinkedHashMap<>();
         for (DiskRange mergedRange : mergedRanges) {
             // read full range in one request
             byte[] buffer = new byte[mergedRange.getLength()];

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/HdfsOrcDataSource.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/HdfsOrcDataSource.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/HdfsOrcDataSource.java
index 73ea475..da12461 100644
--- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/HdfsOrcDataSource.java
+++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/HdfsOrcDataSource.java
@@ -106,7 +106,7 @@ public class HdfsOrcDataSource
     Iterable<DiskRange> mergedRanges = mergeAdjacentDiskRanges(diskRanges.values(), maxMergeDistance);
 
     // read ranges
-    Map<DiskRange, byte[]> buffers = new LinkedHashMap<DiskRange, byte[]>();
+    Map<DiskRange, byte[]> buffers = new LinkedHashMap<>();
     for (DiskRange mergedRange : mergedRanges) {
       // read full range in one request
       byte[] buffer = new byte[mergedRange.getLength()];

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/MemoryManager.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/MemoryManager.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/MemoryManager.java
index 8cd40f7..79af80f 100644
--- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/MemoryManager.java
+++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/MemoryManager.java
@@ -52,7 +52,7 @@ class MemoryManager {
   private static final int ROWS_BETWEEN_CHECKS = 5000;
   private final long totalMemoryPool;
   private final Map<Path, WriterInfo> writerList =
-      new HashMap<Path, WriterInfo>();
+          new HashMap<>();
   private long totalAllocation = 0;
   private double currentScale = 1;
   private int rowsAddedSinceCheck = 0;

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/OrcUtils.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/OrcUtils.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/OrcUtils.java
index 847c10c..28ddd02 100644
--- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/OrcUtils.java
+++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/OrcUtils.java
@@ -91,7 +91,7 @@ public class OrcUtils {
     // schema: struct<a:int, b:float, c:map<string,int>>
     // column span map for the above struct will be
     // a => [1,1], b => [2,2], c => [3,5]
-    Map<String, List<Integer>> columnSpanMap = new HashMap<String, List<Integer>>();
+    Map<String, List<Integer>> columnSpanMap = new HashMap<>();
     if (allColumns != null) {
       String[] columns = allColumns.split(",");
       int startIdx = 0;

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/WriterImpl.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/WriterImpl.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/WriterImpl.java
index e520082..1e5e720 100644
--- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/WriterImpl.java
+++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/orc/WriterImpl.java
@@ -99,7 +99,7 @@ public class WriterImpl implements Writer, MemoryManager.Callback {
   private final float paddingTolerance;
   // the streams that make up the current stripe
   private final Map<StreamName, BufferedStream> streams =
-    new TreeMap<StreamName, BufferedStream>();
+          new TreeMap<>();
 
   private FSDataOutputStream rawWriter = null;
   // the compressed metadata information outStream
@@ -114,9 +114,9 @@ public class WriterImpl implements Writer, MemoryManager.Callback {
   private int rowsInIndex = 0;
   private int stripesAtLastFlush = -1;
   private final List<OrcProto.StripeInformation> stripes =
-    new ArrayList<OrcProto.StripeInformation>();
+          new ArrayList<>();
   private final Map<String, ByteString> userMetadata =
-    new TreeMap<String, ByteString>();
+          new TreeMap<>();
   private final TreeWriter treeWriter;
   private final boolean buildIndex;
   private final MemoryManager memoryManager;
@@ -343,7 +343,7 @@ public class WriterImpl implements Writer, MemoryManager.Callback {
    */
   private class BufferedStream implements OutStream.OutputReceiver {
     private final OutStream outStream;
-    private final List<ByteBuffer> output = new ArrayList<ByteBuffer>();
+    private final List<ByteBuffer> output = new ArrayList<>();
 
     BufferedStream(String name, int bufferSize,
                    CompressionCodec codec) throws IOException {
@@ -1150,9 +1150,9 @@ public class WriterImpl implements Writer, MemoryManager.Callback {
     private final PositionedOutputStream directStreamOutput;
     private final IntegerWriter directLengthOutput;
     private final List<RowIndexEntry> savedRowIndex =
-        new ArrayList<RowIndexEntry>();
+            new ArrayList<>();
     private final boolean buildIndex;
-    private final List<Long> rowIndexValueCount = new ArrayList<Long>();
+    private final List<Long> rowIndexValueCount = new ArrayList<>();
     // If the number of keys in a dictionary is greater than this fraction of
     //the total number of non-null rows, turn off dictionary encoding
     private final float dictionaryKeySizeThreshold;

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/CodecFactory.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/CodecFactory.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/CodecFactory.java
index 4ba47c1..fcaf2f3 100644
--- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/CodecFactory.java
+++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/CodecFactory.java
@@ -123,9 +123,9 @@ class CodecFactory {
 
   }
 
-  private final Map<CompressionCodecName, BytesCompressor> compressors = new HashMap<CompressionCodecName, BytesCompressor>();
-  private final Map<CompressionCodecName, BytesDecompressor> decompressors = new HashMap<CompressionCodecName, BytesDecompressor>();
-  private final Map<String, CompressionCodec> codecByName = new HashMap<String, CompressionCodec>();
+  private final Map<CompressionCodecName, BytesCompressor> compressors = new HashMap<>();
+  private final Map<CompressionCodecName, BytesDecompressor> decompressors = new HashMap<>();
+  private final Map<String, CompressionCodec> codecByName = new HashMap<>();
   private final Configuration configuration;
 
   public CodecFactory(Configuration configuration) {

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/ColumnChunkPageWriteStore.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/ColumnChunkPageWriteStore.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/ColumnChunkPageWriteStore.java
index 91d4748..6507b80 100644
--- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/ColumnChunkPageWriteStore.java
+++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/ColumnChunkPageWriteStore.java
@@ -56,7 +56,7 @@ class ColumnChunkPageWriteStore implements PageWriteStore {
     private long totalValueCount;
     private int pageCount;
 
-    private Set<Encoding> encodings = new HashSet<Encoding>();
+    private Set<Encoding> encodings = new HashSet<>();
 
     private Statistics totalStatistics;
 
@@ -138,7 +138,7 @@ class ColumnChunkPageWriteStore implements PageWriteStore {
         writer.writeDictionaryPage(dictionaryPage);
         encodings.add(dictionaryPage.getEncoding());
       }
-      writer.writeDataPages(BytesInput.from(buf), uncompressedLength, compressedLength, totalStatistics, new ArrayList<Encoding>(encodings));
+      writer.writeDataPages(BytesInput.from(buf), uncompressedLength, compressedLength, totalStatistics, new ArrayList<>(encodings));
       writer.endColumn();
       if (DEBUG) {
         LOG.debug(
@@ -176,7 +176,7 @@ class ColumnChunkPageWriteStore implements PageWriteStore {
     }
   }
 
-  private final Map<ColumnDescriptor, ColumnChunkPageWriter> writers = new HashMap<ColumnDescriptor, ColumnChunkPageWriter>();
+  private final Map<ColumnDescriptor, ColumnChunkPageWriter> writers = new HashMap<>();
   private final MessageType schema;
   private final BytesCompressor compressor;
   private final int initialSize;

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/ParquetFileWriter.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/ParquetFileWriter.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/ParquetFileWriter.java
index ac1c421..7a32329 100644
--- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/ParquetFileWriter.java
+++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/ParquetFileWriter.java
@@ -64,7 +64,7 @@ public class ParquetFileWriter {
   private BlockMetaData currentBlock;
   private ColumnChunkMetaData currentColumn;
   private long currentRecordCount;
-  private List<BlockMetaData> blocks = new ArrayList<BlockMetaData>();
+  private List<BlockMetaData> blocks = new ArrayList<>();
   private long uncompressedLength;
   private long compressedLength;
   private Set<parquet.column.Encoding> currentEncodings;
@@ -181,7 +181,7 @@ public class ParquetFileWriter {
                           CompressionCodecName compressionCodecName) throws IOException {
     state = state.startColumn();
     if (DEBUG) LOG.debug(out.getPos() + ": start column: " + descriptor + " count=" + valueCount);
-    currentEncodings = new HashSet<parquet.column.Encoding>();
+    currentEncodings = new HashSet<>();
     currentChunkPath = ColumnPath.get(descriptor.getPath());
     currentChunkType = descriptor.getType();
     currentChunkCodec = compressionCodecName;
@@ -399,7 +399,7 @@ public class ParquetFileWriter {
   private static ParquetMetadata mergeFooters(Path root, List<Footer> footers) {
     String rootPath = root.toString();
     GlobalMetaData fileMetaData = null;
-    List<BlockMetaData> blocks = new ArrayList<BlockMetaData>();
+    List<BlockMetaData> blocks = new ArrayList<>();
     for (Footer footer : footers) {
       String path = footer.getFile().toString();
       if (!path.startsWith(rootPath)) {
@@ -450,8 +450,8 @@ public class ParquetFileWriter {
       FileMetaData toMerge,
       GlobalMetaData mergedMetadata) {
     MessageType schema = null;
-    Map<String, Set<String>> newKeyValues = new HashMap<String, Set<String>>();
-    Set<String> createdBy = new HashSet<String>();
+    Map<String, Set<String>> newKeyValues = new HashMap<>();
+    Set<String> createdBy = new HashSet<>();
     if (mergedMetadata != null) {
       schema = mergedMetadata.getSchema();
       newKeyValues.putAll(mergedMetadata.getKeyValueMetaData());
@@ -464,7 +464,7 @@ public class ParquetFileWriter {
     for (Entry<String, String> entry : toMerge.getKeyValueMetaData().entrySet()) {
       Set<String> values = newKeyValues.get(entry.getKey());
       if (values == null) {
-        values = new HashSet<String>();
+        values = new HashSet<>();
         newKeyValues.put(entry.getKey(), values);
       }
       values.add(entry.getValue());

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/ParquetReader.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/ParquetReader.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/ParquetReader.java
index 9c167a0..739686f 100644
--- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/ParquetReader.java
+++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/ParquetReader.java
@@ -96,7 +96,7 @@ public class ParquetReader<T> implements Closeable {
     this.footersIterator = footers.iterator();
     globalMetaData = ParquetFileWriter.getGlobalMetaData(footers);
 
-    List<BlockMetaData> blocks = new ArrayList<BlockMetaData>();
+    List<BlockMetaData> blocks = new ArrayList<>();
     for (Footer footer : footers) {
       blocks.addAll(footer.getParquetMetadata().getBlocks());
     }
@@ -130,7 +130,7 @@ public class ParquetReader<T> implements Closeable {
     }
     if (footersIterator.hasNext()) {
       Footer footer = footersIterator.next();
-      reader = new InternalParquetRecordReader<T>(readSupport, filter);
+      reader = new InternalParquetRecordReader<>(readSupport, filter);
       reader.initialize(
           readContext.getRequestedSchema(), globalMetaData.getSchema(), footer.getParquetMetadata().getFileMetaData().getKeyValueMetaData(),
           readContext.getReadSupportMetadata(), footer.getFile(), footer.getParquetMetadata().getBlocks(), conf);

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/ParquetWriter.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/ParquetWriter.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/ParquetWriter.java
index 7527437..5843c2d 100644
--- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/ParquetWriter.java
+++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/thirdparty/parquet/ParquetWriter.java
@@ -176,18 +176,18 @@ public class ParquetWriter<T> implements Closeable {
 
     CodecFactory codecFactory = new CodecFactory(conf);
     CodecFactory.BytesCompressor compressor =	codecFactory.getCompressor(compressionCodecName, 0);
-    this.writer = new InternalParquetRecordWriter<T>(
-        fileWriter,
-        writeSupport,
-        schema,
-        writeContext.getExtraMetaData(),
-        blockSize,
-        pageSize,
-        compressor,
-        dictionaryPageSize,
-        enableDictionary,
-        validating,
-        writerVersion);
+    this.writer = new InternalParquetRecordWriter<>(
+            fileWriter,
+            writeSupport,
+            schema,
+            writeContext.getExtraMetaData(),
+            blockSize,
+            pageSize,
+            compressor,
+            dictionaryPageSize,
+            enableDictionary,
+            validating,
+            writerVersion);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestReadWrite.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestReadWrite.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestReadWrite.java
index e63230d..35b9f07 100644
--- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestReadWrite.java
+++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestReadWrite.java
@@ -52,7 +52,7 @@ public class TestReadWrite {
   }
 
   private Schema createAllTypesSchema() {
-    List<Column> columns = new ArrayList<Column>();
+    List<Column> columns = new ArrayList<>();
     columns.add(new Column("myboolean", Type.BOOLEAN));
     columns.add(new Column("mybit", Type.BIT));
     columns.add(new Column("mychar", Type.CHAR));

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestSchemaConverter.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestSchemaConverter.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestSchemaConverter.java
index 517e00e..07451d5 100644
--- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestSchemaConverter.java
+++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestSchemaConverter.java
@@ -64,7 +64,7 @@ public class TestSchemaConverter {
       "}\n";
 
   private Schema createAllTypesSchema() {
-    List<Column> columns = new ArrayList<Column>();
+    List<Column> columns = new ArrayList<>();
     columns.add(new Column("myboolean", Type.BOOLEAN));
     columns.add(new Column("mybit", Type.BIT));
     columns.add(new Column("mychar", Type.CHAR));
@@ -84,7 +84,7 @@ public class TestSchemaConverter {
   }
 
   private Schema createAllTypesConvertedSchema() {
-    List<Column> columns = new ArrayList<Column>();
+    List<Column> columns = new ArrayList<>();
     columns.add(new Column("myboolean", Type.BOOLEAN));
     columns.add(new Column("myint", Type.INT4));
     columns.add(new Column("mylong", Type.INT8));

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/AdviceAdapter.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/AdviceAdapter.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/AdviceAdapter.java
index 72e0cc0..aa4170c 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/AdviceAdapter.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/AdviceAdapter.java
@@ -105,8 +105,8 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
     public void visitCode() {
         mv.visitCode();
         if (constructor) {
-            stackFrame = new ArrayList<Object>();
-            branches = new HashMap<Label, List<Object>>();
+            stackFrame = new ArrayList<>();
+            branches = new HashMap<>();
         } else {
             superInitialized = true;
             onMethodEnter();
@@ -536,7 +536,7 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
             String type) {
         super.visitTryCatchBlock(start, end, handler, type);
         if (constructor && !branches.containsKey(handler)) {
-            List<Object> stackFrame = new ArrayList<Object>();
+            List<Object> stackFrame = new ArrayList<>();
             stackFrame.add(OTHER);
             branches.put(handler, stackFrame);
         }
@@ -553,7 +553,7 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
         if (branches.containsKey(label)) {
             return;
         }
-        branches.put(label, new ArrayList<Object>(stackFrame));
+        branches.put(label, new ArrayList<>(stackFrame));
     }
 
     private Object popValue() {

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/AnalyzerAdapter.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/AnalyzerAdapter.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/AnalyzerAdapter.java
index ef8ef4d..c2ad1f0 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/AnalyzerAdapter.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/AnalyzerAdapter.java
@@ -165,9 +165,9 @@ public class AnalyzerAdapter extends MethodVisitor {
             final MethodVisitor mv) {
         super(api, mv);
         this.owner = owner;
-        locals = new ArrayList<Object>();
-        stack = new ArrayList<Object>();
-        uninitializedTypes = new HashMap<Object, Object>();
+        locals = new ArrayList<>();
+        stack = new ArrayList<>();
+        uninitializedTypes = new HashMap<>();
 
         if ((access & Opcodes.ACC_STATIC) == 0) {
             if ("<init>".equals(name)) {
@@ -224,8 +224,8 @@ public class AnalyzerAdapter extends MethodVisitor {
             this.locals.clear();
             this.stack.clear();
         } else {
-            this.locals = new ArrayList<Object>();
-            this.stack = new ArrayList<Object>();
+            this.locals = new ArrayList<>();
+            this.stack = new ArrayList<>();
         }
         visitFrameTypes(nLocal, local, this.locals);
         visitFrameTypes(nStack, stack, this.stack);
@@ -277,7 +277,7 @@ public class AnalyzerAdapter extends MethodVisitor {
         if (opcode == Opcodes.NEW) {
             if (labels == null) {
                 Label l = new Label();
-                labels = new ArrayList<Label>(3);
+                labels = new ArrayList<>(3);
                 labels.add(l);
                 if (mv != null) {
                     mv.visitLabel(l);
@@ -371,7 +371,7 @@ public class AnalyzerAdapter extends MethodVisitor {
             mv.visitLabel(label);
         }
         if (labels == null) {
-            labels = new ArrayList<Label>(3);
+            labels = new ArrayList<>(3);
         }
         labels.add(label);
     }

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/GeneratorAdapter.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/GeneratorAdapter.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/GeneratorAdapter.java
index f8c8ae0..8cf20ff 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/GeneratorAdapter.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/GeneratorAdapter.java
@@ -239,7 +239,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Types of the local variables of the method visited by this adapter.
      */
-    private final List<Type> localTypes = new ArrayList<Type>();
+    private final List<Type> localTypes = new ArrayList<>();
 
     /**
      * Creates a new {@link GeneratorAdapter}. <i>Subclasses must not use this

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/JSRInlinerAdapter.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/JSRInlinerAdapter.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/JSRInlinerAdapter.java
index b64f371..10d966b 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/JSRInlinerAdapter.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/JSRInlinerAdapter.java
@@ -68,7 +68,7 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
     /**
      * For each label that is jumped to by a JSR, we create a BitSet instance.
      */
-    private final Map<LabelNode, BitSet> subroutineHeads = new HashMap<LabelNode, BitSet>();
+    private final Map<LabelNode, BitSet> subroutineHeads = new HashMap<>();
 
     /**
      * This subroutine instance denotes the line of execution that is not
@@ -370,7 +370,7 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
      * subroutine until the code is fully elaborated.
      */
     private void emitCode() {
-        LinkedList<Instantiation> worklist = new LinkedList<Instantiation>();
+        LinkedList<Instantiation> worklist = new LinkedList<>();
         // Create an instantiation of the "root" subroutine, which is just the
         // main routine
         worklist.add(new Instantiation(null, mainSubroutine));
@@ -378,8 +378,8 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
         // Emit instantiations of each subroutine we encounter, including the
         // main subroutine
         InsnList newInstructions = new InsnList();
-        List<TryCatchBlockNode> newTryCatchBlocks = new ArrayList<TryCatchBlockNode>();
-        List<LocalVariableNode> newLocalVariables = new ArrayList<LocalVariableNode>();
+        List<TryCatchBlockNode> newTryCatchBlocks = new ArrayList<>();
+        List<LocalVariableNode> newLocalVariables = new ArrayList<>();
         while (!worklist.isEmpty()) {
             Instantiation inst = worklist.removeFirst();
             emitSubroutine(inst, worklist, newInstructions, newTryCatchBlocks,
@@ -602,7 +602,7 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
          * 
          * @see #findOwner(int)
          */
-        public final Map<LabelNode, LabelNode> rangeTable = new HashMap<LabelNode, LabelNode>();
+        public final Map<LabelNode, LabelNode> rangeTable = new HashMap<>();
 
         /**
          * All returns for this instantiation will be mapped to this label

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/Method.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/Method.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/Method.java
index b9bc7c7..00a379e 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/Method.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/Method.java
@@ -59,7 +59,7 @@ public class Method {
     private static final Map<String, String> DESCRIPTORS;
 
     static {
-        DESCRIPTORS = new HashMap<String, String>();
+        DESCRIPTORS = new HashMap<>();
         DESCRIPTORS.put("void", "V");
         DESCRIPTORS.put("byte", "B");
         DESCRIPTORS.put("char", "C");

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/SerialVersionUIDAdder.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/SerialVersionUIDAdder.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/SerialVersionUIDAdder.java
index 4056b2f..6477fa5 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/SerialVersionUIDAdder.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/commons/SerialVersionUIDAdder.java
@@ -183,9 +183,9 @@ public class SerialVersionUIDAdder extends ClassVisitor {
      */
     protected SerialVersionUIDAdder(final int api, final ClassVisitor cv) {
         super(api, cv);
-        svuidFields = new ArrayList<Item>();
-        svuidConstructors = new ArrayList<Item>();
-        svuidMethods = new ArrayList<Item>();
+        svuidFields = new ArrayList<>();
+        svuidConstructors = new ArrayList<>();
+        svuidMethods = new ArrayList<>();
     }
 
     // ------------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/optimizer/JarOptimizer.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/optimizer/JarOptimizer.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/optimizer/JarOptimizer.java
index c15aa69..066273d 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/optimizer/JarOptimizer.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/optimizer/JarOptimizer.java
@@ -60,8 +60,8 @@ import org.apache.tajo.org.objectweb.asm.Opcodes;
  */
 public class JarOptimizer {
 
-    static final Set<String> API = new HashSet<String>();
-    static final Map<String, String> HIERARCHY = new HashMap<String, String>();
+    static final Set<String> API = new HashSet<>();
+    static final Map<String, String> HIERARCHY = new HashMap<>();
     static boolean nodebug = false;
 
     public static void main(final String[] args) throws IOException {

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/optimizer/NameMapping.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/optimizer/NameMapping.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/optimizer/NameMapping.java
index ee75e24..f74097b 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/optimizer/NameMapping.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/optimizer/NameMapping.java
@@ -56,7 +56,7 @@ public class NameMapping {
         try {
             is = new BufferedInputStream(new FileInputStream(file));
             mapping.load(is);
-            unused = new HashSet<Object>(mapping.keySet());
+            unused = new HashSet<>(mapping.keySet());
         } finally {
             if (is != null) {
                 is.close();

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/optimizer/Shrinker.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/optimizer/Shrinker.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/optimizer/Shrinker.java
index 40909ac..b02b63f 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/optimizer/Shrinker.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/optimizer/Shrinker.java
@@ -58,7 +58,7 @@ import org.apache.tajo.org.objectweb.asm.commons.SimpleRemapper;
  */
 public class Shrinker {
 
-    static final HashMap<String, String> MAPPING = new HashMap<String, String>();
+    static final HashMap<String, String> MAPPING = new HashMap<>();
 
     public static void main(final String[] args) throws IOException {
         Properties properties = new Properties();
@@ -71,7 +71,7 @@ public class Shrinker {
             MAPPING.put((String) entry.getKey(), (String) entry.getValue());
         }
 
-        final Set<String> unused = new HashSet<String>(MAPPING.keySet());
+        final Set<String> unused = new HashSet<>(MAPPING.keySet());
 
         File f = new File(args[n - 1]);
         File d = new File(args[n]);
@@ -111,7 +111,7 @@ public class Shrinker {
             ClassOptimizer co = new ClassOptimizer(ccc, remapper);
             cr.accept(co, ClassReader.SKIP_DEBUG);
 
-            Set<Constant> constants = new TreeSet<Constant>(
+            Set<Constant> constants = new TreeSet<>(
                     new ConstantComparator());
             constants.addAll(cp.values());
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/AnnotationNode.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/AnnotationNode.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/AnnotationNode.java
index c6649a6..4df5978 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/AnnotationNode.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/AnnotationNode.java
@@ -104,7 +104,7 @@ public class AnnotationNode extends AnnotationVisitor {
     @Override
     public void visit(final String name, final Object value) {
         if (values == null) {
-            values = new ArrayList<Object>(this.desc != null ? 2 : 1);
+            values = new ArrayList<>(this.desc != null ? 2 : 1);
         }
         if (this.desc != null) {
             values.add(name);
@@ -116,7 +116,7 @@ public class AnnotationNode extends AnnotationVisitor {
     public void visitEnum(final String name, final String desc,
             final String value) {
         if (values == null) {
-            values = new ArrayList<Object>(this.desc != null ? 2 : 1);
+            values = new ArrayList<>(this.desc != null ? 2 : 1);
         }
         if (this.desc != null) {
             values.add(name);
@@ -128,7 +128,7 @@ public class AnnotationNode extends AnnotationVisitor {
     public AnnotationVisitor visitAnnotation(final String name,
             final String desc) {
         if (values == null) {
-            values = new ArrayList<Object>(this.desc != null ? 2 : 1);
+            values = new ArrayList<>(this.desc != null ? 2 : 1);
         }
         if (this.desc != null) {
             values.add(name);
@@ -141,12 +141,12 @@ public class AnnotationNode extends AnnotationVisitor {
     @Override
     public AnnotationVisitor visitArray(final String name) {
         if (values == null) {
-            values = new ArrayList<Object>(this.desc != null ? 2 : 1);
+            values = new ArrayList<>(this.desc != null ? 2 : 1);
         }
         if (this.desc != null) {
             values.add(name);
         }
-        List<Object> array = new ArrayList<Object>();
+        List<Object> array = new ArrayList<>();
         values.add(array);
         return new AnnotationNode(array);
     }

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/ClassNode.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/ClassNode.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/ClassNode.java
index 352283a..b41370a 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/ClassNode.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/ClassNode.java
@@ -182,10 +182,10 @@ public class ClassNode extends ClassVisitor {
      */
     public ClassNode(final int api) {
         super(api);
-        this.interfaces = new ArrayList<String>();
-        this.innerClasses = new ArrayList<InnerClassNode>();
-        this.fields = new ArrayList<FieldNode>();
-        this.methods = new ArrayList<MethodNode>();
+        this.interfaces = new ArrayList<>();
+        this.innerClasses = new ArrayList<>();
+        this.fields = new ArrayList<>();
+        this.methods = new ArrayList<>();
     }
 
     // ------------------------------------------------------------------------
@@ -226,12 +226,12 @@ public class ClassNode extends ClassVisitor {
         AnnotationNode an = new AnnotationNode(desc);
         if (visible) {
             if (visibleAnnotations == null) {
-                visibleAnnotations = new ArrayList<AnnotationNode>(1);
+                visibleAnnotations = new ArrayList<>(1);
             }
             visibleAnnotations.add(an);
         } else {
             if (invisibleAnnotations == null) {
-                invisibleAnnotations = new ArrayList<AnnotationNode>(1);
+                invisibleAnnotations = new ArrayList<>(1);
             }
             invisibleAnnotations.add(an);
         }
@@ -241,7 +241,7 @@ public class ClassNode extends ClassVisitor {
     @Override
     public void visitAttribute(final Attribute attr) {
         if (attrs == null) {
-            attrs = new ArrayList<Attribute>(1);
+            attrs = new ArrayList<>(1);
         }
         attrs.add(attr);
     }

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/FieldNode.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/FieldNode.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/FieldNode.java
index 066aeef..c5a0085 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/FieldNode.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/FieldNode.java
@@ -171,12 +171,12 @@ public class FieldNode extends FieldVisitor {
         AnnotationNode an = new AnnotationNode(desc);
         if (visible) {
             if (visibleAnnotations == null) {
-                visibleAnnotations = new ArrayList<AnnotationNode>(1);
+                visibleAnnotations = new ArrayList<>(1);
             }
             visibleAnnotations.add(an);
         } else {
             if (invisibleAnnotations == null) {
-                invisibleAnnotations = new ArrayList<AnnotationNode>(1);
+                invisibleAnnotations = new ArrayList<>(1);
             }
             invisibleAnnotations.add(an);
         }
@@ -186,7 +186,7 @@ public class FieldNode extends FieldVisitor {
     @Override
     public void visitAttribute(final Attribute attr) {
         if (attrs == null) {
-            attrs = new ArrayList<Attribute>(1);
+            attrs = new ArrayList<>(1);
         }
         attrs.add(attr);
     }

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/FrameNode.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/FrameNode.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/FrameNode.java
index 92747d6..fc94696 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/FrameNode.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/FrameNode.java
@@ -168,7 +168,7 @@ public class FrameNode extends AbstractInsnNode {
         FrameNode clone = new FrameNode();
         clone.type = type;
         if (local != null) {
-            clone.local = new ArrayList<Object>();
+            clone.local = new ArrayList<>();
             for (int i = 0; i < local.size(); ++i) {
                 Object l = local.get(i);
                 if (l instanceof LabelNode) {
@@ -178,7 +178,7 @@ public class FrameNode extends AbstractInsnNode {
             }
         }
         if (stack != null) {
-            clone.stack = new ArrayList<Object>();
+            clone.stack = new ArrayList<>();
             for (int i = 0; i < stack.size(); ++i) {
                 Object s = stack.get(i);
                 if (s instanceof LabelNode) {

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/LookupSwitchInsnNode.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/LookupSwitchInsnNode.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/LookupSwitchInsnNode.java
index 0563e31..3e4c97a 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/LookupSwitchInsnNode.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/LookupSwitchInsnNode.java
@@ -76,8 +76,8 @@ public class LookupSwitchInsnNode extends AbstractInsnNode {
             final LabelNode[] labels) {
         super(Opcodes.LOOKUPSWITCH);
         this.dflt = dflt;
-        this.keys = new ArrayList<Integer>(keys == null ? 0 : keys.length);
-        this.labels = new ArrayList<LabelNode>(labels == null ? 0
+        this.keys = new ArrayList<>(keys == null ? 0 : keys.length);
+        this.labels = new ArrayList<>(labels == null ? 0
                 : labels.length);
         if (keys != null) {
             for (int i = 0; i < keys.length; ++i) {

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/MethodNode.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/MethodNode.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/MethodNode.java
index e8d1747..e4fd788 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/MethodNode.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/MethodNode.java
@@ -245,13 +245,13 @@ public class MethodNode extends MethodVisitor {
         this.name = name;
         this.desc = desc;
         this.signature = signature;
-        this.exceptions = new ArrayList<String>(exceptions == null ? 0
+        this.exceptions = new ArrayList<>(exceptions == null ? 0
                 : exceptions.length);
         boolean isAbstract = (access & Opcodes.ACC_ABSTRACT) != 0;
         if (!isAbstract) {
-            this.localVariables = new ArrayList<LocalVariableNode>(5);
+            this.localVariables = new ArrayList<>(5);
         }
-        this.tryCatchBlocks = new ArrayList<TryCatchBlockNode>();
+        this.tryCatchBlocks = new ArrayList<>();
         if (exceptions != null) {
             this.exceptions.addAll(Arrays.asList(exceptions));
         }
@@ -279,12 +279,12 @@ public class MethodNode extends MethodVisitor {
         AnnotationNode an = new AnnotationNode(desc);
         if (visible) {
             if (visibleAnnotations == null) {
-                visibleAnnotations = new ArrayList<AnnotationNode>(1);
+                visibleAnnotations = new ArrayList<>(1);
             }
             visibleAnnotations.add(an);
         } else {
             if (invisibleAnnotations == null) {
-                invisibleAnnotations = new ArrayList<AnnotationNode>(1);
+                invisibleAnnotations = new ArrayList<>(1);
             }
             invisibleAnnotations.add(an);
         }
@@ -301,7 +301,7 @@ public class MethodNode extends MethodVisitor {
                 visibleParameterAnnotations = (List<AnnotationNode>[]) new List<?>[params];
             }
             if (visibleParameterAnnotations[parameter] == null) {
-                visibleParameterAnnotations[parameter] = new ArrayList<AnnotationNode>(
+                visibleParameterAnnotations[parameter] = new ArrayList<>(
                         1);
             }
             visibleParameterAnnotations[parameter].add(an);
@@ -311,7 +311,7 @@ public class MethodNode extends MethodVisitor {
                 invisibleParameterAnnotations = (List<AnnotationNode>[]) new List<?>[params];
             }
             if (invisibleParameterAnnotations[parameter] == null) {
-                invisibleParameterAnnotations[parameter] = new ArrayList<AnnotationNode>(
+                invisibleParameterAnnotations[parameter] = new ArrayList<>(
                         1);
             }
             invisibleParameterAnnotations[parameter].add(an);
@@ -322,7 +322,7 @@ public class MethodNode extends MethodVisitor {
     @Override
     public void visitAttribute(final Attribute attr) {
         if (attrs == null) {
-            attrs = new ArrayList<Attribute>(1);
+            attrs = new ArrayList<>(1);
         }
         attrs.add(attr);
     }

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/TableSwitchInsnNode.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/TableSwitchInsnNode.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/TableSwitchInsnNode.java
index a597c29..c7a02cc 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/TableSwitchInsnNode.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/TableSwitchInsnNode.java
@@ -85,7 +85,7 @@ public class TableSwitchInsnNode extends AbstractInsnNode {
         this.min = min;
         this.max = max;
         this.dflt = dflt;
-        this.labels = new ArrayList<LabelNode>();
+        this.labels = new ArrayList<>();
         if (labels != null) {
             this.labels.addAll(Arrays.asList(labels));
         }

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Analyzer.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Analyzer.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Analyzer.java
index 0288e73..1284ab6 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Analyzer.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Analyzer.java
@@ -125,7 +125,7 @@ public class Analyzer<V extends Value> implements Opcodes {
             for (int j = begin; j < end; ++j) {
                 List<TryCatchBlockNode> insnHandlers = handlers[j];
                 if (insnHandlers == null) {
-                    insnHandlers = new ArrayList<TryCatchBlockNode>();
+                    insnHandlers = new ArrayList<>();
                     handlers[j] = insnHandlers;
                 }
                 insnHandlers.add(tcb);
@@ -134,8 +134,8 @@ public class Analyzer<V extends Value> implements Opcodes {
 
         // computes the subroutine for each instruction:
         Subroutine main = new Subroutine(null, m.maxLocals, null);
-        List<AbstractInsnNode> subroutineCalls = new ArrayList<AbstractInsnNode>();
-        Map<LabelNode, Subroutine> subroutineHeads = new HashMap<LabelNode, Subroutine>();
+        List<AbstractInsnNode> subroutineCalls = new ArrayList<>();
+        Map<LabelNode, Subroutine> subroutineHeads = new HashMap<>();
         findSubroutine(0, main, subroutineCalls);
         while (!subroutineCalls.isEmpty()) {
             JumpInsnNode jsr = (JumpInsnNode) subroutineCalls.remove(0);
@@ -419,7 +419,7 @@ public class Analyzer<V extends Value> implements Opcodes {
      * @return the created frame.
      */
     protected Frame<V> newFrame(final int nLocals, final int nStack) {
-        return new Frame<V>(nLocals, nStack);
+        return new Frame<>(nLocals, nStack);
     }
 
     /**
@@ -430,7 +430,7 @@ public class Analyzer<V extends Value> implements Opcodes {
      * @return the created frame.
      */
     protected Frame<V> newFrame(final Frame<? extends V> src) {
-        return new Frame<V>(src);
+        return new Frame<>(src);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Frame.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Frame.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Frame.java
index c7ff4fb..2057e07 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Frame.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Frame.java
@@ -596,7 +596,7 @@ public class Frame<V extends Value> {
         case Opcodes.INVOKESPECIAL:
         case Opcodes.INVOKESTATIC:
         case Opcodes.INVOKEINTERFACE: {
-            values = new ArrayList<V>();
+            values = new ArrayList<>();
             String desc = ((MethodInsnNode) insn).desc;
             for (int i = Type.getArgumentTypes(desc).length; i > 0; --i) {
                 values.add(0, pop());
@@ -612,7 +612,7 @@ public class Frame<V extends Value> {
             break;
         }
         case Opcodes.INVOKEDYNAMIC: {
-            values = new ArrayList<V>();
+            values = new ArrayList<>();
             String desc = ((InvokeDynamicInsnNode) insn).desc;
             for (int i = Type.getArgumentTypes(desc).length; i > 0; --i) {
                 values.add(0, pop());
@@ -644,7 +644,7 @@ public class Frame<V extends Value> {
             interpreter.unaryOperation(insn, pop());
             break;
         case Opcodes.MULTIANEWARRAY:
-            values = new ArrayList<V>();
+            values = new ArrayList<>();
             for (int i = ((MultiANewArrayInsnNode) insn).dims; i > 0; --i) {
                 values.add(0, pop());
             }

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/SmallSet.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/SmallSet.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/SmallSet.java
index cf92e28..d618bac 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/SmallSet.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/SmallSet.java
@@ -47,7 +47,7 @@ class SmallSet<E> extends AbstractSet<E> implements Iterator<E> {
     E e1, e2;
 
     static final <T> Set<T> emptySet() {
-        return new SmallSet<T>(null, null);
+        return new SmallSet<>(null, null);
     }
 
     SmallSet(final E e1, final E e2) {
@@ -61,7 +61,7 @@ class SmallSet<E> extends AbstractSet<E> implements Iterator<E> {
 
     @Override
     public Iterator<E> iterator() {
-        return new SmallSet<E>(e1, e2);
+        return new SmallSet<>(e1, e2);
     }
 
     @Override
@@ -106,7 +106,7 @@ class SmallSet<E> extends AbstractSet<E> implements Iterator<E> {
         }
         if (s.e2 == null) { // s contains exactly one element
             if (e2 == null) {
-                return new SmallSet<E>(e1, s.e1); // necessarily e1 != s.e1
+                return new SmallSet<>(e1, s.e1); // necessarily e1 != s.e1
             } else if (s.e1 == e1 || s.e1 == e2) { // s is included in this
                 return this;
             }
@@ -120,7 +120,7 @@ class SmallSet<E> extends AbstractSet<E> implements Iterator<E> {
             }
         }
         // here we know that there are at least 3 distinct elements
-        HashSet<E> r = new HashSet<E>(4);
+        HashSet<E> r = new HashSet<>(4);
         r.add(e1);
         if (e2 != null) {
             r.add(e2);

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/SourceInterpreter.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/SourceInterpreter.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/SourceInterpreter.java
index 4054dc6..14b492a 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/SourceInterpreter.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/SourceInterpreter.java
@@ -188,7 +188,7 @@ public class SourceInterpreter extends Interpreter<SourceValue> implements
             }
         }
         if (d.size != w.size || !d.insns.containsAll(w.insns)) {
-            HashSet<AbstractInsnNode> s = new HashSet<AbstractInsnNode>();
+            HashSet<AbstractInsnNode> s = new HashSet<>();
             s.addAll(d.insns);
             s.addAll(w.insns);
             return new SourceValue(Math.min(d.size, w.size), s);

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/SourceValue.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/SourceValue.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/SourceValue.java
index aa42478..8a4f4c1 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/SourceValue.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/SourceValue.java
@@ -69,7 +69,7 @@ public class SourceValue implements Value {
 
     public SourceValue(final int size, final AbstractInsnNode insn) {
         this.size = size;
-        this.insns = new SmallSet<AbstractInsnNode>(insn, null);
+        this.insns = new SmallSet<>(insn, null);
     }
 
     public SourceValue(final int size, final Set<AbstractInsnNode> insns) {

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Subroutine.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Subroutine.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Subroutine.java
index 19cb36f..c189dc7 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Subroutine.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/tree/analysis/Subroutine.java
@@ -55,7 +55,7 @@ class Subroutine {
             final JumpInsnNode caller) {
         this.start = start;
         this.access = new boolean[maxLocals];
-        this.callers = new ArrayList<JumpInsnNode>();
+        this.callers = new ArrayList<>();
         callers.add(caller);
     }
 
@@ -64,7 +64,7 @@ class Subroutine {
         result.start = start;
         result.access = new boolean[access.length];
         System.arraycopy(access, 0, result.access, 0, access.length);
-        result.callers = new ArrayList<JumpInsnNode>(callers);
+        result.callers = new ArrayList<>(callers);
         return result;
     }
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/ASMifier.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/ASMifier.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/ASMifier.java
index 7fad810..42ce546 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/ASMifier.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/ASMifier.java
@@ -794,7 +794,7 @@ public class ASMifier extends Printer {
         buf.append("// ATTRIBUTE ").append(attr.type).append('\n');
         if (attr instanceof ASMifiable) {
             if (labelNames == null) {
-                labelNames = new HashMap<Label, String>();
+                labelNames = new HashMap<>();
             }
             buf.append("{\n");
             ((ASMifiable) attr).asmify(buf, "attr", labelNames);
@@ -1127,7 +1127,7 @@ public class ASMifier extends Printer {
      */
     protected void declareLabel(final Label l) {
         if (labelNames == null) {
-            labelNames = new HashMap<Label, String>();
+            labelNames = new HashMap<>();
         }
         String name = labelNames.get(l);
         if (name == null) {

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/CheckClassAdapter.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/CheckClassAdapter.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/CheckClassAdapter.java
index 412c803..12e8712 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/CheckClassAdapter.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/CheckClassAdapter.java
@@ -213,7 +213,7 @@ public class CheckClassAdapter extends ClassVisitor {
                 .getObjectType(cn.superName);
         List<MethodNode> methods = cn.methods;
 
-        List<Type> interfaces = new ArrayList<Type>();
+        List<Type> interfaces = new ArrayList<>();
         for (Iterator<String> i = cn.interfaces.iterator(); i.hasNext();) {
             interfaces.add(Type.getObjectType(i.next().toString()));
         }
@@ -223,7 +223,7 @@ public class CheckClassAdapter extends ClassVisitor {
             SimpleVerifier verifier = new SimpleVerifier(
                     Type.getObjectType(cn.name), syperType, interfaces,
                     (cn.access & Opcodes.ACC_INTERFACE) != 0);
-            Analyzer<BasicValue> a = new Analyzer<BasicValue>(verifier);
+            Analyzer<BasicValue> a = new Analyzer<>(verifier);
             if (loader != null) {
                 verifier.setClassLoader(loader);
             }
@@ -350,7 +350,7 @@ public class CheckClassAdapter extends ClassVisitor {
     protected CheckClassAdapter(final int api, final ClassVisitor cv,
             final boolean checkDataFlow) {
         super(api, cv);
-        this.labels = new HashMap<Label, Integer>();
+        this.labels = new HashMap<>();
         this.checkDataFlow = checkDataFlow;
     }
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/CheckMethodAdapter.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/CheckMethodAdapter.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/CheckMethodAdapter.java
index a7eea05..48f1af5 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/CheckMethodAdapter.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/CheckMethodAdapter.java
@@ -410,8 +410,8 @@ public class CheckMethodAdapter extends MethodVisitor {
             final Map<Label, Integer> labels) {
         super(api, mv);
         this.labels = labels;
-        this.usedLabels = new HashSet<Label>();
-        this.handlers = new ArrayList<Label>();
+        this.usedLabels = new HashSet<>();
+        this.handlers = new ArrayList<>();
     }
 
     /**
@@ -437,7 +437,7 @@ public class CheckMethodAdapter extends MethodVisitor {
         this(new MethodNode(access, name, desc, null, null) {
             @Override
             public void visitEnd() {
-                Analyzer<BasicValue> a = new Analyzer<BasicValue>(
+                Analyzer<BasicValue> a = new Analyzer<>(
                         new BasicVerifier());
                 try {
                     a.analyze("dummy", this);

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/Printer.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/Printer.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/Printer.java
index 20e142d..1fb0e53 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/Printer.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/Printer.java
@@ -145,7 +145,7 @@ public abstract class Printer {
     protected Printer(final int api) {
         this.api = api;
         this.buf = new StringBuffer();
-        this.text = new ArrayList<Object>();
+        this.text = new ArrayList<>();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/Textifier.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/Textifier.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/Textifier.java
index 7dc1fb1..1b733fe 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/Textifier.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/Textifier.java
@@ -1044,7 +1044,7 @@ public class Textifier extends Printer {
      */
     protected void appendLabel(final Label l) {
         if (labelNames == null) {
-            labelNames = new HashMap<Label, String>();
+            labelNames = new HashMap<>();
         }
         String name = labelNames.get(l);
         if (name == null) {

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/xml/ASMContentHandler.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/xml/ASMContentHandler.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/xml/ASMContentHandler.java
index c8c14c9..9a15fd8 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/xml/ASMContentHandler.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/xml/ASMContentHandler.java
@@ -61,7 +61,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
     /**
      * Stack of the intermediate processing contexts.
      */
-    private final ArrayList<Object> stack = new ArrayList<Object>();
+    private final ArrayList<Object> stack = new ArrayList<>();
 
     /**
      * Complete name of the current element.
@@ -146,7 +146,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
     /**
      * Map of the opcode names to opcode and opcode group
      */
-    static final HashMap<String, Opcode> OPCODES = new HashMap<String, Opcode>();
+    static final HashMap<String, Opcode> OPCODES = new HashMap<>();
     static {
         addOpcode("NOP", NOP, OpcodeGroup.INSN);
         addOpcode("ACONST_NULL", ACONST_NULL, OpcodeGroup.INSN);
@@ -309,7 +309,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
         OPCODES.put(operStr, new Opcode(oper, group));
     }
 
-    static final HashMap<String, Integer> TYPES = new HashMap<String, Integer>();
+    static final HashMap<String, Integer> TYPES = new HashMap<>();
     static {
         String[] types = SAXCodeAdapter.TYPES;
         for (int i = 0; i < types.length; i++) {
@@ -442,11 +442,11 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
 
     static final class RuleSet {
 
-        private final HashMap<String, Object> rules = new HashMap<String, Object>();
+        private final HashMap<String, Object> rules = new HashMap<>();
 
-        private final ArrayList<String> lpatterns = new ArrayList<String>();
+        private final ArrayList<String> lpatterns = new ArrayList<>();
 
-        private final ArrayList<String> rpatterns = new ArrayList<String>();
+        private final ArrayList<String> rpatterns = new ArrayList<>();
 
         public void add(final String path, final Object rule) {
             String pattern = path;
@@ -675,7 +675,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
         public final void begin(final String name, final Attributes attrs) {
             int major = Integer.parseInt(attrs.getValue("major"));
             int minor = Integer.parseInt(attrs.getValue("minor"));
-            HashMap<String, Object> vals = new HashMap<String, Object>();
+            HashMap<String, Object> vals = new HashMap<>();
             vals.put("version", new Integer(minor << 16 | major));
             vals.put("access", attrs.getValue("access"));
             vals.put("name", attrs.getValue("name"));
@@ -788,8 +788,8 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
 
         @Override
         public final void begin(final String name, final Attributes attrs) {
-            labels = new HashMap<Object, Label>();
-            HashMap<String, Object> vals = new HashMap<String, Object>();
+            labels = new HashMap<>();
+            HashMap<String, Object> vals = new HashMap<>();
             vals.put("access", attrs.getValue("access"));
             vals.put("name", attrs.getValue("name"));
             vals.put("desc", attrs.getValue("desc"));
@@ -844,7 +844,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
 
         @Override
         public final void begin(final String name, final Attributes attrs) {
-            HashMap<String, Object> vals = new HashMap<String, Object>();
+            HashMap<String, Object> vals = new HashMap<>();
             vals.put("min", attrs.getValue("min"));
             vals.put("max", attrs.getValue("max"));
             vals.put("dflt", attrs.getValue("dflt"));
@@ -883,7 +883,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
 
         @Override
         public final void begin(final String name, final Attributes attrs) {
-            HashMap<String, Object> vals = new HashMap<String, Object>();
+            HashMap<String, Object> vals = new HashMap<>();
             vals.put("dflt", attrs.getValue("dflt"));
             vals.put("labels", new ArrayList<Label>());
             vals.put("keys", new ArrayList<String>());
@@ -926,9 +926,9 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
 
         @Override
         public void begin(final String name, final Attributes attrs) {
-            HashMap<String, Object> typeLists = new HashMap<String, Object>();
-            typeLists.put("local", new ArrayList<Object>());
-            typeLists.put("stack", new ArrayList<Object>());
+            HashMap<String, Object> typeLists = new HashMap<>();
+            typeLists.put("local", new ArrayList<>());
+            typeLists.put("stack", new ArrayList<>());
             push(attrs.getValue("type"));
             push(attrs.getValue("count") == null ? "0" : attrs
                     .getValue("count"));
@@ -1052,7 +1052,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
             push(attrs.getValue("name"));
             push(attrs.getValue("desc"));
             push(decodeHandle(attrs.getValue("bsm")));
-            push(new ArrayList<Object>());
+            push(new ArrayList<>());
         }
 
         @Override

http://git-wip-us.apache.org/repos/asf/tajo/blob/aa699c70/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/xml/SAXCodeAdapter.java
----------------------------------------------------------------------
diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/xml/SAXCodeAdapter.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/xml/SAXCodeAdapter.java
index c7ace51..9cfe9cd 100644
--- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/xml/SAXCodeAdapter.java
+++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/xml/SAXCodeAdapter.java
@@ -68,7 +68,7 @@ public final class SAXCodeAdapter extends MethodVisitor {
     public SAXCodeAdapter(final SAXAdapter sa, final int access) {
         super(Opcodes.ASM4);
         this.sa = sa;
-        this.labelNames = new HashMap<Label, String>();
+        this.labelNames = new HashMap<>();
 
         if ((access & (Opcodes.ACC_ABSTRACT | Opcodes.ACC_INTERFACE | Opcodes.ACC_NATIVE)) == 0) {
             sa.addStart("code", new AttributesImpl());


Mime
View raw message