This is an automated email from the ASF dual-hosted git repository.
jinwoo pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new af12f177ed GEODE-10533: Fix Deprecated APIs in geode-gfsh Module
(#8000)
af12f177ed is described below
commit af12f177ed8454ef35c108d1eb9740d1ac1e126c
Author: Ventsislav Marinov <[email protected]>
AuthorDate: Fri Apr 3 22:07:23 2026 -0400
GEODE-10533: Fix Deprecated APIs in geode-gfsh Module (#8000)
* GEODE-10533: Fix Deprecated APIs in geode-gfsh Module
* GEODE-10533: Fix Deprecated APIs in geode-gfsh Module
* GEODE-10533: Fix Deprecated APIs in geode-gfsh Module
* GEODE-10533: Fix Deprecated APIs in geode-gfsh Module
* GEODE-10533: Fix Deprecated APIs in geode-gfsh Module
---------
Co-authored-by: VENTSISLAV MARINOV <[email protected]>
---
.../geode/management/internal/cli/commands/ConnectCommand.java | 3 ++-
.../geode/management/internal/cli/commands/CreateIndexCommand.java | 4 ++--
.../geode/management/internal/cli/commands/QueryCommand.java | 5 +++--
.../internal/cli/commands/ShowMissingDiskStoreCommand.java | 4 ++--
.../internal/cli/commands/lifecycle/StopServerCommand.java | 2 +-
.../internal/cli/domain/FixedPartitionAttributesInfo.java | 5 ++---
.../management/internal/cli/domain/PartitionAttributesInfo.java | 7 +++----
.../geode/management/internal/cli/domain/RegionAttributesInfo.java | 3 ++-
.../internal/cli/functions/CreateAsyncEventQueueFunction.java | 2 +-
.../management/internal/cli/functions/RegionFunctionArgs.java | 6 ++++--
.../management/internal/cli/functions/UserFunctionExecution.java | 5 ++++-
11 files changed, 26 insertions(+), 20 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..cd697701c3 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,9 +82,9 @@ 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)
+ return results.stream().filter(Set.class::isInstance)
.map(Set.class::cast)
- .flatMap(Set::stream)
+ .flatMap(s -> ((Set<?>) s).stream())
.filter(ColocatedRegionDetails.class::isInstance)
.map(ColocatedRegionDetails.class::cast)
.collect(Collectors.toList());
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..6bf349349e 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,7 @@
package org.apache.geode.management.internal.cli.domain;
import java.io.Serializable;
-
-import org.apache.commons.lang3.StringUtils;
+import java.util.Objects;
import org.apache.geode.cache.FixedPartitionAttributes;
@@ -37,7 +36,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..c17f50f519 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
@@ -20,8 +20,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
+import java.util.Objects;
import org.apache.geode.cache.FixedPartitionAttributes;
import org.apache.geode.cache.PartitionAttributes;
@@ -152,9 +151,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..05d77c238c 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
@@ -21,6 +21,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import org.apache.commons.lang3.StringUtils;
@@ -364,7 +365,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..61f1c1027f 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..357969dde2 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,12 @@ 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;
