You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2016/07/01 01:59:20 UTC
[23/32] accumulo git commit: ACCUMULO-4357 Remove unneeded code for
readability
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java b/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
index d4712b9..6c53c5b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
@@ -35,7 +35,7 @@ import com.google.common.base.Predicate;
public class TableConfiguration extends ObservableConfiguration {
private static final Logger log = LoggerFactory.getLogger(TableConfiguration.class);
- private static final Map<PropCacheKey,ZooCache> propCaches = new java.util.HashMap<PropCacheKey,ZooCache>();
+ private static final Map<PropCacheKey,ZooCache> propCaches = new java.util.HashMap<>();
private ZooCachePropertyAccessor propCacheAccessor = null;
private final Instance instance;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfigurationFactory.java b/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfigurationFactory.java
index 6c8ceca..0cfbff8 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfigurationFactory.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfigurationFactory.java
@@ -35,7 +35,7 @@ import org.apache.hadoop.fs.Path;
* A factory for {@link ZooConfiguration} objects.
*/
class ZooConfigurationFactory {
- private static final Map<String,ZooConfiguration> instances = new HashMap<String,ZooConfiguration>();
+ private static final Map<String,ZooConfiguration> instances = new HashMap<>();
/**
* Gets a configuration object for the given instance with the given parent. Repeated calls will return the same object.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java b/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
index fd5af14..7815a3d 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
@@ -64,12 +64,12 @@ public class MetadataConstraints implements Constraint {
}
}
- private static final HashSet<ColumnFQ> validColumnQuals = new HashSet<ColumnFQ>(Arrays.asList(TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN,
+ private static final HashSet<ColumnFQ> validColumnQuals = new HashSet<>(Arrays.asList(TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN,
TabletsSection.TabletColumnFamily.OLD_PREV_ROW_COLUMN, TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN,
TabletsSection.TabletColumnFamily.SPLIT_RATIO_COLUMN, TabletsSection.ServerColumnFamily.TIME_COLUMN, TabletsSection.ServerColumnFamily.LOCK_COLUMN,
TabletsSection.ServerColumnFamily.FLUSH_COLUMN, TabletsSection.ServerColumnFamily.COMPACT_COLUMN));
- private static final HashSet<Text> validColumnFams = new HashSet<Text>(Arrays.asList(TabletsSection.BulkFileColumnFamily.NAME, LogColumnFamily.NAME,
+ private static final HashSet<Text> validColumnFams = new HashSet<>(Arrays.asList(TabletsSection.BulkFileColumnFamily.NAME, LogColumnFamily.NAME,
ScanFileColumnFamily.NAME, DataFileColumnFamily.NAME, TabletsSection.CurrentLocationColumnFamily.NAME, TabletsSection.LastLocationColumnFamily.NAME,
TabletsSection.FutureLocationColumnFamily.NAME, ChoppedColumnFamily.NAME, ClonedColumnFamily.NAME));
@@ -86,7 +86,7 @@ public class MetadataConstraints implements Constraint {
static private ArrayList<Short> addViolation(ArrayList<Short> lst, int violation) {
if (lst == null)
- lst = new ArrayList<Short>();
+ lst = new ArrayList<>();
lst.add((short) violation);
return lst;
}
@@ -194,8 +194,8 @@ public class MetadataConstraints implements Constraint {
// See ACCUMULO-1230.
boolean isLocationMutation = false;
- HashSet<Text> dataFiles = new HashSet<Text>();
- HashSet<Text> loadedFiles = new HashSet<Text>();
+ HashSet<Text> dataFiles = new HashSet<>();
+ HashSet<Text> loadedFiles = new HashSet<>();
String tidString = new String(columnUpdate.getValue(), UTF_8);
int otherTidCount = 0;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/fs/PerTableVolumeChooser.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/PerTableVolumeChooser.java b/server/base/src/main/java/org/apache/accumulo/server/fs/PerTableVolumeChooser.java
index e51df03..594a0a2 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/PerTableVolumeChooser.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/PerTableVolumeChooser.java
@@ -32,7 +32,7 @@ public class PerTableVolumeChooser implements VolumeChooser {
private final VolumeChooser fallbackVolumeChooser = new RandomVolumeChooser();
// TODO Add hint of expected size to construction, see ACCUMULO-3410
/* Track VolumeChooser instances so they can keep state. */
- private final ConcurrentHashMap<String,VolumeChooser> tableSpecificChooser = new ConcurrentHashMap<String,VolumeChooser>();
+ private final ConcurrentHashMap<String,VolumeChooser> tableSpecificChooser = new ConcurrentHashMap<>();
// TODO has to be lazily initialized currently because of the reliance on HdfsZooInstance. see ACCUMULO-3411
private volatile ServerConfigurationFactory serverConfs;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java b/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java
index 6bc225f..ec7c360 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java
@@ -43,7 +43,7 @@ import com.google.common.base.Predicate;
* to selecting from all of the options presented. Can be customized via the table property {@value #PREFERRED_VOLUMES_CUSTOM_KEY}, which should contain a comma
* separated list of {@link Volume} URIs. Note that both the property name and the format of its value are specific to this particular implementation.
*/
-public class PreferredVolumeChooser extends RandomVolumeChooser implements VolumeChooser {
+public class PreferredVolumeChooser extends RandomVolumeChooser {
private static final Logger log = LoggerFactory.getLogger(PreferredVolumeChooser.class);
/**
@@ -77,7 +77,7 @@ public class PreferredVolumeChooser extends RandomVolumeChooser implements Volum
serverConfs = localConf;
}
TableConfiguration tableConf = localConf.getTableConfiguration(env.getTableId());
- final Map<String,String> props = new HashMap<String,String>();
+ final Map<String,String> props = new HashMap<>();
tableConf.getProperties(props, PREFERRED_VOLUMES_FILTER);
if (props.isEmpty()) {
log.warn("No preferred volumes specified. Defaulting to randomly choosing from instance volumes");
@@ -93,12 +93,12 @@ public class PreferredVolumeChooser extends RandomVolumeChooser implements Volum
// If the preferred volumes property was specified, split the returned string by the comma and add use it to filter the given options.
Set<String> preferred = parsedPreferredVolumes.get(volumes);
if (preferred == null) {
- preferred = new HashSet<String>(Arrays.asList(StringUtils.split(volumes, ',')));
+ preferred = new HashSet<>(Arrays.asList(StringUtils.split(volumes, ',')));
parsedPreferredVolumes.put(volumes, preferred);
}
// Only keep the options that are in the preferred set
- final ArrayList<String> filteredOptions = new ArrayList<String>(Arrays.asList(options));
+ final ArrayList<String> filteredOptions = new ArrayList<>(Arrays.asList(options));
filteredOptions.retainAll(preferred);
// If there are no preferred volumes left, then warn the user and choose randomly from the instance volumes
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
index 5317485..d9df424 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
@@ -65,7 +65,7 @@ public class VolumeManagerImpl implements VolumeManager {
private static final Logger log = LoggerFactory.getLogger(VolumeManagerImpl.class);
- private static final HashSet<String> WARNED_ABOUT_SYNCONCLOSE = new HashSet<String>();
+ private static final HashSet<String> WARNED_ABOUT_SYNCONCLOSE = new HashSet<>();
private final Map<String,Volume> volumesByName;
private final Multimap<URI,Volume> volumesByFileSystemUri;
@@ -326,7 +326,7 @@ public class VolumeManagerImpl implements VolumeManager {
}
public static VolumeManager get(AccumuloConfiguration conf, final Configuration hadoopConf) throws IOException {
- final Map<String,Volume> volumes = new HashMap<String,Volume>();
+ final Map<String,Volume> volumes = new HashMap<>();
// The "default" Volume for Accumulo (in case no volumes are specified)
for (String volumeUriOrDir : VolumeConfiguration.getVolumeUris(conf, hadoopConf)) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
index 0c3092b..192ae77 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
@@ -126,7 +126,7 @@ public class VolumeUtil {
else
switchedPath = le.filename;
- ArrayList<String> switchedLogs = new ArrayList<String>();
+ ArrayList<String> switchedLogs = new ArrayList<>();
String switchedLog = switchVolume(le.filename, FileType.WAL, replacements);
if (switchedLog != null) {
switchedLogs.add(switchedLog);
@@ -153,8 +153,8 @@ public class VolumeUtil {
public SortedMap<FileRef,DataFileValue> datafiles;
public TabletFiles() {
- logEntries = new ArrayList<LogEntry>();
- datafiles = new TreeMap<FileRef,DataFileValue>();
+ logEntries = new ArrayList<>();
+ datafiles = new TreeMap<>();
}
public TabletFiles(String dir, List<LogEntry> logEntries, SortedMap<FileRef,DataFileValue> datafiles) {
@@ -183,11 +183,11 @@ public class VolumeUtil {
List<Pair<Path,Path>> replacements = ServerConstants.getVolumeReplacements();
log.trace("Using volume replacements: " + replacements);
- List<LogEntry> logsToRemove = new ArrayList<LogEntry>();
- List<LogEntry> logsToAdd = new ArrayList<LogEntry>();
+ List<LogEntry> logsToRemove = new ArrayList<>();
+ List<LogEntry> logsToAdd = new ArrayList<>();
- List<FileRef> filesToRemove = new ArrayList<FileRef>();
- SortedMap<FileRef,DataFileValue> filesToAdd = new TreeMap<FileRef,DataFileValue>();
+ List<FileRef> filesToRemove = new ArrayList<>();
+ SortedMap<FileRef,DataFileValue> filesToAdd = new TreeMap<>();
TabletFiles ret = new TabletFiles();
@@ -345,7 +345,7 @@ public class VolumeUtil {
}
private static HashSet<String> getFileNames(FileStatus[] filesStatuses) {
- HashSet<String> names = new HashSet<String>();
+ HashSet<String> names = new HashSet<>();
for (FileStatus fileStatus : filesStatuses)
if (fileStatus.isDirectory())
throw new IllegalArgumentException("expected " + fileStatus.getPath() + " to be a file");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
index 5a4cac1..0ccf51f 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
@@ -155,9 +155,9 @@ public class Initialize implements KeywordExecutable {
return zoo;
}
- private static HashMap<String,String> initialMetadataConf = new HashMap<String,String>();
- private static HashMap<String,String> initialMetadataCombinerConf = new HashMap<String,String>();
- private static HashMap<String,String> initialReplicationTableConf = new HashMap<String,String>();
+ private static HashMap<String,String> initialMetadataConf = new HashMap<>();
+ private static HashMap<String,String> initialMetadataCombinerConf = new HashMap<>();
+ private static HashMap<String,String> initialReplicationTableConf = new HashMap<>();
static {
initialMetadataConf.put(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE.getKey(), "32K");
@@ -575,7 +575,8 @@ public class Initialize implements KeywordExecutable {
if (opts.clearInstanceName) {
exists = false;
break;
- } else if (exists = zoo.exists(instanceNamePath)) {
+ } else if (zoo.exists(instanceNamePath)) {
+ exists = true;
String decision = getConsoleReader().readLine("Instance name \"" + instanceName + "\" exists. Delete existing entry from zookeeper? [Y/N] : ");
if (decision == null)
System.exit(0);
@@ -696,10 +697,10 @@ public class Initialize implements KeywordExecutable {
String[] volumeURIs = VolumeConfiguration.getVolumeUris(SiteConfiguration.getInstance());
- HashSet<String> initializedDirs = new HashSet<String>();
+ HashSet<String> initializedDirs = new HashSet<>();
initializedDirs.addAll(Arrays.asList(ServerConstants.checkBaseUris(volumeURIs, true)));
- HashSet<String> uinitializedDirs = new HashSet<String>();
+ HashSet<String> uinitializedDirs = new HashSet<>();
uinitializedDirs.addAll(Arrays.asList(volumeURIs));
uinitializedDirs.removeAll(initializedDirs);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java b/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
index 772be32..3a76442 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
@@ -82,7 +82,7 @@ public class MetadataBulkLoadFilter extends Filter {
throw new IOException("This iterator not intended for use at scan time");
}
- bulkTxStatusCache = new HashMap<Long,MetadataBulkLoadFilter.Status>();
+ bulkTxStatusCache = new HashMap<>();
arbitrator = getArbitrator();
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java b/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
index 0c0cceb..46f5f8b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
@@ -205,15 +205,15 @@ public class LiveTServerSet implements Watcher {
this.connection = connection;
this.instance = instance;
}
- };
+ }
// The set of active tservers with locks, indexed by their name in zookeeper
- private Map<String,TServerInfo> current = new HashMap<String,TServerInfo>();
+ private Map<String,TServerInfo> current = new HashMap<>();
// as above, indexed by TServerInstance
- private Map<TServerInstance,TServerInfo> currentInstances = new HashMap<TServerInstance,TServerInfo>();
+ private Map<TServerInstance,TServerInfo> currentInstances = new HashMap<>();
// The set of entries in zookeeper without locks, and the first time each was noticed
- private Map<String,Long> locklessServers = new HashMap<String,Long>();
+ private Map<String,Long> locklessServers = new HashMap<>();
public LiveTServerSet(ClientContext context, Listener cback) {
this.cback = cback;
@@ -238,12 +238,12 @@ public class LiveTServerSet implements Watcher {
public synchronized void scanServers() {
try {
- final Set<TServerInstance> updates = new HashSet<TServerInstance>();
- final Set<TServerInstance> doomed = new HashSet<TServerInstance>();
+ final Set<TServerInstance> updates = new HashSet<>();
+ final Set<TServerInstance> doomed = new HashSet<>();
final String path = ZooUtil.getRoot(context.getInstance()) + Constants.ZTSERVERS;
- HashSet<String> all = new HashSet<String>(current.keySet());
+ HashSet<String> all = new HashSet<>(current.keySet());
all.addAll(getZooCache().getChildren(path));
locklessServers.keySet().retainAll(all);
@@ -332,8 +332,8 @@ public class LiveTServerSet implements Watcher {
String server = event.getPath().substring(pos + 1);
- final Set<TServerInstance> updates = new HashSet<TServerInstance>();
- final Set<TServerInstance> doomed = new HashSet<TServerInstance>();
+ final Set<TServerInstance> updates = new HashSet<>();
+ final Set<TServerInstance> doomed = new HashSet<>();
final String path = ZooUtil.getRoot(context.getInstance()) + Constants.ZTSERVERS;
@@ -359,7 +359,7 @@ public class LiveTServerSet implements Watcher {
}
public synchronized Set<TServerInstance> getCurrentServers() {
- return new HashSet<TServerInstance>(currentInstances.keySet());
+ return new HashSet<>(currentInstances.keySet());
}
public synchronized int size() {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
index fd3dfd8..112fcc1 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
@@ -69,8 +69,8 @@ public class ChaoticLoadBalancer extends TabletBalancer {
Map<KeyExtent,TServerInstance> assignments) {
long total = assignments.size() + unassigned.size();
long avg = (long) Math.ceil(((double) total) / current.size());
- Map<TServerInstance,Long> toAssign = new HashMap<TServerInstance,Long>();
- List<TServerInstance> tServerArray = new ArrayList<TServerInstance>();
+ Map<TServerInstance,Long> toAssign = new HashMap<>();
+ List<TServerInstance> tServerArray = new ArrayList<>();
for (Entry<TServerInstance,TabletServerStatus> e : current.entrySet()) {
long numTablets = 0;
for (TableInfo ti : e.getValue().getTableMap().values()) {
@@ -105,8 +105,8 @@ public class ChaoticLoadBalancer extends TabletBalancer {
@Override
public long balance(SortedMap<TServerInstance,TabletServerStatus> current, Set<KeyExtent> migrations, List<TabletMigration> migrationsOut) {
- Map<TServerInstance,Long> numTablets = new HashMap<TServerInstance,Long>();
- List<TServerInstance> underCapacityTServer = new ArrayList<TServerInstance>();
+ Map<TServerInstance,Long> numTablets = new HashMap<>();
+ List<TServerInstance> underCapacityTServer = new ArrayList<>();
if (!migrations.isEmpty()) {
outstandingMigrations.migrations = migrations;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
index 56b3839..c31eb37 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
@@ -53,7 +53,7 @@ public class DefaultLoadBalancer extends TabletBalancer {
}
List<TServerInstance> randomize(Set<TServerInstance> locations) {
- List<TServerInstance> result = new ArrayList<TServerInstance>(locations);
+ List<TServerInstance> result = new ArrayList<>(locations);
Collections.shuffle(result);
return result;
}
@@ -123,11 +123,11 @@ public class DefaultLoadBalancer extends TabletBalancer {
if (current.size() < 2) {
return false;
}
- final Map<String,Map<KeyExtent,TabletStats>> donerTabletStats = new HashMap<String,Map<KeyExtent,TabletStats>>();
+ final Map<String,Map<KeyExtent,TabletStats>> donerTabletStats = new HashMap<>();
// Sort by total number of online tablets, per server
int total = 0;
- ArrayList<ServerCounts> totals = new ArrayList<ServerCounts>();
+ ArrayList<ServerCounts> totals = new ArrayList<>();
for (Entry<TServerInstance,TabletServerStatus> entry : current.entrySet()) {
int serverTotal = 0;
if (entry.getValue() != null && entry.getValue().tableMap != null) {
@@ -197,7 +197,7 @@ public class DefaultLoadBalancer extends TabletBalancer {
*/
List<TabletMigration> move(ServerCounts tooMuch, ServerCounts tooLittle, int count, Map<String,Map<KeyExtent,TabletStats>> donerTabletStats) {
- List<TabletMigration> result = new ArrayList<TabletMigration>();
+ List<TabletMigration> result = new ArrayList<>();
if (count == 0)
return result;
@@ -235,7 +235,7 @@ public class DefaultLoadBalancer extends TabletBalancer {
Map<KeyExtent,TabletStats> onlineTabletsForTable = donerTabletStats.get(table);
try {
if (onlineTabletsForTable == null) {
- onlineTabletsForTable = new HashMap<KeyExtent,TabletStats>();
+ onlineTabletsForTable = new HashMap<>();
List<TabletStats> stats = getOnlineTabletsForTable(tooMuch.server, table);
if (null == stats) {
log.warn("Unable to find tablets to move");
@@ -271,7 +271,7 @@ public class DefaultLoadBalancer extends TabletBalancer {
}
static Map<String,Integer> tabletCountsPerTable(TabletServerStatus status) {
- Map<String,Integer> result = new HashMap<String,Integer>();
+ Map<String,Integer> result = new HashMap<>();
if (status != null && status.tableMap != null) {
Map<String,TableInfo> tableMap = status.tableMap;
for (Entry<String,TableInfo> entry : tableMap.entrySet()) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java
index b2b2ed5..1838536 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java
@@ -145,7 +145,7 @@ public abstract class GroupBalancer extends TabletBalancer {
}
}
- tabletsByGroup.add(new ComparablePair<String,KeyExtent>(partitioner.apply(entry.getKey()), entry.getKey()));
+ tabletsByGroup.add(new ComparablePair<>(partitioner.apply(entry.getKey()), entry.getKey()));
}
Collections.sort(tabletsByGroup);
@@ -528,7 +528,7 @@ public abstract class GroupBalancer extends TabletBalancer {
if (srcTgi.getExtras().size() <= maxExtraGroups) {
serversToRemove.add(srcTgi.getTserverInstance());
} else {
- serversGroupsToRemove.add(new Pair<String,TServerInstance>(group, srcTgi.getTserverInstance()));
+ serversGroupsToRemove.add(new Pair<>(group, srcTgi.getTserverInstance()));
}
if (destTgi.getExtras().size() >= maxExtraGroups || moves.size() >= getMaxMigrations()) {
@@ -593,7 +593,7 @@ public abstract class GroupBalancer extends TabletBalancer {
moves.move(group, 1, srcTgi, destTgi);
if (num == 2) {
- serversToRemove.add(new Pair<String,TserverGroupInfo>(group, srcTgi));
+ serversToRemove.add(new Pair<>(group, srcTgi));
}
if (destTgi.getExtras().size() >= maxExtraGroups || moves.size() >= getMaxMigrations()) {
@@ -655,7 +655,7 @@ public abstract class GroupBalancer extends TabletBalancer {
if (srcTgi.getExtras().size() <= expectedExtra) {
emptyServers.add(srcTgi.getTserverInstance());
} else if (srcTgi.getExtras().get(group) == null) {
- emptyServerGroups.add(new Pair<String,TServerInstance>(group, srcTgi.getTserverInstance()));
+ emptyServerGroups.add(new Pair<>(group, srcTgi.getTserverInstance()));
}
if (destTgi.getExtras().size() >= expectedExtra || moves.size() >= getMaxMigrations()) {
@@ -761,7 +761,7 @@ public abstract class GroupBalancer extends TabletBalancer {
}
}
- return new Pair<KeyExtent,Location>(extent, loc);
+ return new Pair<>(extent, loc);
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
index 0506b5c..0fd217c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
@@ -89,7 +89,7 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer implements Con
private volatile long lastOOBCheck = System.currentTimeMillis();
private volatile long lastPoolRecheck = 0;
private boolean isIpBasedRegex = false;
- private Map<String,SortedMap<TServerInstance,TabletServerStatus>> pools = new HashMap<String,SortedMap<TServerInstance,TabletServerStatus>>();
+ private Map<String,SortedMap<TServerInstance,TabletServerStatus>> pools = new HashMap<>();
private int maxTServerMigrations = HOST_BALANCER_REGEX_MAX_MIGRATIONS_DEFAULT;
/**
@@ -103,13 +103,13 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer implements Con
protected synchronized Map<String,SortedMap<TServerInstance,TabletServerStatus>> splitCurrentByRegex(SortedMap<TServerInstance,TabletServerStatus> current) {
if ((System.currentTimeMillis() - lastPoolRecheck) > poolRecheckMillis) {
LOG.debug("Performing pool recheck - regrouping tablet servers based on regular expressions");
- Map<String,SortedMap<TServerInstance,TabletServerStatus>> newPools = new HashMap<String,SortedMap<TServerInstance,TabletServerStatus>>();
+ Map<String,SortedMap<TServerInstance,TabletServerStatus>> newPools = new HashMap<>();
for (Entry<TServerInstance,TabletServerStatus> e : current.entrySet()) {
List<String> poolNames = getPoolNamesForHost(e.getKey().host());
for (String pool : poolNames) {
SortedMap<TServerInstance,TabletServerStatus> np = newPools.get(pool);
if (null == np) {
- np = new TreeMap<TServerInstance,TabletServerStatus>(current.comparator());
+ np = new TreeMap<>(current.comparator());
newPools.put(pool, np);
}
np.put(e.getKey(), e.getValue());
@@ -265,18 +265,18 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer implements Con
Map<String,SortedMap<TServerInstance,TabletServerStatus>> pools = splitCurrentByRegex(current);
// group the unassigned into tables
- Map<String,Map<KeyExtent,TServerInstance>> groupedUnassigned = new HashMap<String,Map<KeyExtent,TServerInstance>>();
+ Map<String,Map<KeyExtent,TServerInstance>> groupedUnassigned = new HashMap<>();
for (Entry<KeyExtent,TServerInstance> e : unassigned.entrySet()) {
Map<KeyExtent,TServerInstance> tableUnassigned = groupedUnassigned.get(e.getKey().getTableId());
if (tableUnassigned == null) {
- tableUnassigned = new HashMap<KeyExtent,TServerInstance>();
+ tableUnassigned = new HashMap<>();
groupedUnassigned.put(e.getKey().getTableId(), tableUnassigned);
}
tableUnassigned.put(e.getKey(), e.getValue());
}
// Send a view of the current servers to the tables tablet balancer
for (Entry<String,Map<KeyExtent,TServerInstance>> e : groupedUnassigned.entrySet()) {
- Map<KeyExtent,TServerInstance> newAssignments = new HashMap<KeyExtent,TServerInstance>();
+ Map<KeyExtent,TServerInstance> newAssignments = new HashMap<>();
String tableName = tableIdToTableName.get(e.getKey());
String poolName = getPoolNameForTable(tableName);
SortedMap<TServerInstance,TabletServerStatus> currentView = pools.get(poolName);
@@ -377,7 +377,7 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer implements Con
this.poolRecheckMillis);
continue;
}
- ArrayList<TabletMigration> newMigrations = new ArrayList<TabletMigration>();
+ ArrayList<TabletMigration> newMigrations = new ArrayList<>();
long tableBalanceTime = getBalancerForTable(s).balance(currentView, migrations, newMigrations);
if (tableBalanceTime < minBalanceTime) {
minBalanceTime = tableBalanceTime;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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 4bae545..de3f4f7 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<String,TabletBalancer> perTableBalancers = new HashMap<String,TabletBalancer>();
+ Map<String,TabletBalancer> 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<TServerInstance,TabletServerStatus> current, Map<KeyExtent,TServerInstance> unassigned,
Map<KeyExtent,TServerInstance> assignments) {
// separate the unassigned into tables
- Map<String,Map<KeyExtent,TServerInstance>> groupedUnassigned = new HashMap<String,Map<KeyExtent,TServerInstance>>();
+ Map<String,Map<KeyExtent,TServerInstance>> groupedUnassigned = new HashMap<>();
for (Entry<KeyExtent,TServerInstance> e : unassigned.entrySet()) {
Map<KeyExtent,TServerInstance> tableUnassigned = groupedUnassigned.get(e.getKey().getTableId());
if (tableUnassigned == null) {
- tableUnassigned = new HashMap<KeyExtent,TServerInstance>();
+ tableUnassigned = new HashMap<>();
groupedUnassigned.put(e.getKey().getTableId(), tableUnassigned);
}
tableUnassigned.put(e.getKey(), e.getValue());
}
for (Entry<String,Map<KeyExtent,TServerInstance>> e : groupedUnassigned.entrySet()) {
- Map<KeyExtent,TServerInstance> newAssignments = new HashMap<KeyExtent,TServerInstance>();
+ Map<KeyExtent,TServerInstance> 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<TabletMigration> newMigrations = new ArrayList<TabletMigration>();
+ ArrayList<TabletMigration> 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/b102e760/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<TabletMigration> checkMigrationSanity(Set<TServerInstance> current, List<TabletMigration> migrations) {
- List<TabletMigration> result = new ArrayList<TabletMigration>(migrations.size());
+ List<TabletMigration> 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/b102e760/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<DeadServer> getList() {
- List<DeadServer> result = new ArrayList<DeadServer>();
+ List<DeadServer> result = new ArrayList<>();
IZooReaderWriter zoo = ZooReaderWriter.getInstance();
try {
List<String> children = zoo.getChildren(path);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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 536e1a5..14486a6 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<TabletLocationStat
TServerInstance current = null;
TServerInstance last = null;
long lastTimestamp = 0;
- List<Collection<String>> walogs = new ArrayList<Collection<String>>();
+ List<Collection<String>> walogs = new ArrayList<>();
boolean chopped = false;
for (Entry<Key,Value> entry : decodedRow.entrySet()) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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<TabletServerState> badStates;
static {
- mapping = new HashMap<Byte,TabletServerState>(TabletServerState.values().length);
- badStates = new HashSet<TabletServerState>();
+ 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/b102e760/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 26d98a8..973bbd2 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
@@ -90,7 +90,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
if (migrations == null)
return Collections.emptySet();
try {
- Set<KeyExtent> result = new HashSet<KeyExtent>();
+ Set<KeyExtent> result = new HashSet<>();
DataInputBuffer buffer = new DataInputBuffer();
byte[] data = Base64.decodeBase64(migrations.getBytes(UTF_8));
buffer.reset(data, data.length);
@@ -108,7 +108,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
private Set<String> parseTables(String tables) {
if (tables == null)
return null;
- Set<String> result = new HashSet<String>();
+ Set<String> result = new HashSet<>();
for (String table : tables.split(","))
result.add(table);
return result;
@@ -118,7 +118,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
if (servers == null)
return null;
// parse "host:port[INSTANCE]"
- Set<TServerInstance> result = new HashSet<TServerInstance>();
+ Set<TServerInstance> result = new HashSet<>();
if (servers.length() > 0) {
for (String part : servers.split(",")) {
String parts[] = part.split("\\[", 2);
@@ -136,7 +136,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
if (merges == null)
return null;
try {
- Map<String,MergeInfo> result = new HashMap<String,MergeInfo>();
+ Map<String,MergeInfo> result = new HashMap<>();
DataInputBuffer buffer = new DataInputBuffer();
byte[] data = Base64.decodeBase64(merges.getBytes(UTF_8));
buffer.reset(data, data.length);
@@ -215,7 +215,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
public static void setCurrentServers(IteratorSetting cfg, Set<TServerInstance> goodServers) {
if (goodServers != null) {
- List<String> servers = new ArrayList<String>();
+ List<String> servers = new ArrayList<>();
for (TServerInstance server : goodServers)
servers.add(server.toString());
cfg.addOption(SERVERS_OPTION, Joiner.on(",").join(servers));
@@ -262,7 +262,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
public static void setShuttingDown(IteratorSetting cfg, Set<TServerInstance> servers) {
if (servers != null) {
- List<String> serverList = new ArrayList<String>();
+ List<String> serverList = new ArrayList<>();
for (TServerInstance server : servers) {
serverList.add(server.toString());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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 720046f..8f92db5 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
@@ -84,7 +84,7 @@ public class ZooTabletStateStore extends TabletStateStore {
currentSession = parse(current);
futureSession = null;
}
- List<Collection<String>> logs = new ArrayList<Collection<String>>();
+ List<Collection<String>> 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/b102e760/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<IteratorSetting>(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/b102e760/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<String,Metric> registry = new ConcurrentHashMap<String,Metric>();
+ private static ConcurrentHashMap<String,Metric> registry = new ConcurrentHashMap<>();
private boolean currentlyLogging = false;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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 fce1ca9..d59267a 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<DedupedLogEvent> getEvents() {
- return new ArrayList<DedupedLogEvent>(events.values());
+ return new ArrayList<>(events.values());
}
synchronized public void clear() {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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<ProblemReport> {
public Map<String,Map<ProblemType,Integer>> summarize() {
- TreeMap<String,Map<ProblemType,Integer>> summary = new TreeMap<String,Map<ProblemType,Integer>>();
+ TreeMap<String,Map<ProblemType,Integer>> summary = new TreeMap<>();
for (ProblemReport pr : this) {
Map<ProblemType,Integer> tableProblems = summary.get(pr.getTableName());
if (tableProblems == null) {
- tableProblems = new EnumMap<ProblemType,Integer>(ProblemType.class);
+ tableProblems = new EnumMap<>(ProblemType.class);
summary.put(pr.getTableName(), tableProblems);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java b/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java
index aacf64d..84e4742 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java
@@ -45,7 +45,7 @@ import com.google.protobuf.InvalidProtocolBufferException;
public class StatusCombiner extends TypedValueCombiner<Status> {
private static final Logger log = LoggerFactory.getLogger(StatusCombiner.class);
- public static class StatusEncoder extends AbstractEncoder<Status> implements Encoder<Status> {
+ public static class StatusEncoder extends AbstractEncoder<Status> {
private static final Logger log = LoggerFactory.getLogger(StatusEncoder.class);
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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<String> onewayMethods = new HashSet<String>();
+ final Set<String> onewayMethods = new HashSet<>();
for (Entry<String,?> entry : processorView.entrySet()) {
try {
if ((Boolean) isOnewayMethod.invoke(entry.getValue())) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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> T service(final T instance, final Class<? extends T> originalClass, AccumuloConfiguration conf) {
- InvocationHandler handler = new TCredentialsUpdatingInvocationHandler<T>(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/b102e760/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 f874353..49995d6 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
@@ -71,7 +71,7 @@ public class TServerUtils {
/**
* Static instance, passed to {@link ClientInfoProcessorFactory}, which will contain the client address of any incoming RPC.
*/
- public static final ThreadLocal<String> clientAddress = new ThreadLocal<String>();
+ public static final ThreadLocal<String> clientAddress = new ThreadLocal<>();
/**
*
@@ -339,7 +339,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<String> socketEnabledProtocols = new HashSet<String>(Arrays.asList(sslServerSock.getEnabledProtocols()));
+ Set<String> 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/b102e760/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<String> rpcPrincipal = new ThreadLocal<String>();
- public static final ThreadLocal<SaslMechanism> rpcMechanism = new ThreadLocal<SaslMechanism>();
+ public static final ThreadLocal<String> rpcPrincipal = new ThreadLocal<>();
+ public static final ThreadLocal<SaslMechanism> rpcMechanism = new ThreadLocal<>();
private final TProcessor wrapped;
private final UserGroupInformation loginUser;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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<String> truncate(Collection<?> list) {
- List<String> result = new ArrayList<String>();
+ List<String> 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<KeyExtent,List<Range>> convertedBatch = Translator.translate(tbatch, new Translator.TKeyExtentTranslator(), new Translator.ListTranslator(
new Translator.TRangeTranslator()));
- Map<KeyExtent,List<String>> truncated = new HashMap<KeyExtent,List<String>>();
+ Map<KeyExtent,List<String>> truncated = new HashMap<>();
for (Entry<KeyExtent,List<Range>> entry : convertedBatch.entrySet()) {
truncated.put(entry.getKey(), truncate(entry.getValue()));
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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<Authenticati
private final Instance instance;
private final long tokenMaxLifetime;
- private final ConcurrentHashMap<Integer,AuthenticationKey> allKeys = new ConcurrentHashMap<Integer,AuthenticationKey>();
+ private final ConcurrentHashMap<Integer,AuthenticationKey> allKeys = new ConcurrentHashMap<>();
private AuthenticationKey currentKey;
/**
@@ -168,7 +168,7 @@ public class AuthenticationTokenSecretManager extends SecretManager<Authenticati
}
// The use of the ServiceLoader inside Token doesn't work to automatically get the Identifier
// Explicitly returning the identifier also saves an extra deserialization
- Token<AuthenticationTokenIdentifier> token = new Token<AuthenticationTokenIdentifier>(id.getBytes(), password, id.getKind(), new Text(svcName.toString()));
+ Token<AuthenticationTokenIdentifier> 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/b102e760/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<Class<? extends AuthenticationToken>> getSupportedTokenTypes() {
- Set<Class<? extends AuthenticationToken>> cs = new HashSet<Class<? extends AuthenticationToken>>();
+ Set<Class<? extends AuthenticationToken>> cs = new HashSet<>();
cs.add(NullToken.class);
return cs;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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<String> listUsers() {
- return new TreeSet<String>(zooCache.getChildren(ZKUserPath));
+ return new TreeSet<>(zooCache.getChildren(ZKUserPath));
}
@Override
@@ -200,7 +200,7 @@ public final class ZKAuthenticator implements Authenticator {
@Override
public Set<Class<? extends AuthenticationToken>> getSupportedTokenTypes() {
- Set<Class<? extends AuthenticationToken>> cs = new HashSet<Class<? extends AuthenticationToken>>();
+ Set<Class<? extends AuthenticationToken>> cs = new HashSet<>();
cs.add(PasswordToken.class);
return cs;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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<SystemPermission> rootPerms = new TreeSet<SystemPermission>();
+ Set<SystemPermission> rootPerms = new TreeSet<>();
for (SystemPermission p : SystemPermission.values())
rootPerms.add(p);
- Map<String,Set<TablePermission>> tablePerms = new HashMap<String,Set<TablePermission>>();
+ Map<String,Set<TablePermission>> 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/b102e760/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<SystemPermission> perms;
if (permBytes == null) {
- perms = new TreeSet<SystemPermission>();
+ 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<TablePermission>();
+ 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<NamespacePermission>();
+ 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<SystemPermission> rootPerms = new TreeSet<SystemPermission>();
+ Set<SystemPermission> rootPerms = new TreeSet<>();
for (SystemPermission p : SystemPermission.values())
rootPerms.add(p);
- Map<String,Set<TablePermission>> tablePerms = new HashMap<String,Set<TablePermission>>();
+ Map<String,Set<TablePermission>> 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<String,Set<NamespacePermission>> namespacePerms = new HashMap<String,Set<NamespacePermission>>();
+ Map<String,Set<NamespacePermission>> 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/b102e760/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<SystemPermission> convertSystemPermissions(byte[] systempermissions) {
ByteArrayInputStream bytes = new ByteArrayInputStream(systempermissions);
DataInputStream in = new DataInputStream(bytes);
- Set<SystemPermission> toReturn = new HashSet<SystemPermission>();
+ Set<SystemPermission> toReturn = new HashSet<>();
try {
while (in.available() > 0)
toReturn.add(SystemPermission.getPermissionById(in.readByte()));
@@ -145,7 +145,7 @@ class ZKSecurityTool {
}
public static Set<TablePermission> convertTablePermissions(byte[] tablepermissions) {
- Set<TablePermission> toReturn = new HashSet<TablePermission>();
+ Set<TablePermission> toReturn = new HashSet<>();
for (byte b : tablepermissions)
toReturn.add(TablePermission.getPermissionById(b));
return toReturn;
@@ -165,7 +165,7 @@ class ZKSecurityTool {
}
public static Set<NamespacePermission> convertNamespacePermissions(byte[] namespacepermissions) {
- Set<NamespacePermission> toReturn = new HashSet<NamespacePermission>();
+ Set<NamespacePermission> toReturn = new HashSet<>();
for (byte b : namespacepermissions)
toReturn.add(NamespacePermission.getPermissionById(b));
return toReturn;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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 176b247..01faacd 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
@@ -51,7 +51,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<String,Long> mincIdleThresholds = new HashMap<String,Long>();
+ private final HashMap<String,Long> mincIdleThresholds = new HashMap<>();
private ServerConfiguration config = null;
private static class TabletInfo {
@@ -71,7 +71,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<Long,List<TabletInfo>> map = new TreeMap<Long,List<TabletInfo>>();
+ final TreeMap<Long,List<TabletInfo>> map = new TreeMap<>();
LargestMap(int n) {
max = n;
@@ -98,7 +98,7 @@ public class LargestFirstMemoryManager implements MemoryManager {
if (lst != null) {
lst.add(value);
} else {
- lst = new ArrayList<TabletInfo>();
+ lst = new ArrayList<>();
lst.add(value);
map.put(key, lst);
}
@@ -159,7 +159,7 @@ public class LargestFirstMemoryManager implements MemoryManager {
mincIdleThresholds.clear();
final MemoryManagementActions result = new MemoryManagementActions();
- result.tabletsToMinorCompact = new ArrayList<KeyExtent>();
+ 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/b102e760/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 df18fbf..ea2f458 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
@@ -90,13 +90,13 @@ public class Admin implements KeywordExecutable {
@Parameters(commandDescription = "stop the tablet server on the given hosts")
static class StopCommand {
@Parameter(description = "<host> {<host> ... }")
- List<String> args = new ArrayList<String>();
+ List<String> args = new ArrayList<>();
}
@Parameters(commandDescription = "Ping tablet servers. If no arguments, pings all.")
static class PingCommand {
@Parameter(description = "{<host> ... }")
- List<String> args = new ArrayList<String>();
+ List<String> args = new ArrayList<>();
}
@Parameters(commandDescription = "print tablets that are offline in online tables")
@@ -139,7 +139,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<String> tables = new ArrayList<String>();
+ List<String> tables = new ArrayList<>();
@Parameter(names = {"-u", "--users"}, description = "print users and their authorizations and permissions")
boolean users = false;
}
@@ -518,7 +518,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<String,String> props = new TreeMap<String,String>();
+ TreeMap<String,String> props = new TreeMap<>();
for (Entry<String,String> p : connector.namespaceOperations().getProperties(namespace)) {
props.put(p.getKey(), p.getValue());
}
@@ -565,14 +565,14 @@ public class Admin implements KeywordExecutable {
private void printSystemConfiguration(Connector connector, File outputDirectory) throws IOException, AccumuloException, AccumuloSecurityException {
Configuration conf = new Configuration(false);
- TreeMap<String,String> site = new TreeMap<String,String>(siteConfig);
+ TreeMap<String,String> site = new TreeMap<>(siteConfig);
for (Entry<String,String> prop : site.entrySet()) {
String defaultValue = getDefaultConfigValue(prop.getKey());
if (!prop.getValue().equals(defaultValue) && !systemConfig.containsKey(prop.getKey())) {
conf.set(prop.getKey(), prop.getValue());
}
}
- TreeMap<String,String> system = new TreeMap<String,String>(systemConfig);
+ TreeMap<String,String> system = new TreeMap<>(systemConfig);
for (Entry<String,String> prop : system.entrySet()) {
String defaultValue = getDefaultConfigValue(prop.getKey());
if (!prop.getValue().equals(defaultValue)) {
@@ -593,7 +593,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<String,String> props = new TreeMap<String,String>();
+ TreeMap<String,String> props = new TreeMap<>();
for (Entry<String,String> p : connector.tableOperations().getProperties(tableName)) {
props.put(p.getKey(), p.getValue());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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<String> argsList = new ArrayList<String>(args.length + 2);
+ List<String> 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<String> ephemerals = new ArrayList<String>();
+ final List<String> 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/b102e760/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 867cd67..4f69c72 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<String,TreeSet<KeyExtent>> tables = new HashMap<String,TreeSet<KeyExtent>>();
+ Map<String,TreeSet<KeyExtent>> tables = new HashMap<>();
Scanner scanner;
@@ -124,7 +124,7 @@ public class CheckForMetadataProblems {
tables.clear();
- tablets = new TreeSet<KeyExtent>();
+ tablets = new TreeSet<>();
tables.put(tableName, tablets);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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<String> instances = new HashSet<String>(zk.getChildren(Constants.ZROOT + Constants.ZINSTANCES));
- Set<String> uuids = new HashSet<String>(zk.getChildren(Constants.ZROOT));
+ Set<String> instances = new HashSet<>(zk.getChildren(Constants.ZROOT + Constants.ZINSTANCES));
+ Set<String> 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/b102e760/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<String>(Arrays.asList(tokens[3].split(",")));
+ options = new HashSet<>(Arrays.asList(tokens[3].split(",")));
}
@Override
@@ -80,7 +80,7 @@ public class FileSystemMonitor {
}
static List<Mount> getMountsFromFile(BufferedReader br) throws IOException {
- List<Mount> mounts = new ArrayList<Mount>();
+ List<Mount> 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<String,Boolean> readWriteFilesystems = new HashMap<String,Boolean>();
+ private Map<String,Boolean> readWriteFilesystems = new HashMap<>();
public FileSystemMonitor(final String procFile, long period) throws IOException {
List<Mount> mounts = parse(procFile);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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 491a830..a686bae 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<String> reduceFiles(AccumuloConfiguration acuConf, Configuration conf, VolumeManager fs, Text prevEndRow, Text endRow,
Collection<String> mapFiles, int maxFiles, Path tmpDir, int pass) throws IOException {
- ArrayList<String> paths = new ArrayList<String>(mapFiles);
+ ArrayList<String> paths = new ArrayList<>(mapFiles);
if (paths.size() <= maxFiles)
return paths;
@@ -118,7 +118,7 @@ public class FileUtil {
int start = 0;
- ArrayList<String> outFiles = new ArrayList<String>();
+ ArrayList<String> 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().newWriterBuilder().forFile(newMapFile.toString(), ns, ns.getConf()).withTableConfiguration(acuConf).build();
writer.startDefaultLocalityGroup();
- List<SortedKeyValueIterator<Key,Value>> iters = new ArrayList<SortedKeyValueIterator<Key,Value>>(inFiles.size());
+ List<SortedKeyValueIterator<Key,Value>> 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<FileSKVIterator> readers = new ArrayList<FileSKVIterator>(mapFiles.size());
+ ArrayList<FileSKVIterator> 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<FileSKVIterator> readers = new ArrayList<FileSKVIterator>(mapFiles.size());
+ ArrayList<FileSKVIterator> 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<Double,Key> ret = new TreeMap<Double,Key>();
+ TreeMap<Double,Key> ret = new TreeMap<>();
Key lastKey = null;
long keysRead = 0;
@@ -436,7 +436,7 @@ public class FileUtil {
public static Map<FileRef,FileInfo> tryToGetFirstAndLastRows(VolumeManager fs, AccumuloConfiguration acuConf, Set<FileRef> mapfiles) {
- HashMap<FileRef,FileInfo> mapFilesInfo = new HashMap<FileRef,FileInfo>();
+ HashMap<FileRef,FileInfo> mapFilesInfo = new HashMap<>();
long t1 = System.currentTimeMillis();
@@ -517,7 +517,7 @@ public class FileUtil {
VolumeManager fs) throws IOException {
long totalIndexEntries = 0;
- Map<KeyExtent,MLong> counts = new TreeMap<KeyExtent,MLong>();
+ Map<KeyExtent,MLong> counts = new TreeMap<>();
for (KeyExtent keyExtent : extents)
counts.put(keyExtent, new MLong(0));
@@ -548,7 +548,7 @@ public class FileUtil {
}
}
- Map<KeyExtent,Long> results = new TreeMap<KeyExtent,Long>();
+ Map<KeyExtent,Long> results = new TreeMap<>();
for (KeyExtent keyExtent : extents) {
double numEntries = counts.get(keyExtent).l;
if (numEntries == 0)
@@ -560,7 +560,7 @@ public class FileUtil {
}
public static Collection<String> toPathStrings(Collection<FileRef> refs) {
- ArrayList<String> ret = new ArrayList<String>();
+ ArrayList<String> ret = new ArrayList<>();
for (FileRef fileRef : refs) {
ret.add(fileRef.path().toString());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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<String,UUID> tm = new TreeMap<String,UUID>();
+ TreeMap<String,UUID> tm = new TreeMap<>();
List<String> names;
@@ -198,7 +198,7 @@ public class ListInstances {
}
private static TreeSet<UUID> getInstanceIDs(ZooReader zk, boolean printErrors) {
- TreeSet<UUID> ts = new TreeSet<UUID>();
+ TreeSet<UUID> ts = new TreeSet<>();
try {
List<String> children = zk.getChildren(Constants.ZROOT);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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 9ad461b..3e30aaf 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
@@ -67,10 +67,10 @@ public class ListVolumesUsed {
private static void listZookeeper() throws Exception {
System.out.println("Listing volumes referenced in zookeeper");
- TreeSet<String> volumes = new TreeSet<String>();
+ TreeSet<String> volumes = new TreeSet<>();
volumes.add(getTableURI(MetadataTableUtil.getRootTabletDir()));
- ArrayList<LogEntry> result = new ArrayList<LogEntry>();
+ ArrayList<LogEntry> result = new ArrayList<>();
MetadataTableUtil.getRootLogEntries(result);
for (LogEntry logEntry : result) {
getLogURIs(volumes, logEntry);
@@ -92,7 +92,7 @@ public class ListVolumesUsed {
scanner.fetchColumnFamily(MetadataSchema.TabletsSection.LogColumnFamily.NAME);
MetadataSchema.TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.fetch(scanner);
- TreeSet<String> volumes = new TreeSet<String>();
+ TreeSet<String> volumes = new TreeSet<>();
for (Entry<Key,Value> entry : scanner) {
if (entry.getKey().getColumnFamily().equals(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME)) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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<String,Long> totalBlocks = new HashMap<String,Long>();
- Map<String,Long> localBlocks = new HashMap<String,Long>();
- ArrayList<String> files = new ArrayList<String>();
+ Map<String,Long> totalBlocks = new HashMap<>();
+ Map<String,Long> localBlocks = new HashMap<>();
+ ArrayList<String> files = new ArrayList<>();
for (Entry<Key,Value> entry : scanner) {
Key key = entry.getKey();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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<Set<TokenProperty>> tokenProps = new ArrayList<Set<TokenProperty>>();
+ List<Set<TokenProperty>> tokenProps = new ArrayList<>();
for (Class<? extends AuthenticationToken> tokenType : authenticator.getSupportedTokenTypes()) {
tokenProps.add(tokenType.newInstance().getProperties());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b102e760/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 5aa61bc..1bdd255 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
@@ -161,11 +161,11 @@ public class MasterMetadataUtil {
} else {
log.info("Finishing incomplete split " + metadataEntry + " " + metadataPrevEndRow);
- List<FileRef> highDatafilesToRemove = new ArrayList<FileRef>();
+ List<FileRef> highDatafilesToRemove = new ArrayList<>();
- SortedMap<FileRef,DataFileValue> origDatafileSizes = new TreeMap<FileRef,DataFileValue>();
- SortedMap<FileRef,DataFileValue> highDatafileSizes = new TreeMap<FileRef,DataFileValue>();
- SortedMap<FileRef,DataFileValue> lowDatafileSizes = new TreeMap<FileRef,DataFileValue>();
+ SortedMap<FileRef,DataFileValue> origDatafileSizes = new TreeMap<>();
+ SortedMap<FileRef,DataFileValue> highDatafileSizes = new TreeMap<>();
+ SortedMap<FileRef,DataFileValue> lowDatafileSizes = new TreeMap<>();
try (Scanner scanner3 = new ScannerImpl(context, MetadataTable.ID, Authorizations.EMPTY)) {
Key rowKey = new Key(metadataEntry);