This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push:
new e1127daf0b Fix more modernizer QA hits
e1127daf0b is described below
commit e1127daf0ba6a47fa30072b730c843a7752303f5
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Wed Apr 26 15:05:53 2023 -0400
Fix more modernizer QA hits
Fix some more QA-related changes for Optional, detected by the
modernizer-maven-plugin that was updated as part of #3344
This fixes additional things caught by the plugin that are unique to the
main branch for 3.0 and thus were not already fixed in the 2.1 branch
before the merge.
---
.../java/org/apache/accumulo/core/clientImpl/ClientContext.java | 6 +++---
.../org/apache/accumulo/core/metadata/schema/TabletMetadata.java | 2 +-
.../java/org/apache/accumulo/core/rpc/clients/TServerClient.java | 2 +-
.../accumulo/core/util/compaction/ExternalCompactionUtil.java | 2 +-
.../org/apache/accumulo/server/fs/VolumeChooserEnvironmentImpl.java | 2 +-
.../java/org/apache/accumulo/server/manager/LiveTServerSet.java | 2 +-
.../main/java/org/apache/accumulo/server/util/ListInstances.java | 2 +-
.../java/org/apache/accumulo/server/util/TabletServerLocks.java | 2 +-
.../monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java | 2 +-
.../org/apache/accumulo/test/functional/GarbageCollectorIT.java | 4 ++--
10 files changed, 13 insertions(+), 13 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
index dbe7590ee7..daa3dd35da 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
@@ -407,8 +407,8 @@ public class ClientContext implements AccumuloClient {
ZcStat stat = new ZcStat();
Optional<ServiceLockData> sld = ServiceLock.getLockData(getZooCache(),
zLockPath, stat);
if (sld.isPresent()) {
- UUID uuid = sld.get().getServerUUID(ThriftService.TABLET_SCAN);
- String group = sld.get().getGroup(ThriftService.TABLET_SCAN);
+ UUID uuid =
sld.orElseThrow().getServerUUID(ThriftService.TABLET_SCAN);
+ String group = sld.orElseThrow().getGroup(ThriftService.TABLET_SCAN);
liveScanServers.put(addr, new Pair<>(uuid, group));
}
} catch (IllegalArgumentException e) {
@@ -522,7 +522,7 @@ public class ClientContext implements AccumuloClient {
Optional<ServiceLockData> sld = zooCache.getLockData(zLockManagerPath);
String location = null;
if (sld.isPresent()) {
- location = sld.get().getAddressString(ThriftService.MANAGER);
+ location = sld.orElseThrow().getAddressString(ThriftService.MANAGER);
}
if (timer != null) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java
index 13c55d8f99..353fa12425 100644
---
a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java
+++
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java
@@ -547,7 +547,7 @@ public class TabletMetadata {
if (sld.isPresent()) {
log.trace("Checking server at ZK path = " + lockPath);
- HostAndPort client =
sld.get().getAddress(ServiceLockData.ThriftService.TSERV);
+ HostAndPort client =
sld.orElseThrow().getAddress(ServiceLockData.ThriftService.TSERV);
if (client != null) {
server = Optional.of(new TServerInstance(client,
stat.getEphemeralOwner()));
}
diff --git
a/core/src/main/java/org/apache/accumulo/core/rpc/clients/TServerClient.java
b/core/src/main/java/org/apache/accumulo/core/rpc/clients/TServerClient.java
index d319542da9..e0621dacc8 100644
--- a/core/src/main/java/org/apache/accumulo/core/rpc/clients/TServerClient.java
+++ b/core/src/main/java/org/apache/accumulo/core/rpc/clients/TServerClient.java
@@ -70,7 +70,7 @@ public interface TServerClient<C extends TServiceClient> {
ServiceLock.path(context.getZooKeeperRoot() + Constants.ZTSERVERS +
"/" + tserver);
Optional<ServiceLockData> sld = zc.getLockData(zLocPath);
if (sld.isPresent()) {
- HostAndPort address = sld.get().getAddress(ThriftService.TSERV);
+ HostAndPort address =
sld.orElseThrow().getAddress(ThriftService.TSERV);
if (address != null) {
servers.add(new ThriftTransportKey(address, rpcTimeout, context));
}
diff --git
a/core/src/main/java/org/apache/accumulo/core/util/compaction/ExternalCompactionUtil.java
b/core/src/main/java/org/apache/accumulo/core/util/compaction/ExternalCompactionUtil.java
index 17a61a6c09..808a9e2c90 100644
---
a/core/src/main/java/org/apache/accumulo/core/util/compaction/ExternalCompactionUtil.java
+++
b/core/src/main/java/org/apache/accumulo/core/util/compaction/ExternalCompactionUtil.java
@@ -108,7 +108,7 @@ public class ExternalCompactionUtil {
if (sld.isEmpty()) {
return Optional.empty();
}
- return
Optional.ofNullable(sld.get().getAddress(ThriftService.COORDINATOR));
+ return
Optional.ofNullable(sld.orElseThrow().getAddress(ThriftService.COORDINATOR));
} catch (KeeperException | InterruptedException e) {
throw new RuntimeException(e);
}
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeChooserEnvironmentImpl.java
b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeChooserEnvironmentImpl.java
index 8fbfa83bd9..b07fd0f46f 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeChooserEnvironmentImpl.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeChooserEnvironmentImpl.java
@@ -102,7 +102,7 @@ public class VolumeChooserEnvironmentImpl implements
VolumeChooserEnvironment {
}
VolumeChooserEnvironmentImpl other = (VolumeChooserEnvironmentImpl) obj;
return getChooserScope() == other.getChooserScope()
- && Objects.equals(tableId.get(), other.getTable().get());
+ && Objects.equals(tableId.orElseThrow(),
other.getTable().orElseThrow());
}
@Override
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/manager/LiveTServerSet.java
b/server/base/src/main/java/org/apache/accumulo/server/manager/LiveTServerSet.java
index fb79111623..6f75e00cb8 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/manager/LiveTServerSet.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/manager/LiveTServerSet.java
@@ -325,7 +325,7 @@ public class LiveTServerSet implements Watcher {
}
} else {
locklessServers.remove(zPath);
- HostAndPort client =
sld.get().getAddress(ServiceLockData.ThriftService.TSERV);
+ HostAndPort client =
sld.orElseThrow().getAddress(ServiceLockData.ThriftService.TSERV);
TServerInstance instance = new TServerInstance(client,
stat.getEphemeralOwner());
if (info == null) {
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 a7256de205..275e11e5a0 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
@@ -171,7 +171,7 @@ public class ListInstances {
if (sld.isEmpty()) {
return null;
}
- return sld.get().getAddressString(ThriftService.MANAGER);
+ return sld.orElseThrow().getAddressString(ThriftService.MANAGER);
} catch (Exception e) {
handleException(e, printErrors);
return null;
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java
b/server/base/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java
index 70110f704a..8afb863dbd 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java
@@ -49,7 +49,7 @@ public class TabletServerLocks {
Optional<ServiceLockData> lockData = ServiceLock.getLockData(cache,
zLockPath, null);
final String holder;
if (lockData.isPresent()) {
- holder = lockData.get().getAddressString(ThriftService.TSERV);
+ holder =
lockData.orElseThrow().getAddressString(ThriftService.TSERV);
} else {
holder = "<none>";
}
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 3a2b85095c..1567d8475b 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
@@ -431,7 +431,7 @@ public class Monitor extends AbstractServer implements
HighlyAvailableService {
Optional<ServiceLockData> sld =
ServiceLockData.parse(zk.getData(path + "/" + locks.get(0)));
if (sld.isPresent()) {
- address = sld.get().getAddress(ThriftService.GC);
+ address = sld.orElseThrow().getAddress(ThriftService.GC);
}
GCMonitorService.Client client =
ThriftUtil.getClient(ThriftClientTypes.GC, address, context);
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
index 082b644aed..a5737501e8 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
@@ -288,8 +288,8 @@ public class GarbageCollectorIT extends ConfigurableMacBase
{
Optional<ServiceLockData> sld =
ServiceLockData.parse(zk.getData(lockPath));
- assertNotNull(sld.get());
- HostAndPort hostAndPort = sld.get().getAddress(ThriftService.GC);
+ assertNotNull(sld.orElseThrow());
+ HostAndPort hostAndPort =
sld.orElseThrow().getAddress(ThriftService.GC);
// We shouldn't have the "bindall" address in zk
assertNotEquals("0.0.0.0", hostAndPort.getHost());
