This is an automated email from the ASF dual-hosted git repository. jmark99 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/master by this push: new e4b69f9 Replace explicit types with diamond operator (#1540) e4b69f9 is described below commit e4b69f976c7223ff7dc3fd930462c323da0ef7ae Author: Mark Owens <jmar...@apache.org> AuthorDate: Mon Mar 2 14:27:49 2020 -0500 Replace explicit types with diamond operator (#1540) Update code to take advantage of the newer Java language feature allowing the diamond operator to replace explicit types. --- .../core/client/mapred/AccumuloFileOutputFormat.java | 2 +- .../core/client/mapred/AccumuloInputFormat.java | 2 +- .../client/mapred/AccumuloMultiTableInputFormat.java | 2 +- .../core/client/mapred/AccumuloRowInputFormat.java | 2 +- .../client/mapreduce/AccumuloFileOutputFormat.java | 2 +- .../core/client/mapreduce/AccumuloInputFormat.java | 2 +- .../mapreduce/AccumuloMultiTableInputFormat.java | 2 +- .../core/client/mapreduce/AccumuloRowInputFormat.java | 2 +- .../summary/summarizers/AuthorizationSummarizer.java | 2 +- .../apache/accumulo/core/clientImpl/Namespaces.java | 6 +++--- .../apache/accumulo/core/clientImpl/ScannerImpl.java | 19 +++++++++---------- .../org/apache/accumulo/core/logging/FateLogger.java | 2 +- .../org/apache/accumulo/core/summary/Gatherer.java | 2 +- .../java/org/apache/accumulo/core/util/Validator.java | 6 +++--- .../core/file/rfile/MultiThreadedRFileTest.java | 3 +-- .../java/org/apache/accumulo/core/util/MergeTest.java | 2 +- .../hadoop/mapred/AccumuloFileOutputFormat.java | 2 +- .../accumulo/hadoop/mapred/AccumuloInputFormat.java | 2 +- .../hadoop/mapred/AccumuloRowInputFormat.java | 2 +- .../hadoop/mapreduce/AccumuloFileOutputFormat.java | 2 +- .../hadoop/mapreduce/AccumuloInputFormat.java | 2 +- .../hadoop/mapreduce/AccumuloRowInputFormat.java | 2 +- .../accumulo/server/fs/SpaceAwareVolumeChooser.java | 2 +- .../org/apache/accumulo/server/gc/GcVolumeUtil.java | 2 +- .../master/balancer/HostRegexTableLoadBalancer.java | 4 ++-- .../server/master/balancer/RegexGroupBalancer.java | 2 +- .../server/master/state/ZooTabletStateStore.java | 2 +- .../accumulo/server/replication/StatusFormatter.java | 2 +- .../server/replication/proto/Replication.java | 6 ++---- .../server/master/balancer/GroupBalancerTest.java | 2 +- .../apache/accumulo/gc/SimpleGarbageCollector.java | 4 ++-- .../apache/accumulo/master/FateServiceHandler.java | 2 +- .../main/java/org/apache/accumulo/master/Master.java | 4 ++-- .../apache/accumulo/master/util/TableValidators.java | 12 ++++++------ .../java/org/apache/accumulo/monitor/Monitor.java | 2 +- .../org/apache/accumulo/tserver/OnlineTablets.java | 2 +- .../org/apache/accumulo/tserver/TabletServer.java | 6 +++--- .../tserver/tablet/TabletMutationPrepAttemptTest.java | 4 ++-- 38 files changed, 62 insertions(+), 66 deletions(-) diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.java index 9393a6f..76b8991 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.java @@ -164,7 +164,7 @@ public class AccumuloFileOutputFormat extends FileOutputFormat<Key,Value> { new Path(getWorkOutputPath(job), getUniqueName(job, "part") + "." + extension); final int visCacheSize = FileOutputConfigurator.getVisibilityCacheSize(conf); - return new RecordWriter<Key,Value>() { + return new RecordWriter<>() { RFileWriter out = null; @Override diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java index 07496e8..798d2e7 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java @@ -73,7 +73,7 @@ public class AccumuloInputFormat extends InputFormatBase<Key,Value> { throw new IllegalArgumentException("No RecordReader for " + split.getClass()); } - RecordReaderBase<Key,Value> recordReader = new RecordReaderBase<Key,Value>() { + RecordReaderBase<Key,Value> recordReader = new RecordReaderBase<>() { @Override public boolean next(Key key, Value value) throws IOException { diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.java index 640dcc8..b9e8e3a 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.java @@ -75,7 +75,7 @@ public class AccumuloMultiTableInputFormat extends AbstractInputFormat<Key,Value throws IOException { log.setLevel(getLogLevel(job)); InputFormatBase.RecordReaderBase<Key,Value> recordReader = - new InputFormatBase.RecordReaderBase<Key,Value>() { + new InputFormatBase.RecordReaderBase<>() { @Override public boolean next(Key key, Value value) throws IOException { diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java index 908460d..e5222fa 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java @@ -62,7 +62,7 @@ public class AccumuloRowInputFormat JobConf job, Reporter reporter) throws IOException { log.setLevel(getLogLevel(job)); RecordReaderBase<Text,PeekingIterator<Entry<Key,Value>>> recordReader = - new RecordReaderBase<Text,PeekingIterator<Entry<Key,Value>>>() { + new RecordReaderBase<>() { RowIterator rowIterator; @Override diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java index 4d01bd9..90a692a 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java @@ -160,7 +160,7 @@ public class AccumuloFileOutputFormat extends FileOutputFormat<Key,Value> { final Path file = this.getDefaultWorkFile(context, "." + extension); final int visCacheSize = FileOutputConfigurator.getVisibilityCacheSize(conf); - return new RecordWriter<Key,Value>() { + return new RecordWriter<>() { RFileWriter out = null; @Override diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java index 8ef34a8..85ae210 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java @@ -72,7 +72,7 @@ public class AccumuloInputFormat extends InputFormatBase<Key,Value> { throw new IllegalArgumentException("No RecordReader for " + split.getClass()); } - return new RecordReaderBase<Key,Value>() { + return new RecordReaderBase<>() { @Override public boolean nextKeyValue() throws IOException, InterruptedException { if (scannerIterator.hasNext()) { diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.java index a6986bb..3e45e32 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.java @@ -76,7 +76,7 @@ public class AccumuloMultiTableInputFormat extends AbstractInputFormat<Key,Value public RecordReader<Key,Value> createRecordReader(InputSplit inputSplit, TaskAttemptContext context) throws IOException, InterruptedException { log.setLevel(getLogLevel(context)); - return new AbstractRecordReader<Key,Value>() { + return new AbstractRecordReader<>() { @Override public boolean nextKeyValue() throws IOException, InterruptedException { if (scannerIterator.hasNext()) { diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java index c83024f..147bb0d 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java @@ -61,7 +61,7 @@ public class AccumuloRowInputFormat public RecordReader<Text,PeekingIterator<Entry<Key,Value>>> createRecordReader(InputSplit split, TaskAttemptContext context) throws IOException, InterruptedException { log.setLevel(getLogLevel(context)); - return new RecordReaderBase<Text,PeekingIterator<Entry<Key,Value>>>() { + return new RecordReaderBase<>() { RowIterator rowIterator; @Override diff --git a/core/src/main/java/org/apache/accumulo/core/client/summary/summarizers/AuthorizationSummarizer.java b/core/src/main/java/org/apache/accumulo/core/client/summary/summarizers/AuthorizationSummarizer.java index 524947f..ef7e7d3 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/summary/summarizers/AuthorizationSummarizer.java +++ b/core/src/main/java/org/apache/accumulo/core/client/summary/summarizers/AuthorizationSummarizer.java @@ -65,7 +65,7 @@ public class AuthorizationSummarizer extends CountingSummarizer<ByteSequence> { final int MAX_ENTRIES = 1000; private Map<ByteSequence,Set<ByteSequence>> cache = - new LinkedHashMap<ByteSequence,Set<ByteSequence>>(MAX_ENTRIES + 1, .75F, true) { + new LinkedHashMap<>(MAX_ENTRIES + 1, .75F, true) { private static final long serialVersionUID = 1L; // This method is called just after a new entry has been added diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/Namespaces.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/Namespaces.java index 3279739..a365876 100644 --- a/core/src/main/java/org/apache/accumulo/core/clientImpl/Namespaces.java +++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/Namespaces.java @@ -41,7 +41,7 @@ public class Namespaces { private static final Logger log = LoggerFactory.getLogger(Namespaces.class); public static final String VALID_NAME_REGEX = "^\\w*$"; - public static final Validator<String> VALID_NAME = new Validator<String>() { + public static final Validator<String> VALID_NAME = new Validator<>() { @Override public boolean test(String namespace) { return namespace != null && namespace.matches(VALID_NAME_REGEX); @@ -56,7 +56,7 @@ public class Namespaces { } }; - public static final Validator<String> NOT_DEFAULT = new Validator<String>() { + public static final Validator<String> NOT_DEFAULT = new Validator<>() { @Override public boolean test(String namespace) { return !Namespace.DEFAULT.name().equals(namespace); @@ -68,7 +68,7 @@ public class Namespaces { } }; - public static final Validator<String> NOT_ACCUMULO = new Validator<String>() { + public static final Validator<String> NOT_ACCUMULO = new Validator<>() { @Override public boolean test(String namespace) { return !Namespace.ACCUMULO.name().equals(namespace); diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ScannerImpl.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ScannerImpl.java index 5133986..8da83ed 100644 --- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ScannerImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ScannerImpl.java @@ -71,16 +71,15 @@ public class ScannerImpl extends ScannerOptions implements Scanner { // and does not read all of the data. For this case do not want iterator tracking to consume too // much memory. Also it would be best to avoid an RPC storm of close methods for thousands // sessions that may have timed out. - private Map<ScannerIterator,Long> iters = - new LinkedHashMap<ScannerIterator,Long>(MAX_ENTRIES + 1, .75F, true) { - private static final long serialVersionUID = 1L; - - // This method is called just after a new entry has been added - @Override - public boolean removeEldestEntry(Map.Entry<ScannerIterator,Long> eldest) { - return size() > MAX_ENTRIES; - } - }; + private Map<ScannerIterator,Long> iters = new LinkedHashMap<>(MAX_ENTRIES + 1, .75F, true) { + private static final long serialVersionUID = 1L; + + // This method is called just after a new entry has been added + @Override + public boolean removeEldestEntry(Map.Entry<ScannerIterator,Long> eldest) { + return size() > MAX_ENTRIES; + } + }; /** * This is used for ScannerIterators to report their activity back to the scanner that created diff --git a/core/src/main/java/org/apache/accumulo/core/logging/FateLogger.java b/core/src/main/java/org/apache/accumulo/core/logging/FateLogger.java index f725202..c856275 100644 --- a/core/src/main/java/org/apache/accumulo/core/logging/FateLogger.java +++ b/core/src/main/java/org/apache/accumulo/core/logging/FateLogger.java @@ -43,7 +43,7 @@ public class FateLogger { public static <T> TStore<T> wrap(TStore<T> store, Function<Repo<T>,String> toLogString) { // only logging operations that change the persisted data, not operations that only read data - return new TStore<T>() { + return new TStore<>() { @Override public long reserve() { diff --git a/core/src/main/java/org/apache/accumulo/core/summary/Gatherer.java b/core/src/main/java/org/apache/accumulo/core/summary/Gatherer.java index 466e548..982ebf4 100644 --- a/core/src/main/java/org/apache/accumulo/core/summary/Gatherer.java +++ b/core/src/main/java/org/apache/accumulo/core/summary/Gatherer.java @@ -245,7 +245,7 @@ public class Gatherer { return () -> { Iterator<Entry<K,V>> esi = map.entrySet().iterator(); - return new Iterator<Map<K,V>>() { + return new Iterator<>() { @Override public boolean hasNext() { return esi.hasNext(); diff --git a/core/src/main/java/org/apache/accumulo/core/util/Validator.java b/core/src/main/java/org/apache/accumulo/core/util/Validator.java index 6e838ef..5e9fdd3 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/Validator.java +++ b/core/src/main/java/org/apache/accumulo/core/util/Validator.java @@ -64,7 +64,7 @@ public abstract class Validator<T> implements Predicate<T> { if (other == null) return this; final Validator<T> mine = this; - return new Validator<T>() { + return new Validator<>() { @Override public boolean test(T argument) { @@ -91,7 +91,7 @@ public abstract class Validator<T> implements Predicate<T> { if (other == null) return this; final Validator<T> mine = this; - return new Validator<T>() { + return new Validator<>() { @Override public boolean test(T argument) { @@ -114,7 +114,7 @@ public abstract class Validator<T> implements Predicate<T> { */ public final Validator<T> not() { final Validator<T> mine = this; - return new Validator<T>() { + return new Validator<>() { @Override public boolean test(T argument) { diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/MultiThreadedRFileTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/MultiThreadedRFileTest.java index e3b371e..d707ac1 100644 --- a/core/src/test/java/org/apache/accumulo/core/file/rfile/MultiThreadedRFileTest.java +++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/MultiThreadedRFileTest.java @@ -225,8 +225,7 @@ public class MultiThreadedRFileTest { justification = "information put into error message is safe and used for testing") @Test public void testMultipleReaders() throws IOException { - final List<Throwable> threadExceptions = - Collections.synchronizedList(new ArrayList<Throwable>()); + final List<Throwable> threadExceptions = Collections.synchronizedList(new ArrayList<>()); Map<String,MutableInt> messages = new HashMap<>(); Map<String,String> stackTrace = new HashMap<>(); diff --git a/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java b/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java index e3d3644..aa16c22 100644 --- a/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java +++ b/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java @@ -59,7 +59,7 @@ public class MergeTest { protected Iterator<Size> getSizeIterator(AccumuloClient client, String tablename, final Text start, final Text end) throws MergeException { final Iterator<Size> impl = tablets.iterator(); - return new Iterator<Size>() { + return new Iterator<>() { Size next = skip(); @Override diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapred/AccumuloFileOutputFormat.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapred/AccumuloFileOutputFormat.java index ff9ca1b..eb304f1 100644 --- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapred/AccumuloFileOutputFormat.java +++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapred/AccumuloFileOutputFormat.java @@ -60,7 +60,7 @@ public class AccumuloFileOutputFormat extends FileOutputFormat<Key,Value> { new Path(getWorkOutputPath(job), getUniqueName(job, "part") + "." + extension); final int visCacheSize = ConfiguratorBase.getVisibilityCacheSize(conf); - return new RecordWriter<Key,Value>() { + return new RecordWriter<>() { RFileWriter out = null; @Override diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapred/AccumuloInputFormat.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapred/AccumuloInputFormat.java index 65f945a..5077ade 100644 --- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapred/AccumuloInputFormat.java +++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapred/AccumuloInputFormat.java @@ -62,7 +62,7 @@ public class AccumuloInputFormat implements InputFormat<Key,Value> { public RecordReader<Key,Value> getRecordReader(InputSplit split, JobConf job, Reporter reporter) throws IOException { - AccumuloRecordReader<Key,Value> recordReader = new AccumuloRecordReader<Key,Value>(CLASS) { + AccumuloRecordReader<Key,Value> recordReader = new AccumuloRecordReader<>(CLASS) { @Override public boolean next(Key key, Value value) { diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapred/AccumuloRowInputFormat.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapred/AccumuloRowInputFormat.java index b3efc4d..abd9b13 100644 --- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapred/AccumuloRowInputFormat.java +++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapred/AccumuloRowInputFormat.java @@ -61,7 +61,7 @@ public class AccumuloRowInputFormat implements InputFormat<Text,PeekingIterator< public RecordReader<Text,PeekingIterator<Entry<Key,Value>>> getRecordReader(InputSplit split, JobConf job, Reporter reporter) throws IOException { AccumuloRecordReader<Text,PeekingIterator<Entry<Key,Value>>> recordReader = - new AccumuloRecordReader<Text,PeekingIterator<Entry<Key,Value>>>(CLASS) { + new AccumuloRecordReader<>(CLASS) { RowIterator rowIterator; @Override diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapreduce/AccumuloFileOutputFormat.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapreduce/AccumuloFileOutputFormat.java index 932bde4..9c2d4ba 100644 --- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapreduce/AccumuloFileOutputFormat.java +++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapreduce/AccumuloFileOutputFormat.java @@ -71,7 +71,7 @@ public class AccumuloFileOutputFormat extends FileOutputFormat<Key,Value> { final Path file = this.getDefaultWorkFile(context, "." + extension); final int visCacheSize = ConfiguratorBase.getVisibilityCacheSize(conf); - return new RecordWriter<Key,Value>() { + return new RecordWriter<>() { RFileWriter out = null; @Override diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapreduce/AccumuloInputFormat.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapreduce/AccumuloInputFormat.java index b2f29ac..1603f34 100644 --- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapreduce/AccumuloInputFormat.java +++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapreduce/AccumuloInputFormat.java @@ -87,7 +87,7 @@ public class AccumuloInputFormat extends InputFormat<Key,Value> { @Override public RecordReader<Key,Value> createRecordReader(InputSplit split, TaskAttemptContext context) { - return new AccumuloRecordReader<Key,Value>(CLASS) { + return new AccumuloRecordReader<>(CLASS) { @Override public boolean nextKeyValue() { if (scannerIterator.hasNext()) { diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapreduce/AccumuloRowInputFormat.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapreduce/AccumuloRowInputFormat.java index d2ebceb..b38b0d3 100644 --- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapreduce/AccumuloRowInputFormat.java +++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoop/mapreduce/AccumuloRowInputFormat.java @@ -63,7 +63,7 @@ public class AccumuloRowInputFormat extends InputFormat<Text,PeekingIterator<Ent @Override public RecordReader<Text,PeekingIterator<Entry<Key,Value>>> createRecordReader(InputSplit split, TaskAttemptContext context) { - return new AccumuloRecordReader<Text,PeekingIterator<Entry<Key,Value>>>(CLASS) { + return new AccumuloRecordReader<>(CLASS) { RowIterator rowIterator; @Override diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/SpaceAwareVolumeChooser.java b/server/base/src/main/java/org/apache/accumulo/server/fs/SpaceAwareVolumeChooser.java index 72f094f..875d484 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/fs/SpaceAwareVolumeChooser.java +++ b/server/base/src/main/java/org/apache/accumulo/server/fs/SpaceAwareVolumeChooser.java @@ -76,7 +76,7 @@ public class SpaceAwareVolumeChooser extends PreferredVolumeChooser { choiceCache = CacheBuilder.newBuilder() .expireAfterWrite(computationCacheDuration, TimeUnit.MILLISECONDS) - .build(new CacheLoader<List<String>,WeightedRandomCollection>() { + .build(new CacheLoader<>() { @Override public WeightedRandomCollection load(List<String> key) { return new WeightedRandomCollection(key, env, random); diff --git a/server/base/src/main/java/org/apache/accumulo/server/gc/GcVolumeUtil.java b/server/base/src/main/java/org/apache/accumulo/server/gc/GcVolumeUtil.java index 390bc88..a4461cc 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/gc/GcVolumeUtil.java +++ b/server/base/src/main/java/org/apache/accumulo/server/gc/GcVolumeUtil.java @@ -45,7 +45,7 @@ public class GcVolumeUtil { Collection<Volume> volumes = fs.getVolumes(); - ArrayList<Path> ret = new ArrayList<Path>(volumes.size()); + ArrayList<Path> ret = new ArrayList<>(volumes.size()); for (Volume vol : volumes) { Path volPath = vol.prefixChild(relPath); ret.add(volPath); 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 b7ee392..880bab5 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 @@ -332,8 +332,8 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer { this.hrtlbConf = context.getServerConfFactory().getSystemConfiguration().newDeriver(HrtlbConf::new); - tablesRegExCache = CacheBuilder.newBuilder().expireAfterAccess(1, TimeUnit.HOURS) - .build(new CacheLoader<TableId,Deriver<Map<String,String>>>() { + tablesRegExCache = + CacheBuilder.newBuilder().expireAfterAccess(1, TimeUnit.HOURS).build(new CacheLoader<>() { @Override public Deriver<Map<String,String>> load(TableId key) throws Exception { return context.getServerConfFactory().getTableConfiguration(key) diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/RegexGroupBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/RegexGroupBalancer.java index da36ca8..c427bf0 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/RegexGroupBalancer.java +++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/RegexGroupBalancer.java @@ -82,7 +82,7 @@ public class RegexGroupBalancer extends GroupBalancer { final Pattern pattern = Pattern.compile(regex); - return new Function<KeyExtent,String>() { + return new Function<>() { @Override public String apply(KeyExtent input) { 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 a8e896c..e34911a 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 @@ -47,7 +47,7 @@ class ZooTabletStateStore implements TabletStateStore { @Override public ClosableIterator<TabletLocationState> iterator() { - return new ClosableIterator<TabletLocationState>() { + return new ClosableIterator<>() { boolean finished = false; @Override diff --git a/server/base/src/main/java/org/apache/accumulo/server/replication/StatusFormatter.java b/server/base/src/main/java/org/apache/accumulo/server/replication/StatusFormatter.java index c495d8e..6ece564 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/replication/StatusFormatter.java +++ b/server/base/src/main/java/org/apache/accumulo/server/replication/StatusFormatter.java @@ -58,7 +58,7 @@ public class StatusFormatter implements Formatter { private FormatterConfig config; /* so a new date object doesn't get created for every record in the scan result */ - private static ThreadLocal<Date> tmpDate = new ThreadLocal<Date>() { + private static ThreadLocal<Date> tmpDate = new ThreadLocal<>() { @Override protected Date initialValue() { return new Date(); diff --git a/server/base/src/main/java/org/apache/accumulo/server/replication/proto/Replication.java b/server/base/src/main/java/org/apache/accumulo/server/replication/proto/Replication.java index 11e8990..4aeff39 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/replication/proto/Replication.java +++ b/server/base/src/main/java/org/apache/accumulo/server/replication/proto/Replication.java @@ -213,10 +213,8 @@ package org.apache.accumulo.server.replication.proto; org.apache.accumulo.server.replication.proto.Replication.Status.class, org.apache.accumulo.server.replication.proto.Replication.Status.Builder.class); } - public static final com.google.protobuf.Parser<Status> PARSER = - new com.google.protobuf.AbstractParser<Status>() { - public Status parsePartialFrom( - com.google.protobuf.CodedInputStream input, + public static final com.google.protobuf.Parser<Status> PARSER = new com.google.protobuf.AbstractParser<>() { + public Status parsePartialFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return new Status(input, extensionRegistry); diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java index 534e871..7a65a99 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java @@ -48,7 +48,7 @@ import com.google.common.collect.Iterables; public class GroupBalancerTest { - private static Function<KeyExtent,String> partitioner = new Function<KeyExtent,String>() { + private static Function<KeyExtent,String> partitioner = new Function<>() { @Override public String apply(KeyExtent input) { diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java index 93a58b5..65830df 100644 --- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java @@ -292,7 +292,7 @@ public class SimpleGarbageCollector extends AbstractServer implements Iface { return; } - List<String> processedDeletes = Collections.synchronizedList(new ArrayList<String>()); + List<String> processedDeletes = Collections.synchronizedList(new ArrayList<>()); minimizeDeletes(confirmedDeletes, processedDeletes, fs); @@ -703,7 +703,7 @@ public class SimpleGarbageCollector extends AbstractServer implements Iface { @VisibleForTesting static void minimizeDeletes(SortedMap<String,String> confirmedDeletes, List<String> processedDeletes, VolumeManager fs) { - Set<Path> seenVolumes = new HashSet<Path>(); + Set<Path> seenVolumes = new HashSet<>(); Collection<Volume> volumes = fs.getVolumes(); // when deleting a dir and all files in that dir, only need to delete the dir diff --git a/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java b/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java index cecdb5b..db8931a 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java +++ b/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java @@ -206,7 +206,7 @@ class FateServiceHandler implements FateService.Iface { final String oldTableName = validateTableNameArgument(arguments.get(0), tableOp, NOT_SYSTEM); String newTableName = - validateTableNameArgument(arguments.get(1), tableOp, new Validator<String>() { + validateTableNameArgument(arguments.get(1), tableOp, new Validator<>() { @Override public boolean test(String argument) { diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java index 0600357..da8d902 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/Master.java +++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java @@ -187,7 +187,7 @@ public class Master extends AbstractServer private final List<TabletGroupWatcher> watchers = new ArrayList<>(); final SecurityOperation security; final Map<TServerInstance,AtomicInteger> badServers = - Collections.synchronizedMap(new HashMap<TServerInstance,AtomicInteger>()); + Collections.synchronizedMap(new HashMap<>()); final Set<TServerInstance> serversToShutdown = Collections.synchronizedSet(new HashSet<>()); final SortedMap<KeyExtent,TServerInstance> migrations = Collections.synchronizedSortedMap(new TreeMap<>()); @@ -1636,7 +1636,7 @@ public class Master extends AbstractServer final MasterMonitorInfo result = new MasterMonitorInfo(); result.tServerInfo = new ArrayList<>(); - result.tableMap = new HashMap<String,TableInfo>(); + result.tableMap = new HashMap<>(); for (Entry<TServerInstance,TabletServerStatus> serverEntry : tserverStatus.entrySet()) { final TabletServerStatus status = serverEntry.getValue(); result.tServerInfo.add(status); diff --git a/server/master/src/main/java/org/apache/accumulo/master/util/TableValidators.java b/server/master/src/main/java/org/apache/accumulo/master/util/TableValidators.java index 9e1ffa9..dc201ac 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/util/TableValidators.java +++ b/server/master/src/main/java/org/apache/accumulo/master/util/TableValidators.java @@ -36,7 +36,7 @@ import com.google.common.base.Joiner; public class TableValidators { public static final String VALID_ID_REGEX = "^([a-z0-9]+)$"; // BigDecimal base36 - public static final Validator<String> VALID_NAME = new Validator<String>() { + public static final Validator<String> VALID_NAME = new Validator<>() { @Override public boolean test(String tableName) { return tableName != null && tableName.matches(VALID_NAME_REGEX); @@ -51,7 +51,7 @@ public class TableValidators { } }; - public static final Validator<TableId> VALID_ID = new Validator<TableId>() { + public static final Validator<TableId> VALID_ID = new Validator<>() { @Override public boolean test(TableId tableId) { return tableId != null && (RootTable.ID.equals(tableId) || MetadataTable.ID.equals(tableId) @@ -67,7 +67,7 @@ public class TableValidators { } }; - public static final Validator<String> NOT_METADATA = new Validator<String>() { + public static final Validator<String> NOT_METADATA = new Validator<>() { private List<String> metadataTables = Arrays.asList(RootTable.NAME, MetadataTable.NAME); @@ -82,7 +82,7 @@ public class TableValidators { } }; - public static final Validator<TableId> CAN_CLONE = new Validator<TableId>() { + public static final Validator<TableId> CAN_CLONE = new Validator<>() { private List<TableId> metaIDs = Arrays.asList(RootTable.ID, MetadataTable.ID); @@ -104,7 +104,7 @@ public class TableValidators { } }; - public static final Validator<String> NOT_SYSTEM = new Validator<String>() { + public static final Validator<String> NOT_SYSTEM = new Validator<>() { @Override public boolean test(String tableName) { @@ -117,7 +117,7 @@ public class TableValidators { } }; - public static final Validator<TableId> NOT_ROOT_ID = new Validator<TableId>() { + public static final Validator<TableId> NOT_ROOT_ID = new Validator<>() { @Override public boolean test(TableId tableId) { diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java index 3586903..8850d20 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java @@ -123,7 +123,7 @@ public class Monitor extends AbstractServer implements HighlyAvailableService { private final AtomicBoolean monitorInitialized = new AtomicBoolean(false); private static <T> List<Pair<Long,T>> newMaxList() { - return Collections.synchronizedList(new LinkedList<Pair<Long,T>>() { + return Collections.synchronizedList(new LinkedList<>() { private static final long serialVersionUID = 1L; private final long maxDelta = 60 * 60 * 1000; diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/OnlineTablets.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/OnlineTablets.java index ff0e4cc..cdeb66b 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/OnlineTablets.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/OnlineTablets.java @@ -33,7 +33,7 @@ import com.google.common.collect.ImmutableSortedMap; */ public class OnlineTablets { private volatile ImmutableSortedMap<KeyExtent,Tablet> snapshot = ImmutableSortedMap.of(); - private final SortedMap<KeyExtent,Tablet> onlineTablets = new TreeMap<KeyExtent,Tablet>(); + private final SortedMap<KeyExtent,Tablet> onlineTablets = new TreeMap<>(); public synchronized void put(KeyExtent ke, Tablet t) { onlineTablets.put(ke, t); diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java index 6e1048f..c9a27ce 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java @@ -320,9 +320,9 @@ public class TabletServer extends AbstractServer { private final OnlineTablets onlineTablets = new OnlineTablets(); private final SortedSet<KeyExtent> unopenedTablets = - Collections.synchronizedSortedSet(new TreeSet<KeyExtent>()); + Collections.synchronizedSortedSet(new TreeSet<>()); private final SortedSet<KeyExtent> openingTablets = - Collections.synchronizedSortedSet(new TreeSet<KeyExtent>()); + Collections.synchronizedSortedSet(new TreeSet<>()); private final Map<KeyExtent,Long> recentlyUnloadedCache = Collections.synchronizedMap(new LRUMap<>(1000)); @@ -842,7 +842,7 @@ public class TabletServer extends AbstractServer { } Set<Column> columnSet = tcolumns.isEmpty() ? Collections.emptySet() - : new HashSet<Column>(Collections2.transform(tcolumns, Column::new)); + : new HashSet<>(Collections2.transform(tcolumns, Column::new)); ScanParameters scanParams = new ScanParameters(-1, new Authorizations(authorizations), columnSet, ssiList, ssio, diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/TabletMutationPrepAttemptTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/TabletMutationPrepAttemptTest.java index 675758b..3022ff7 100644 --- a/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/TabletMutationPrepAttemptTest.java +++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/TabletMutationPrepAttemptTest.java @@ -65,9 +65,9 @@ public class TabletMutationPrepAttemptTest { public void testTabletOpen() { CommitSession cs = mock(CommitSession.class); - List<Mutation> nonViolators = new ArrayList<Mutation>(); + List<Mutation> nonViolators = new ArrayList<>(); Violations violations = new Violations(); - Set<Mutation> violators = new HashSet<Mutation>(); + Set<Mutation> violators = new HashSet<>(); PreparedMutations prepared = new PreparedMutations(cs, nonViolators, violations, violators);