This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 436b495b680 Remove usage of com.google.common.collect.Collections2
(#17721)
436b495b680 is described below
commit 436b495b680e666283b7f517e979c0c01bfd58fa
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Tue May 17 13:15:06 2022 +0800
Remove usage of com.google.common.collect.Collections2 (#17721)
---
pom.xml | 2 +-
.../apache/shardingsphere/infra/expr/InlineExpressionParser.java | 7 ++++---
.../route/engine/SingleTableDatabaseBroadcastRouteEngineTest.java | 2 +-
.../cluster/coordinator/ClusterContextManagerCoordinatorTest.java | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index ef56c21ac50..4d8cd716146 100644
--- a/pom.xml
+++ b/pom.xml
@@ -736,7 +736,7 @@
<artifactId>freemarker</artifactId>
<version>${freemarker.version}</version>
</dependency>
-
+
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/expr/InlineExpressionParser.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/expr/InlineExpressionParser.java
index 7d7ad8c3456..f8bebaa2871 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/expr/InlineExpressionParser.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/expr/InlineExpressionParser.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.infra.expr;
import com.google.common.base.Strings;
-import com.google.common.collect.Collections2;
import com.google.common.collect.Sets;
import groovy.lang.Closure;
import groovy.lang.GString;
@@ -29,10 +28,12 @@ import lombok.RequiredArgsConstructor;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
/**
* Inline expression parser.
@@ -83,7 +84,7 @@ public final class InlineExpressionParser {
* @return closure
*/
public Closure<?> evaluateClosure() {
- return (Closure) evaluate("{it -> \"" + inlineExpression + "\"}");
+ return (Closure<?>) evaluate("{it -> \"" + inlineExpression + "\"}");
}
private List<Object> evaluate(final List<String> inlineExpressions) {
@@ -182,7 +183,7 @@ public final class InlineExpressionParser {
continue;
}
if (each instanceof Collection) {
-
result.add(Sets.newLinkedHashSet(Collections2.transform((Collection<Object>)
each, Object::toString)));
+ result.add(((Collection<Object>)
each).stream().map(Object::toString).collect(Collectors.toCollection(LinkedHashSet::new)));
} else {
result.add(Sets.newHashSet(each.toString()));
}
diff --git
a/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/test/java/org/apache/shardingsphere/singletable/route/engine/SingleTableDatabaseBroadcastRouteEngineTest.java
b/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/test/java/org/apache/shardingsphere/singletable/route/engine/SingleTableDatabaseBroadcastRouteEngineTest.java
index d2e99b159b2..e9cba12b567 100644
---
a/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/test/java/org/apache/shardingsphere/singletable/route/engine/SingleTableDatabaseBroadcastRouteEngineTest.java
+++
b/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/test/java/org/apache/shardingsphere/singletable/route/engine/SingleTableDatabaseBroadcastRouteEngineTest.java
@@ -44,7 +44,7 @@ public final class
SingleTableDatabaseBroadcastRouteEngineTest {
@Test
public void assertRoute() {
- SingleTableRule singleTableRule = new SingleTableRule(new
SingleTableRuleConfiguration(),
+ SingleTableRule singleTableRule = new SingleTableRule(new
SingleTableRuleConfiguration(),
DefaultDatabase.LOGIC_NAME, mock(DatabaseType.class),
createDataSourceMap(), Collections.emptyList(), new ConfigurationProperties(new
Properties()));
RouteContext routeContext = new RouteContext();
SingleTableDatabaseBroadcastRouteEngine engine = new
SingleTableDatabaseBroadcastRouteEngine();
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
index 05e9b36b803..36ae4dca2c4 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
@@ -373,7 +373,7 @@ public final class ClusterContextManagerCoordinatorTest {
String showProcessListId = "foo_process_id";
coordinator.triggerShowProcessList(new
ShowProcessListTriggerEvent(instanceDefinition, showProcessListId));
ClusterPersistRepository repository =
ReflectionUtil.getFieldValue(coordinator, "registryCenter",
RegistryCenter.class).getRepository();
- verify(repository).persist("/execution_nodes/foo_process_id/proxy_" +
instanceDefinition.getInstanceId().getId(),
+ verify(repository).persist("/execution_nodes/foo_process_id/proxy_" +
instanceDefinition.getInstanceId().getId(),
"contexts:" + System.lineSeparator() + "- startTimeMillis: 0"
+ System.lineSeparator());
verify(repository).delete("/nodes/compute_nodes/process_trigger/proxy/" +
instanceDefinition.getInstanceId().getId() + "/foo_process_id");
}
