accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [32/32] accumulo git commit: ACCUMULO-4357 Use more diamond operators in Java 8
Date Fri, 01 Jul 2016 01:59:29 GMT
ACCUMULO-4357 Use more diamond operators in Java 8


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fd67a6c8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fd67a6c8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fd67a6c8

Branch: refs/heads/master
Commit: fd67a6c85a93bb26817700982954232b65a01abf
Parents: 72d8e74
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Jun 30 21:58:15 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Jun 30 21:58:15 2016 -0400

----------------------------------------------------------------------
 .../apache/accumulo/core/client/impl/ThriftTransportPool.java  | 4 ++--
 .../accumulo/core/client/mapreduce/InputTableConfig.java       | 6 +++---
 .../core/client/mapreduce/lib/impl/InputConfigurator.java      | 2 +-
 .../org/apache/accumulo/core/conf/AccumuloConfiguration.java   | 2 +-
 core/src/main/java/org/apache/accumulo/core/util/Pair.java     | 2 +-
 .../java/org/apache/accumulo/core/client/TestThrift1474.java   | 2 +-
 .../apache/accumulo/core/client/impl/ClientContextTest.java    | 2 +-
 .../apache/accumulo/core/conf/DefaultConfigurationTest.java    | 2 +-
 .../org/apache/accumulo/core/conf/SiteConfigurationTest.java   | 2 +-
 .../accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java  | 2 +-
 proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java | 4 ++--
 .../main/java/org/apache/accumulo/server/util/FileUtil.java    | 4 ++--
 .../org/apache/accumulo/server/util/MetadataTableUtil.java     | 2 +-
 .../accumulo/server/conf/NamespaceConfigurationTest.java       | 2 +-
 .../apache/accumulo/server/conf/TableConfigurationTest.java    | 2 +-
 .../accumulo/server/master/balancer/GroupBalancerTest.java     | 2 +-
 .../java/org/apache/accumulo/server/util/FileUtilTest.java     | 2 +-
 .../java/org/apache/accumulo/monitor/util/TableColumn.java     | 2 +-
 .../apache/accumulo/tserver/TabletServerResourceManager.java   | 2 +-
 .../accumulo/test/functional/TabletStateChangeIteratorIT.java  | 2 +-
 .../org/apache/accumulo/test/functional/ZombieTServer.java     | 2 +-
 .../apache/accumulo/test/performance/thrift/NullTserver.java   | 2 +-
 22 files changed, 27 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java
index 682ecbd..d9bd4e8 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java
@@ -433,7 +433,7 @@ public class ThriftTransportPool {
                 cachedConnection.setReserved(true);
                 final String serverAddr = ttk.getServer().toString();
                 log.trace("Using existing connection to {}", serverAddr);
-                return new Pair<String,TTransport>(serverAddr, cachedConnection.transport);
+                return new Pair<>(serverAddr, cachedConnection.transport);
               }
             }
           }
@@ -455,7 +455,7 @@ public class ThriftTransportPool {
                 cachedConnection.setReserved(true);
                 final String serverAddr = ttk.getServer().toString();
                 log.trace("Using existing connection to {} timeout {}", serverAddr, ttk.getTimeout());
-                return new Pair<String,TTransport>(serverAddr, cachedConnection.transport);
+                return new Pair<>(serverAddr, cachedConnection.transport);
               }
             }
           }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
