http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java index 43c185a..e6d3147 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java @@ -150,7 +150,7 @@ public class TestDefaultMemStore { int rowCount = addRows(this.memstore); List<KeyValueScanner> memstorescanners = this.memstore.getScanners(0); Scan scan = new Scan(); - List<Cell> result = new ArrayList<Cell>(); + List<Cell> result = new ArrayList<>(); Configuration conf = HBaseConfiguration.create(); ScanInfo scanInfo = new ScanInfo(conf, null, 0, 1, HConstants.LATEST_TIMESTAMP, KeepDeletedCells.FALSE, 0, @@ -502,7 +502,7 @@ public class TestDefaultMemStore { int NUM_THREADS = 8; ReadOwnWritesTester threads[] = new ReadOwnWritesTester[NUM_THREADS]; - AtomicReference<Throwable> caught = new AtomicReference<Throwable>(); + AtomicReference<Throwable> caught = new AtomicReference<>(); for (int i = 0; i < NUM_THREADS; i++) { threads[i] = new ReadOwnWritesTester(i, memstore, mvcc, caught, this.startSeqNum); @@ -589,7 +589,7 @@ public class TestDefaultMemStore { try (InternalScanner scanner = new StoreScanner(new Scan( Bytes.toBytes(startRowId)), scanInfo, scanType, null, memstore.getScanners(0))) { - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); for (int i = 0; scanner.next(results); i++) { int rowId = startRowId + i; Cell left = results.get(0); @@ -598,7 +598,7 @@ public class TestDefaultMemStore { "Row name", CellComparator.COMPARATOR.compareRows(left, row1, 0, row1.length) == 0); assertEquals("Count of columns", QUALIFIER_COUNT, results.size()); - List<Cell> row = new ArrayList<Cell>(); + List<Cell> row = new ArrayList<>(); for (Cell kv : results) { row.add(kv); } @@ -660,7 +660,7 @@ public class TestDefaultMemStore { KeyValue del2 = new KeyValue(row, fam, qf1, ts2, KeyValue.Type.Delete, val); memstore.add(del2, null); - List<Cell> expected = new ArrayList<Cell>(); + List<Cell> expected = new ArrayList<>(); expected.add(put3); expected.add(del2); expected.add(put2); @@ -696,7 +696,7 @@ public class TestDefaultMemStore { new KeyValue(row, fam, qf1, ts2, KeyValue.Type.DeleteColumn, val); memstore.add(del2, null); - List<Cell> expected = new ArrayList<Cell>(); + List<Cell> expected = new ArrayList<>(); expected.add(put3); expected.add(del2); expected.add(put2); @@ -733,7 +733,7 @@ public class TestDefaultMemStore { new KeyValue(row, fam, null, ts, KeyValue.Type.DeleteFamily, val); memstore.add(del, null); - List<Cell> expected = new ArrayList<Cell>(); + List<Cell> expected = new ArrayList<>(); expected.add(del); expected.add(put1); expected.add(put2); @@ -822,7 +822,7 @@ public class TestDefaultMemStore { memstore = new DefaultMemStore(conf, CellComparator.COMPARATOR); MemstoreSize oldSize = memstore.size(); - List<Cell> l = new ArrayList<Cell>(); + List<Cell> l = new ArrayList<>(); KeyValue kv1 = KeyValueTestUtil.create("r", "f", "q", 100, "v"); KeyValue kv2 = KeyValueTestUtil.create("r", "f", "q", 101, "v"); KeyValue kv3 = KeyValueTestUtil.create("r", "f", "q", 102, "v"); @@ -880,7 +880,7 @@ public class TestDefaultMemStore { t = runSnapshot(memstore); // test the case that the timeOfOldestEdit is updated after a KV upsert - List<Cell> l = new ArrayList<Cell>(); + List<Cell> l = new ArrayList<>(); KeyValue kv1 = KeyValueTestUtil.create("r", "f", "q", 100, "v"); kv1.setSequenceId(100); l.add(kv1);
http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionKeyRotation.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionKeyRotation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionKeyRotation.java index 3eb86be..b34c307 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionKeyRotation.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionKeyRotation.java @@ -233,7 +233,7 @@ public class TestEncryptionKeyRotation { } private static List<Path> findStorefilePaths(TableName tableName) throws Exception { - List<Path> paths = new ArrayList<Path>(); + List<Path> paths = new ArrayList<>(); for (Region region: TEST_UTIL.getRSForFirstRegionInTable(tableName).getOnlineRegions(tableName)) { for (Store store: region.getStores()) { @@ -246,7 +246,7 @@ public class TestEncryptionKeyRotation { } private static List<Path> findCompactedStorefilePaths(TableName tableName) throws Exception { - List<Path> paths = new ArrayList<Path>(); + List<Path> paths = new ArrayList<>(); for (Region region: TEST_UTIL.getRSForFirstRegionInTable(tableName).getOnlineRegions(tableName)) { for (Store store : region.getStores()) { http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionRandomKeying.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionRandomKeying.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionRandomKeying.java index 760bdac..2b0ab7b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionRandomKeying.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionRandomKeying.java @@ -52,7 +52,7 @@ public class TestEncryptionRandomKeying { private static HTableDescriptor htd; private static List<Path> findStorefilePaths(TableName tableName) throws Exception { - List<Path> paths = new ArrayList<Path>(); + List<Path> paths = new ArrayList<>(); for (Region region: TEST_UTIL.getRSForFirstRegionInTable(tableName).getOnlineRegions(htd.getTableName())) { for (Store store: region.getStores()) { http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java index 9ed0c2a..1051036 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java @@ -245,7 +245,7 @@ public class TestEndToEndSplitTransaction { verifyStartEndKeys(keys); //HTable.getRegionsInfo() - Set<HRegionInfo> regions = new TreeSet<HRegionInfo>(); + Set<HRegionInfo> regions = new TreeSet<>(); for (HRegionLocation loc : rl.getAllRegionLocations()) { regions.add(loc.getRegionInfo()); } @@ -275,7 +275,7 @@ public class TestEndToEndSplitTransaction { i++; } - Pair<byte[][], byte[][]> keys = new Pair<byte[][], byte[][]>(startKeys, endKeys); + Pair<byte[][], byte[][]> keys = new Pair<>(startKeys, endKeys); verifyStartEndKeys(keys); } http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java index 9a49c5d..9f0975d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java @@ -233,8 +233,7 @@ public class TestFSErrorsExposed { } static class FaultyFileSystem extends FilterFileSystem { - List<SoftReference<FaultyInputStream>> inStreams = - new ArrayList<SoftReference<FaultyInputStream>>(); + List<SoftReference<FaultyInputStream>> inStreams = new ArrayList<>(); public FaultyFileSystem(FileSystem testFileSystem) { super(testFileSystem); @@ -244,7 +243,7 @@ public class TestFSErrorsExposed { public FSDataInputStream open(Path p, int bufferSize) throws IOException { FSDataInputStream orig = fs.open(p, bufferSize); FaultyInputStream faulty = new FaultyInputStream(orig); - inStreams.add(new SoftReference<FaultyInputStream>(faulty)); + inStreams.add(new SoftReference<>(faulty)); return faulty; } http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestGetClosestAtOrBefore.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestGetClosestAtOrBefore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestGetClosestAtOrBefore.java index 7ee3f0b..570d2d8 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestGetClosestAtOrBefore.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestGetClosestAtOrBefore.java @@ -101,7 +101,7 @@ public class TestGetClosestAtOrBefore { } InternalScanner s = mr.getScanner(new Scan()); try { - List<Cell> keys = new ArrayList<Cell>(); + List<Cell> keys = new ArrayList<>(); while (s.next(keys)) { LOG.info(keys); keys.clear(); @@ -125,7 +125,7 @@ public class TestGetClosestAtOrBefore { Scan scan = new Scan(firstRowInC); s = mr.getScanner(scan); try { - List<Cell> keys = new ArrayList<Cell>(); + List<Cell> keys = new ArrayList<>(); while (s.next(keys)) { mr.delete(new Delete(CellUtil.cloneRow(keys.get(0)))); keys.clear(); http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHMobStore.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHMobStore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHMobStore.java index 6877fca..b416c7d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHMobStore.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHMobStore.java @@ -100,9 +100,8 @@ public class TestHMobStore { private Cell seekKey1; private Cell seekKey2; private Cell seekKey3; - private NavigableSet<byte[]> qualifiers = - new ConcurrentSkipListSet<byte[]>(Bytes.BYTES_COMPARATOR); - private List<Cell> expected = new ArrayList<Cell>(); + private NavigableSet<byte[]> qualifiers = new ConcurrentSkipListSet<>(Bytes.BYTES_COMPARATOR); + private List<Cell> expected = new ArrayList<>(); private long id = System.currentTimeMillis(); private Get get = new Get(row); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); @@ -222,7 +221,7 @@ public class TestHMobStore { scan.getFamilyMap().get(store.getFamily().getName()), 0); - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); scanner.next(results); Collections.sort(results, CellComparator.COMPARATOR); scanner.close(); @@ -267,7 +266,7 @@ public class TestHMobStore { scan.getFamilyMap().get(store.getFamily().getName()), 0); - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); scanner.next(results); Collections.sort(results, CellComparator.COMPARATOR); scanner.close(); @@ -312,7 +311,7 @@ public class TestHMobStore { scan.getFamilyMap().get(store.getFamily().getName()), 0); - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); scanner.next(results); Collections.sort(results, CellComparator.COMPARATOR); scanner.close(); @@ -357,7 +356,7 @@ public class TestHMobStore { scan.getFamilyMap().get(store.getFamily().getName()), 0); - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); scanner.next(results); Collections.sort(results, CellComparator.COMPARATOR); scanner.close(); @@ -409,7 +408,7 @@ public class TestHMobStore { scan.getFamilyMap().get(store.getFamily().getName()), 0); - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); scanner.next(results); Collections.sort(results, CellComparator.COMPARATOR); scanner.close(); @@ -525,7 +524,7 @@ public class TestHMobStore { scan.getFamilyMap().get(store.getFamily().getName()), 0); - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); scanner.next(results); Collections.sort(results, CellComparator.COMPARATOR); scanner.close(); http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java index 35f1b7d..eac3c77 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java @@ -608,7 +608,7 @@ public class TestHRegion { // open the second scanner RegionScanner scanner2 = region.getScanner(scan); - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); System.out.println("Smallest read point:" + region.getSmallestReadPoint()); @@ -657,7 +657,7 @@ public class TestHRegion { region.compact(true); scanner1.reseek(Bytes.toBytes("r2")); - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); scanner1.next(results); Cell keyValue = results.get(0); Assert.assertTrue(Bytes.compareTo(CellUtil.cloneRow(keyValue), Bytes.toBytes("r2")) == 0); @@ -694,7 +694,7 @@ public class TestHRegion { writer.close(); } MonitoredTask status = TaskMonitor.get().createStatus(method); - Map<byte[], Long> maxSeqIdInStores = new TreeMap<byte[], Long>(Bytes.BYTES_COMPARATOR); + Map<byte[], Long> maxSeqIdInStores = new TreeMap<>(Bytes.BYTES_COMPARATOR); for (Store store : region.getStores()) { maxSeqIdInStores.put(store.getColumnFamilyName().getBytes(), minSeqId - 1); } @@ -746,7 +746,7 @@ public class TestHRegion { } long recoverSeqId = 1030; MonitoredTask status = TaskMonitor.get().createStatus(method); - Map<byte[], Long> maxSeqIdInStores = new TreeMap<byte[], Long>(Bytes.BYTES_COMPARATOR); + Map<byte[], Long> maxSeqIdInStores = new TreeMap<>(Bytes.BYTES_COMPARATOR); for (Store store : region.getStores()) { maxSeqIdInStores.put(store.getColumnFamilyName().getBytes(), recoverSeqId - 1); } @@ -791,7 +791,7 @@ public class TestHRegion { FSDataOutputStream dos = fs.create(recoveredEdits); dos.close(); - Map<byte[], Long> maxSeqIdInStores = new TreeMap<byte[], Long>(Bytes.BYTES_COMPARATOR); + Map<byte[], Long> maxSeqIdInStores = new TreeMap<>(Bytes.BYTES_COMPARATOR); for (Store store : region.getStores()) { maxSeqIdInStores.put(store.getColumnFamilyName().getBytes(), minSeqId); } @@ -848,7 +848,7 @@ public class TestHRegion { } long recoverSeqId = 1030; - Map<byte[], Long> maxSeqIdInStores = new TreeMap<byte[], Long>(Bytes.BYTES_COMPARATOR); + Map<byte[], Long> maxSeqIdInStores = new TreeMap<>(Bytes.BYTES_COMPARATOR); MonitoredTask status = TaskMonitor.get().createStatus(method); for (Store store : region.getStores()) { maxSeqIdInStores.put(store.getColumnFamilyName().getBytes(), recoverSeqId - 1); @@ -893,7 +893,7 @@ public class TestHRegion { // this will create a region with 3 files assertEquals(3, region.getStore(family).getStorefilesCount()); - List<Path> storeFiles = new ArrayList<Path>(3); + List<Path> storeFiles = new ArrayList<>(3); for (StoreFile sf : region.getStore(family).getStorefiles()) { storeFiles.add(sf.getPath()); } @@ -1007,7 +1007,7 @@ public class TestHRegion { // this will create a region with 3 files from flush assertEquals(3, region.getStore(family).getStorefilesCount()); - List<String> storeFiles = new ArrayList<String>(3); + List<String> storeFiles = new ArrayList<>(3); for (StoreFile sf : region.getStore(family).getStorefiles()) { storeFiles.add(sf.getPath().getName()); } @@ -1017,7 +1017,7 @@ public class TestHRegion { WAL.Reader reader = WALFactory.createReader(fs, AbstractFSWALProvider.getCurrentFileName(wal), TEST_UTIL.getConfiguration()); try { - List<WAL.Entry> flushDescriptors = new ArrayList<WAL.Entry>(); + List<WAL.Entry> flushDescriptors = new ArrayList<>(); long lastFlushSeqId = -1; while (true) { WAL.Entry entry = reader.next(); @@ -1422,7 +1422,7 @@ public class TestHRegion { InternalScanner scanner = buildScanner(keyPrefix, value, r); int count = 0; boolean more = false; - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); do { more = scanner.next(results); if (results != null && !results.isEmpty()) @@ -1440,7 +1440,7 @@ public class TestHRegion { private int getNumberOfRows(String keyPrefix, String value, HRegion r) throws Exception { InternalScanner resultScanner = buildScanner(keyPrefix, value, r); int numberOfResults = 0; - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); boolean more = false; do { more = resultScanner.next(results); @@ -1579,7 +1579,7 @@ public class TestHRegion { MultithreadedTestUtil.TestContext ctx = new MultithreadedTestUtil.TestContext(CONF); - final AtomicReference<OperationStatus[]> retFromThread = new AtomicReference<OperationStatus[]>(); + final AtomicReference<OperationStatus[]> retFromThread = new AtomicReference<>(); final CountDownLatch startingPuts = new CountDownLatch(1); final CountDownLatch startingClose = new CountDownLatch(1); TestThread putter = new TestThread(ctx) { @@ -2112,14 +2112,13 @@ public class TestHRegion { // Setting up region this.region = initHRegion(tableName, method, CONF, fam1, fam2, fam3); try { - List<Cell> kvs = new ArrayList<Cell>(); + List<Cell> kvs = new ArrayList<>(); kvs.add(new KeyValue(row1, fam4, null, null)); // testing existing family byte[] family = fam2; try { - NavigableMap<byte[], List<Cell>> deleteMap = new TreeMap<byte[], List<Cell>>( - Bytes.BYTES_COMPARATOR); + NavigableMap<byte[], List<Cell>> deleteMap = new TreeMap<>(Bytes.BYTES_COMPARATOR); deleteMap.put(family, kvs); region.delete(deleteMap, Durability.SYNC_WAL); } catch (Exception e) { @@ -2130,8 +2129,7 @@ public class TestHRegion { boolean ok = false; family = fam4; try { - NavigableMap<byte[], List<Cell>> deleteMap = new TreeMap<byte[], List<Cell>>( - Bytes.BYTES_COMPARATOR); + NavigableMap<byte[], List<Cell>> deleteMap = new TreeMap<>(Bytes.BYTES_COMPARATOR); deleteMap.put(family, kvs); region.delete(deleteMap, Durability.SYNC_WAL); } catch (Exception e) { @@ -2361,7 +2359,7 @@ public class TestHRegion { Scan scan = new Scan(); scan.addFamily(fam1).addFamily(fam2); InternalScanner s = region.getScanner(scan); - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); s.next(results); assertTrue(CellUtil.matchingRow(results.get(0), rowA)); @@ -2488,7 +2486,7 @@ public class TestHRegion { scan.addColumn(fam1, qual1); InternalScanner s = region.getScanner(scan); - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); assertEquals(false, s.next(results)); assertEquals(1, results.size()); Cell kv = results.get(0); @@ -2514,13 +2512,12 @@ public class TestHRegion { this.region = initHRegion(tableName, method, CONF, fam1); try { // Building checkerList - List<Cell> kvs = new ArrayList<Cell>(); + List<Cell> kvs = new ArrayList<>(); kvs.add(new KeyValue(row1, fam1, col1, null)); kvs.add(new KeyValue(row1, fam1, col2, null)); kvs.add(new KeyValue(row1, fam1, col3, null)); - NavigableMap<byte[], List<Cell>> deleteMap = new TreeMap<byte[], List<Cell>>( - Bytes.BYTES_COMPARATOR); + NavigableMap<byte[], List<Cell>> deleteMap = new TreeMap<>(Bytes.BYTES_COMPARATOR); deleteMap.put(fam1, kvs); region.delete(deleteMap, Durability.SYNC_WAL); @@ -2811,22 +2808,22 @@ public class TestHRegion { List<Cell> res = null; // Result 1 - List<Cell> expected1 = new ArrayList<Cell>(); + List<Cell> expected1 = new ArrayList<>(); expected1.add(new KeyValue(row1, fam2, null, ts, KeyValue.Type.Put, null)); expected1.add(new KeyValue(row1, fam4, null, ts, KeyValue.Type.Put, null)); - res = new ArrayList<Cell>(); + res = new ArrayList<>(); is.next(res); for (int i = 0; i < res.size(); i++) { assertTrue(CellUtil.equalsIgnoreMvccVersion(expected1.get(i), res.get(i))); } // Result 2 - List<Cell> expected2 = new ArrayList<Cell>(); + List<Cell> expected2 = new ArrayList<>(); expected2.add(new KeyValue(row2, fam2, null, ts, KeyValue.Type.Put, null)); expected2.add(new KeyValue(row2, fam4, null, ts, KeyValue.Type.Put, null)); - res = new ArrayList<Cell>(); + res = new ArrayList<>(); is.next(res); for (int i = 0; i < res.size(); i++) { assertTrue(CellUtil.equalsIgnoreMvccVersion(expected2.get(i), res.get(i))); @@ -2872,14 +2869,14 @@ public class TestHRegion { region.put(put); // Expected - List<Cell> expected = new ArrayList<Cell>(); + List<Cell> expected = new ArrayList<>(); expected.add(kv13); expected.add(kv12); Scan scan = new Scan(row1); scan.addColumn(fam1, qf1); scan.setMaxVersions(MAX_VERSIONS); - List<Cell> actual = new ArrayList<Cell>(); + List<Cell> actual = new ArrayList<>(); InternalScanner scanner = region.getScanner(scan); boolean hasNext = scanner.next(actual); @@ -2931,7 +2928,7 @@ public class TestHRegion { region.flush(true); // Expected - List<Cell> expected = new ArrayList<Cell>(); + List<Cell> expected = new ArrayList<>(); expected.add(kv13); expected.add(kv12); expected.add(kv23); @@ -2941,7 +2938,7 @@ public class TestHRegion { scan.addColumn(fam1, qf1); scan.addColumn(fam1, qf2); scan.setMaxVersions(MAX_VERSIONS); - List<Cell> actual = new ArrayList<Cell>(); + List<Cell> actual = new ArrayList<>(); InternalScanner scanner = region.getScanner(scan); boolean hasNext = scanner.next(actual); @@ -3010,7 +3007,7 @@ public class TestHRegion { region.put(put); // Expected - List<Cell> expected = new ArrayList<Cell>(); + List<Cell> expected = new ArrayList<>(); expected.add(kv14); expected.add(kv13); expected.add(kv12); @@ -3023,7 +3020,7 @@ public class TestHRegion { scan.addColumn(fam1, qf2); int versions = 3; scan.setMaxVersions(versions); - List<Cell> actual = new ArrayList<Cell>(); + List<Cell> actual = new ArrayList<>(); InternalScanner scanner = region.getScanner(scan); boolean hasNext = scanner.next(actual); @@ -3074,7 +3071,7 @@ public class TestHRegion { region.put(put); // Expected - List<Cell> expected = new ArrayList<Cell>(); + List<Cell> expected = new ArrayList<>(); expected.add(kv13); expected.add(kv12); expected.add(kv23); @@ -3083,7 +3080,7 @@ public class TestHRegion { Scan scan = new Scan(row1); scan.addFamily(fam1); scan.setMaxVersions(MAX_VERSIONS); - List<Cell> actual = new ArrayList<Cell>(); + List<Cell> actual = new ArrayList<>(); InternalScanner scanner = region.getScanner(scan); boolean hasNext = scanner.next(actual); @@ -3134,7 +3131,7 @@ public class TestHRegion { region.flush(true); // Expected - List<Cell> expected = new ArrayList<Cell>(); + List<Cell> expected = new ArrayList<>(); expected.add(kv13); expected.add(kv12); expected.add(kv23); @@ -3143,7 +3140,7 @@ public class TestHRegion { Scan scan = new Scan(row1); scan.addFamily(fam1); scan.setMaxVersions(MAX_VERSIONS); - List<Cell> actual = new ArrayList<Cell>(); + List<Cell> actual = new ArrayList<>(); InternalScanner scanner = region.getScanner(scan); boolean hasNext = scanner.next(actual); @@ -3198,7 +3195,7 @@ public class TestHRegion { scan.addColumn(family, col1); InternalScanner s = region.getScanner(scan); - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); assertEquals(false, s.next(results)); assertEquals(0, results.size()); } finally { @@ -3258,7 +3255,7 @@ public class TestHRegion { region.put(put); // Expected - List<KeyValue> expected = new ArrayList<KeyValue>(); + List<KeyValue> expected = new ArrayList<>(); expected.add(kv14); expected.add(kv13); expected.add(kv12); @@ -3269,7 +3266,7 @@ public class TestHRegion { Scan scan = new Scan(row1); int versions = 3; scan.setMaxVersions(versions); - List<Cell> actual = new ArrayList<Cell>(); + List<Cell> actual = new ArrayList<>(); InternalScanner scanner = region.getScanner(scan); boolean hasNext = scanner.next(actual); @@ -3334,7 +3331,7 @@ public class TestHRegion { scan.setLoadColumnFamiliesOnDemand(true); InternalScanner s = region.getScanner(scan); - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); assertTrue(s.next(results)); assertEquals(results.size(), 1); results.clear(); @@ -3427,7 +3424,7 @@ public class TestHRegion { // r8: first:a // r9: first:a - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); int index = 0; ScannerContext scannerContext = ScannerContext.newBuilder().setBatchLimit(3).build(); while (true) { @@ -3501,7 +3498,7 @@ public class TestHRegion { new BinaryComparator(Bytes.toBytes(5L)))); int expectedCount = 0; - List<Cell> res = new ArrayList<Cell>(); + List<Cell> res = new ArrayList<>(); boolean toggle = true; for (long i = 0; i < numRows; i++) { @@ -3643,7 +3640,7 @@ public class TestHRegion { Scan scan = new Scan(Bytes.toBytes("row0"), Bytes.toBytes("row1")); int expectedCount = numFamilies * numQualifiers; - List<Cell> res = new ArrayList<Cell>(); + List<Cell> res = new ArrayList<>(); long prevTimestamp = 0L; for (int i = 0; i < testCount; i++) { @@ -3943,7 +3940,7 @@ public class TestHRegion { new BinaryComparator(Bytes.toBytes(0L))), new SingleColumnValueFilter(family, qual1, CompareOp.LESS_OR_EQUAL, new BinaryComparator(Bytes.toBytes(3L)))))); InternalScanner scanner = region.getScanner(idxScan); - List<Cell> res = new ArrayList<Cell>(); + List<Cell> res = new ArrayList<>(); while (scanner.next(res)) ; @@ -4841,7 +4838,7 @@ public class TestHRegion { scan.addFamily(families[i]); InternalScanner s = r.getScanner(scan); try { - List<Cell> curVals = new ArrayList<Cell>(); + List<Cell> curVals = new ArrayList<>(); boolean first = true; OUTER_LOOP: while (s.next(curVals)) { for (Cell kv : curVals) { @@ -5000,7 +4997,7 @@ public class TestHRegion { scan.setMaxVersions(5); scan.setReversed(true); InternalScanner scanner = region.getScanner(scan); - List<Cell> currRow = new ArrayList<Cell>(); + List<Cell> currRow = new ArrayList<>(); boolean hasNext = scanner.next(currRow); assertEquals(2, currRow.size()); assertTrue(Bytes.equals(currRow.get(0).getRowArray(), currRow.get(0).getRowOffset(), currRow @@ -5056,7 +5053,7 @@ public class TestHRegion { region.put(put); Scan scan = new Scan(rowD); - List<Cell> currRow = new ArrayList<Cell>(); + List<Cell> currRow = new ArrayList<>(); scan.setReversed(true); scan.setMaxVersions(5); InternalScanner scanner = region.getScanner(scan); @@ -5113,7 +5110,7 @@ public class TestHRegion { put.add(kv3); region.put(put); Scan scan = new Scan(); - List<Cell> currRow = new ArrayList<Cell>(); + List<Cell> currRow = new ArrayList<>(); scan.setReversed(true); InternalScanner scanner = region.getScanner(scan); boolean hasNext = scanner.next(currRow); @@ -5184,7 +5181,7 @@ public class TestHRegion { Scan scan = new Scan(rowD, rowA); scan.addColumn(families[0], col1); scan.setReversed(true); - List<Cell> currRow = new ArrayList<Cell>(); + List<Cell> currRow = new ArrayList<>(); InternalScanner scanner = region.getScanner(scan); boolean hasNext = scanner.next(currRow); assertEquals(1, currRow.size()); @@ -5267,7 +5264,7 @@ public class TestHRegion { Scan scan = new Scan(rowD, rowA); scan.addColumn(families[0], col1); scan.setReversed(true); - List<Cell> currRow = new ArrayList<Cell>(); + List<Cell> currRow = new ArrayList<>(); InternalScanner scanner = region.getScanner(scan); boolean hasNext = scanner.next(currRow); assertEquals(1, currRow.size()); @@ -5412,7 +5409,7 @@ public class TestHRegion { scan.setBatch(3); scan.setReversed(true); InternalScanner scanner = region.getScanner(scan); - List<Cell> currRow = new ArrayList<Cell>(); + List<Cell> currRow = new ArrayList<>(); boolean hasNext = false; // 1. scan out "row4" (5 kvs), "row5" can't be scanned out since not // included in scan range @@ -5519,7 +5516,7 @@ public class TestHRegion { scan.setReversed(true); scan.setBatch(10); InternalScanner scanner = region.getScanner(scan); - List<Cell> currRow = new ArrayList<Cell>(); + List<Cell> currRow = new ArrayList<>(); boolean hasNext = scanner.next(currRow); assertEquals(1, currRow.size()); assertTrue(Bytes.equals(currRow.get(0).getRowArray(), currRow.get(0).getRowOffset(), currRow @@ -6348,7 +6345,7 @@ public class TestHRegion { CONF.setInt("hbase.regionserver.wal.disruptor.event.count", 2); this.region = initHRegion(tableName, method, CONF, families); try { - List<Thread> threads = new ArrayList<Thread>(); + List<Thread> threads = new ArrayList<>(); for (int i = 0; i < numRows; i++) { final int count = i; Thread t = new Thread(new Runnable() { http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionOnCluster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionOnCluster.java index 23c96a2..41ad68b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionOnCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionOnCluster.java @@ -159,7 +159,7 @@ public class TestHRegionOnCluster { put.addColumn(family, Bytes.toBytes("q1"), Bytes.toBytes(value)); table.put(put); ResultScanner resultScanner = table.getScanner(new Scan()); - List<Result> results = new ArrayList<Result>(); + List<Result> results = new ArrayList<>(); while (true) { Result r = resultScanner.next(); if (r == null) http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionReplayEvents.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionReplayEvents.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionReplayEvents.java index ac10f8c..0054642 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionReplayEvents.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionReplayEvents.java @@ -179,7 +179,7 @@ public class TestHRegionReplayEvents { when(rss.getExecutorService()).thenReturn(es); primaryRegion = HRegion.createHRegion(primaryHri, rootDir, CONF, htd, walPrimary); primaryRegion.close(); - List<Region> regions = new ArrayList<Region>(); + List<Region> regions = new ArrayList<>(); regions.add(primaryRegion); when(rss.getOnlineRegions()).thenReturn(regions); @@ -1391,7 +1391,7 @@ public class TestHRegionReplayEvents { // Test case 3: compact primary files primaryRegion.compactStores(); - List<Region> regions = new ArrayList<Region>(); + List<Region> regions = new ArrayList<>(); regions.add(primaryRegion); when(rss.getOnlineRegions()).thenReturn(regions); CompactedHFilesDischarger cleaner = new CompactedHFilesDischarger(100, null, rss, false); @@ -1486,11 +1486,10 @@ public class TestHRegionReplayEvents { random.nextBytes(randomValues); Path testPath = TEST_UTIL.getDataTestDirOnTestFS(); - List<Pair<byte[], String>> familyPaths = new ArrayList<Pair<byte[], String>>(); + List<Pair<byte[], String>> familyPaths = new ArrayList<>(); int expectedLoadFileCount = 0; for (byte[] family : families) { - familyPaths.add(new Pair<byte[], String>(family, createHFileForFamilies(testPath, family, - randomValues))); + familyPaths.add(new Pair<>(family, createHFileForFamilies(testPath, family, randomValues))); expectedLoadFileCount++; } primaryRegion.bulkLoadHFiles(familyPaths, false, null); @@ -1519,7 +1518,7 @@ public class TestHRegionReplayEvents { secondaryRegion.replayWALBulkLoadEventMarker(bulkloadEvent); - List<String> storeFileName = new ArrayList<String>(); + List<String> storeFileName = new ArrayList<>(); for (StoreDescriptor storeDesc : bulkloadEvent.getStoresList()) { storeFileName.addAll(storeDesc.getStoreFileList()); } http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java index 398711e..0ac5153 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java @@ -108,7 +108,7 @@ public class TestHRegionServerBulkLoad { @Parameters public static final Collection<Object[]> parameters() { int[] sleepDurations = new int[] { 0, 30000 }; - List<Object[]> configurations = new ArrayList<Object[]>(); + List<Object[]> configurations = new ArrayList<>(); for (int i : sleepDurations) { configurations.add(new Object[] { i }); } @@ -189,8 +189,7 @@ public class TestHRegionServerBulkLoad { // create HFiles for different column families FileSystem fs = UTIL.getTestFileSystem(); byte[] val = Bytes.toBytes(String.format("%010d", iteration)); - final List<Pair<byte[], String>> famPaths = new ArrayList<Pair<byte[], String>>( - NUM_CFS); + final List<Pair<byte[], String>> famPaths = new ArrayList<>(NUM_CFS); for (int i = 0; i < NUM_CFS; i++) { Path hfile = new Path(dir, family(i)); byte[] fam = Bytes.toBytes(family(i)); http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoadWithOldClient.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoadWithOldClient.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoadWithOldClient.java index f68fda9..7aa1b31 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoadWithOldClient.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoadWithOldClient.java @@ -80,8 +80,7 @@ public class TestHRegionServerBulkLoadWithOldClient extends TestHRegionServerBul // create HFiles for different column families FileSystem fs = UTIL.getTestFileSystem(); byte[] val = Bytes.toBytes(String.format("%010d", iteration)); - final List<Pair<byte[], String>> famPaths = new ArrayList<Pair<byte[], String>>( - NUM_CFS); + final List<Pair<byte[], String>> famPaths = new ArrayList<>(NUM_CFS); for (int i = 0; i < NUM_CFS; i++) { Path hfile = new Path(dir, family(i)); byte[] fam = Bytes.toBytes(family(i)); http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java index 00cc50a..83810f2 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java @@ -113,7 +113,7 @@ public class TestJoinedScanners { byte [] val_large = new byte[valueWidth]; - List<Put> puts = new ArrayList<Put>(); + List<Put> puts = new ArrayList<>(); for (long i = 0; i < rows_to_insert; i++) { Put put = new Put(Bytes.toBytes(Long.toString (i))); http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java index 3e32772..d93152a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java @@ -212,7 +212,7 @@ public class TestKeepDeletes { s.setRaw(true); s.setMaxVersions(); InternalScanner scan = region.getScanner(s); - List<Cell> kvs = new ArrayList<Cell>(); + List<Cell> kvs = new ArrayList<>(); scan.next(kvs); assertEquals(2, kvs.size()); @@ -226,7 +226,7 @@ public class TestKeepDeletes { s.setRaw(true); s.setMaxVersions(); scan = region.getScanner(s); - kvs = new ArrayList<Cell>(); + kvs = new ArrayList<>(); scan.next(kvs); assertTrue(kvs.isEmpty()); @@ -271,7 +271,7 @@ public class TestKeepDeletes { s.setMaxVersions(); s.setTimeRange(0L, ts+1); InternalScanner scanner = region.getScanner(s); - List<Cell> kvs = new ArrayList<Cell>(); + List<Cell> kvs = new ArrayList<>(); while (scanner.next(kvs)) ; assertTrue(kvs.isEmpty()); @@ -346,7 +346,7 @@ public class TestKeepDeletes { s.setRaw(true); s.setMaxVersions(); InternalScanner scan = region.getScanner(s); - List<Cell> kvs = new ArrayList<Cell>(); + List<Cell> kvs = new ArrayList<>(); scan.next(kvs); assertEquals(8, kvs.size()); assertTrue(CellUtil.isDeleteFamily(kvs.get(0))); @@ -365,7 +365,7 @@ public class TestKeepDeletes { s.setMaxVersions(); s.setTimeRange(0, 1); scan = region.getScanner(s); - kvs = new ArrayList<Cell>(); + kvs = new ArrayList<>(); scan.next(kvs); // nothing in this interval, not even delete markers assertTrue(kvs.isEmpty()); @@ -376,7 +376,7 @@ public class TestKeepDeletes { s.setMaxVersions(); s.setTimeRange(0, ts+2); scan = region.getScanner(s); - kvs = new ArrayList<Cell>(); + kvs = new ArrayList<>(); scan.next(kvs); assertEquals(4, kvs.size()); assertTrue(CellUtil.isDeleteFamily(kvs.get(0))); @@ -391,7 +391,7 @@ public class TestKeepDeletes { s.setMaxVersions(); s.setTimeRange(ts+3, ts+5); scan = region.getScanner(s); - kvs = new ArrayList<Cell>(); + kvs = new ArrayList<>(); scan.next(kvs); assertEquals(2, kvs.size()); assertArrayEquals(CellUtil.cloneValue(kvs.get(0)), T3); @@ -794,7 +794,7 @@ public class TestKeepDeletes { Scan s = new Scan(T1); s.setTimeRange(0, ts+1); InternalScanner scanner = region.getScanner(s); - List<Cell> kvs = new ArrayList<Cell>(); + List<Cell> kvs = new ArrayList<>(); scanner.next(kvs); assertEquals(4, kvs.size()); scanner.close(); @@ -802,7 +802,7 @@ public class TestKeepDeletes { s = new Scan(T2); s.setTimeRange(0, ts+2); scanner = region.getScanner(s); - kvs = new ArrayList<Cell>(); + kvs = new ArrayList<>(); scanner.next(kvs); assertEquals(4, kvs.size()); scanner.close(); @@ -951,7 +951,7 @@ public class TestKeepDeletes { // use max versions from the store(s) s.setMaxVersions(region.getStores().iterator().next().getScanInfo().getMaxVersions()); InternalScanner scan = region.getScanner(s); - List<Cell> kvs = new ArrayList<Cell>(); + List<Cell> kvs = new ArrayList<>(); int res = 0; boolean hasMore; do { http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueHeap.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueHeap.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueHeap.java index b030c74..d574e75 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueHeap.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueHeap.java @@ -67,7 +67,7 @@ public class TestKeyValueHeap extends HBaseTestCase { TestScanner s2 = new TestScanner(Arrays.asList(kv111, kv112)); TestScanner s3 = new TestScanner(Arrays.asList(kv113, kv114, kv121, kv122, kv213)); - List<KeyValueScanner> scanners = new ArrayList<KeyValueScanner>(Arrays.asList(s1, s2, s3)); + List<KeyValueScanner> scanners = new ArrayList<>(Arrays.asList(s1, s2, s3)); /* * Uses {@code scanners} to build a KeyValueHeap, iterates over it and asserts that returned @@ -136,7 +136,7 @@ public class TestKeyValueHeap extends HBaseTestCase { public void testScannerLeak() throws IOException { // Test for unclosed scanners (HBASE-1927) - TestScanner s4 = new TestScanner(new ArrayList<Cell>()); + TestScanner s4 = new TestScanner(new ArrayList<>()); scanners.add(s4); //Creating KeyValueHeap @@ -163,9 +163,9 @@ public class TestKeyValueHeap extends HBaseTestCase { TestScanner s1 = new SeekTestScanner(Arrays.asList(kv115, kv211, kv212)); TestScanner s2 = new SeekTestScanner(Arrays.asList(kv111, kv112)); TestScanner s3 = new SeekTestScanner(Arrays.asList(kv113, kv114, kv121, kv122, kv213)); - TestScanner s4 = new SeekTestScanner(new ArrayList<Cell>()); + TestScanner s4 = new SeekTestScanner(new ArrayList<>()); - List<KeyValueScanner> scanners = new ArrayList<KeyValueScanner>(Arrays.asList(s1, s2, s3, s4)); + List<KeyValueScanner> scanners = new ArrayList<>(Arrays.asList(s1, s2, s3, s4)); // Creating KeyValueHeap KeyValueHeap kvh = new KeyValueHeap(scanners, CellComparator.COMPARATOR); @@ -197,13 +197,13 @@ public class TestKeyValueHeap extends HBaseTestCase { TestScanner scan1 = new TestScanner(Arrays.asList(kv111, kv112, kv113A), 1); TestScanner scan2 = new TestScanner(Arrays.asList(kv113B), 2); List<Cell> expected = Arrays.asList(kv111, kv112, kv113B, kv113A); - assertCells(expected, new ArrayList<KeyValueScanner>(Arrays.asList(scan1, scan2))); + assertCells(expected, new ArrayList<>(Arrays.asList(scan1, scan2))); } { TestScanner scan1 = new TestScanner(Arrays.asList(kv111, kv112, kv113A), 2); TestScanner scan2 = new TestScanner(Arrays.asList(kv113B), 1); List<Cell> expected = Arrays.asList(kv111, kv112, kv113A, kv113B); - assertCells(expected, new ArrayList<KeyValueScanner>(Arrays.asList(scan1, scan2))); + assertCells(expected, new ArrayList<>(Arrays.asList(scan1, scan2))); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java index edc46ca..9d00d38 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java @@ -137,7 +137,7 @@ public class TestMajorCompaction { // Now delete everything. InternalScanner s = r.getScanner(new Scan()); do { - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); boolean result = s.next(results); r.delete(new Delete(CellUtil.cloneRow(results.get(0)))); if (!result) break; @@ -150,7 +150,7 @@ public class TestMajorCompaction { s = r.getScanner(new Scan()); int counter = 0; do { - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); boolean result = s.next(results); if (!result) break; counter++; @@ -180,8 +180,7 @@ public class TestMajorCompaction { public void majorCompactionWithDataBlockEncoding(boolean inCacheOnly) throws Exception { - Map<Store, HFileDataBlockEncoder> replaceBlockCache = - new HashMap<Store, HFileDataBlockEncoder>(); + Map<Store, HFileDataBlockEncoder> replaceBlockCache = new HashMap<>(); for (Store store : r.getStores()) { HFileDataBlockEncoder blockEncoder = store.getDataBlockEncoder(); replaceBlockCache.put(store, blockEncoder); @@ -461,7 +460,7 @@ public class TestMajorCompaction { scan.setReversed(true); InternalScanner s = r.getScanner(scan); do { - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); boolean result = s.next(results); assertTrue(!results.isEmpty()); r.delete(new Delete(CellUtil.cloneRow(results.get(0)))); @@ -477,7 +476,7 @@ public class TestMajorCompaction { s = r.getScanner(scan); int counter = 0; do { - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); boolean result = s.next(results); if (!result) break; counter++; http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreLAB.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreLAB.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreLAB.java index c106c04..141b802 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreLAB.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreLAB.java @@ -197,7 +197,7 @@ public class TestMemStoreLAB { MemStoreChunkPool.clearDisableFlag(); mslab = new MemStoreLABImpl(conf); // launch multiple threads to trigger frequent chunk retirement - List<Thread> threads = new ArrayList<Thread>(); + List<Thread> threads = new ArrayList<>(); final KeyValue kv = new KeyValue(Bytes.toBytes("r"), Bytes.toBytes("f"), Bytes.toBytes("q"), new byte[MemStoreLABImpl.MAX_ALLOC_DEFAULT - 24]); for (int i = 0; i < 10; i++) { http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinVersions.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinVersions.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinVersions.java index 661583e..52b5a40 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinVersions.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinVersions.java @@ -427,7 +427,7 @@ public class TestMinVersions { p.addColumn(c1, c1, T3); region.put(p); - List<Long> tss = new ArrayList<Long>(); + List<Long> tss = new ArrayList<>(); tss.add(ts-1); tss.add(ts-2); http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMiniBatchOperationInProgress.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMiniBatchOperationInProgress.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMiniBatchOperationInProgress.java index 15931c6..7406e47 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMiniBatchOperationInProgress.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMiniBatchOperationInProgress.java @@ -40,10 +40,10 @@ public class TestMiniBatchOperationInProgress { OperationStatus[] retCodeDetails = new OperationStatus[10]; WALEdit[] walEditsFromCoprocessors = new WALEdit[10]; for (int i = 0; i < 10; i++) { - operations[i] = new Pair<Mutation, Integer>(new Put(Bytes.toBytes(i)), null); + operations[i] = new Pair<>(new Put(Bytes.toBytes(i)), null); } MiniBatchOperationInProgress<Pair<Mutation, Integer>> miniBatch = - new MiniBatchOperationInProgress<Pair<Mutation, Integer>>(operations, retCodeDetails, + new MiniBatchOperationInProgress<>(operations, retCodeDetails, walEditsFromCoprocessors, 0, 5); assertEquals(5, miniBatch.size()); @@ -68,7 +68,7 @@ public class TestMiniBatchOperationInProgress { } catch (ArrayIndexOutOfBoundsException e) { } - miniBatch = new MiniBatchOperationInProgress<Pair<Mutation, Integer>>(operations, + miniBatch = new MiniBatchOperationInProgress<>(operations, retCodeDetails, walEditsFromCoprocessors, 7, 10); try { miniBatch.setWalEdit(-1, new WALEdit()); http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java index ff6f09b..8afdec9 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java @@ -124,7 +124,7 @@ public class TestMultiColumnScanner { @Parameters public static final Collection<Object[]> parameters() { - List<Object[]> parameters = new ArrayList<Object[]>(); + List<Object[]> parameters = new ArrayList<>(); for (Object[] bloomAndCompressionParams : HBaseTestingUtility.BLOOM_AND_COMPRESSION_COMBINATIONS) { for (boolean useDataBlockEncoding : new boolean[]{false, true}) { @@ -154,15 +154,15 @@ public class TestMultiColumnScanner { ); List<String> rows = sequentialStrings("row", NUM_ROWS); List<String> qualifiers = sequentialStrings("qual", NUM_COLUMNS); - List<KeyValue> kvs = new ArrayList<KeyValue>(); - Set<String> keySet = new HashSet<String>(); + List<KeyValue> kvs = new ArrayList<>(); + Set<String> keySet = new HashSet<>(); // A map from <row>_<qualifier> to the most recent delete timestamp for // that column. - Map<String, Long> lastDelTimeMap = new HashMap<String, Long>(); + Map<String, Long> lastDelTimeMap = new HashMap<>(); Random rand = new Random(29372937L); - Set<String> rowQualSkip = new HashSet<String>(); + Set<String> rowQualSkip = new HashSet<>(); // Skip some columns in some rows. We need to test scanning over a set // of columns when some of the columns are not there. @@ -228,7 +228,7 @@ public class TestMultiColumnScanner { for (int columnBitMask = 1; columnBitMask <= MAX_COLUMN_BIT_MASK; ++columnBitMask) { Scan scan = new Scan(); scan.setMaxVersions(maxVersions); - Set<String> qualSet = new TreeSet<String>(); + Set<String> qualSet = new TreeSet<>(); { int columnMaskTmp = columnBitMask; for (String qual : qualifiers) { @@ -242,7 +242,7 @@ public class TestMultiColumnScanner { } InternalScanner scanner = region.getScanner(scan); - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); int kvPos = 0; int numResults = 0; @@ -317,7 +317,7 @@ public class TestMultiColumnScanner { } private static List<String> sequentialStrings(String prefix, int n) { - List<String> lst = new ArrayList<String>(); + List<String> lst = new ArrayList<>(); for (int i = 0; i < n; ++i) { StringBuilder sb = new StringBuilder(); sb.append(prefix + i); http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionFavoredNodes.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionFavoredNodes.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionFavoredNodes.java index 67be032..d8f75ed 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionFavoredNodes.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionFavoredNodes.java @@ -117,8 +117,7 @@ public class TestRegionFavoredNodes { List<Region> regions = server.getOnlineRegions(TABLE_NAME); for (Region region : regions) { List<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ServerName>favoredNodes = - new ArrayList<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos. - ServerName>(3); + new ArrayList<>(3); String encodedRegionName = region.getRegionInfo().getEncodedName(); for (int j = 0; j < FAVORED_NODES_NUM; j++) { org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ServerName.Builder b = http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionIncrement.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionIncrement.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionIncrement.java index 1583bf8..5d11c0e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionIncrement.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionIncrement.java @@ -193,7 +193,7 @@ public class TestRegionIncrement { threads[i].join(); } RegionScanner regionScanner = region.getScanner(new Scan()); - List<Cell> cells = new ArrayList<Cell>(THREAD_COUNT); + List<Cell> cells = new ArrayList<>(THREAD_COUNT); while(regionScanner.next(cells)) continue; assertEquals(THREAD_COUNT, cells.size()); long total = 0; @@ -230,7 +230,7 @@ public class TestRegionIncrement { threads[i].join(); } RegionScanner regionScanner = region.getScanner(new Scan()); - List<Cell> cells = new ArrayList<Cell>(100); + List<Cell> cells = new ArrayList<>(100); while(regionScanner.next(cells)) continue; assertEquals(THREAD_COUNT, cells.size()); long total = 0; http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java index 3e6d180..358aabd 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java @@ -382,11 +382,11 @@ public class TestRegionMergeTransactionOnCluster { List<Pair<HRegionInfo, ServerName>> currentRegionToServers = MetaTableAccessor.getTableRegionsAndLocations( TEST_UTIL.getConnection(), tableName); - List<HRegionInfo> initialRegions = new ArrayList<HRegionInfo>(); + List<HRegionInfo> initialRegions = new ArrayList<>(); for (Pair<HRegionInfo, ServerName> p : initialRegionToServers) { initialRegions.add(p.getFirst()); } - List<HRegionInfo> currentRegions = new ArrayList<HRegionInfo>(); + List<HRegionInfo> currentRegions = new ArrayList<>(); for (Pair<HRegionInfo, ServerName> p : currentRegionToServers) { currentRegions.add(p.getFirst()); } @@ -427,7 +427,7 @@ public class TestRegionMergeTransactionOnCluster { ADMIN.mergeRegionsAsync( regionA.getEncodedNameAsBytes(), regionB.getEncodedNameAsBytes(), false); - return new PairOfSameType<HRegionInfo>(regionA, regionB); + return new PairOfSameType<>(regionA, regionB); } private void waitAndVerifyRegionNum(HMaster master, TableName tablename, http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicaFailover.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicaFailover.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicaFailover.java index abe6c6c..69b7581 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicaFailover.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicaFailover.java @@ -283,7 +283,7 @@ public class TestRegionReplicaFailover { admin.flush(table.getName()); HTU.loadNumericRows(table, fam, 1000, 2000); - final AtomicReference<Throwable> ex = new AtomicReference<Throwable>(null); + final AtomicReference<Throwable> ex = new AtomicReference<>(null); final AtomicBoolean done = new AtomicBoolean(false); final AtomicInteger key = new AtomicInteger(2000); http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java index 9166101..642cc14 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java @@ -329,7 +329,7 @@ public class TestRegionReplicas { @SuppressWarnings("unchecked") final AtomicReference<Exception>[] exceptions = new AtomicReference[3]; for (int i=0; i < exceptions.length; i++) { - exceptions[i] = new AtomicReference<Exception>(); + exceptions[i] = new AtomicReference<>(); } Runnable writer = new Runnable() { http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionSplitPolicy.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionSplitPolicy.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionSplitPolicy.java index b2909e2..89f7589 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionSplitPolicy.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionSplitPolicy.java @@ -63,7 +63,7 @@ public class TestRegionSplitPolicy { mockRegion = Mockito.mock(HRegion.class); Mockito.doReturn(htd).when(mockRegion).getTableDesc(); Mockito.doReturn(hri).when(mockRegion).getRegionInfo(); - stores = new ArrayList<Store>(); + stores = new ArrayList<>(); Mockito.doReturn(stores).when(mockRegion).getStores(); } @@ -103,7 +103,7 @@ public class TestRegionSplitPolicy { // Now make it so the mock region has a RegionServerService that will // return 'online regions'. RegionServerServices rss = Mockito.mock(RegionServerServices.class); - final List<Region> regions = new ArrayList<Region>(); + final List<Region> regions = new ArrayList<>(); Mockito.when(rss.getOnlineRegions(TABLENAME)).thenReturn(regions); Mockito.when(mockRegion.getRegionServerServices()).thenReturn(rss); // Set max size for this 'table'. @@ -162,7 +162,7 @@ public class TestRegionSplitPolicy { conf.setFloat("hbase.busy.policy.blockedRequests", 0.1f); RegionServerServices rss = Mockito.mock(RegionServerServices.class); - final List<Region> regions = new ArrayList<Region>(); + final List<Region> regions = new ArrayList<>(); Mockito.when(rss.getOnlineRegions(TABLENAME)).thenReturn(regions); Mockito.when(mockRegion.getRegionServerServices()).thenReturn(rss); Mockito.when(mockRegion.getBlockedRequestsCount()).thenReturn(0L); http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestReversibleScanners.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestReversibleScanners.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestReversibleScanners.java index ea16edf..69965ba 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestReversibleScanners.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestReversibleScanners.java @@ -435,7 +435,7 @@ public class TestReversibleScanners { private void verifyCountAndOrder(InternalScanner scanner, int expectedKVCount, int expectedRowCount, boolean forward) throws IOException { - List<Cell> kvList = new ArrayList<Cell>(); + List<Cell> kvList = new ArrayList<>(); Result lastResult = null; int rowCount = 0; int kvCount = 0; @@ -502,8 +502,7 @@ public class TestReversibleScanners { .getScannersForStoreFiles(Lists.newArrayList(sf1, sf2), false, true, false, false, readPoint); List<KeyValueScanner> memScanners = memstore.getScanners(readPoint); - List<KeyValueScanner> scanners = new ArrayList<KeyValueScanner>( - fileScanners.size() + 1); + List<KeyValueScanner> scanners = new ArrayList<>(fileScanners.size() + 1); scanners.addAll(fileScanners); scanners.addAll(memScanners); @@ -611,7 +610,7 @@ public class TestReversibleScanners { for (int i = startRowNum; i >= 0; i--) { for (int j = (i == startRowNum ? startQualNum : 0); j < QUALSIZE; j++) { if (makeMVCC(i, j) <= readPoint) { - nextReadableNum = new Pair<Integer, Integer>(i, j); + nextReadableNum = new Pair<>(i, j); findExpected = true; break; } http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.java index 8a31af8..4cf2964 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.java @@ -85,7 +85,7 @@ public class TestSCVFWithMiniCluster { htable = util.getConnection().getTable(HBASE_TABLE_NAME); /* Add some values */ - List<Put> puts = new ArrayList<Put>(); + List<Put> puts = new ArrayList<>(); /* Add a row with 'a:foo' = false */ Put put = new Put(Bytes.toBytes("1")); http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java index 027193f..72267be 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java @@ -74,7 +74,7 @@ public class TestScanWithBloomError { private static final String ROW = "theRow"; private static final String QUALIFIER_PREFIX = "qual"; private static final byte[] ROW_BYTES = Bytes.toBytes(ROW); - private static NavigableSet<Integer> allColIds = new TreeSet<Integer>(); + private static NavigableSet<Integer> allColIds = new TreeSet<>(); private Region region; private BloomType bloomType; private FileSystem fs; @@ -84,7 +84,7 @@ public class TestScanWithBloomError { @Parameters public static final Collection<Object[]> parameters() { - List<Object[]> configurations = new ArrayList<Object[]>(); + List<Object[]> configurations = new ArrayList<>(); for (BloomType bloomType : BloomType.values()) { configurations.add(new Object[] { bloomType }); } @@ -160,24 +160,24 @@ public class TestScanWithBloomError { + lastStoreFileReader.getHFileReader().getName()); lastStoreFileReader.disableBloomFilterForTesting(); - List<Cell> allResults = new ArrayList<Cell>(); + List<Cell> allResults = new ArrayList<>(); { // Limit the scope of results. - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); while (scanner.next(results) || results.size() > 0) { allResults.addAll(results); results.clear(); } } - List<Integer> actualIds = new ArrayList<Integer>(); + List<Integer> actualIds = new ArrayList<>(); for (Cell kv : allResults) { String qual = Bytes.toString(CellUtil.cloneQualifier(kv)); assertTrue(qual.startsWith(QUALIFIER_PREFIX)); actualIds.add(Integer.valueOf(qual.substring( QUALIFIER_PREFIX.length()))); } - List<Integer> expectedIds = new ArrayList<Integer>(); + List<Integer> expectedIds = new ArrayList<>(); for (int expectedId : expectedResultCols) expectedIds.add(expectedId); http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java index 1b42754..d9fd3de 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java @@ -132,7 +132,7 @@ public class TestScanner { try { this.region = TEST_UTIL.createLocalHRegion(TESTTABLEDESC, null, null); HBaseTestCase.addContent(this.region, HConstants.CATALOG_FAMILY); - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); // Do simple test of getting one row only first. Scan scan = new Scan(Bytes.toBytes("abc"), Bytes.toBytes("abd")); scan.addFamily(HConstants.CATALOG_FAMILY); @@ -151,7 +151,7 @@ public class TestScanner { s = region.getScanner(scan); count = 0; Cell kv = null; - results = new ArrayList<Cell>(); + results = new ArrayList<>(); for (boolean first = true; s.next(results);) { kv = results.get(0); if (first) { @@ -170,7 +170,7 @@ public class TestScanner { } void rowPrefixFilter(Scan scan) throws IOException { - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); scan.addFamily(HConstants.CATALOG_FAMILY); InternalScanner s = region.getScanner(scan); boolean hasMore = true; @@ -186,7 +186,7 @@ public class TestScanner { } void rowInclusiveStopFilter(Scan scan, byte[] stopRow) throws IOException { - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); scan.addFamily(HConstants.CATALOG_FAMILY); InternalScanner s = region.getScanner(scan); boolean hasMore = true; @@ -234,7 +234,7 @@ public class TestScanner { HBaseTestCase.addContent(this.region, HConstants.CATALOG_FAMILY); Scan scan = new Scan(); InternalScanner s = region.getScanner(scan); - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); try { s.next(results); s.close(); @@ -376,7 +376,7 @@ public class TestScanner { throws IOException { InternalScanner scanner = null; Scan scan = null; - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); byte [][][] scanColumns = { COLS, EXPLICIT_COLS @@ -540,7 +540,7 @@ public class TestScanner { // run a major compact, column1 of firstRow will be cleaned. region.compact(true); - List<Cell> results = new ArrayList<Cell>(); + List<Cell> results = new ArrayList<>(); s.next(results); // make sure returns column2 of firstRow @@ -549,7 +549,7 @@ public class TestScanner { assertTrue(CellUtil.matchingRow(results.get(0), firstRowBytes)); assertTrue(CellUtil.matchingFamily(results.get(0), fam2)); - results = new ArrayList<Cell>(); + results = new ArrayList<>(); s.next(results); // get secondRow http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.java index ac33f15..9bda019 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.java @@ -128,7 +128,7 @@ public class TestScannerRetriableFailure { } public void loadTable(final Table table, int numRows) throws IOException { - List<Put> puts = new ArrayList<Put>(numRows); + List<Put> puts = new ArrayList<>(numRows); for (int i = 0; i < numRows; ++i) { byte[] row = Bytes.toBytes(String.format("%09d", i)); Put put = new Put(row); http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java index b31be9d..67f6f34 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java @@ -111,9 +111,9 @@ public class TestSeekOptimizations { private Put put; private Delete del; private Random rand; - private Set<Long> putTimestamps = new HashSet<Long>(); - private Set<Long> delTimestamps = new HashSet<Long>(); - private List<Cell> expectedKVs = new ArrayList<Cell>(); + private Set<Long> putTimestamps = new HashSet<>(); + private Set<Long> delTimestamps = new HashSet<>(); + private List<Cell> expectedKVs = new ArrayList<>(); private Compression.Algorithm comprAlgo; private BloomType bloomType; @@ -199,7 +199,7 @@ public class TestSeekOptimizations { throws IOException { StoreScanner.enableLazySeekGlobally(lazySeekEnabled); final Scan scan = new Scan(); - final Set<String> qualSet = new HashSet<String>(); + final Set<String> qualSet = new HashSet<>(); for (int iColumn : columnArr) { String qualStr = getQualStr(iColumn); scan.addColumn(FAMILY_BYTES, Bytes.toBytes(qualStr)); @@ -217,8 +217,8 @@ public class TestSeekOptimizations { final long initialSeekCount = StoreFileScanner.getSeekCount(); final InternalScanner scanner = region.getScanner(scan); - final List<Cell> results = new ArrayList<Cell>(); - final List<Cell> actualKVs = new ArrayList<Cell>(); + final List<Cell> results = new ArrayList<>(); + final List<Cell> actualKVs = new ArrayList<>(); // Such a clumsy do-while loop appears to be the official way to use an // internalScanner. scanner.next() return value refers to the _next_ @@ -260,8 +260,8 @@ public class TestSeekOptimizations { private List<Cell> filterExpectedResults(Set<String> qualSet, byte[] startRow, byte[] endRow, int maxVersions) { - final List<Cell> filteredKVs = new ArrayList<Cell>(); - final Map<String, Integer> verCount = new HashMap<String, Integer>(); + final List<Cell> filteredKVs = new ArrayList<>(); + final Map<String, Integer> verCount = new HashMap<>(); for (Cell kv : expectedKVs) { if (startRow.length > 0 && Bytes.compareTo(kv.getRowArray(), kv.getRowOffset(), kv.getRowLength(), @@ -297,7 +297,7 @@ public class TestSeekOptimizations { } private void prepareExpectedKVs(long latestDelTS) { - final List<Cell> filteredKVs = new ArrayList<Cell>(); + final List<Cell> filteredKVs = new ArrayList<>(); for (Cell kv : expectedKVs) { if (kv.getTimestamp() > latestDelTS || latestDelTS == -1) { filteredKVs.add(kv); http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java index 46c1dd5..4c09810 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java @@ -112,11 +112,10 @@ public class TestStore { byte [] qf5 = Bytes.toBytes("qf5"); byte [] qf6 = Bytes.toBytes("qf6"); - NavigableSet<byte[]> qualifiers = - new ConcurrentSkipListSet<byte[]>(Bytes.BYTES_COMPARATOR); + NavigableSet<byte[]> qualifiers = new ConcurrentSkipListSet<>(Bytes.BYTES_COMPARATOR); - List<Cell> expected = new ArrayList<Cell>(); - List<Cell> result = new ArrayList<Cell>(); + List<Cell> expected = new ArrayList<>(); + List<Cell> result = new ArrayList<>(); long id = System.currentTimeMillis(); Get get = new Get(row); @@ -624,8 +623,7 @@ public class TestStore { * only; thereafter it will succeed. Used by {@link TestHRegion} too. */ static class FaultyFileSystem extends FilterFileSystem { - List<SoftReference<FaultyOutputStream>> outStreams = - new ArrayList<SoftReference<FaultyOutputStream>>(); + List<SoftReference<FaultyOutputStream>> outStreams = new ArrayList<>(); private long faultPos = 200; AtomicBoolean fault = new AtomicBoolean(true); @@ -699,7 +697,7 @@ public class TestStore { */ List<Cell> getKeyValueSet(long[] timestamps, int numRows, byte[] qualifier, byte[] family) { - List<Cell> kvList = new ArrayList<Cell>(); + List<Cell> kvList = new ArrayList<>(); for (int i=1;i<=numRows;i++) { byte[] b = Bytes.toBytes(i); for (long timestamp: timestamps) { http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java index 0a8dbc4..7e4ebd8 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java @@ -512,7 +512,7 @@ public class TestStoreFile extends HBaseTestCase { int falseNeg = 0; for (int i = 0; i < 2000; i++) { String row = String.format(localFormatter, i); - TreeSet<byte[]> columns = new TreeSet<byte[]>(Bytes.BYTES_COMPARATOR); + TreeSet<byte[]> columns = new TreeSet<>(Bytes.BYTES_COMPARATOR); columns.add("family:col".getBytes()); Scan scan = new Scan(row.getBytes(),row.getBytes()); @@ -712,7 +712,7 @@ public class TestStoreFile extends HBaseTestCase { for (int j = 0; j < colCount*2; ++j) { // column qualifiers String row = String.format(localFormatter, i); String col = String.format(localFormatter, j); - TreeSet<byte[]> columns = new TreeSet<byte[]>(Bytes.BYTES_COMPARATOR); + TreeSet<byte[]> columns = new TreeSet<>(Bytes.BYTES_COMPARATOR); columns.add(("col" + col).getBytes()); Scan scan = new Scan(row.getBytes(),row.getBytes()); @@ -799,7 +799,7 @@ public class TestStoreFile extends HBaseTestCase { */ List<KeyValue> getKeyValueSet(long[] timestamps, int numRows, byte[] qualifier, byte[] family) { - List<KeyValue> kvList = new ArrayList<KeyValue>(); + List<KeyValue> kvList = new ArrayList<>(); for (int i=1;i<=numRows;i++) { byte[] b = Bytes.toBytes(i) ; LOG.info(Bytes.toString(b)); @@ -851,7 +851,7 @@ public class TestStoreFile extends HBaseTestCase { when(store.getFamily()).thenReturn(hcd); StoreFileReader reader = hsf.createReader(); StoreFileScanner scanner = getStoreFileScanner(reader, false, false); - TreeSet<byte[]> columns = new TreeSet<byte[]>(Bytes.BYTES_COMPARATOR); + TreeSet<byte[]> columns = new TreeSet<>(Bytes.BYTES_COMPARATOR); columns.add(qualifier); scan.setTimeRange(20, 100); @@ -1019,7 +1019,7 @@ public class TestStoreFile extends HBaseTestCase { throws IOException { // Let's put ~5 small KVs in each block, so let's make 5*numBlocks KVs int numKVs = 5 * numBlocks; - List<KeyValue> kvs = new ArrayList<KeyValue>(numKVs); + List<KeyValue> kvs = new ArrayList<>(numKVs); byte [] b = Bytes.toBytes("x"); int totalSize = 0; for (int i=numKVs;i>0;i--) { http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.java index d96fd9f..3cdb227 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.java @@ -170,7 +170,7 @@ public class TestStoreFileRefresherChore { byte[] qf = Bytes.toBytes("cq"); HRegionServer regionServer = mock(HRegionServer.class); - List<Region> regions = new ArrayList<Region>(); + List<Region> regions = new ArrayList<>(); when(regionServer.getOnlineRegionsLocalContext()).thenReturn(regions); when(regionServer.getConfiguration()).thenReturn(TEST_UTIL.getConfiguration());
