This is an automated email from the ASF dual-hosted git repository. ventsi pushed a commit to branch GEODE-10533 in repository https://gitbox.apache.org/repos/asf/geode.git
commit 5f50d8d697d559f9ff7ab42f5a0de41eb6ae76e9 Author: Ventsislav Marinov <[email protected]> AuthorDate: Wed Apr 1 08:25:03 2026 -0400 GEODE-10533: Fix Deprecated APIs in geode-gfsh Module --- .../management/internal/cli/commands/ConnectCommand.java | 3 ++- .../management/internal/cli/commands/CreateIndexCommand.java | 4 ++-- .../geode/management/internal/cli/commands/QueryCommand.java | 5 +++-- .../internal/cli/commands/ShowMissingDiskStoreCommand.java | 12 ++++++------ .../internal/cli/commands/lifecycle/StopServerCommand.java | 2 +- .../internal/cli/domain/FixedPartitionAttributesInfo.java | 4 ++-- .../internal/cli/domain/PartitionAttributesInfo.java | 10 +++------- .../management/internal/cli/domain/RegionAttributesInfo.java | 10 ++-------- .../cli/functions/CreateAsyncEventQueueFunction.java | 2 +- .../internal/cli/functions/RegionFunctionArgs.java | 6 ++++-- .../internal/cli/functions/UserFunctionExecution.java | 4 +++- 11 files changed, 29 insertions(+), 33 deletions(-) diff --git a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java index 35d3eb7f34..36b4b7a2ed 100644 --- a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java +++ b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java @@ -31,6 +31,7 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSession; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Strings; import org.springframework.shell.standard.ShellMethod; import org.springframework.shell.standard.ShellOption; @@ -117,7 +118,7 @@ public class ConnectCommand extends OfflineGfshCommand { .createInfo("Already connected to: " + getGfsh().getOperationInvoker().toString()); } - if (StringUtils.startsWith(url, "https")) { + if (Strings.CS.startsWith(url, "https")) { useSsl = true; } diff --git a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommand.java b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommand.java index 29cbe617e7..a49f3ab269 100644 --- a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommand.java +++ b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommand.java @@ -24,7 +24,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Strings; import org.springframework.shell.standard.ShellMethod; import org.springframework.shell.standard.ShellOption; @@ -166,7 +166,7 @@ public class CreateIndexCommand extends GfshCommand { // returned here should not have "." String getValidRegionName(String regionPath) { String regionName = regionPath.trim().split(" ")[0]; - regionName = StringUtils.removeStart(regionName, SEPARATOR); + regionName = Strings.CS.removeStart(regionName, SEPARATOR); if (regionName.contains(".")) { regionName = regionName.substring(0, regionName.indexOf('.')); } diff --git a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommand.java b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommand.java index 413f568f3b..37b61c82b3 100644 --- a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommand.java +++ b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommand.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Set; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Strings; import org.apache.logging.log4j.Logger; import org.apache.shiro.subject.Subject; import org.springframework.shell.standard.ShellMethod; @@ -81,8 +82,8 @@ public class QueryCommand extends GfshCommand { boolean limitAdded = false; - if (!StringUtils.containsIgnoreCase(query, " limit") - && !StringUtils.containsIgnoreCase(query, " count(")) { + if (!Strings.CI.contains(query, " limit") + && !Strings.CI.contains(query, " count(")) { query = query + " limit " + CommandExecutionContext.getShellFetchSize(); limitAdded = true; } diff --git a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoreCommand.java b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoreCommand.java index 83b982c085..4b7c54c27a 100644 --- a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoreCommand.java +++ b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoreCommand.java @@ -82,12 +82,12 @@ public class ShowMissingDiskStoreCommand extends GfshCommand { // sends a List of Sets. Some of the sets are Set<PersistentMemberIds>, some are // Set<ColocatedRegionDetails>. We want to return a List of all of the ColocatedRegionDetails, // and ignore the PersistentMemberIds - return (List<ColocatedRegionDetails>) results.stream().filter(Set.class::isInstance) - .map(Set.class::cast) - .flatMap(Set::stream) - .filter(ColocatedRegionDetails.class::isInstance) - .map(ColocatedRegionDetails.class::cast) - .collect(Collectors.toList()); + return results.stream().filter(Set.class::isInstance) + .map(Set.class::cast) + .flatMap(s -> ((Set<?>) s).stream()) + .filter(ColocatedRegionDetails.class::isInstance) + .map(ColocatedRegionDetails.class::cast) + .collect(Collectors.toList()); } private ResultModel toMissingDiskStoresTabularResult( diff --git a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopServerCommand.java b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopServerCommand.java index 953087a4f1..7985ddddc6 100644 --- a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopServerCommand.java +++ b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopServerCommand.java @@ -14,7 +14,7 @@ */ package org.apache.geode.management.internal.cli.commands.lifecycle; -import static io.micrometer.core.instrument.util.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; import static org.apache.geode.management.internal.cli.shell.MXBeanProvider.getMemberMXBean; import java.util.concurrent.TimeUnit; diff --git a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/domain/FixedPartitionAttributesInfo.java b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/domain/FixedPartitionAttributesInfo.java index 06061bacfc..18a5edb067 100644 --- a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/domain/FixedPartitionAttributesInfo.java +++ b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/domain/FixedPartitionAttributesInfo.java @@ -15,8 +15,8 @@ package org.apache.geode.management.internal.cli.domain; import java.io.Serializable; +import java.util.Objects; -import org.apache.commons.lang3.StringUtils; import org.apache.geode.cache.FixedPartitionAttributes; @@ -37,7 +37,7 @@ public class FixedPartitionAttributesInfo implements Serializable { if (obj instanceof FixedPartitionAttributesInfo) { FixedPartitionAttributesInfo fpaInfo = (FixedPartitionAttributesInfo) obj; return numBuckets == fpaInfo.getNumBuckets() - && StringUtils.equals(partitionName, fpaInfo.getPartitionName()) + && Objects.equals(partitionName, fpaInfo.getPartitionName()) && isPrimary == fpaInfo.isPrimary(); } else { diff --git a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/domain/PartitionAttributesInfo.java b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/domain/PartitionAttributesInfo.java index c2bcfe7f69..04d5148bf3 100644 --- a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/domain/PartitionAttributesInfo.java +++ b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/domain/PartitionAttributesInfo.java @@ -15,11 +15,7 @@ package org.apache.geode.management.internal.cli.domain; import java.io.Serializable; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; import org.apache.commons.lang3.StringUtils; @@ -152,9 +148,9 @@ public class PartitionAttributesInfo implements Serializable { public boolean equals(Object obj) { if (obj instanceof PartitionAttributesInfo) { PartitionAttributesInfo paInfo = (PartitionAttributesInfo) obj; - return StringUtils.equals(getColocatedWith(), paInfo.getColocatedWith()) + return Objects.equals(getColocatedWith(), paInfo.getColocatedWith()) && getLocalMaxMemory() == paInfo.getLocalMaxMemory() - && StringUtils.equals(getPartitionResolverName(), paInfo.getPartitionResolverName()) + && Objects.equals(getPartitionResolverName(), paInfo.getPartitionResolverName()) && getRecoveryDelay() == paInfo.getRecoveryDelay() && getRedundantCopies() == paInfo.getRedundantCopies() && getStartupRecoveryDelay() == paInfo.getStartupRecoveryDelay() diff --git a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/domain/RegionAttributesInfo.java b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/domain/RegionAttributesInfo.java index 6adf2ecaea..1ebf1d7d61 100644 --- a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/domain/RegionAttributesInfo.java +++ b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/domain/RegionAttributesInfo.java @@ -15,13 +15,7 @@ package org.apache.geode.management.internal.cli.domain; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import org.apache.commons.lang3.StringUtils; @@ -364,7 +358,7 @@ public class RegionAttributesInfo implements Serializable { Boolean.toString(cloningEnabled)); } - if (!StringUtils.equals(RegionAttributesDefault.COMPRESSOR_CLASS_NAME, compressorClassName)) { + if (!Objects.equals(RegionAttributesDefault.COMPRESSOR_CLASS_NAME, compressorClassName)) { nonDefaultAttributes.put(RegionAttributesNames.COMPRESSOR, compressorClassName); } diff --git a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction.java b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction.java index ca9de06aec..eac61685a6 100644 --- a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction.java +++ b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction.java @@ -113,7 +113,7 @@ public class CreateAsyncEventQueueFunction extends CliFunction<CacheConfig.Async String listenerClassName = config.getAsyncEventListener().getClassName(); Object listenerInstance; Class<?> listenerClass = InternalDataSerializer.getCachedClass(listenerClassName); - listenerInstance = listenerClass.newInstance(); + listenerInstance = listenerClass.getDeclaredConstructor().newInstance(); List<ParameterType> parameters = config.getAsyncEventListener().getParameters(); Properties listenerProperties = new Properties(); diff --git a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/functions/RegionFunctionArgs.java b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/functions/RegionFunctionArgs.java index 46d149495b..15820a805a 100644 --- a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/functions/RegionFunctionArgs.java +++ b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/functions/RegionFunctionArgs.java @@ -16,6 +16,7 @@ package org.apache.geode.management.internal.cli.functions; import java.io.Serializable; +import java.lang.reflect.InvocationTargetException; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; @@ -606,8 +607,9 @@ public class RegionFunctionArgs implements Serializable { if (objectSizer != null) { try { Class<?> sizerClass = ClassPathLoader.getLatest().forName(objectSizer); - sizer = (ObjectSizer) sizerClass.newInstance(); - } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) { + sizer = (ObjectSizer) sizerClass.getDeclaredConstructor().newInstance(); + } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | + NoSuchMethodException | InvocationTargetException e) { throw new IllegalArgumentException( "Unable to instantiate class " + objectSizer + " - " + e); } diff --git a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecution.java b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecution.java index d3bdd1d242..3feb55c5b9 100644 --- a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecution.java +++ b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecution.java @@ -17,6 +17,7 @@ package org.apache.geode.management.internal.cli.functions; import static org.apache.geode.management.internal.functions.CliFunctionResult.StatusState.ERROR; import static org.apache.geode.management.internal.functions.CliFunctionResult.StatusState.OK; +import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -106,10 +107,11 @@ public class UserFunctionExecution implements InternalFunction<Object[]> { @SuppressWarnings("unchecked") ResultCollector<Object, List<Object>> parseResultCollector(String resultCollectorName) - throws ClassNotFoundException, IllegalAccessException, InstantiationException { + throws ClassNotFoundException, IllegalAccessException, InstantiationException, NoSuchMethodException, InvocationTargetException { if (resultCollectorName != null && resultCollectorName.length() > 0) { return (ResultCollector<Object, List<Object>>) ClassPathLoader.getLatest() .forName(resultCollectorName) + .getDeclaredConstructor() .newInstance(); } else { return null;
