ACCUMULO-4820 Cleanup code for 2.0 (#388)
* Replace explicit type with <>
* Collapse identical catch statements
* Utilize try with resources
diff --git a/src/main/java/org/apache/accumulo/proxy/ProxyServer.java b/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
index 9478cc6..3255e13 100644
--- a/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
+++ b/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
@@ -649,7 +649,7 @@
try {
Map<String,Set<Text>> groups = new HashMap<>();
for (Entry<String,Set<String>> groupEntry : groupStrings.entrySet()) {
- groups.put(groupEntry.getKey(), new HashSet<Text>());
+ groups.put(groupEntry.getKey(), new HashSet<>());
for (String val : groupEntry.getValue()) {
groups.get(groupEntry.getKey()).add(new Text(val));
}
@@ -1194,7 +1194,7 @@
// synchronized to prevent race conditions
synchronized (batchScanner) {
ScanResult ret = new ScanResult();
- ret.setResults(new ArrayList<KeyValue>());
+ ret.setResults(new ArrayList<>());
int numRead = 0;
try {
while (batchScanner.hasNext() && numRead < k) {
