GEODE-10533: Fix Deprecated APIs in geode-gfsh Module

Author: marinov-code

geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java

@@ -31,6 +31,7 @@
 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 ResultModel connect(
           .createInfo("Already connected to: " + getGfsh().getOperationInvoker().toString());
     }
 
-    if (StringUtils.startsWith(url, "https")) {
+    if (Strings.CS.startsWith(url, "https")) {
       useSsl = true;
     }
 

geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommand.java

@@ -24,7 +24,7 @@
 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 ResultModel createIndex(@ShellOption(value = CliStrings.CREATE_INDEX__NAM
   // 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('.'));
     }

geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommand.java

@@ -23,6 +23,7 @@
 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 @@ DataCommandResult select(String query, DistributedMember targetMember) {
 
     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;
     }

geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoreCommand.java

@@ -82,12 +82,12 @@ private List<ColocatedRegionDetails> getMissingColocatedRegionList(
     // 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(

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;

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 boolean equals(Object obj) {
     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 {

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 List<FixedPartitionAttributesInfo> getFixedPartitionAttributesInfo() {
   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()

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 Map<String, String> getNonDefaultAttributes() {
           Boolean.toString(cloningEnabled));
     }
 
-    if (!StringUtils.equals(RegionAttributesDefault.COMPRESSOR_CLASS_NAME, compressorClassName)) {
+    if (!Objects.equals(RegionAttributesDefault.COMPRESSOR_CLASS_NAME, compressorClassName)) {
       nonDefaultAttributes.put(RegionAttributesNames.COMPRESSOR, compressorClassName);
     }
 

geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction.java

@@ -113,7 +113,7 @@ public CliFunctionResult executeFunction(FunctionContext<CacheConfig.AsyncEventQ
       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();

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 EvictionAttributes convertToEvictionAttributes() {
       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);
         }