Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 77FBD200BDD for ; Fri, 4 Nov 2016 23:22:47 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 7689A160B1C; Fri, 4 Nov 2016 22:22:47 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 56255160B0F for ; Fri, 4 Nov 2016 23:22:45 +0100 (CET) Received: (qmail 66492 invoked by uid 500); 4 Nov 2016 22:22:44 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 66288 invoked by uid 99); 4 Nov 2016 22:22:43 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Nov 2016 22:22:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 642E0E04EE; Fri, 4 Nov 2016 22:22:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Fri, 04 Nov 2016 22:22:50 -0000 Message-Id: In-Reply-To: <8db15481562846a5947e4d4b91c82ee1@git.apache.org> References: <8db15481562846a5947e4d4b91c82ee1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/48] accumulo git commit: ACCUMULO-4514 Remove unnecessary code archived-at: Fri, 04 Nov 2016 22:22:47 -0000 http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java index 7d76572..9fc28b5 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java +++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java @@ -43,7 +43,7 @@ public class TableLoadBalancer extends TabletBalancer { private static final Logger log = LoggerFactory.getLogger(TableLoadBalancer.class); - Map perTableBalancers = new HashMap(); + Map perTableBalancers = new HashMap<>(); private TabletBalancer constructNewBalancerForTable(String clazzName, String table) throws Exception { String context = null; @@ -114,17 +114,17 @@ public class TableLoadBalancer extends TabletBalancer { public void getAssignments(SortedMap current, Map unassigned, Map assignments) { // separate the unassigned into tables - Map> groupedUnassigned = new HashMap>(); + Map> groupedUnassigned = new HashMap<>(); for (Entry e : unassigned.entrySet()) { Map tableUnassigned = groupedUnassigned.get(e.getKey().getTableId().toString()); if (tableUnassigned == null) { - tableUnassigned = new HashMap(); + tableUnassigned = new HashMap<>(); groupedUnassigned.put(e.getKey().getTableId().toString(), tableUnassigned); } tableUnassigned.put(e.getKey(), e.getValue()); } for (Entry> e : groupedUnassigned.entrySet()) { - Map newAssignments = new HashMap(); + Map newAssignments = new HashMap<>(); getBalancerForTable(e.getKey()).getAssignments(current, e.getValue(), newAssignments); assignments.putAll(newAssignments); } @@ -152,7 +152,7 @@ public class TableLoadBalancer extends TabletBalancer { if (t == null) return minBalanceTime; for (String s : t.tableIdMap().values()) { - ArrayList newMigrations = new ArrayList(); + ArrayList newMigrations = new ArrayList<>(); long tableBalanceTime = getBalancerForTable(s).balance(current, migrations, newMigrations); if (tableBalanceTime < minBalanceTime) minBalanceTime = tableBalanceTime; http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java index a199288..a160bb0 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java +++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java @@ -213,7 +213,7 @@ public abstract class TabletBalancer { * @return A list of TabletMigration object that passed sanity checks. */ public static List checkMigrationSanity(Set current, List migrations) { - List result = new ArrayList(migrations.size()); + List result = new ArrayList<>(migrations.size()); for (TabletMigration m : migrations) { if (m.tablet == null) { log.warn("Balancer gave back a null tablet " + m); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java index 3cd2517..0be5f45 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java +++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java @@ -46,7 +46,7 @@ public class DeadServerList { } public List getList() { - List result = new ArrayList(); + List result = new ArrayList<>(); IZooReaderWriter zoo = ZooReaderWriter.getInstance(); try { List children = zoo.getChildren(path); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java index 81eff0f..7744fe6 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java +++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java @@ -137,7 +137,7 @@ public class MetaDataTableScanner implements ClosableIterator> walogs = new ArrayList>(); + List> walogs = new ArrayList<>(); boolean chopped = false; for (Entry entry : decodedRow.entrySet()) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletServerState.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletServerState.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletServerState.java index 942eabf..d618d8b 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletServerState.java +++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletServerState.java @@ -45,8 +45,8 @@ public enum TabletServerState { private static HashSet badStates; static { - mapping = new HashMap(TabletServerState.values().length); - badStates = new HashSet(); + mapping = new HashMap<>(TabletServerState.values().length); + badStates = new HashSet<>(); for (TabletServerState state : TabletServerState.values()) { mapping.put(state.id, state); if (state.id > 99) http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java index 236b602..5cc16af 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java +++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java @@ -91,7 +91,7 @@ public class TabletStateChangeIterator extends SkippingIterator { if (migrations == null) return Collections.emptySet(); try { - Set result = new HashSet(); + Set result = new HashSet<>(); DataInputBuffer buffer = new DataInputBuffer(); byte[] data = Base64.decodeBase64(migrations.getBytes(UTF_8)); buffer.reset(data, data.length); @@ -109,7 +109,7 @@ public class TabletStateChangeIterator extends SkippingIterator { private Set parseTables(String tables) { if (tables == null) return null; - Set result = new HashSet(); + Set result = new HashSet<>(); for (String table : tables.split(",")) result.add(table); return result; @@ -119,7 +119,7 @@ public class TabletStateChangeIterator extends SkippingIterator { if (servers == null) return null; // parse "host:port[INSTANCE]" - Set result = new HashSet(); + Set result = new HashSet<>(); if (servers.length() > 0) { for (String part : servers.split(",")) { String parts[] = part.split("\\[", 2); @@ -137,7 +137,7 @@ public class TabletStateChangeIterator extends SkippingIterator { if (merges == null) return null; try { - Map result = new HashMap(); + Map result = new HashMap<>(); DataInputBuffer buffer = new DataInputBuffer(); byte[] data = Base64.decodeBase64(merges.getBytes(UTF_8)); buffer.reset(data, data.length); @@ -216,7 +216,7 @@ public class TabletStateChangeIterator extends SkippingIterator { public static void setCurrentServers(IteratorSetting cfg, Set goodServers) { if (goodServers != null) { - List servers = new ArrayList(); + List servers = new ArrayList<>(); for (TServerInstance server : goodServers) servers.add(server.toString()); cfg.addOption(SERVERS_OPTION, Joiner.on(",").join(servers)); @@ -263,7 +263,7 @@ public class TabletStateChangeIterator extends SkippingIterator { public static void setShuttingDown(IteratorSetting cfg, Set servers) { if (servers != null) { - List serverList = new ArrayList(); + List serverList = new ArrayList<>(); for (TServerInstance server : servers) { serverList.add(server.toString()); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java index ab99396..3121de9 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java +++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java @@ -81,7 +81,7 @@ public class ZooTabletStateStore extends TabletStateStore { currentSession = parse(current); futureSession = null; } - List> logs = new ArrayList>(); + List> logs = new ArrayList<>(); for (String entry : store.getChildren(RootTable.ZROOT_TABLET_WALOGS)) { byte[] logInfo = store.get(RootTable.ZROOT_TABLET_WALOGS + "/" + entry); if (logInfo != null) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/master/tableOps/UserCompactionConfig.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/tableOps/UserCompactionConfig.java b/server/base/src/main/java/org/apache/accumulo/server/master/tableOps/UserCompactionConfig.java index 02c6ac3..def0696 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/master/tableOps/UserCompactionConfig.java +++ b/server/base/src/main/java/org/apache/accumulo/server/master/tableOps/UserCompactionConfig.java @@ -89,7 +89,7 @@ public class UserCompactionConfig implements Writable { } int num = in.readInt(); - iterators = new ArrayList(num); + iterators = new ArrayList<>(num); for (int i = 0; i < num; i++) { iterators.add(new IteratorSetting(in)); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/metrics/AbstractMetricsImpl.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/metrics/AbstractMetricsImpl.java b/server/base/src/main/java/org/apache/accumulo/server/metrics/AbstractMetricsImpl.java index 42d2d00..24a9750 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/metrics/AbstractMetricsImpl.java +++ b/server/base/src/main/java/org/apache/accumulo/server/metrics/AbstractMetricsImpl.java @@ -93,7 +93,7 @@ public abstract class AbstractMetricsImpl implements Metrics { static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(AbstractMetricsImpl.class); - private static ConcurrentHashMap registry = new ConcurrentHashMap(); + private static ConcurrentHashMap registry = new ConcurrentHashMap<>(); private boolean currentlyLogging = false; http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java b/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java index 8acc764..11821c2 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java +++ b/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java @@ -181,7 +181,7 @@ public class LogService extends org.apache.log4j.AppenderSkeleton { } synchronized public List getEvents() { - return new ArrayList(events.values()); + return new ArrayList<>(events.values()); } synchronized public void clear() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java index d44efb1..82e9f5b 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java +++ b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java @@ -305,12 +305,12 @@ public class ProblemReports implements Iterable { public Map> summarize() { - TreeMap> summary = new TreeMap>(); + TreeMap> summary = new TreeMap<>(); for (ProblemReport pr : this) { Map tableProblems = summary.get(pr.getTableName()); if (tableProblems == null) { - tableProblems = new EnumMap(ProblemType.class); + tableProblems = new EnumMap<>(ProblemType.class); summary.put(pr.getTableName(), tableProblems); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java index ec68166..b942913 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java +++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java @@ -106,7 +106,7 @@ public class RpcWrapper { isOnewayMethod.setAccessible(true); try { - final Set onewayMethods = new HashSet(); + final Set onewayMethods = new HashSet<>(); for (Entry entry : processorView.entrySet()) { try { if ((Boolean) isOnewayMethod.invoke(entry.getValue())) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingWrapper.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingWrapper.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingWrapper.java index 698cf9e..54f61dd 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingWrapper.java +++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingWrapper.java @@ -29,7 +29,7 @@ import org.apache.accumulo.core.conf.AccumuloConfiguration; public class TCredentialsUpdatingWrapper { public static T service(final T instance, final Class originalClass, AccumuloConfiguration conf) { - InvocationHandler handler = new TCredentialsUpdatingInvocationHandler(instance, conf); + InvocationHandler handler = new TCredentialsUpdatingInvocationHandler<>(instance, conf); @SuppressWarnings("unchecked") T proxiedInstance = (T) Proxy.newProxyInstance(originalClass.getClassLoader(), originalClass.getInterfaces(), handler); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java index daf5e0f..ce2d3db 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java +++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java @@ -73,7 +73,7 @@ public class TServerUtils { /** * Static instance, passed to {@link ClientInfoProcessorFactory}, which will contain the client address of any incoming RPC. */ - public static final ThreadLocal clientAddress = new ThreadLocal(); + public static final ThreadLocal clientAddress = new ThreadLocal<>(); /** * Start a server, at the given port, or higher, if that port is not available. @@ -333,7 +333,7 @@ public class TServerUtils { // Be nice for the user and automatically remove protocols that might not exist in their JVM. Keeps us from forcing config alterations too // e.g. TLSv1.1 and TLSv1.2 don't exist in JDK6 - Set socketEnabledProtocols = new HashSet(Arrays.asList(sslServerSock.getEnabledProtocols())); + Set socketEnabledProtocols = new HashSet<>(Arrays.asList(sslServerSock.getEnabledProtocols())); // Keep only the enabled protocols that were specified by the configuration socketEnabledProtocols.retainAll(Arrays.asList(protocols)); if (socketEnabledProtocols.isEmpty()) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/rpc/UGIAssumingProcessor.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/UGIAssumingProcessor.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/UGIAssumingProcessor.java index 48d18f4..27f15c7 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/rpc/UGIAssumingProcessor.java +++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/UGIAssumingProcessor.java @@ -40,8 +40,8 @@ import org.slf4j.LoggerFactory; public class UGIAssumingProcessor implements TProcessor { private static final Logger log = LoggerFactory.getLogger(UGIAssumingProcessor.class); - public static final ThreadLocal rpcPrincipal = new ThreadLocal(); - public static final ThreadLocal rpcMechanism = new ThreadLocal(); + public static final ThreadLocal rpcPrincipal = new ThreadLocal<>(); + public static final ThreadLocal rpcMechanism = new ThreadLocal<>(); private final TProcessor wrapped; private final UserGroupInformation loginUser; http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java b/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java index 7fc9d81..e5ca006 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java +++ b/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java @@ -130,7 +130,7 @@ public class AuditedSecurityOperation extends SecurityOperation { private static final int MAX_ELEMENTS_TO_LOG = 10; private static List truncate(Collection list) { - List result = new ArrayList(); + List result = new ArrayList<>(); int i = 0; for (Object obj : list) { if (i++ > MAX_ELEMENTS_TO_LOG) { @@ -173,7 +173,7 @@ public class AuditedSecurityOperation extends SecurityOperation { @SuppressWarnings({"unchecked", "rawtypes"}) Map> convertedBatch = Translator.translate(tbatch, new Translator.TKeyExtentTranslator(), new Translator.ListTranslator( new Translator.TRangeTranslator())); - Map> truncated = new HashMap>(); + Map> truncated = new HashMap<>(); for (Entry> entry : convertedBatch.entrySet()) { truncated.put(entry.getKey(), truncate(entry.getValue())); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenSecretManager.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenSecretManager.java b/server/base/src/main/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenSecretManager.java index 99a088a..a648cb5 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenSecretManager.java +++ b/server/base/src/main/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenSecretManager.java @@ -58,7 +58,7 @@ public class AuthenticationTokenSecretManager extends SecretManager allKeys = new ConcurrentHashMap(); + private final ConcurrentHashMap allKeys = new ConcurrentHashMap<>(); private AuthenticationKey currentKey; /** @@ -168,7 +168,7 @@ public class AuthenticationTokenSecretManager extends SecretManager token = new Token(id.getBytes(), password, id.getKind(), new Text(svcName.toString())); + Token token = new Token<>(id.getBytes(), password, id.getKind(), new Text(svcName.toString())); return Maps.immutableEntry(token, id); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java index a57608c..8170ea3 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java +++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java @@ -73,7 +73,7 @@ public class InsecureAuthenticator implements Authenticator { @Override public Set> getSupportedTokenTypes() { - Set> cs = new HashSet>(); + Set> cs = new HashSet<>(); cs.add(NullToken.class); return cs; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java index a1616c1..6623fc6 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java +++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java @@ -103,7 +103,7 @@ public final class ZKAuthenticator implements Authenticator { @Override public Set listUsers() { - return new TreeSet(zooCache.getChildren(ZKUserPath)); + return new TreeSet<>(zooCache.getChildren(ZKUserPath)); } @Override @@ -200,7 +200,7 @@ public final class ZKAuthenticator implements Authenticator { @Override public Set> getSupportedTokenTypes() { - Set> cs = new HashSet>(); + Set> cs = new HashSet<>(); cs.add(PasswordToken.class); return cs; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java index 2d7f7bb..2803627 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java +++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java @@ -86,10 +86,10 @@ public class ZKAuthorizor implements Authorizor { IZooReaderWriter zoo = ZooReaderWriter.getInstance(); // create the root user with all system privileges, no table privileges, and no record-level authorizations - Set rootPerms = new TreeSet(); + Set rootPerms = new TreeSet<>(); for (SystemPermission p : SystemPermission.values()) rootPerms.add(p); - Map> tablePerms = new HashMap>(); + Map> tablePerms = new HashMap<>(); // Allow the root user to flush the metadata tables tablePerms.put(MetadataTable.ID, Collections.singleton(TablePermission.ALTER_TABLE)); tablePerms.put(RootTable.ID, Collections.singleton(TablePermission.ALTER_TABLE)); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java index 06433c4..cf43aee 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java +++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java @@ -180,7 +180,7 @@ public class ZKPermHandler implements PermissionHandler { byte[] permBytes = zooCache.get(ZKUserPath + "/" + user + ZKUserSysPerms); Set perms; if (permBytes == null) { - perms = new TreeSet(); + perms = new TreeSet<>(); } else { perms = ZKSecurityTool.convertSystemPermissions(permBytes); } @@ -208,7 +208,7 @@ public class ZKPermHandler implements PermissionHandler { if (serializedPerms != null) tablePerms = ZKSecurityTool.convertTablePermissions(serializedPerms); else - tablePerms = new TreeSet(); + tablePerms = new TreeSet<>(); try { if (tablePerms.add(permission)) { @@ -234,7 +234,7 @@ public class ZKPermHandler implements PermissionHandler { if (serializedPerms != null) namespacePerms = ZKSecurityTool.convertNamespacePermissions(serializedPerms); else - namespacePerms = new TreeSet(); + namespacePerms = new TreeSet<>(); try { if (namespacePerms.add(permission)) { @@ -377,15 +377,15 @@ public class ZKPermHandler implements PermissionHandler { IZooReaderWriter zoo = ZooReaderWriter.getInstance(); // create the root user with all system privileges, no table privileges, and no record-level authorizations - Set rootPerms = new TreeSet(); + Set rootPerms = new TreeSet<>(); for (SystemPermission p : SystemPermission.values()) rootPerms.add(p); - Map> tablePerms = new HashMap>(); + Map> tablePerms = new HashMap<>(); // Allow the root user to flush the system tables tablePerms.put(RootTable.ID, Collections.singleton(TablePermission.ALTER_TABLE)); tablePerms.put(MetadataTable.ID, Collections.singleton(TablePermission.ALTER_TABLE)); // essentially the same but on the system namespace, the ALTER_TABLE permission is now redundant - Map> namespacePerms = new HashMap>(); + Map> namespacePerms = new HashMap<>(); namespacePerms.put(Namespaces.ACCUMULO_NAMESPACE_ID, Collections.singleton(NamespacePermission.ALTER_NAMESPACE)); namespacePerms.put(Namespaces.ACCUMULO_NAMESPACE_ID, Collections.singleton(NamespacePermission.ALTER_TABLE)); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKSecurityTool.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKSecurityTool.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKSecurityTool.java index 6401190..a3da0d8 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKSecurityTool.java +++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKSecurityTool.java @@ -120,7 +120,7 @@ class ZKSecurityTool { public static Set convertSystemPermissions(byte[] systempermissions) { ByteArrayInputStream bytes = new ByteArrayInputStream(systempermissions); DataInputStream in = new DataInputStream(bytes); - Set toReturn = new HashSet(); + Set toReturn = new HashSet<>(); try { while (in.available() > 0) toReturn.add(SystemPermission.getPermissionById(in.readByte())); @@ -145,7 +145,7 @@ class ZKSecurityTool { } public static Set convertTablePermissions(byte[] tablepermissions) { - Set toReturn = new HashSet(); + Set toReturn = new HashSet<>(); for (byte b : tablepermissions) toReturn.add(TablePermission.getPermissionById(b)); return toReturn; @@ -165,7 +165,7 @@ class ZKSecurityTool { } public static Set convertNamespacePermissions(byte[] namespacepermissions) { - Set toReturn = new HashSet(); + Set toReturn = new HashSet<>(); for (byte b : namespacepermissions) toReturn.add(NamespacePermission.getPermissionById(b)); return toReturn; http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java index e49e1af..d86fab3 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java +++ b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java @@ -52,7 +52,7 @@ public class LargestFirstMemoryManager implements MemoryManager { // The fraction of memory that needs to be used before we begin flushing. private double compactionThreshold; private long maxObserved; - private final HashMap mincIdleThresholds = new HashMap(); + private final HashMap mincIdleThresholds = new HashMap<>(); private ServerConfiguration config = null; private static class TabletInfo { @@ -72,7 +72,7 @@ public class LargestFirstMemoryManager implements MemoryManager { // A little map that will hold the "largest" N tablets, where largest is a result of the timeMemoryLoad function private static class LargestMap { final int max; - final TreeMap> map = new TreeMap>(); + final TreeMap> map = new TreeMap<>(); LargestMap(int n) { max = n; @@ -99,7 +99,7 @@ public class LargestFirstMemoryManager implements MemoryManager { if (lst != null) { lst.add(value); } else { - lst = new ArrayList(); + lst = new ArrayList<>(); lst.add(value); map.put(key, lst); } @@ -160,7 +160,7 @@ public class LargestFirstMemoryManager implements MemoryManager { mincIdleThresholds.clear(); final MemoryManagementActions result = new MemoryManagementActions(); - result.tabletsToMinorCompact = new ArrayList(); + result.tabletsToMinorCompact = new ArrayList<>(); LargestMap largestMemTablets = new LargestMap(maxMinCs); final LargestMap largestIdleMemTablets = new LargestMap(maxConcurrentMincs); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java index bd080ec..2f21a72 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java @@ -89,13 +89,13 @@ public class Admin implements KeywordExecutable { @Parameters(commandDescription = "stop the tablet server on the given hosts") static class StopCommand { @Parameter(description = " { ... }") - List args = new ArrayList(); + List args = new ArrayList<>(); } @Parameters(commandDescription = "Ping tablet servers. If no arguments, pings all.") static class PingCommand { @Parameter(description = "{ ... }") - List args = new ArrayList(); + List args = new ArrayList<>(); } @Parameters(commandDescription = "print tablets that are offline in online tables") @@ -138,7 +138,7 @@ public class Admin implements KeywordExecutable { @Parameter(names = {"-n", "--namespaces"}, description = "print the namespace configuration") boolean namespaceConfiguration = false; @Parameter(names = {"-t", "--tables"}, description = "print per-table configuration") - List tables = new ArrayList(); + List tables = new ArrayList<>(); @Parameter(names = {"-u", "--users"}, description = "print users and their authorizations and permissions") boolean users = false; } @@ -504,7 +504,7 @@ public class Admin implements KeywordExecutable { File namespaceScript = new File(outputDirectory, namespace + NS_FILE_SUFFIX); FileWriter nsWriter = new FileWriter(namespaceScript); nsWriter.write(createNsFormat.format(new String[] {namespace})); - TreeMap props = new TreeMap(); + TreeMap props = new TreeMap<>(); for (Entry p : connector.namespaceOperations().getProperties(namespace)) { props.put(p.getKey(), p.getValue()); } @@ -551,14 +551,14 @@ public class Admin implements KeywordExecutable { private void printSystemConfiguration(Connector connector, File outputDirectory) throws IOException, AccumuloException, AccumuloSecurityException { Configuration conf = new Configuration(false); - TreeMap site = new TreeMap(siteConfig); + TreeMap site = new TreeMap<>(siteConfig); for (Entry prop : site.entrySet()) { String defaultValue = getDefaultConfigValue(prop.getKey()); if (!prop.getValue().equals(defaultValue) && !systemConfig.containsKey(prop.getKey())) { conf.set(prop.getKey(), prop.getValue()); } } - TreeMap system = new TreeMap(systemConfig); + TreeMap system = new TreeMap<>(systemConfig); for (Entry prop : system.entrySet()) { String defaultValue = getDefaultConfigValue(prop.getKey()); if (!prop.getValue().equals(defaultValue)) { @@ -579,7 +579,7 @@ public class Admin implements KeywordExecutable { File tableBackup = new File(outputDirectory, tableName + ".cfg"); FileWriter writer = new FileWriter(tableBackup); writer.write(createTableFormat.format(new String[] {tableName})); - TreeMap props = new TreeMap(); + TreeMap props = new TreeMap<>(); for (Entry p : connector.tableOperations().getProperties(tableName)) { props.put(p.getKey(), p.getValue()); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java b/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java index a9ecf47..43863b5 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java @@ -54,7 +54,7 @@ public class ChangeSecret { public static void main(String[] args) throws Exception { Opts opts = new Opts(); - List argsList = new ArrayList(args.length + 2); + List argsList = new ArrayList<>(args.length + 2); argsList.add("--old"); argsList.add("--new"); argsList.addAll(Arrays.asList(args)); @@ -90,7 +90,7 @@ public class ChangeSecret { private static boolean verifyAccumuloIsDown(Instance inst, String oldPassword) { ZooReader zooReader = new ZooReaderWriter(inst.getZooKeepers(), inst.getZooKeepersSessionTimeOut(), oldPassword); String root = ZooUtil.getRoot(inst); - final List ephemerals = new ArrayList(); + final List ephemerals = new ArrayList<>(); recurse(zooReader, root, new Visitor() { @Override public void visit(ZooReader zoo, String path) throws Exception { http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java b/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java index b081a60..58c409f 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java @@ -90,7 +90,7 @@ public class CheckForMetadataProblems { public static void checkMetadataAndRootTableEntries(String tableNameToCheck, ClientOpts opts, VolumeManager fs) throws Exception { System.out.println("Checking table: " + tableNameToCheck); - Map> tables = new HashMap>(); + Map> tables = new HashMap<>(); Scanner scanner; @@ -124,7 +124,7 @@ public class CheckForMetadataProblems { tables.clear(); - tablets = new TreeSet(); + tablets = new TreeSet<>(); tables.put(tableName, tablets); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java b/server/base/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java index ba27733..0c4578c 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java @@ -60,8 +60,8 @@ public class DeleteZooInstance { IZooReaderWriter zk = ZooReaderWriter.getInstance(); // try instance name: - Set instances = new HashSet(zk.getChildren(Constants.ZROOT + Constants.ZINSTANCES)); - Set uuids = new HashSet(zk.getChildren(Constants.ZROOT)); + Set instances = new HashSet<>(zk.getChildren(Constants.ZROOT + Constants.ZINSTANCES)); + Set uuids = new HashSet<>(zk.getChildren(Constants.ZROOT)); uuids.remove("instances"); if (instances.contains(opts.instance)) { String path = Constants.ZROOT + Constants.ZINSTANCES + "/" + opts.instance; http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java b/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java index 11d0e0f..5e9959c 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java @@ -56,7 +56,7 @@ public class FileSystemMonitor { mountPoint = tokens[1].trim(); filesystemType = tokens[2].trim().toLowerCase(); - options = new HashSet(Arrays.asList(tokens[3].split(","))); + options = new HashSet<>(Arrays.asList(tokens[3].split(","))); } @Override @@ -80,7 +80,7 @@ public class FileSystemMonitor { } static List getMountsFromFile(BufferedReader br) throws IOException { - List mounts = new ArrayList(); + List mounts = new ArrayList<>(); String line; while ((line = br.readLine()) != null) { Mount mount = new Mount(line); @@ -94,7 +94,7 @@ public class FileSystemMonitor { return mounts; } - private Map readWriteFilesystems = new HashMap(); + private Map readWriteFilesystems = new HashMap<>(); public FileSystemMonitor(final String procFile, long period) throws IOException { List mounts = parse(procFile); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/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 04e17d5..51a0783 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 @@ -109,7 +109,7 @@ public class FileUtil { public static Collection reduceFiles(AccumuloConfiguration acuConf, Configuration conf, VolumeManager fs, Text prevEndRow, Text endRow, Collection mapFiles, int maxFiles, Path tmpDir, int pass) throws IOException { - ArrayList paths = new ArrayList(mapFiles); + ArrayList paths = new ArrayList<>(mapFiles); if (paths.size() <= maxFiles) return paths; @@ -118,7 +118,7 @@ public class FileUtil { int start = 0; - ArrayList outFiles = new ArrayList(); + ArrayList outFiles = new ArrayList<>(); int count = 0; @@ -134,7 +134,7 @@ public class FileUtil { FileSystem ns = fs.getVolumeByPath(new Path(newMapFile)).getFileSystem(); FileSKVWriter writer = new RFileOperations().openWriter(newMapFile.toString(), ns, ns.getConf(), acuConf); writer.startDefaultLocalityGroup(); - List> iters = new ArrayList>(inFiles.size()); + List> iters = new ArrayList<>(inFiles.size()); FileSKVIterator reader = null; try { @@ -202,7 +202,7 @@ public class FileUtil { Path tmpDir = null; int maxToOpen = acuconf.getCount(Property.TSERV_TABLET_SPLIT_FINDMIDPOINT_MAXOPEN); - ArrayList readers = new ArrayList(mapFiles.size()); + ArrayList readers = new ArrayList<>(mapFiles.size()); try { if (mapFiles.size() > maxToOpen) { @@ -275,7 +275,7 @@ public class FileUtil { Path tmpDir = null; int maxToOpen = acuConf.getCount(Property.TSERV_TABLET_SPLIT_FINDMIDPOINT_MAXOPEN); - ArrayList readers = new ArrayList(mapFiles.size()); + ArrayList readers = new ArrayList<>(mapFiles.size()); try { if (mapFiles.size() > maxToOpen) { @@ -319,7 +319,7 @@ public class FileUtil { mmfi.next(); // read half of the keys in the index - TreeMap ret = new TreeMap(); + TreeMap ret = new TreeMap<>(); Key lastKey = null; long keysRead = 0; @@ -436,7 +436,7 @@ public class FileUtil { public static Map tryToGetFirstAndLastRows(VolumeManager fs, AccumuloConfiguration acuConf, Set mapfiles) { - HashMap mapFilesInfo = new HashMap(); + HashMap mapFilesInfo = new HashMap<>(); long t1 = System.currentTimeMillis(); @@ -516,7 +516,7 @@ public class FileUtil { VolumeManager fs) throws IOException { long totalIndexEntries = 0; - Map counts = new TreeMap(); + Map counts = new TreeMap<>(); for (KeyExtent keyExtent : extents) counts.put(keyExtent, new MLong(0)); @@ -546,7 +546,7 @@ public class FileUtil { } } - Map results = new TreeMap(); + Map results = new TreeMap<>(); for (KeyExtent keyExtent : extents) { double numEntries = counts.get(keyExtent).l; if (numEntries == 0) @@ -558,7 +558,7 @@ public class FileUtil { } public static Collection toPathStrings(Collection refs) { - ArrayList ret = new ArrayList(); + ArrayList ret = new ArrayList<>(); for (FileRef fileRef : refs) { ret.add(fileRef.path().toString()); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java b/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java index 9dc1251..0674bea 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java @@ -172,7 +172,7 @@ public class ListInstances { String instancesPath = Constants.ZROOT + Constants.ZINSTANCES; - TreeMap tm = new TreeMap(); + TreeMap tm = new TreeMap<>(); List names; @@ -198,7 +198,7 @@ public class ListInstances { } private static TreeSet getInstanceIDs(ZooReader zk, boolean printErrors) { - TreeSet ts = new TreeSet(); + TreeSet ts = new TreeSet<>(); try { List children = zk.getChildren(Constants.ZROOT); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/util/ListVolumesUsed.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ListVolumesUsed.java b/server/base/src/main/java/org/apache/accumulo/server/util/ListVolumesUsed.java index e90d1dd..203113f 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/ListVolumesUsed.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/ListVolumesUsed.java @@ -68,10 +68,10 @@ public class ListVolumesUsed { private static void listZookeeper() throws Exception { System.out.println("Listing volumes referenced in zookeeper"); - TreeSet volumes = new TreeSet(); + TreeSet volumes = new TreeSet<>(); volumes.add(getTableURI(MetadataTableUtil.getRootTabletDir())); - ArrayList result = new ArrayList(); + ArrayList result = new ArrayList<>(); MetadataTableUtil.getRootLogEntries(result); for (LogEntry logEntry : result) { getLogURIs(volumes, logEntry); @@ -93,7 +93,7 @@ public class ListVolumesUsed { scanner.fetchColumnFamily(MetadataSchema.TabletsSection.LogColumnFamily.NAME); MetadataSchema.TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.fetch(scanner); - TreeSet volumes = new TreeSet(); + TreeSet volumes = new TreeSet<>(); for (Entry entry : scanner) { if (entry.getKey().getColumnFamily().equals(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME)) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java b/server/base/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java index 5d49fa7..2e43505 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java @@ -53,9 +53,9 @@ public class LocalityCheck { scanner.fetchColumnFamily(DataFileColumnFamily.NAME); scanner.setRange(MetadataSchema.TabletsSection.getRange()); - Map totalBlocks = new HashMap(); - Map localBlocks = new HashMap(); - ArrayList files = new ArrayList(); + Map totalBlocks = new HashMap<>(); + Map localBlocks = new HashMap<>(); + ArrayList files = new ArrayList<>(); for (Entry entry : scanner) { Key key = entry.getKey(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java b/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java index 8ffe586..7c102e6 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java @@ -46,7 +46,7 @@ public class LoginProperties implements KeywordExecutable { Authenticator authenticator = AccumuloVFSClassLoader.getClassLoader().loadClass(config.get(Property.INSTANCE_SECURITY_AUTHENTICATOR)) .asSubclass(Authenticator.class).newInstance(); - List> tokenProps = new ArrayList>(); + List> tokenProps = new ArrayList<>(); for (Class tokenType : authenticator.getSupportedTokenTypes()) { tokenProps.add(tokenType.newInstance().getProperties()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java index 14eba68..b61dd56 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java @@ -157,14 +157,14 @@ public class MasterMetadataUtil { } else { log.info("Finishing incomplete split " + metadataEntry + " " + metadataPrevEndRow); - List highDatafilesToRemove = new ArrayList(); + List highDatafilesToRemove = new ArrayList<>(); Scanner scanner3 = new ScannerImpl(context, MetadataTable.ID, Authorizations.EMPTY); Key rowKey = new Key(metadataEntry); - SortedMap origDatafileSizes = new TreeMap(); - SortedMap highDatafileSizes = new TreeMap(); - SortedMap lowDatafileSizes = new TreeMap(); + SortedMap origDatafileSizes = new TreeMap<>(); + SortedMap highDatafileSizes = new TreeMap<>(); + SortedMap lowDatafileSizes = new TreeMap<>(); scanner3.fetchColumnFamily(DataFileColumnFamily.NAME); scanner3.setRange(new Range(rowKey, rowKey.followingKey(PartialKey.ROW))); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/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 5e74aac..0832769 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 @@ -105,8 +105,8 @@ public class MetadataTableUtil { private static final Text EMPTY_TEXT = new Text(); private static final byte[] EMPTY_BYTES = new byte[0]; - private static Map root_tables = new HashMap(); - private static Map metadata_tables = new HashMap(); + private static Map root_tables = new HashMap<>(); + private static Map metadata_tables = new HashMap<>(); private static final Logger log = LoggerFactory.getLogger(MetadataTableUtil.class); private MetadataTableUtil() {} @@ -249,7 +249,7 @@ public class MetadataTableUtil { } public static SortedMap getDataFileSizes(KeyExtent extent, ClientContext context) throws IOException { - TreeMap sizes = new TreeMap(); + TreeMap sizes = new TreeMap<>(); Scanner mdScanner = new ScannerImpl(context, MetadataTable.ID, Authorizations.EMPTY); mdScanner.fetchColumnFamily(DataFileColumnFamily.NAME); @@ -503,8 +503,8 @@ public class MetadataTableUtil { public static Pair,SortedMap> getFileAndLogEntries(ClientContext context, KeyExtent extent) throws KeeperException, InterruptedException, IOException { - ArrayList result = new ArrayList(); - TreeMap sizes = new TreeMap(); + ArrayList result = new ArrayList<>(); + TreeMap sizes = new TreeMap<>(); VolumeManager fs = VolumeManagerImpl.get(); if (extent.isRootTablet()) { @@ -547,7 +547,7 @@ public class MetadataTableUtil { public static List getLogEntries(ClientContext context, KeyExtent extent) throws IOException, KeeperException, InterruptedException { log.info("Scanning logging entries for " + extent); - ArrayList result = new ArrayList(); + ArrayList result = new ArrayList<>(); if (extent.equals(RootTable.EXTENT)) { log.info("Getting logs for root tablet from zookeeper"); getRootLogEntries(result); @@ -771,7 +771,7 @@ public class MetadataTableUtil { while (cloneIter.hasNext()) { Map cloneTablet = cloneIter.next(); Text cloneEndRow = new KeyExtent(cloneTablet.keySet().iterator().next().getRow(), (Text) null).getEndRow(); - HashSet cloneFiles = new HashSet(); + HashSet cloneFiles = new HashSet<>(); boolean cloneSuccessful = false; for (Entry entry : cloneTablet.entrySet()) { @@ -784,7 +784,7 @@ public class MetadataTableUtil { if (!cloneSuccessful) getFiles(cloneFiles, cloneTablet, null); - List> srcTablets = new ArrayList>(); + List> srcTablets = new ArrayList<>(); Map srcTablet = srcIter.next(); srcTablets.add(srcTablet); @@ -794,7 +794,7 @@ public class MetadataTableUtil { if (cmp < 0) throw new TabletIterator.TabletDeletedException("Tablets deleted from src during clone : " + cloneEndRow + " " + srcEndRow); - HashSet srcFiles = new HashSet(); + HashSet srcFiles = new HashSet<>(); if (!cloneSuccessful) getFiles(srcFiles, srcTablet, srcTableId); @@ -921,7 +921,7 @@ public class MetadataTableUtil { } public static List getBulkFilesLoaded(Connector conn, KeyExtent extent, long tid) throws IOException { - List result = new ArrayList(); + List result = new ArrayList<>(); try { VolumeManager fs = VolumeManagerImpl.get(); Scanner mscanner = new IsolatedScanner(conn.createScanner(extent.isMeta() ? RootTable.NAME : MetadataTable.NAME, Authorizations.EMPTY)); @@ -941,7 +941,7 @@ public class MetadataTableUtil { public static Map getBulkFilesLoaded(ClientContext context, KeyExtent extent) throws IOException { Text metadataRow = extent.getMetadataEntry(); - Map ret = new HashMap(); + Map ret = new HashMap<>(); VolumeManager fs = VolumeManagerImpl.get(); Scanner scanner = new ScannerImpl(context, extent.isMeta() ? RootTable.ID : MetadataTable.ID, Authorizations.EMPTY); @@ -1041,11 +1041,11 @@ public class MetadataTableUtil { } public static SortedMap> getTabletEntries(SortedMap tabletKeyValues, List columns) { - TreeMap> tabletEntries = new TreeMap>(); + TreeMap> tabletEntries = new TreeMap<>(); HashSet colSet = null; if (columns != null) { - colSet = new HashSet(columns); + colSet = new HashSet<>(columns); } for (Entry entry : tabletKeyValues.entrySet()) { @@ -1058,7 +1058,7 @@ public class MetadataTableUtil { SortedMap colVals = tabletEntries.get(row); if (colVals == null) { - colVals = new TreeMap(); + colVals = new TreeMap<>(); tabletEntries.put(row, colVals); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java b/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java index c9d4dd5..8b6c9f4 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java @@ -125,7 +125,7 @@ public class RemoveEntriesForMissingFiles { @SuppressWarnings({"rawtypes"}) Map cache = new LRUMap(100000); - Set processing = new HashSet(); + Set processing = new HashSet<>(); ExecutorService threadPool = Executors.newFixedThreadPool(16); System.out.printf("Scanning : %s %s\n", table, range); @@ -137,7 +137,7 @@ public class RemoveEntriesForMissingFiles { metadata.fetchColumnFamily(DataFileColumnFamily.NAME); int count = 0; AtomicInteger missing = new AtomicInteger(0); - AtomicReference exceptionRef = new AtomicReference(null); + AtomicReference exceptionRef = new AtomicReference<>(null); BatchWriter writer = null; if (fix) http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java index 8e755a3..396025a 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java @@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory; */ public class ReplicationTableUtil { - private static Map writers = new HashMap(); + private static Map writers = new HashMap<>(); private static final Logger log = LoggerFactory.getLogger(ReplicationTableUtil.class); public static final String COMBINER_NAME = "replcombiner"; http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java b/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java index d4e79d76..8da1ce9 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java @@ -43,7 +43,7 @@ public class RestoreZookeeper { private static class Restore extends DefaultHandler { IZooReaderWriter zk = null; - Stack cwd = new Stack(); + Stack cwd = new Stack<>(); boolean overwrite = false; Restore(IZooReaderWriter zk, boolean overwrite) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java b/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java index 235286b..f6a2a95 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java @@ -59,10 +59,10 @@ public class TableDiskUsage { private static final Logger log = LoggerFactory.getLogger(TableDiskUsage.class); private int nextInternalId = 0; - private Map internalIds = new HashMap(); - private Map externalIds = new HashMap(); - private Map tableFiles = new HashMap(); - private Map fileSizes = new HashMap(); + private Map internalIds = new HashMap<>(); + private Map externalIds = new HashMap<>(); + private Map tableFiles = new HashMap<>(); + private Map fileSizes = new HashMap<>(); void addTable(String tableId) { if (internalIds.containsKey(tableId)) @@ -101,7 +101,7 @@ public class TableDiskUsage { Map,Long> calculateUsage() { // Bitset of tables that contain a file and total usage by all files that share that usage - Map,Long> usage = new HashMap,Long>(); + Map,Long> usage = new HashMap<>(); if (log.isTraceEnabled()) { log.trace("fileSizes " + fileSizes); @@ -124,10 +124,10 @@ public class TableDiskUsage { } - Map,Long> externalUsage = new HashMap,Long>(); + Map,Long> externalUsage = new HashMap<>(); for (Entry,Long> entry : usage.entrySet()) { - List externalKey = new ArrayList(); + List externalKey = new ArrayList<>(); List key = entry.getKey(); // table bitset for (int i = 0; i < key.size(); i++) @@ -165,9 +165,9 @@ public class TableDiskUsage { for (String tableId : tableIds) tdu.addTable(tableId); - HashSet tablesReferenced = new HashSet(tableIds); - HashSet emptyTableIds = new HashSet(); - HashSet nameSpacesReferenced = new HashSet(); + HashSet tablesReferenced = new HashSet<>(tableIds); + HashSet emptyTableIds = new HashSet<>(); + HashSet nameSpacesReferenced = new HashSet<>(); // For each table ID for (String tableId : tableIds) { @@ -223,11 +223,11 @@ public class TableDiskUsage { } // Invert tableId->tableName - HashMap reverseTableIdMap = new HashMap(); + HashMap reverseTableIdMap = new HashMap<>(); for (Entry entry : conn.tableOperations().tableIdMap().entrySet()) reverseTableIdMap.put(entry.getValue(), entry.getKey()); - TreeMap,Long> usage = new TreeMap,Long>(new Comparator>() { + TreeMap,Long> usage = new TreeMap<>(new Comparator>() { @Override public int compare(TreeSet o1, TreeSet o2) { @@ -258,7 +258,7 @@ public class TableDiskUsage { }); for (Entry,Long> entry : tdu.calculateUsage().entrySet()) { - TreeSet tableNames = new TreeSet(); + TreeSet tableNames = new TreeSet<>(); // Convert size shared by each table id into size shared by each table name for (String tableId : entry.getKey()) tableNames.add(reverseTableIdMap.get(tableId)); @@ -268,7 +268,7 @@ public class TableDiskUsage { } if (!emptyTableIds.isEmpty()) { - TreeSet emptyTables = new TreeSet(); + TreeSet emptyTables = new TreeSet<>(); for (String tableId : emptyTableIds) { emptyTables.add(reverseTableIdMap.get(tableId)); } @@ -281,7 +281,7 @@ public class TableDiskUsage { public static void printDiskUsage(AccumuloConfiguration acuConf, Collection tables, VolumeManager fs, Connector conn, Printer printer, boolean humanReadable) throws TableNotFoundException, IOException { - HashSet tableIds = new HashSet(); + HashSet tableIds = new HashSet<>(); // Get table IDs for all tables requested to be 'du' for (String tableName : tables) { @@ -303,7 +303,7 @@ public class TableDiskUsage { static class Opts extends ClientOpts { @Parameter(description = " {
... } ") - List tables = new ArrayList(); + List tables = new ArrayList<>(); } public static void main(String[] args) throws Exception { http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java index 6aa937f..d804e1c 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java @@ -71,7 +71,7 @@ public class TableInfoUtil { } public static Map summarizeTableStats(MasterMonitorInfo mmi) { - Map compactingByTable = new HashMap(); + Map compactingByTable = new HashMap<>(); if (mmi != null && mmi.tServerInfo != null) { for (TabletServerStatus status : mmi.tServerInfo) { if (status != null && status.tableMap != null) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java b/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java index 2137999..827f6b8 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java @@ -188,7 +188,7 @@ public class TabletIterator implements Iterator> { Text curMetaDataRow = null; - TreeMap tm = new TreeMap(); + TreeMap tm = new TreeMap<>(); boolean sawPrevEndRow = false; http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java b/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java index c0c979b..5b444de 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java @@ -87,14 +87,14 @@ public class VerifyTabletAssignments { else System.out.println("Checking table " + tableName + " again, failures " + check.size()); - TreeMap tabletLocations = new TreeMap(); + TreeMap tabletLocations = new TreeMap<>(); String tableId = Tables.getNameToIdMap(context.getInstance()).get(tableName); MetadataServicer.forTableId(context, tableId).getTabletLocations(tabletLocations); - final HashSet failures = new HashSet(); + final HashSet failures = new HashSet<>(); - Map> extentsPerServer = new TreeMap>(); + Map> extentsPerServer = new TreeMap<>(); for (Entry entry : tabletLocations.entrySet()) { KeyExtent keyExtent = entry.getKey(); @@ -108,7 +108,7 @@ public class VerifyTabletAssignments { final HostAndPort parsedLoc = HostAndPort.fromString(loc); List extentList = extentsPerServer.get(parsedLoc); if (extentList == null) { - extentList = new ArrayList(); + extentList = new ArrayList<>(); extentsPerServer.put(parsedLoc, extentList); } @@ -156,7 +156,7 @@ public class VerifyTabletAssignments { throws ThriftSecurityException, TException, NoSuchScanIDException { TabletClientService.Iface client = ThriftUtil.getTServerClient(entry.getKey(), context); - Map> batch = new TreeMap>(); + Map> batch = new TreeMap<>(); for (KeyExtent keyExtent : entry.getValue()) { Text row = keyExtent.getEndRow(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java b/server/base/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java index 0f298b4..4faa7ad 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java +++ b/server/base/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java @@ -233,7 +233,7 @@ public class DistributedWorkQueue { } public List getWorkQueued() throws KeeperException, InterruptedException { - ArrayList children = new ArrayList(zoo.getChildren(path)); + ArrayList children = new ArrayList<>(zoo.getChildren(path)); children.remove(LOCKS_NODE); return children; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/test/java/org/apache/accumulo/server/ServerConstantsTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/ServerConstantsTest.java b/server/base/src/test/java/org/apache/accumulo/server/ServerConstantsTest.java index 05f0a47..15c23be 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/ServerConstantsTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/ServerConstantsTest.java @@ -94,7 +94,7 @@ public class ServerConstantsTest { LocalFileSystem fs = FileSystem.getLocal(new Configuration()); - ArrayList accumuloPaths = new ArrayList(); + ArrayList accumuloPaths = new ArrayList<>(); for (int i = 0; i < uuids.size(); i++) { String volume = "v" + i; http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java b/server/base/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java index 1c6a48f..e43562b 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java @@ -53,7 +53,7 @@ import org.junit.Test; public class BulkImporterTest { - static final SortedSet fakeMetaData = new TreeSet(); + static final SortedSet fakeMetaData = new TreeSet<>(); static final Text tableId = new Text("1"); static { fakeMetaData.add(new KeyExtent(tableId, new Text("a"), null)); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/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 742ebb2..071e9c0 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 @@ -118,10 +118,10 @@ public class NamespaceConfigurationTest { @Test public void testGetProperties() { Predicate all = Predicates.alwaysTrue(); - Map props = new java.util.HashMap(); + Map props = new java.util.HashMap<>(); parent.getProperties(props, all); replay(parent); - List children = new java.util.ArrayList(); + List children = new java.util.ArrayList<>(); children.add("foo"); children.add("ding"); expect(zc.getChildren(ZooUtil.getRoot(iid) + Constants.ZNAMESPACES + "/" + NSID + Constants.ZNAMESPACE_CONF)).andReturn(children); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/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 1eb933a..34d6905 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 @@ -102,10 +102,10 @@ public class TableConfigurationTest { @Test public void testGetProperties() { Predicate all = Predicates.alwaysTrue(); - Map props = new java.util.HashMap(); + Map props = new java.util.HashMap<>(); parent.getProperties(props, all); replay(parent); - List children = new java.util.ArrayList(); + List children = new java.util.ArrayList<>(); children.add("foo"); children.add("ding"); expect(zc.getChildren(ZooUtil.getRoot(iid) + Constants.ZTABLES + "/" + TID + Constants.ZTABLE_CONF)).andReturn(children); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/test/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessorTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessorTest.java b/server/base/src/test/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessorTest.java index e90e921..9bd7b90 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessorTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessorTest.java @@ -105,7 +105,7 @@ public class ZooCachePropertyAccessorTest { @Test public void testGetProperties() { - Map props = new java.util.HashMap(); + Map props = new java.util.HashMap<>(); AccumuloConfiguration parent = createMock(AccumuloConfiguration.class); @SuppressWarnings("unchecked") Predicate filter = createMock(Predicate.class); @@ -113,7 +113,7 @@ public class ZooCachePropertyAccessorTest { replay(parent); String child1 = "child1"; String child2 = "child2"; - List children = new java.util.ArrayList(); + List children = new java.util.ArrayList<>(); children.add(child1); children.add(child2); expect(zc.getChildren(PATH)).andReturn(children); @@ -132,7 +132,7 @@ public class ZooCachePropertyAccessorTest { @Test public void testGetProperties_NoChildren() { - Map props = new java.util.HashMap(); + Map props = new java.util.HashMap<>(); AccumuloConfiguration parent = createMock(AccumuloConfiguration.class); @SuppressWarnings("unchecked") Predicate filter = createMock(Predicate.class); @@ -147,14 +147,14 @@ public class ZooCachePropertyAccessorTest { @Test public void testGetProperties_Filter() { - Map props = new java.util.HashMap(); + Map props = new java.util.HashMap<>(); AccumuloConfiguration parent = createMock(AccumuloConfiguration.class); @SuppressWarnings("unchecked") Predicate filter = createMock(Predicate.class); parent.getProperties(props, filter); replay(parent); String child1 = "child1"; - List children = new java.util.ArrayList(); + List children = new java.util.ArrayList<>(); children.add(child1); expect(zc.getChildren(PATH)).andReturn(children); replay(zc); @@ -167,7 +167,7 @@ public class ZooCachePropertyAccessorTest { @Test public void testGetProperties_ParentFilter() { - Map props = new java.util.HashMap(); + Map props = new java.util.HashMap<>(); AccumuloConfiguration parent = createMock(AccumuloConfiguration.class); @SuppressWarnings("unchecked") Predicate filter = createMock(Predicate.class); http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f42858/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java b/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java index 402f689..14ca20c 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java @@ -60,7 +60,7 @@ public class FileRefTest { Assert.assertNotEquals(new FileRef("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/C0005.rf"), new FileRef("hdfs://nn1/accumulo/tables/2a/t-0003/C0004.rf")); Assert.assertNotEquals(new FileRef("hdfs://nn1/accumulo/tables/2a/t-0003/C0005.rf"), new FileRef("hdfs://nn1/accumulo/tables/2a/t-0003/C0004.rf")); - HashMap refMap = new HashMap(); + HashMap refMap = new HashMap<>(); refMap.put(new FileRef("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/C0004.rf"), "7"); refMap.put(new FileRef("hdfs://nn1/accumulo/tables/2a/t-0003/C0005.rf"), "8");