index a8724c2..b892ac1 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
@@ -75,7 +75,7 @@ public class InputTableConfig implements Writable {
    * Returns the ranges to be queried in the configuration
    */
   public List<Range> getRanges() {
-    return ranges != null ? ranges : new ArrayList<Range>();
+    return ranges != null ? ranges : new ArrayList<>();
   }
 
   /**
@@ -95,7 +95,7 @@ public class InputTableConfig implements Writable {
    * Returns the columns to be fetched for this configuration
    */
   public Collection<Pair<Text,Text>> getFetchedColumns() {
-    return columns != null ? columns : new HashSet<Pair<Text,Text>>();
+    return columns != null ? columns : new HashSet<>();
   }
 
   /**
@@ -114,7 +114,7 @@ public class InputTableConfig implements Writable {
    * Returns the iterators to be set on this configuration
    */
   public List<IteratorSetting> getIterators() {
-    return iterators != null ? iterators : new ArrayList<IteratorSetting>();
+    return iterators != null ? iterators : new ArrayList<>();
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
index 92ae7a4..57158a6 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
@@ -351,7 +351,7 @@ public class InputConfigurator extends ConfiguratorBase {
       int idx = col.indexOf(":");
       Text cf = new Text(idx < 0 ? Base64.getDecoder().decode(col) : Base64.getDecoder().decode(col.substring(0,
idx)));
       Text cq = idx < 0 ? null : new Text(Base64.getDecoder().decode(col.substring(idx
+ 1)));
-      columns.add(new Pair<Text,Text>(cf, cq));
+      columns.add(new Pair<>(cf, cq));
     }
     return columns;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java b/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
index 75a401f..593f466 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
@@ -133,7 +133,7 @@ public abstract class AccumuloConfiguration implements Iterable<Entry<String,Str
   @Override
   public Iterator<Entry<String,String>> iterator() {
     Predicate<String> all = x -> true;
-    TreeMap<String,String> entries = new TreeMap<String,String>();
+    TreeMap<String,String> entries = new TreeMap<>();
     getProperties(entries, all);
     return entries.entrySet().iterator();
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/core/src/main/java/org/apache/accumulo/core/util/Pair.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/Pair.java b/core/src/main/java/org/apache/accumulo/core/util/Pair.java
index 2d51bcd..37fb04f 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/Pair.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/Pair.java
@@ -81,7 +81,7 @@ public class Pair<A,B> {
   }
 
   public static <K2,V2,K1 extends K2,V1 extends V2> Pair<K2,V2> fromEntry(Entry<K1,V1>
entry) {
-    return new Pair<K2,V2>(entry.getKey(), entry.getValue());
+    return new Pair<>(entry.getKey(), entry.getValue());
   }
 
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java b/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java
index 845439e..621e7f2 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java
@@ -64,7 +64,7 @@ public class TestThrift1474 {
     serverTransport.listen();
     int port = serverTransport.getServerSocket().getLocalPort();
     TestServer handler = new TestServer();
-    ThriftTest.Processor<ThriftTest.Iface> processor = new ThriftTest.Processor<ThriftTest.Iface>(handler);
+    ThriftTest.Processor<ThriftTest.Iface> processor = new ThriftTest.Processor<>(handler);
 
     TThreadPoolServer.Args args = new TThreadPoolServer.Args(serverTransport);
     args.stopTimeoutVal = 10;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java
b/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java
index a423057..ab46c6c 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/impl/ClientContextTest.java
@@ -96,7 +96,7 @@ public class ClientContextTest {
     clientConf.addProperty(Property.GENERAL_SECURITY_CREDENTIAL_PROVIDER_PATHS.getKey(),
absPath);
 
     AccumuloConfiguration accClientConf = ClientContext.convertClientConfig(clientConf);
-    Map<String,String> props = new HashMap<String,String>();
+    Map<String,String> props = new HashMap<>();
     accClientConf.getProperties(props, x -> true);
 
     // Only sensitive properties are added

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/core/src/test/java/org/apache/accumulo/core/conf/DefaultConfigurationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/conf/DefaultConfigurationTest.java
b/core/src/test/java/org/apache/accumulo/core/conf/DefaultConfigurationTest.java
index a942e15..9e4c5ec 100644
--- a/core/src/test/java/org/apache/accumulo/core/conf/DefaultConfigurationTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/conf/DefaultConfigurationTest.java
@@ -38,7 +38,7 @@ public class DefaultConfigurationTest {
 
   @Test
   public void testGetProperties() {
-    Map<String,String> p = new java.util.HashMap<String,String>();
+    Map<String,String> p = new java.util.HashMap<>();
     c.getProperties(p, x -> true);
     assertEquals(Property.MASTER_CLIENTPORT.getDefaultValue(), p.get(Property.MASTER_CLIENTPORT.getKey()));
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java b/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java
index 7d74804..896bf8c 100644
--- a/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java
@@ -64,7 +64,7 @@ public class SiteConfigurationTest {
 
     EasyMock.replay(siteCfg);
 
-    Map<String,String> props = new HashMap<String,String>();
+    Map<String,String> props = new HashMap<>();
     Predicate<String> all = x -> true;
     siteCfg.getProperties(props, all);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java
----------------------------------------------------------------------
diff --git a/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java
b/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java
index 4293d47..46cf6e3 100644
--- a/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java
+++ b/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java
@@ -68,7 +68,7 @@ public class MiniAccumuloConfigImplTest {
   public void testSiteConfig() {
 
     // constructor site config overrides default props
-    Map<String,String> siteConfig = new HashMap<String,String>();
+    Map<String,String> siteConfig = new HashMap<>();
     siteConfig.put(INSTANCE_DFS_URI.getKey(), "hdfs://");
     MiniAccumuloConfigImpl config = new MiniAccumuloConfigImpl(tempFolder.getRoot(), "password").setSiteConfig(siteConfig).initialize();
     assertEquals("hdfs://", config.getSiteConfig().get(INSTANCE_DFS_URI.getKey()));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
index 40b84f2..c4b422c 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
@@ -1466,8 +1466,8 @@ public class ProxyServer implements AccumuloProxy.Iface {
       Set<String> propertiesToExclude) throws org.apache.accumulo.proxy.thrift.AccumuloException,
org.apache.accumulo.proxy.thrift.AccumuloSecurityException,
       org.apache.accumulo.proxy.thrift.TableNotFoundException, org.apache.accumulo.proxy.thrift.TableExistsException,
TException {
     try {
-      propertiesToExclude = propertiesToExclude == null ? new HashSet<String>() : propertiesToExclude;
-      propertiesToSet = propertiesToSet == null ? new HashMap<String,String>() : propertiesToSet;
+      propertiesToExclude = propertiesToExclude == null ? new HashSet<>() : propertiesToExclude;
+      propertiesToSet = propertiesToSet == null ? new HashMap<>() : propertiesToSet;
 
       getConnector(login).tableOperations().clone(tableName, newTableName, flush, propertiesToSet,
propertiesToExclude);
     } catch (Exception e) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
index 0a45d99..9205683 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
@@ -229,7 +229,7 @@ public class FileUtil {
         return .5;
       }
 
-      List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<SortedKeyValueIterator<Key,Value>>(readers);
+      List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<>(readers);
       MultiIterator mmfi = new MultiIterator(iters, true);
 
       // skip the prevendrow
@@ -310,7 +310,7 @@ public class FileUtil {
         throw new IOException("Failed to find mid point, no entries between " + prevEndRow
+ " and " + endRow + " for " + mapFiles);
       }
 
-      List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<SortedKeyValueIterator<Key,Value>>(readers);
+      List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<>(readers);
       MultiIterator mmfi = new MultiIterator(iters, true);
 
       // skip the prevendrow

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
index dea7064..872febc 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
@@ -543,7 +543,7 @@ public class MetadataTableUtil {
       }
     }
 
-    return new Pair<List<LogEntry>,SortedMap<FileRef,DataFileValue>>(result,
sizes);
+    return new Pair<>(result, sizes);
   }
 
   public static List<LogEntry> getLogEntries(ClientContext context, KeyExtent extent)
throws IOException, KeeperException, InterruptedException {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
b/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
index 40753ff..c0e4bc6 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
@@ -116,7 +116,7 @@ public class NamespaceConfigurationTest {
   @Test
   public void testGetProperties() {
     Predicate<String> all = x -> true;
-    Map<String,String> props = new java.util.HashMap<String,String>();
+    Map<String,String> props = new java.util.HashMap<>();
     parent.getProperties(props, all);
     replay(parent);
     List<String> children = new java.util.ArrayList<>();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
b/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
index c67dae9..53a56c6 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
@@ -100,7 +100,7 @@ public class TableConfigurationTest {
   @Test
   public void testGetProperties() {
     Predicate<String> all = x -> true;
-    Map<String,String> props = new java.util.HashMap<String,String>();
+    Map<String,String> props = new java.util.HashMap<>();
     parent.getProperties(props, all);
     replay(parent);
     List<String> children = new java.util.ArrayList<>();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
index 47d50f3..24d8fe2 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
@@ -80,7 +80,7 @@ public class GroupBalancerTest {
 
         @Override
         protected Iterable<Pair<KeyExtent,Location>> getLocationProvider() {
-          return Iterables.transform(tabletLocs.entrySet(), input -> new Pair<KeyExtent,Location>(input.getKey(),
new Location(input.getValue())));
+          return Iterables.transform(tabletLocs.entrySet(), input -> new Pair<>(input.getKey(),
new Location(input.getValue())));
         }
 
         @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
index e748969..4292eed 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
@@ -91,7 +91,7 @@ public class FileUtilTest {
     assertTrue(tmp1.mkdirs() || tmp1.isDirectory());
     Path tmpPath1 = new Path(tmp1.toURI());
 
-    HashMap<Property,String> testProps = new HashMap<Property,String>();
+    HashMap<Property,String> testProps = new HashMap<>();
     testProps.put(INSTANCE_DFS_DIR, accumuloDir.getAbsolutePath());
 
     AccumuloConfiguration testConf = new FileUtilTestConfiguration(testProps);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableColumn.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableColumn.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableColumn.java
index 1e00927..86ba393 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableColumn.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/TableColumn.java
@@ -26,7 +26,7 @@ public class TableColumn<T> {
 
   public TableColumn(String title, CellType<T> type, String legend) {
     this.title = title;
-    this.type = type != null ? type : new StringType<T>();
+    this.type = type != null ? type : new StringType<>();
     this.legend = legend;
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
index 97606ea..089bd12 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
@@ -410,7 +410,7 @@ public class TabletServerResourceManager {
           synchronized (tabletReports) {
             tabletReportsCopy = new HashMap<>(tabletReports);
           }
-          ArrayList<TabletState> tabletStates = new ArrayList<TabletState>(tabletReportsCopy.values());
+          ArrayList<TabletState> tabletStates = new ArrayList<>(tabletReportsCopy.values());
           mma = memoryManager.getMemoryManagementActions(tabletStates);
 
         } catch (Throwable t) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
index 0283f37..e61ec9a 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
@@ -213,7 +213,7 @@ public class TabletStateChangeIteratorIT extends SharedMiniClusterBase
{
 
     @Override
     public Set<String> onlineTables() {
-      HashSet<String> onlineTables = new HashSet<String>(getConnector().tableOperations().tableIdMap().values());
+      HashSet<String> onlineTables = new HashSet<>(getConnector().tableOperations().tableIdMap().values());
       return Sets.filter(onlineTables, tableId -> Tables.getTableState(getConnector().getInstance(),
tableId) == TableState.ONLINE);
     }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
index 6c20cda..14d594a 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
@@ -103,7 +103,7 @@ public class ZombieTServer {
 
     TransactionWatcher watcher = new TransactionWatcher();
     final ThriftClientHandler tch = new ThriftClientHandler(context, watcher);
-    Processor<Iface> processor = new Processor<Iface>(tch);
+    Processor<Iface> processor = new Processor<>(tch);
     ServerAddress serverPort = TServerUtils.startTServer(context.getConfiguration(), ThriftServerType.CUSTOM_HS_HA,
processor, "ZombieTServer", "walking dead",
         2, 1, 1000, 10 * 1024 * 1024, null, null, -1, HostAndPort.fromParts("0.0.0.0", port));
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd67a6c8/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
b/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
index 63a7771..7c27413 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
@@ -257,7 +257,7 @@ public class NullTserver {
 
     TransactionWatcher watcher = new TransactionWatcher();
     ThriftClientHandler tch = new ThriftClientHandler(new AccumuloServerContext(new ServerConfigurationFactory(HdfsZooInstance.getInstance())),
watcher);
-    Processor<Iface> processor = new Processor<Iface>(tch);
+    Processor<Iface> processor = new Processor<>(tch);
     TServerUtils.startTServer(context.getConfiguration(), ThriftServerType.CUSTOM_HS_HA,
processor, "NullTServer",
         "null tserver", 2, 1, 1000, 10 * 1024 * 1024, null, null, -1, HostAndPort.fromParts("0.0.0.0",
opts.port));
 


Mime
View raw message