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 44265200C36 for ; Fri, 10 Mar 2017 23:09:49 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 42C6F160B95; Fri, 10 Mar 2017 22:09:49 +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 E545A160B8D for ; Fri, 10 Mar 2017 23:09:46 +0100 (CET) Received: (qmail 53793 invoked by uid 500); 10 Mar 2017 22:09:42 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 52835 invoked by uid 99); 10 Mar 2017 22:09:41 -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, 10 Mar 2017 22:09:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 90CFEDFF32; Fri, 10 Mar 2017 22:09:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: syuanjiang@apache.org To: commits@hbase.apache.org Date: Fri, 10 Mar 2017 22:09:59 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [19/50] [abbrv] hbase git commit: HBASE-17532 Replaced explicit type with diamond operator archived-at: Fri, 10 Mar 2017 22:09:49 -0000 http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java index 5cb7d75..a38e264 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java @@ -147,14 +147,14 @@ public class ReplicationSourceManager implements ReplicationListener { final Path oldLogDir, final UUID clusterId) throws IOException { //CopyOnWriteArrayList is thread-safe. //Generally, reading is more than modifying. - this.sources = new CopyOnWriteArrayList(); + this.sources = new CopyOnWriteArrayList<>(); this.replicationQueues = replicationQueues; this.replicationPeers = replicationPeers; this.replicationTracker = replicationTracker; this.server = server; - this.walsById = new HashMap>>(); - this.walsByIdRecoveredQueues = new ConcurrentHashMap>>(); - this.oldsources = new CopyOnWriteArrayList(); + this.walsById = new HashMap<>(); + this.walsByIdRecoveredQueues = new ConcurrentHashMap<>(); + this.oldsources = new CopyOnWriteArrayList<>(); this.conf = conf; this.fs = fs; this.logDir = logDir; @@ -170,8 +170,7 @@ public class ReplicationSourceManager implements ReplicationListener { // use a short 100ms sleep since this could be done inline with a RS startup // even if we fail, other region servers can take care of it this.executor = new ThreadPoolExecutor(nbWorkers, nbWorkers, - 100, TimeUnit.MILLISECONDS, - new LinkedBlockingQueue()); + 100, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>()); ThreadFactoryBuilder tfb = new ThreadFactoryBuilder(); tfb.setNameFormat("ReplicationExecutor-%d"); tfb.setDaemon(true); @@ -277,7 +276,7 @@ public class ReplicationSourceManager implements ReplicationListener { this.replicationPeers, server, id, this.clusterId, peerConfig, peer); synchronized (this.walsById) { this.sources.add(src); - Map> walsByGroup = new HashMap>(); + Map> walsByGroup = new HashMap<>(); this.walsById.put(id, walsByGroup); // Add the latest wal to that source's queue synchronized (latestPaths) { @@ -285,7 +284,7 @@ public class ReplicationSourceManager implements ReplicationListener { for (Path logPath : latestPaths) { String name = logPath.getName(); String walPrefix = AbstractFSWALProvider.getWALPrefixFromWALName(name); - SortedSet logs = new TreeSet(); + SortedSet logs = new TreeSet<>(); logs.add(name); walsByGroup.put(walPrefix, logs); try { @@ -423,7 +422,7 @@ public class ReplicationSourceManager implements ReplicationListener { if (!existingPrefix) { // The new log belongs to a new group, add it into this peer LOG.debug("Start tracking logs for wal group " + logPrefix + " for peer " + peerId); - SortedSet wals = new TreeSet(); + SortedSet wals = new TreeSet<>(); wals.add(logName); walsByPrefix.put(logPrefix, wals); } @@ -570,8 +569,7 @@ public class ReplicationSourceManager implements ReplicationListener { + sources.size() + " and another " + oldsources.size() + " that were recovered"); String terminateMessage = "Replication stream was removed by a user"; - List oldSourcesToDelete = - new ArrayList(); + List oldSourcesToDelete = new ArrayList<>(); // synchronized on oldsources to avoid adding recovered source for the to-be-removed peer // see NodeFailoverWorker.run synchronized (oldsources) { @@ -589,7 +587,7 @@ public class ReplicationSourceManager implements ReplicationListener { LOG.info("Number of deleted recovered sources for " + id + ": " + oldSourcesToDelete.size()); // Now look for the one on this cluster - List srcToRemove = new ArrayList(); + List srcToRemove = new ArrayList<>(); // synchronize on replicationPeers to avoid adding source for the to-be-removed peer synchronized (this.replicationPeers) { for (ReplicationSourceInterface src : this.sources) { @@ -735,13 +733,13 @@ public class ReplicationSourceManager implements ReplicationListener { continue; } // track sources in walsByIdRecoveredQueues - Map> walsByGroup = new HashMap>(); + Map> walsByGroup = new HashMap<>(); walsByIdRecoveredQueues.put(peerId, walsByGroup); for (String wal : walsSet) { String walPrefix = AbstractFSWALProvider.getWALPrefixFromWALName(wal); SortedSet wals = walsByGroup.get(walPrefix); if (wals == null) { - wals = new TreeSet(); + wals = new TreeSet<>(); walsByGroup.put(walPrefix, wals); } wals.add(wal); http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java index f06330c..c1aad93 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java @@ -286,7 +286,7 @@ public class AccessControlLists { ACL_KEY_DELIMITER, columnName, ACL_KEY_DELIMITER, ACL_KEY_DELIMITER, columnName)))); - Set qualifierSet = new TreeSet(Bytes.BYTES_COMPARATOR); + Set qualifierSet = new TreeSet<>(Bytes.BYTES_COMPARATOR); ResultScanner scanner = null; try { scanner = table.getScanner(scan); @@ -384,8 +384,7 @@ public class AccessControlLists { throw new IOException("Can only load permissions from "+ACL_TABLE_NAME); } - Map> allPerms = - new TreeMap>(Bytes.BYTES_RAWCOMPARATOR); + Map> allPerms = new TreeMap<>(Bytes.BYTES_RAWCOMPARATOR); // do a full scan of _acl_ table @@ -397,7 +396,7 @@ public class AccessControlLists { iScanner = aclRegion.getScanner(scan); while (true) { - List row = new ArrayList(); + List row = new ArrayList<>(); boolean hasNext = iScanner.next(row); ListMultimap perms = ArrayListMultimap.create(); @@ -436,8 +435,7 @@ public class AccessControlLists { */ static Map> loadAll( Configuration conf) throws IOException { - Map> allPerms = - new TreeMap>(Bytes.BYTES_RAWCOMPARATOR); + Map> allPerms = new TreeMap<>(Bytes.BYTES_RAWCOMPARATOR); // do a full scan of _acl_, filtering on only first table region rows @@ -530,7 +528,7 @@ public class AccessControlLists { ListMultimap allPerms = getPermissions( conf, entryName, null); - List perms = new ArrayList(); + List perms = new ArrayList<>(); if(isNamespaceEntry(entryName)) { // Namespace for (Map.Entry entry : allPerms.entries()) { @@ -591,8 +589,7 @@ public class AccessControlLists { //Handle namespace entry if(isNamespaceEntry(entryName)) { - return new Pair(username, - new TablePermission(Bytes.toString(fromNamespaceEntry(entryName)), value)); + return new Pair<>(username, new TablePermission(Bytes.toString(fromNamespaceEntry(entryName)), value)); } //Handle table and global entry @@ -612,8 +609,7 @@ public class AccessControlLists { } } - return new Pair(username, - new TablePermission(TableName.valueOf(entryName), permFamily, permQualifier, value)); + return new Pair<>(username, new TablePermission(TableName.valueOf(entryName), permFamily, permQualifier, value)); } /** http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java index 814f209..64ac900 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java @@ -259,8 +259,7 @@ public class AccessController implements MasterObserver, RegionObserver, RegionS */ void updateACL(RegionCoprocessorEnvironment e, final Map> familyMap) { - Set entries = - new TreeSet(Bytes.BYTES_RAWCOMPARATOR); + Set entries = new TreeSet<>(Bytes.BYTES_RAWCOMPARATOR); for (Map.Entry> f : familyMap.entrySet()) { List cells = f.getValue(); for (Cell cell: cells) { @@ -793,7 +792,7 @@ public class AccessController implements MasterObserver, RegionObserver, RegionS // This Map is identical to familyMap. The key is a BR rather than byte[]. // It will be easy to do gets over this new Map as we can create get keys over the Cell cf by // new SimpleByteRange(cell.familyArray, cell.familyOffset, cell.familyLen) - Map> familyMap1 = new HashMap>(); + Map> familyMap1 = new HashMap<>(); for (Entry> entry : familyMap.entrySet()) { if (entry.getValue() instanceof List) { familyMap1.put(new SimpleMutableByteRange(entry.getKey()), (List) entry.getValue()); @@ -882,7 +881,7 @@ public class AccessController implements MasterObserver, RegionObserver, RegionS List newCells = Lists.newArrayList(); for (Cell cell: e.getValue()) { // Prepend the supplied perms in a new ACL tag to an update list of tags for the cell - List tags = new ArrayList(); + List tags = new ArrayList<>(); tags.add(new ArrayBackedTag(AccessControlLists.ACL_TAG_TYPE, perms)); Iterator tagIterator = CellUtil.tagsIterator(cell); while (tagIterator.hasNext()) { @@ -990,7 +989,7 @@ public class AccessController implements MasterObserver, RegionObserver, RegionS public void preCreateTable(ObserverContext c, HTableDescriptor desc, HRegionInfo[] regions) throws IOException { Set families = desc.getFamiliesKeys(); - Map> familyMap = new TreeMap>(Bytes.BYTES_COMPARATOR); + Map> familyMap = new TreeMap<>(Bytes.BYTES_COMPARATOR); for (byte[] family: families) { familyMap.put(family, null); } @@ -2407,8 +2406,7 @@ public class AccessController implements MasterObserver, RegionObserver, RegionS tperm.getTableName())); } - Map> familyMap = - new TreeMap>(Bytes.BYTES_COMPARATOR); + Map> familyMap = new TreeMap<>(Bytes.BYTES_COMPARATOR); if (tperm.getFamily() != null) { if (tperm.getQualifier() != null) { Set qualifiers = Sets.newTreeSet(Bytes.BYTES_COMPARATOR); @@ -2515,7 +2513,7 @@ public class AccessController implements MasterObserver, RegionObserver, RegionS return null; } - Map> familyMap = new TreeMap>(Bytes.BYTES_COMPARATOR); + Map> familyMap = new TreeMap<>(Bytes.BYTES_COMPARATOR); familyMap.put(family, qualifier != null ? ImmutableSet.of(qualifier) : null); return familyMap; } http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/TableAuthManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/TableAuthManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/TableAuthManager.java index eae9e4e..0d539ce 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/TableAuthManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/TableAuthManager.java @@ -103,10 +103,10 @@ public class TableAuthManager implements Closeable { private volatile PermissionCache globalCache; private ConcurrentSkipListMap> tableCache = - new ConcurrentSkipListMap>(); + new ConcurrentSkipListMap<>(); private ConcurrentSkipListMap> nsCache = - new ConcurrentSkipListMap>(); + new ConcurrentSkipListMap<>(); private Configuration conf; private ZKPermissionWatcher zkperms; @@ -143,7 +143,7 @@ public class TableAuthManager implements Closeable { throw new IOException("Unable to obtain the current user, " + "authorization checks for internal operations will not work correctly!"); } - PermissionCache newCache = new PermissionCache(); + PermissionCache newCache = new PermissionCache<>(); String currentUser = user.getShortName(); // the system user is always included @@ -239,7 +239,7 @@ public class TableAuthManager implements Closeable { */ private void updateTableCache(TableName table, ListMultimap tablePerms) { - PermissionCache newTablePerms = new PermissionCache(); + PermissionCache newTablePerms = new PermissionCache<>(); for (Map.Entry entry : tablePerms.entries()) { if (AuthUtil.isGroupPrincipal(entry.getKey())) { @@ -263,7 +263,7 @@ public class TableAuthManager implements Closeable { */ private void updateNsCache(String namespace, ListMultimap tablePerms) { - PermissionCache newTablePerms = new PermissionCache(); + PermissionCache newTablePerms = new PermissionCache<>(); for (Map.Entry entry : tablePerms.entries()) { if (AuthUtil.isGroupPrincipal(entry.getKey())) { @@ -734,8 +734,7 @@ public class TableAuthManager implements Closeable { return mtime.get(); } - private static Map managerMap = - new HashMap(); + private static Map managerMap = new HashMap<>(); private static Map refCount = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/ZKPermissionWatcher.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/ZKPermissionWatcher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/ZKPermissionWatcher.java index f21e877..3324b90 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/ZKPermissionWatcher.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/ZKPermissionWatcher.java @@ -58,8 +58,7 @@ public class ZKPermissionWatcher extends ZooKeeperListener implements Closeable TableAuthManager authManager; String aclZNode; CountDownLatch initialized = new CountDownLatch(1); - AtomicReference> nodes = - new AtomicReference>(null); + AtomicReference> nodes = new AtomicReference<>(null); ExecutorService executor; public ZKPermissionWatcher(ZooKeeperWatcher watcher, http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.java index 26448b1..a569cf3 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.java @@ -70,8 +70,7 @@ public class AuthenticationTokenSecretManager private LeaderElector leaderElector; private ZKClusterId clusterId; - private Map allKeys = - new ConcurrentHashMap(); + private Map allKeys = new ConcurrentHashMap<>(); private AuthenticationKey currentKey; private int idSeq; @@ -181,8 +180,7 @@ public class AuthenticationTokenSecretManager public Token generateToken(String username) { AuthenticationTokenIdentifier ident = new AuthenticationTokenIdentifier(username); - Token token = - new Token(ident, this); + Token token = new Token<>(ident, this); if (clusterId.hasId()) { token.setService(new Text(clusterId.getId())); } http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/TokenUtil.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/TokenUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/TokenUtil.java index f767ed3..1d42450 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/TokenUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/TokenUtil.java @@ -314,7 +314,7 @@ public class TokenUtil { * @return the Token instance */ public static Token toToken(AuthenticationProtos.Token proto) { - return new Token( + return new Token<>( proto.hasIdentifier() ? proto.getIdentifier().toByteArray() : null, proto.hasPassword() ? proto.getPassword().toByteArray() : null, AuthenticationTokenIdentifier.AUTH_TOKEN_TYPE, http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.java index 9abb3a2..d4a5627 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.java @@ -151,10 +151,10 @@ public class DefaultVisibilityLabelServiceImpl implements VisibilityLabelService protected List> getExistingLabelsWithAuths() throws IOException { Scan scan = new Scan(); RegionScanner scanner = labelsRegion.getScanner(scan); - List> existingLabels = new ArrayList>(); + List> existingLabels = new ArrayList<>(); try { while (true) { - List cells = new ArrayList(); + List cells = new ArrayList<>(); scanner.next(cells); if (cells.isEmpty()) { break; @@ -169,8 +169,8 @@ public class DefaultVisibilityLabelServiceImpl implements VisibilityLabelService protected Pair, Map>> extractLabelsAndAuths( List> labelDetails) { - Map labels = new HashMap(); - Map> userAuths = new HashMap>(); + Map labels = new HashMap<>(); + Map> userAuths = new HashMap<>(); for (List cells : labelDetails) { for (Cell cell : cells) { if (CellUtil.matchingQualifier(cell, LABEL_QUALIFIER)) { @@ -183,14 +183,14 @@ public class DefaultVisibilityLabelServiceImpl implements VisibilityLabelService cell.getQualifierLength()); List auths = userAuths.get(user); if (auths == null) { - auths = new ArrayList(); + auths = new ArrayList<>(); userAuths.put(user, auths); } auths.add(CellUtil.getRowAsInt(cell)); } } } - return new Pair, Map>>(labels, userAuths); + return new Pair<>(labels, userAuths); } protected void addSystemLabel(Region region, Map labels, @@ -207,7 +207,7 @@ public class DefaultVisibilityLabelServiceImpl implements VisibilityLabelService public OperationStatus[] addLabels(List labels) throws IOException { assert labelsRegion != null; OperationStatus[] finalOpStatus = new OperationStatus[labels.size()]; - List puts = new ArrayList(labels.size()); + List puts = new ArrayList<>(labels.size()); int i = 0; for (byte[] label : labels) { String labelStr = Bytes.toString(label); @@ -235,7 +235,7 @@ public class DefaultVisibilityLabelServiceImpl implements VisibilityLabelService public OperationStatus[] setAuths(byte[] user, List authLabels) throws IOException { assert labelsRegion != null; OperationStatus[] finalOpStatus = new OperationStatus[authLabels.size()]; - List puts = new ArrayList(authLabels.size()); + List puts = new ArrayList<>(authLabels.size()); int i = 0; for (byte[] auth : authLabels) { String authStr = Bytes.toString(auth); @@ -269,7 +269,7 @@ public class DefaultVisibilityLabelServiceImpl implements VisibilityLabelService else { currentAuths = this.getUserAuths(user, true); } - List deletes = new ArrayList(authLabels.size()); + List deletes = new ArrayList<>(authLabels.size()); int i = 0; for (byte[] authLabel : authLabels) { String authLabelStr = Bytes.toString(authLabel); @@ -334,10 +334,10 @@ public class DefaultVisibilityLabelServiceImpl implements VisibilityLabelService Filter filter = VisibilityUtils.createVisibilityLabelFilter(this.labelsRegion, new Authorizations(SYSTEM_LABEL)); s.setFilter(filter); - ArrayList auths = new ArrayList(); + ArrayList auths = new ArrayList<>(); RegionScanner scanner = this.labelsRegion.getScanner(s); try { - List results = new ArrayList(1); + List results = new ArrayList<>(1); while (true) { scanner.next(results); if (results.isEmpty()) break; @@ -371,10 +371,10 @@ public class DefaultVisibilityLabelServiceImpl implements VisibilityLabelService Filter filter = VisibilityUtils.createVisibilityLabelFilter(this.labelsRegion, new Authorizations(SYSTEM_LABEL)); s.setFilter(filter); - Set auths = new HashSet(); + Set auths = new HashSet<>(); RegionScanner scanner = this.labelsRegion.getScanner(s); try { - List results = new ArrayList(1); + List results = new ArrayList<>(1); while (true) { scanner.next(results); if (results.isEmpty()) break; @@ -389,7 +389,7 @@ public class DefaultVisibilityLabelServiceImpl implements VisibilityLabelService } finally { scanner.close(); } - return new ArrayList(auths); + return new ArrayList<>(auths); } @Override @@ -401,7 +401,7 @@ public class DefaultVisibilityLabelServiceImpl implements VisibilityLabelService labels.remove(SYSTEM_LABEL); if (regex != null) { Pattern pattern = Pattern.compile(regex); - ArrayList matchedLabels = new ArrayList(); + ArrayList matchedLabels = new ArrayList<>(); for (String label : labels.keySet()) { if (pattern.matcher(label).matches()) { matchedLabels.add(label); @@ -409,13 +409,13 @@ public class DefaultVisibilityLabelServiceImpl implements VisibilityLabelService } return matchedLabels; } - return new ArrayList(labels.keySet()); + return new ArrayList<>(labels.keySet()); } @Override public List createVisibilityExpTags(String visExpression, boolean withSerializationFormat, boolean checkAuths) throws IOException { - Set auths = new HashSet(); + Set auths = new HashSet<>(); if (checkAuths) { User user = VisibilityUtils.getActiveUser(); auths.addAll(this.labelsCache.getUserAuthsAsOrdinals(user.getShortName())); @@ -461,7 +461,7 @@ public class DefaultVisibilityLabelServiceImpl implements VisibilityLabelService try { // null authorizations to be handled inside SLG impl. authLabels = scanLabelGenerator.getLabels(VisibilityUtils.getActiveUser(), authorizations); - authLabels = (authLabels == null) ? new ArrayList() : authLabels; + authLabels = (authLabels == null) ? new ArrayList<>() : authLabels; authorizations = new Authorizations(authLabels); } catch (Throwable t) { LOG.error(t); @@ -605,7 +605,7 @@ public class DefaultVisibilityLabelServiceImpl implements VisibilityLabelService } private static List> sortTagsBasedOnOrdinal(List tags) throws IOException { - List> fullTagsList = new ArrayList>(); + List> fullTagsList = new ArrayList<>(); for (Tag tag : tags) { if (tag.getType() == VISIBILITY_TAG_TYPE) { getSortedTagOrdinals(fullTagsList, tag); @@ -616,7 +616,7 @@ public class DefaultVisibilityLabelServiceImpl implements VisibilityLabelService private static void getSortedTagOrdinals(List> fullTagsList, Tag tag) throws IOException { - List tagsOrdinalInSortedOrder = new ArrayList(); + List tagsOrdinalInSortedOrder = new ArrayList<>(); int offset = tag.getValueOffset(); int endOffset = offset + tag.getValueLength(); while (offset < endOffset) { http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/DefinedSetFilterScanLabelGenerator.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/DefinedSetFilterScanLabelGenerator.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/DefinedSetFilterScanLabelGenerator.java index 2c7d253..2126ee7 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/DefinedSetFilterScanLabelGenerator.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/DefinedSetFilterScanLabelGenerator.java @@ -62,18 +62,18 @@ public class DefinedSetFilterScanLabelGenerator implements ScanLabelGenerator { if (authorizations != null) { List labels = authorizations.getLabels(); String userName = user.getShortName(); - Set auths = new HashSet(); + Set auths = new HashSet<>(); auths.addAll(this.labelsCache.getUserAuths(userName)); auths.addAll(this.labelsCache.getGroupAuths(user.getGroupNames())); - return dropLabelsNotInUserAuths(labels, new ArrayList(auths), userName); + return dropLabelsNotInUserAuths(labels, new ArrayList<>(auths), userName); } return null; } private List dropLabelsNotInUserAuths(List labels, List auths, String userName) { - List droppedLabels = new ArrayList(); - List passedLabels = new ArrayList(labels.size()); + List droppedLabels = new ArrayList<>(); + List passedLabels = new ArrayList<>(labels.size()); for (String label : labels) { if (auths.contains(label)) { passedLabels.add(label); http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/EnforcingScanLabelGenerator.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/EnforcingScanLabelGenerator.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/EnforcingScanLabelGenerator.java index dd0497c..177f4d2 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/EnforcingScanLabelGenerator.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/EnforcingScanLabelGenerator.java @@ -62,10 +62,10 @@ public class EnforcingScanLabelGenerator implements ScanLabelGenerator { if (authorizations != null) { LOG.warn("Dropping authorizations requested by user " + userName + ": " + authorizations); } - Set auths = new HashSet(); + Set auths = new HashSet<>(); auths.addAll(this.labelsCache.getUserAuths(userName)); auths.addAll(this.labelsCache.getGroupAuths(user.getGroupNames())); - return new ArrayList(auths); + return new ArrayList<>(auths); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/ExpressionParser.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/ExpressionParser.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/ExpressionParser.java index db3caff..2b9a56e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/ExpressionParser.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/ExpressionParser.java @@ -40,7 +40,7 @@ public class ExpressionParser { private static final char DOUBLE_QUOTES = '"'; public ExpressionNode parse(String expS) throws ParseException { expS = expS.trim(); - Stack expStack = new Stack(); + Stack expStack = new Stack<>(); int index = 0; byte[] exp = Bytes.toBytes(expS); int endPos = exp.length; @@ -68,7 +68,7 @@ public class ExpressionParser { // We have to rewrite the expression within double quotes as incase of expressions // with escape characters we may have to avoid them as the original expression did // not have them - List list = new ArrayList(); + List list = new ArrayList<>(); while (index < endPos && !endDoubleQuotesFound(exp[index])) { if (exp[index] == '\\') { index++; http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/FeedUserAuthScanLabelGenerator.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/FeedUserAuthScanLabelGenerator.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/FeedUserAuthScanLabelGenerator.java index 1f90682..f4cf762 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/FeedUserAuthScanLabelGenerator.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/FeedUserAuthScanLabelGenerator.java @@ -65,10 +65,10 @@ public class FeedUserAuthScanLabelGenerator implements ScanLabelGenerator { if (authorizations == null || authorizations.getLabels() == null || authorizations.getLabels().isEmpty()) { String userName = user.getShortName(); - Set auths = new HashSet(); + Set auths = new HashSet<>(); auths.addAll(this.labelsCache.getUserAuths(userName)); auths.addAll(this.labelsCache.getGroupAuths(user.getGroupNames())); - return new ArrayList(auths); + return new ArrayList<>(auths); } return authorizations.getLabels(); } http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java index fb685bc..476921b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java @@ -145,7 +145,7 @@ public class VisibilityController implements MasterObserver, RegionObserver, boolean authorizationEnabled; // Add to this list if there are any reserved tag types - private static ArrayList RESERVED_VIS_TAG_TYPES = new ArrayList(); + private static ArrayList RESERVED_VIS_TAG_TYPES = new ArrayList<>(); static { RESERVED_VIS_TAG_TYPES.add(TagType.VISIBILITY_TAG_TYPE); RESERVED_VIS_TAG_TYPES.add(TagType.VISIBILITY_EXP_SERIALIZATION_FORMAT_TAG_TYPE); @@ -328,7 +328,7 @@ public class VisibilityController implements MasterObserver, RegionObserver, return; } // TODO this can be made as a global LRU cache at HRS level? - Map> labelCache = new HashMap>(); + Map> labelCache = new HashMap<>(); for (int i = 0; i < miniBatchOp.size(); i++) { Mutation m = miniBatchOp.getOperation(i); CellVisibility cellVisibility = null; @@ -341,7 +341,7 @@ public class VisibilityController implements MasterObserver, RegionObserver, } boolean sanityFailure = false; boolean modifiedTagFound = false; - Pair pair = new Pair(false, null); + Pair pair = new Pair<>(false, null); for (CellScanner cellScanner = m.cellScanner(); cellScanner.advance();) { pair = checkForReservedVisibilityTagPresence(cellScanner.current(), pair); if (!pair.getFirst()) { @@ -381,7 +381,7 @@ public class VisibilityController implements MasterObserver, RegionObserver, } } if (visibilityTags != null) { - List updatedCells = new ArrayList(); + List updatedCells = new ArrayList<>(); for (CellScanner cellScanner = m.cellScanner(); cellScanner.advance();) { Cell cell = cellScanner.current(); List tags = CellUtil.getTags(cell); @@ -427,7 +427,7 @@ public class VisibilityController implements MasterObserver, RegionObserver, } // The check for checkForReservedVisibilityTagPresence happens in preBatchMutate happens. // It happens for every mutation and that would be enough. - List visibilityTags = new ArrayList(); + List visibilityTags = new ArrayList<>(); if (cellVisibility != null) { String labelsExp = cellVisibility.getExpression(); try { @@ -474,7 +474,7 @@ public class VisibilityController implements MasterObserver, RegionObserver, private Pair checkForReservedVisibilityTagPresence(Cell cell, Pair pair) throws IOException { if (pair == null) { - pair = new Pair(false, null); + pair = new Pair<>(false, null); } else { pair.setFirst(false); pair.setSecond(null); @@ -782,7 +782,7 @@ public class VisibilityController implements MasterObserver, RegionObserver, new VisibilityControllerNotReadyException("VisibilityController not yet initialized!"), response); } else { - List labels = new ArrayList(visLabels.size()); + List labels = new ArrayList<>(visLabels.size()); try { if (authorizationEnabled) { checkCallingUserAuth(); @@ -844,7 +844,7 @@ public class VisibilityController implements MasterObserver, RegionObserver, response); } else { byte[] user = request.getUser().toByteArray(); - List labelAuths = new ArrayList(auths.size()); + List labelAuths = new ArrayList<>(auths.size()); try { if (authorizationEnabled) { checkCallingUserAuth(); @@ -959,7 +959,7 @@ public class VisibilityController implements MasterObserver, RegionObserver, "VisibilityController not yet initialized"), response); } else { byte[] requestUser = request.getUser().toByteArray(); - List labelAuths = new ArrayList(auths.size()); + List labelAuths = new ArrayList<>(auths.size()); try { // When AC is ON, do AC based user auth check if (authorizationEnabled && accessControllerAvailable && !isSystemOrSuperUser()) { @@ -1071,7 +1071,7 @@ public class VisibilityController implements MasterObserver, RegionObserver, @Override public ReturnCode filterKeyValue(Cell cell) throws IOException { - List putVisTags = new ArrayList(); + List putVisTags = new ArrayList<>(); Byte putCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(cell, putVisTags); boolean matchFound = VisibilityLabelServiceManager .getInstance().getVisibilityLabelService() http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityLabelsCache.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityLabelsCache.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityLabelsCache.java index 0948520..e27a4f8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityLabelsCache.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityLabelsCache.java @@ -54,10 +54,10 @@ public class VisibilityLabelsCache implements VisibilityLabelOrdinalProvider { private static VisibilityLabelsCache instance; private ZKVisibilityLabelWatcher zkVisibilityWatcher; - private Map labels = new HashMap(); - private Map ordinalVsLabels = new HashMap(); - private Map> userAuths = new HashMap>(); - private Map> groupAuths = new HashMap>(); + private Map labels = new HashMap<>(); + private Map ordinalVsLabels = new HashMap<>(); + private Map> userAuths = new HashMap<>(); + private Map> groupAuths = new HashMap<>(); /** * This covers the members labels, ordinalVsLabels and userAuths @@ -145,10 +145,9 @@ public class VisibilityLabelsCache implements VisibilityLabelOrdinalProvider { for (UserAuthorizations userAuths : multiUserAuths.getUserAuthsList()) { String user = Bytes.toString(userAuths.getUser().toByteArray()); if (AuthUtil.isGroupPrincipal(user)) { - this.groupAuths.put(AuthUtil.getGroupName(user), - new HashSet(userAuths.getAuthList())); + this.groupAuths.put(AuthUtil.getGroupName(user), new HashSet<>(userAuths.getAuthList())); } else { - this.userAuths.put(user, new HashSet(userAuths.getAuthList())); + this.userAuths.put(user, new HashSet<>(userAuths.getAuthList())); } } } finally { @@ -210,7 +209,7 @@ public class VisibilityLabelsCache implements VisibilityLabelOrdinalProvider { List auths = EMPTY_LIST; Set authOrdinals = getUserAuthsAsOrdinals(user); if (!authOrdinals.equals(EMPTY_SET)) { - auths = new ArrayList(authOrdinals.size()); + auths = new ArrayList<>(authOrdinals.size()); for (Integer authOrdinal : authOrdinals) { auths.add(ordinalVsLabels.get(authOrdinal)); } @@ -227,7 +226,7 @@ public class VisibilityLabelsCache implements VisibilityLabelOrdinalProvider { List auths = EMPTY_LIST; Set authOrdinals = getGroupAuthsAsOrdinals(groups); if (!authOrdinals.equals(EMPTY_SET)) { - auths = new ArrayList(authOrdinals.size()); + auths = new ArrayList<>(authOrdinals.size()); for (Integer authOrdinal : authOrdinals) { auths.add(ordinalVsLabels.get(authOrdinal)); } @@ -263,7 +262,7 @@ public class VisibilityLabelsCache implements VisibilityLabelOrdinalProvider { public Set getGroupAuthsAsOrdinals(String[] groups) { this.lock.readLock().lock(); try { - Set authOrdinals = new HashSet(); + Set authOrdinals = new HashSet<>(); if (groups != null && groups.length > 0) { Set groupAuthOrdinals = null; for (String group : groups) { http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityReplicationEndpoint.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityReplicationEndpoint.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityReplicationEndpoint.java index c1c3852..c77b776 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityReplicationEndpoint.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityReplicationEndpoint.java @@ -69,9 +69,9 @@ public class VisibilityReplicationEndpoint implements ReplicationEndpoint { // string based tags. But for intra cluster replication like region // replicas it is not needed. List entries = replicateContext.getEntries(); - List visTags = new ArrayList(); - List nonVisTags = new ArrayList(); - List newEntries = new ArrayList(entries.size()); + List visTags = new ArrayList<>(); + List nonVisTags = new ArrayList<>(); + List newEntries = new ArrayList<>(entries.size()); for (Entry entry : entries) { WALEdit newEdit = new WALEdit(); ArrayList cells = entry.getEdit().getCells(); http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityScanDeleteTracker.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityScanDeleteTracker.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityScanDeleteTracker.java index 2595fe0..67181e1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityScanDeleteTracker.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityScanDeleteTracker.java @@ -53,17 +53,14 @@ public class VisibilityScanDeleteTracker extends ScanDeleteTracker { // type would solve this problem and also ensure that the combination of different type // of deletes with diff ts would also work fine // Track per TS - private List, Byte, Long>> visibilityTagsDeleteFamily = - new ArrayList, Byte, Long>>(); + private List, Byte, Long>> visibilityTagsDeleteFamily = new ArrayList<>(); // Delete family version with different ts and different visibility expression could come. // Need to track it per ts. - private List, Byte, Long>> visibilityTagsDeleteFamilyVersion = - new ArrayList, Byte, Long>>(); + private List, Byte, Long>> visibilityTagsDeleteFamilyVersion = new ArrayList<>(); private List, Byte>> visibilityTagsDeleteColumns; // Tracking as List is to handle same ts cell but different visibility tag. // TODO : Need to handle puts with same ts but different vis tags. - private List, Byte>> visiblityTagsDeleteColumnVersion = - new ArrayList, Byte>>(); + private List, Byte>> visiblityTagsDeleteColumnVersion = new ArrayList<>(); public VisibilityScanDeleteTracker() { super(); @@ -117,50 +114,46 @@ public class VisibilityScanDeleteTracker extends ScanDeleteTracker { Byte deleteCellVisTagsFormat = null; switch (type) { case DeleteFamily: - List delTags = new ArrayList(); + List delTags = new ArrayList<>(); if (visibilityTagsDeleteFamily == null) { - visibilityTagsDeleteFamily = new ArrayList, Byte, Long>>(); + visibilityTagsDeleteFamily = new ArrayList<>(); } deleteCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(delCell, delTags); if (!delTags.isEmpty()) { - visibilityTagsDeleteFamily.add(new Triple, Byte, Long>(delTags, - deleteCellVisTagsFormat, delCell.getTimestamp())); + visibilityTagsDeleteFamily.add(new Triple<>(delTags, deleteCellVisTagsFormat, delCell.getTimestamp())); hasVisTag = true; } break; case DeleteFamilyVersion: if(visibilityTagsDeleteFamilyVersion == null) { - visibilityTagsDeleteFamilyVersion = new ArrayList, Byte, Long>>(); + visibilityTagsDeleteFamilyVersion = new ArrayList<>(); } - delTags = new ArrayList(); + delTags = new ArrayList<>(); deleteCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(delCell, delTags); if (!delTags.isEmpty()) { - visibilityTagsDeleteFamilyVersion.add(new Triple, Byte, Long>(delTags, - deleteCellVisTagsFormat, delCell.getTimestamp())); + visibilityTagsDeleteFamilyVersion.add(new Triple<>(delTags, deleteCellVisTagsFormat, delCell.getTimestamp())); hasVisTag = true; } break; case DeleteColumn: if (visibilityTagsDeleteColumns == null) { - visibilityTagsDeleteColumns = new ArrayList, Byte>>(); + visibilityTagsDeleteColumns = new ArrayList<>(); } - delTags = new ArrayList(); + delTags = new ArrayList<>(); deleteCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(delCell, delTags); if (!delTags.isEmpty()) { - visibilityTagsDeleteColumns.add(new Pair, Byte>(delTags, - deleteCellVisTagsFormat)); + visibilityTagsDeleteColumns.add(new Pair<>(delTags, deleteCellVisTagsFormat)); hasVisTag = true; } break; case Delete: if (visiblityTagsDeleteColumnVersion == null) { - visiblityTagsDeleteColumnVersion = new ArrayList, Byte>>(); + visiblityTagsDeleteColumnVersion = new ArrayList<>(); } - delTags = new ArrayList(); + delTags = new ArrayList<>(); deleteCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(delCell, delTags); if (!delTags.isEmpty()) { - visiblityTagsDeleteColumnVersion.add(new Pair, Byte>(delTags, - deleteCellVisTagsFormat)); + visiblityTagsDeleteColumnVersion.add(new Pair<>(delTags, deleteCellVisTagsFormat)); hasVisTag = true; } break; @@ -182,7 +175,7 @@ public class VisibilityScanDeleteTracker extends ScanDeleteTracker { // visibilityTagsDeleteFamily is ArrayList Triple, Byte, Long> triple = visibilityTagsDeleteFamily.get(i); if (timestamp <= triple.getThird()) { - List putVisTags = new ArrayList(); + List putVisTags = new ArrayList<>(); Byte putCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(cell, putVisTags); boolean matchFound = VisibilityLabelServiceManager.getInstance() .getVisibilityLabelService().matchVisibility(putVisTags, putCellVisTagsFormat, @@ -218,7 +211,7 @@ public class VisibilityScanDeleteTracker extends ScanDeleteTracker { // visibilityTagsDeleteFamilyVersion is ArrayList Triple, Byte, Long> triple = visibilityTagsDeleteFamilyVersion.get(i); if (timestamp == triple.getThird()) { - List putVisTags = new ArrayList(); + List putVisTags = new ArrayList<>(); Byte putCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(cell, putVisTags); boolean matchFound = VisibilityLabelServiceManager.getInstance() .getVisibilityLabelService().matchVisibility(putVisTags, putCellVisTagsFormat, @@ -248,7 +241,7 @@ public class VisibilityScanDeleteTracker extends ScanDeleteTracker { if (visibilityTagsDeleteColumns != null) { if (!visibilityTagsDeleteColumns.isEmpty()) { for (Pair, Byte> tags : visibilityTagsDeleteColumns) { - List putVisTags = new ArrayList(); + List putVisTags = new ArrayList<>(); Byte putCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(cell, putVisTags); boolean matchFound = VisibilityLabelServiceManager.getInstance() @@ -277,7 +270,7 @@ public class VisibilityScanDeleteTracker extends ScanDeleteTracker { if (visiblityTagsDeleteColumnVersion != null) { if (!visiblityTagsDeleteColumnVersion.isEmpty()) { for (Pair, Byte> tags : visiblityTagsDeleteColumnVersion) { - List putVisTags = new ArrayList(); + List putVisTags = new ArrayList<>(); Byte putCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(cell, putVisTags); boolean matchFound = VisibilityLabelServiceManager.getInstance() http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityUtils.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityUtils.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityUtils.java index 1db506d..4441c08 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityUtils.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityUtils.java @@ -175,7 +175,7 @@ public class VisibilityUtils { String slgClassesCommaSeparated = conf.get(VISIBILITY_LABEL_GENERATOR_CLASS); // We have only System level SLGs now. The order of execution will be same as the order in the // comma separated config value - List slgs = new ArrayList(); + List slgs = new ArrayList<>(); if (StringUtils.isNotEmpty(slgClassesCommaSeparated)) { String[] slgClasses = slgClassesCommaSeparated.split(COMMA); for (String slgClass : slgClasses) { @@ -266,7 +266,7 @@ public class VisibilityUtils { public static Filter createVisibilityLabelFilter(Region region, Authorizations authorizations) throws IOException { - Map cfVsMaxVersions = new HashMap(); + Map cfVsMaxVersions = new HashMap<>(); for (HColumnDescriptor hcd : region.getTableDesc().getFamilies()) { cfVsMaxVersions.put(new SimpleMutableByteRange(hcd.getName()), hcd.getMaxVersions()); } @@ -302,10 +302,10 @@ public class VisibilityUtils { throw new IOException(e); } node = EXP_EXPANDER.expand(node); - List tags = new ArrayList(); + List tags = new ArrayList<>(); ByteArrayOutputStream baos = new ByteArrayOutputStream(); DataOutputStream dos = new DataOutputStream(baos); - List labelOrdinals = new ArrayList(); + List labelOrdinals = new ArrayList<>(); // We will be adding this tag before the visibility tags and the presence of this // tag indicates we are supporting deletes with cell visibility if (withSerializationFormat) { http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/expression/NonLeafExpressionNode.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/expression/NonLeafExpressionNode.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/expression/NonLeafExpressionNode.java index 4399ecc..9903b9b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/expression/NonLeafExpressionNode.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/expression/NonLeafExpressionNode.java @@ -26,7 +26,7 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; @InterfaceAudience.Private public class NonLeafExpressionNode implements ExpressionNode { private Operator op; - private List childExps = new ArrayList(2); + private List childExps = new ArrayList<>(2); public NonLeafExpressionNode() { @@ -46,7 +46,7 @@ public class NonLeafExpressionNode implements ExpressionNode { public NonLeafExpressionNode(Operator op, ExpressionNode... exps) { this.op = op; - List expLst = new ArrayList(); + List expLst = new ArrayList<>(); Collections.addAll(expLst, exps); this.childExps = expLst; } http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java index a5507fc..efae7e4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java @@ -564,7 +564,7 @@ public class ExportSnapshot extends AbstractHBaseTool implements Tool { final FileSystem fs, final Path snapshotDir) throws IOException { SnapshotDescription snapshotDesc = SnapshotDescriptionUtils.readSnapshotInfo(fs, snapshotDir); - final List> files = new ArrayList>(); + final List> files = new ArrayList<>(); final TableName table = TableName.valueOf(snapshotDesc.getTable()); // Get snapshot files @@ -591,7 +591,7 @@ public class ExportSnapshot extends AbstractHBaseTool implements Tool { } else { size = HFileLink.buildFromHFileLinkPattern(conf, path).getFileStatus(fs).getLen(); } - files.add(new Pair(fileInfo, size)); + files.add(new Pair<>(fileInfo, size)); } } }); @@ -618,8 +618,7 @@ public class ExportSnapshot extends AbstractHBaseTool implements Tool { }); // create balanced groups - List>> fileGroups = - new LinkedList>>(); + List>> fileGroups = new LinkedList<>(); long[] sizeGroups = new long[ngroups]; int hi = files.size() - 1; int lo = 0; @@ -630,7 +629,7 @@ public class ExportSnapshot extends AbstractHBaseTool implements Tool { while (hi >= lo) { if (g == fileGroups.size()) { - group = new LinkedList>(); + group = new LinkedList<>(); fileGroups.add(group); } else { group = fileGroups.get(g); @@ -703,7 +702,7 @@ public class ExportSnapshot extends AbstractHBaseTool implements Tool { public ExportSnapshotInputSplit(final List> snapshotFiles) { this.files = new ArrayList(snapshotFiles.size()); for (Pair fileInfo: snapshotFiles) { - this.files.add(new Pair( + this.files.add(new Pair<>( new BytesWritable(fileInfo.getFirst().toByteArray()), fileInfo.getSecond())); this.length += fileInfo.getSecond(); } @@ -726,13 +725,13 @@ public class ExportSnapshot extends AbstractHBaseTool implements Tool { @Override public void readFields(DataInput in) throws IOException { int count = in.readInt(); - files = new ArrayList>(count); + files = new ArrayList<>(count); length = 0; for (int i = 0; i < count; ++i) { BytesWritable fileInfo = new BytesWritable(); fileInfo.readFields(in); long size = in.readLong(); - files.add(new Pair(fileInfo, size)); + files.add(new Pair<>(fileInfo, size)); length += size; } } http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java index 98afe8b..63839c4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java @@ -108,11 +108,9 @@ import org.apache.hadoop.io.IOUtils; public class RestoreSnapshotHelper { private static final Log LOG = LogFactory.getLog(RestoreSnapshotHelper.class); - private final Map regionsMap = - new TreeMap(Bytes.BYTES_COMPARATOR); + private final Map regionsMap = new TreeMap<>(Bytes.BYTES_COMPARATOR); - private final Map > parentsMap = - new HashMap >(); + private final Map > parentsMap = new HashMap<>(); private final ForeignExceptionDispatcher monitor; private final MonitoredTask status; @@ -187,7 +185,7 @@ public class RestoreSnapshotHelper { // Take a copy of the manifest.keySet() since we are going to modify // this instance, by removing the regions already present in the restore dir. - Set regionNames = new HashSet(regionManifests.keySet()); + Set regionNames = new HashSet<>(regionManifests.keySet()); HRegionInfo mobRegion = MobUtils.getMobRegionInfo(snapshotManifest.getTableDescriptor() .getTableName()); @@ -213,7 +211,7 @@ public class RestoreSnapshotHelper { status.setStatus("Restoring table regions..."); if (regionNames.contains(mobRegion.getEncodedName())) { // restore the mob region in case - List mobRegions = new ArrayList(1); + List mobRegions = new ArrayList<>(1); mobRegions.add(mobRegion); restoreHdfsMobRegions(exec, regionManifests, mobRegions); regionNames.remove(mobRegion.getEncodedName()); @@ -230,7 +228,7 @@ public class RestoreSnapshotHelper { // Regions to Add: present in the snapshot but not in the current table if (regionNames.size() > 0) { - List regionsToAdd = new ArrayList(regionNames.size()); + List regionsToAdd = new ArrayList<>(regionNames.size()); monitor.rethrowException(); // add the mob region @@ -344,14 +342,14 @@ public class RestoreSnapshotHelper { void addRegionToRemove(final HRegionInfo hri) { if (regionsToRemove == null) { - regionsToRemove = new LinkedList(); + regionsToRemove = new LinkedList<>(); } regionsToRemove.add(hri); } void addRegionToRestore(final HRegionInfo hri) { if (regionsToRestore == null) { - regionsToRestore = new LinkedList(); + regionsToRestore = new LinkedList<>(); } regionsToRestore.add(hri); } @@ -361,7 +359,7 @@ public class RestoreSnapshotHelper { if (regionInfos == null || parentsMap.isEmpty()) return; // Extract region names and offlined regions - Map regionsByName = new HashMap(regionInfos.size()); + Map regionsByName = new HashMap<>(regionInfos.size()); List parentRegions = new LinkedList<>(); for (HRegionInfo regionInfo: regionInfos) { if (regionInfo.isSplitParent()) { @@ -441,10 +439,10 @@ public class RestoreSnapshotHelper { private Map> getRegionHFileReferences( final SnapshotRegionManifest manifest) { Map> familyMap = - new HashMap>(manifest.getFamilyFilesCount()); + new HashMap<>(manifest.getFamilyFilesCount()); for (SnapshotRegionManifest.FamilyFiles familyFiles: manifest.getFamilyFilesList()) { familyMap.put(familyFiles.getFamilyName().toStringUtf8(), - new ArrayList(familyFiles.getStoreFilesList())); + new ArrayList<>(familyFiles.getStoreFilesList())); } return familyMap; } @@ -489,8 +487,7 @@ public class RestoreSnapshotHelper { List snapshotFamilyFiles = snapshotFiles.remove(familyDir.getName()); if (snapshotFamilyFiles != null) { - List hfilesToAdd = - new ArrayList(); + List hfilesToAdd = new ArrayList<>(); for (SnapshotRegionManifest.StoreFile storeFile: snapshotFamilyFiles) { if (familyFiles.contains(storeFile.getName())) { // HFile already present @@ -546,7 +543,7 @@ public class RestoreSnapshotHelper { FileStatus[] hfiles = FSUtils.listStatus(fs, familyDir); if (hfiles == null) return Collections.emptySet(); - Set familyFiles = new HashSet(hfiles.length); + Set familyFiles = new HashSet<>(hfiles.length); for (int i = 0; i < hfiles.length; ++i) { String hfileName = hfiles[i].getPath().getName(); familyFiles.add(hfileName); @@ -564,8 +561,7 @@ public class RestoreSnapshotHelper { final List regions) throws IOException { if (regions == null || regions.isEmpty()) return null; - final Map snapshotRegions = - new HashMap(regions.size()); + final Map snapshotRegions = new HashMap<>(regions.size()); // clone region info (change embedded tableName with the new one) HRegionInfo[] clonedRegionsInfo = new HRegionInfo[regions.size()]; @@ -742,7 +738,7 @@ public class RestoreSnapshotHelper { synchronized (parentsMap) { Pair daughters = parentsMap.get(clonedRegionName); if (daughters == null) { - daughters = new Pair(regionName, null); + daughters = new Pair<>(regionName, null); parentsMap.put(clonedRegionName, daughters); } else if (!regionName.equals(daughters.getFirst())) { daughters.setSecond(regionName); @@ -778,7 +774,7 @@ public class RestoreSnapshotHelper { FileStatus[] regionDirs = FSUtils.listStatus(fs, tableDir, new FSUtils.RegionDirFilter(fs)); if (regionDirs == null) return null; - List regions = new ArrayList(regionDirs.length); + List regions = new ArrayList<>(regionDirs.length); for (int i = 0; i < regionDirs.length; ++i) { HRegionInfo hri = HRegionFileSystem.loadRegionInfoFileContent(fs, regionDirs[i].getPath()); regions.add(hri); http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotInfo.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotInfo.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotInfo.java index 85d3af3..6dbd3f0 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotInfo.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotInfo.java @@ -598,8 +598,7 @@ public final class SnapshotInfo extends AbstractHBaseTool { Path snapshotDir = SnapshotDescriptionUtils.getSnapshotsDir(rootDir); FileStatus[] snapshots = fs.listStatus(snapshotDir, new SnapshotDescriptionUtils.CompletedSnaphotDirectoriesFilter(fs)); - List snapshotLists = - new ArrayList(snapshots.length); + List snapshotLists = new ArrayList<>(snapshots.length); for (FileStatus snapshotDirStat: snapshots) { HBaseProtos.SnapshotDescription snapshotDesc = SnapshotDescriptionUtils.readSnapshotInfo(fs, snapshotDirStat.getPath()); http://git-wip-us.apache.org/repos/asf/hbase/blob/b53f3547/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotManifest.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotManifest.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotManifest.java index 47e3073..4e838ad 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotManifest.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotManifest.java @@ -220,7 +220,7 @@ public final class SnapshotManifest { Object familyData = visitor.familyOpen(regionData, store.getFamily().getName()); monitor.rethrowException(); - List storeFiles = new ArrayList(store.getStorefiles()); + List storeFiles = new ArrayList<>(store.getStorefiles()); if (LOG.isDebugEnabled()) { LOG.debug("Adding snapshot references for " + storeFiles + " hfiles"); } @@ -305,7 +305,7 @@ public final class SnapshotManifest { FileStatus[] stats = FSUtils.listStatus(fs, storeDir); if (stats == null) return null; - ArrayList storeFiles = new ArrayList(stats.length); + ArrayList storeFiles = new ArrayList<>(stats.length); for (int i = 0; i < stats.length; ++i) { storeFiles.add(new StoreFileInfo(conf, fs, stats[i])); } @@ -374,8 +374,7 @@ public final class SnapshotManifest { tpool.shutdown(); } if (v1Regions != null && v2Regions != null) { - regionManifests = - new ArrayList(v1Regions.size() + v2Regions.size()); + regionManifests = new ArrayList<>(v1Regions.size() + v2Regions.size()); regionManifests.addAll(v1Regions); regionManifests.addAll(v2Regions); } else if (v1Regions != null) { @@ -427,8 +426,7 @@ public final class SnapshotManifest { public Map