This is an automated email from the ASF dual-hosted git repository.
edcoleman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 4f35e6aff1763d4b19d1e93036260094b47cc589
Author: hguercan <hasan.guer...@gmail.com>
AuthorDate: Sat May 1 16:50:39 2021 +0200
#2040: replace immutable HashSet by Set.of() to reduce code
* set locale in NumUtilTest to US
* adjusted imports
* closes #2040
---
.../server/security/handler/KerberosAuthenticator.java | 7 ++-----
.../org/apache/accumulo/server/util/FileSystemMonitor.java | 8 ++------
.../accumulo/shell/commands/DeleteTableCommandTest.java | 9 ++++-----
test/src/main/java/org/apache/accumulo/test/OrIteratorIT.java | 3 +--
.../src/main/java/org/apache/accumulo/test/ShellServerIT.java | 6 +++---
.../org/apache/accumulo/test/functional/ManagerMetricsIT.java | 11 ++++-------
.../org/apache/accumulo/test/functional/PermissionsIT.java | 3 +--
7 files changed, 17 insertions(+), 30 deletions(-)
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/security/handler/KerberosAuthenticator.java
b/server/base/src/main/java/org/apache/accumulo/server/security/handler/KerberosAuthenticator.java
index ed66fc7..cebdbaa 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/security/handler/KerberosAuthenticator.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/security/handler/KerberosAuthenticator.java
@@ -20,7 +20,6 @@ package org.apache.accumulo.server.security.handler;
import static java.nio.charset.StandardCharsets.UTF_8;
-import java.util.Arrays;
import java.util.Base64;
import java.util.HashSet;
import java.util.Set;
@@ -44,15 +43,13 @@ import org.apache.zookeeper.KeeperException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Sets;
-
public class KerberosAuthenticator implements Authenticator {
private static final Logger log =
LoggerFactory.getLogger(KerberosAuthenticator.class);
private static final Set<Class<? extends AuthenticationToken>>
SUPPORTED_TOKENS =
- Sets.newHashSet(Arrays.asList(KerberosToken.class, SystemToken.class));
+ Set.of(KerberosToken.class, SystemToken.class);
private static final Set<String> SUPPORTED_TOKEN_NAMES =
- Sets.newHashSet(KerberosToken.class.getName(),
SystemToken.class.getName());
+ Set.of(KerberosToken.class.getName(), SystemToken.class.getName());
private final ZKAuthenticator zkAuthenticator = new ZKAuthenticator();
private ZooCache zooCache;
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 805b3c8..39ce84a 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
@@ -25,9 +25,7 @@ import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -41,15 +39,13 @@ import org.apache.accumulo.core.util.threads.Threads;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Sets;
-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
public class FileSystemMonitor {
private static final String PROC_MOUNTS = "/proc/mounts";
private static final Logger log =
LoggerFactory.getLogger(FileSystemMonitor.class);
private static final String DEVICE_PREFIX = "/dev/";
- private static final Set<String> ACCEPTED_FILESYSTEMS =
Sets.newHashSet("ext3", "ext4", "xfs");
+ private static final Set<String> ACCEPTED_FILESYSTEMS = Set.of("ext3",
"ext4", "xfs");
static class Mount {
String device;
@@ -64,7 +60,7 @@ public class FileSystemMonitor {
mountPoint = tokens[1].trim();
filesystemType = tokens[2].trim().toLowerCase();
- options = new HashSet<>(Arrays.asList(tokens[3].split(",")));
+ options = Set.of(tokens[3].split(","));
}
@Override
diff --git
a/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteTableCommandTest.java
b/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteTableCommandTest.java
index 34a8c2b..a977091 100644
---
a/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteTableCommandTest.java
+++
b/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteTableCommandTest.java
@@ -20,24 +20,23 @@ package org.apache.accumulo.shell.commands;
import static org.junit.Assert.assertEquals;
-import java.util.Arrays;
-import java.util.HashSet;
import java.util.Set;
import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.metadata.RootTable;
import org.junit.Test;
+import com.google.common.collect.Sets;
+
public class DeleteTableCommandTest {
@Test
public void removeAccumuloNamespaceTables() {
- Set<String> tables =
- new HashSet<>(Arrays.asList(MetadataTable.NAME, RootTable.NAME, "a1",
"a2"));
+ Set<String> tables = Sets.newHashSet(MetadataTable.NAME, RootTable.NAME,
"a1", "a2");
DeleteTableCommand cmd = new DeleteTableCommand();
cmd.pruneTables(tables);
- assertEquals(new HashSet<>(Arrays.asList("a1", "a2")), tables);
+ assertEquals(Set.of("a1", "a2"), tables);
}
}
diff --git a/test/src/main/java/org/apache/accumulo/test/OrIteratorIT.java
b/test/src/main/java/org/apache/accumulo/test/OrIteratorIT.java
index 745ce6d..dcaf741 100644
--- a/test/src/main/java/org/apache/accumulo/test/OrIteratorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/OrIteratorIT.java
@@ -26,7 +26,6 @@ import static org.junit.Assert.assertTrue;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
@@ -86,7 +85,7 @@ public class OrIteratorIT extends AccumuloClusterHarness {
expectedData.put("mort", "6");
try (BatchScanner bs = client.createBatchScanner(tableName)) {
- Set<Range> ranges = new HashSet<>(Arrays.asList(Range.exact("row1"),
Range.exact("row2")));
+ Set<Range> ranges = Set.of(Range.exact("row1"), Range.exact("row2"));
bs.setRanges(ranges);
bs.addScanIterator(is);
for (Entry<Key,Value> entry : bs) {
diff --git a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
index 8392246..bd166af 100644
--- a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
@@ -2294,7 +2294,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
ts.exec("createtable " + table + " -l locg1=fam1,fam2", true);
try (AccumuloClient accumuloClient =
Accumulo.newClient().from(getClientProps()).build()) {
Map<String,Set<Text>> lMap =
accumuloClient.tableOperations().getLocalityGroups(table);
- Set<Text> expectedColFams = new HashSet<>(Arrays.asList(new
Text("fam1"), new Text("fam2")));
+ Set<Text> expectedColFams = Set.of(new Text("fam1"), new Text("fam2"));
for (Entry<String,Set<Text>> entry : lMap.entrySet()) {
assertEquals("locg1", entry.getKey());
assertTrue(entry.getValue().containsAll(expectedColFams));
@@ -2316,8 +2316,8 @@ public class ShellServerIT extends SharedMiniClusterBase {
Map<String,Set<Text>> lMap =
accumuloClient.tableOperations().getLocalityGroups(table);
assertTrue(lMap.containsKey("locg1"));
assertTrue(lMap.containsKey("locg2"));
- Set<Text> expectedColFams1 = new HashSet<>(Arrays.asList(new
Text("fam1"), new Text("fam2")));
- Set<Text> expectedColFams2 = new HashSet<>(Arrays.asList(new
Text("colfam1")));
+ Set<Text> expectedColFams1 = Set.of(new Text("fam1"), new Text("fam2"));
+ Set<Text> expectedColFams2 = Set.of(new Text("colfam1"));
assertTrue(lMap.get("locg1").containsAll(expectedColFams1));
assertTrue(lMap.get("locg2").containsAll(expectedColFams2));
ts.exec("deletetable -f " + table);
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/ManagerMetricsIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/ManagerMetricsIT.java
index 69f5499..40e9666 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/ManagerMetricsIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/ManagerMetricsIT.java
@@ -23,9 +23,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -70,12 +68,11 @@ public class ManagerMetricsIT extends
AccumuloClusterHarness {
private long maxWait;
private static final Set<String> REQUIRED_METRIC_KEYS =
- new HashSet<>(Arrays.asList("currentFateOps", "totalFateOps",
"totalZkConnErrors",
- "FateTxState_NEW", "FateTxState_IN_PROGRESS",
"FateTxState_FAILED_IN_PROGRESS",
- "FateTxState_FAILED", "FateTxState_SUCCESSFUL",
"FateTxState_UNKNOWN"));
+ Set.of("currentFateOps", "totalFateOps", "totalZkConnErrors",
"FateTxState_NEW",
+ "FateTxState_IN_PROGRESS", "FateTxState_FAILED_IN_PROGRESS",
"FateTxState_FAILED",
+ "FateTxState_SUCCESSFUL", "FateTxState_UNKNOWN");
- private static final Set<String> OPTIONAL_METRIC_KEYS =
- new HashSet<>(Collections.singletonList("FateTxOpType_CompactRange"));
+ private static final Set<String> OPTIONAL_METRIC_KEYS =
Set.of("FateTxOpType_CompactRange");
private final MetricsFileTailer metricsTail = new
MetricsFileTailer("accumulo.sink.file-manager");
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java
index 8d9ef80..f0d88fa 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java
@@ -26,7 +26,6 @@ import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -722,7 +721,7 @@ public class PermissionsIT extends AccumuloClusterHarness {
break;
case ALTER_TABLE:
Map<String,Set<Text>> groups = new HashMap<>();
- groups.put("tgroup", new HashSet<>(Arrays.asList(new Text("t1"), new
Text("t2"))));
+ groups.put("tgroup", Set.of(new Text("t1"), new Text("t2")));
try {
test_user_client.tableOperations().setLocalityGroups(tableName,
groups);
throw new IllegalStateException("User should not be able to set
locality groups");
