Skip to content

Commit af12f17

Browse files
marinov-codeVENTSISLAV MARINOV
marinov-code
and
VENTSISLAV MARINOV
authored
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 <ventsislav.marinov@sas.com>
1 parent 752a1bf commit af12f17

11 files changed

Lines changed: 26 additions & 20 deletions

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import javax.net.ssl.SSLSession;
3232

3333
import org.apache.commons.lang3.StringUtils;
34+
import org.apache.commons.lang3.Strings;
3435
import org.springframework.shell.standard.ShellMethod;
3536
import org.springframework.shell.standard.ShellOption;
3637

@@ -117,7 +118,7 @@ public ResultModel connect(
117118
.createInfo("Already connected to: " + getGfsh().getOperationInvoker().toString());
118119
}
119120

120-
if (StringUtils.startsWith(url, "https")) {
121+
if (Strings.CS.startsWith(url, "https")) {
121122
useSsl = true;
122123
}
123124

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import java.util.List;
2525
import java.util.Set;
2626

27-
import org.apache.commons.lang3.StringUtils;
27+
import org.apache.commons.lang3.Strings;
2828
import org.springframework.shell.standard.ShellMethod;
2929
import org.springframework.shell.standard.ShellOption;
3030

@@ -166,7 +166,7 @@ public ResultModel createIndex(@ShellOption(value = CliStrings.CREATE_INDEX__NAM
166166
// returned here should not have "."
167167
String getValidRegionName(String regionPath) {
168168
String regionName = regionPath.trim().split(" ")[0];
169-
regionName = StringUtils.removeStart(regionName, SEPARATOR);
169+
regionName = Strings.CS.removeStart(regionName, SEPARATOR);
170170
if (regionName.contains(".")) {
171171
regionName = regionName.substring(0, regionName.indexOf('.'));
172172
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.Set;
2424

2525
import org.apache.commons.lang3.StringUtils;
26+
import org.apache.commons.lang3.Strings;
2627
import org.apache.logging.log4j.Logger;
2728
import org.apache.shiro.subject.Subject;
2829
import org.springframework.shell.standard.ShellMethod;
@@ -81,8 +82,8 @@ DataCommandResult select(String query, DistributedMember targetMember) {
8182

8283
boolean limitAdded = false;
8384

84-
if (!StringUtils.containsIgnoreCase(query, " limit")
85-
&& !StringUtils.containsIgnoreCase(query, " count(")) {
85+
if (!Strings.CI.contains(query, " limit")
86+
&& !Strings.CI.contains(query, " count(")) {
8687
query = query + " limit " + CommandExecutionContext.getShellFetchSize();
8788
limitAdded = true;
8889
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ private List<ColocatedRegionDetails> getMissingColocatedRegionList(
8282
// sends a List of Sets. Some of the sets are Set<PersistentMemberIds>, some are
8383
// Set<ColocatedRegionDetails>. We want to return a List of all of the ColocatedRegionDetails,
8484
// and ignore the PersistentMemberIds
85-
return (List<ColocatedRegionDetails>) results.stream().filter(Set.class::isInstance)
85+
return results.stream().filter(Set.class::isInstance)
8686
.map(Set.class::cast)
87-
.flatMap(Set::stream)
87+
.flatMap(s -> ((Set<?>) s).stream())
8888
.filter(ColocatedRegionDetails.class::isInstance)
8989
.map(ColocatedRegionDetails.class::cast)
9090
.collect(Collectors.toList());

‎geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopServerCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515
package org.apache.geode.management.internal.cli.commands.lifecycle;
1616

17-
import static io.micrometer.core.instrument.util.StringUtils.isNotBlank;
17+
import static org.apache.commons.lang3.StringUtils.isNotBlank;
1818
import static org.apache.geode.management.internal.cli.shell.MXBeanProvider.getMemberMXBean;
1919

2020
import java.util.concurrent.TimeUnit;

‎geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/domain/FixedPartitionAttributesInfo.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
package org.apache.geode.management.internal.cli.domain;
1616

1717
import java.io.Serializable;
18-
19-
import org.apache.commons.lang3.StringUtils;
18+
import java.util.Objects;
2019

2120
import org.apache.geode.cache.FixedPartitionAttributes;
2221

@@ -37,7 +36,7 @@ public boolean equals(Object obj) {
3736
if (obj instanceof FixedPartitionAttributesInfo) {
3837
FixedPartitionAttributesInfo fpaInfo = (FixedPartitionAttributesInfo) obj;
3938
return numBuckets == fpaInfo.getNumBuckets()
40-
&& StringUtils.equals(partitionName, fpaInfo.getPartitionName())
39+
&& Objects.equals(partitionName, fpaInfo.getPartitionName())
4140
&& isPrimary == fpaInfo.isPrimary();
4241

4342
} else {

‎geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/domain/PartitionAttributesInfo.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
import java.util.Iterator;
2121
import java.util.List;
2222
import java.util.Map;
23-
24-
import org.apache.commons.lang3.StringUtils;
23+
import java.util.Objects;
2524

2625
import org.apache.geode.cache.FixedPartitionAttributes;
2726
import org.apache.geode.cache.PartitionAttributes;
@@ -152,9 +151,9 @@ public List<FixedPartitionAttributesInfo> getFixedPartitionAttributesInfo() {
152151
public boolean equals(Object obj) {
153152
if (obj instanceof PartitionAttributesInfo) {
154153
PartitionAttributesInfo paInfo = (PartitionAttributesInfo) obj;
155-
return StringUtils.equals(getColocatedWith(), paInfo.getColocatedWith())
154+
return Objects.equals(getColocatedWith(), paInfo.getColocatedWith())
156155
&& getLocalMaxMemory() == paInfo.getLocalMaxMemory()
157-
&& StringUtils.equals(getPartitionResolverName(), paInfo.getPartitionResolverName())
156+
&& Objects.equals(getPartitionResolverName(), paInfo.getPartitionResolverName())
158157
&& getRecoveryDelay() == paInfo.getRecoveryDelay()
159158
&& getRedundantCopies() == paInfo.getRedundantCopies()
160159
&& getStartupRecoveryDelay() == paInfo.getStartupRecoveryDelay()

‎geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/domain/RegionAttributesInfo.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.HashSet;
2222
import java.util.List;
2323
import java.util.Map;
24+
import java.util.Objects;
2425
import java.util.Set;
2526

2627
import org.apache.commons.lang3.StringUtils;
@@ -364,7 +365,7 @@ public Map<String, String> getNonDefaultAttributes() {
364365
Boolean.toString(cloningEnabled));
365366
}
366367

367-
if (!StringUtils.equals(RegionAttributesDefault.COMPRESSOR_CLASS_NAME, compressorClassName)) {
368+
if (!Objects.equals(RegionAttributesDefault.COMPRESSOR_CLASS_NAME, compressorClassName)) {
368369
nonDefaultAttributes.put(RegionAttributesNames.COMPRESSOR, compressorClassName);
369370
}
370371

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public CliFunctionResult executeFunction(FunctionContext<CacheConfig.AsyncEventQ
113113
String listenerClassName = config.getAsyncEventListener().getClassName();
114114
Object listenerInstance;
115115
Class<?> listenerClass = InternalDataSerializer.getCachedClass(listenerClassName);
116-
listenerInstance = listenerClass.newInstance();
116+
listenerInstance = listenerClass.getDeclaredConstructor().newInstance();
117117

118118
List<ParameterType> parameters = config.getAsyncEventListener().getParameters();
119119
Properties listenerProperties = new Properties();

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package org.apache.geode.management.internal.cli.functions;
1717

1818
import java.io.Serializable;
19+
import java.lang.reflect.InvocationTargetException;
1920
import java.util.Arrays;
2021
import java.util.Collections;
2122
import java.util.HashSet;
@@ -606,8 +607,9 @@ public EvictionAttributes convertToEvictionAttributes() {
606607
if (objectSizer != null) {
607608
try {
608609
Class<?> sizerClass = ClassPathLoader.getLatest().forName(objectSizer);
609-
sizer = (ObjectSizer) sizerClass.newInstance();
610-
} catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
610+
sizer = (ObjectSizer) sizerClass.getDeclaredConstructor().newInstance();
611+
} catch (ClassNotFoundException | InstantiationException | IllegalAccessException
612+
| NoSuchMethodException | InvocationTargetException e) {
611613
throw new IllegalArgumentException(
612614
"Unable to instantiate class " + objectSizer + " - " + e);
613615
}

0 commit comments

Comments
 (0)