You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shenyu.apache.org by li...@apache.org on 2022/10/12 06:44:57 UTC
[shenyu] branch master updated: downgrade shenyu-e2e jdk11 version to jdk8 (#4069)
This is an automated email from the ASF dual-hosted git repository.
likeguo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 284351dce downgrade shenyu-e2e jdk11 version to jdk8 (#4069)
284351dce is described below
commit 284351dce9090b08ba47063a4f4c8ef51fe5fbc6
Author: Haochao Zhuang <10...@users.noreply.github.com>
AuthorDate: Wed Oct 12 14:44:46 2022 +0800
downgrade shenyu-e2e jdk11 version to jdk8 (#4069)
---
shenyu-e2e/pom.xml | 2 +-
shenyu-e2e/shenyu-e2e-case/pom.xml | 12 --------
.../e2e/testcase/plugin/DividePluginCases.java | 2 +-
.../shenyu/e2e/client/admin/AdminClient.java | 9 +++---
.../shenyu/e2e/client/admin/model/Plugin.java | 2 +-
.../org/apache/shenyu/e2e/common/TableView.java | 5 +++-
.../apache/shenyu/e2e/common/TableViewTest.java | 4 +--
.../ShenYuScenarioInvocationContextProvider.java | 3 +-
.../shenyu/e2e/engine/service/NamingResolver.java | 32 ++++++++++++----------
9 files changed, 33 insertions(+), 38 deletions(-)
diff --git a/shenyu-e2e/pom.xml b/shenyu-e2e/pom.xml
index 4e41bb1d1..a15b07742 100644
--- a/shenyu-e2e/pom.xml
+++ b/shenyu-e2e/pom.xml
@@ -40,7 +40,7 @@
</licenses>
<properties>
- <java.version>11</java.version>
+ <java.version>8</java.version>
<testcontainers.version>1.17.3</testcontainers.version>
<junit.version>5.8.2</junit.version>
<assertj.version>3.22.0</assertj.version>
diff --git a/shenyu-e2e/shenyu-e2e-case/pom.xml b/shenyu-e2e/shenyu-e2e-case/pom.xml
index 37d108213..f3015d251 100644
--- a/shenyu-e2e/shenyu-e2e-case/pom.xml
+++ b/shenyu-e2e/shenyu-e2e-case/pom.xml
@@ -37,17 +37,5 @@
<artifactId>shenyu-e2e-client</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
-
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <scope>compile</scope>
- </dependency>
</dependencies>
</project>
diff --git a/shenyu-e2e/shenyu-e2e-case/src/test/java/org/apache/shenyu/e2e/testcase/plugin/DividePluginCases.java b/shenyu-e2e/shenyu-e2e-case/src/test/java/org/apache/shenyu/e2e/testcase/plugin/DividePluginCases.java
index c32336004..80707afb2 100644
--- a/shenyu-e2e/shenyu-e2e-case/src/test/java/org/apache/shenyu/e2e/testcase/plugin/DividePluginCases.java
+++ b/shenyu-e2e/shenyu-e2e-case/src/test/java/org/apache/shenyu/e2e/testcase/plugin/DividePluginCases.java
@@ -46,7 +46,7 @@ public class DividePluginCases implements ShenYuScenarioProvider {
@Override
public List<ScenarioSpec> get() {
- return List.of(
+ return Lists.newArrayList(
ShenYuScenarioSpec.builder()
.name("single-divide uri =]")
.beforeEachSpec(
diff --git a/shenyu-e2e/shenyu-e2e-client/src/main/java/org/apache/shenyu/e2e/client/admin/AdminClient.java b/shenyu-e2e/shenyu-e2e-client/src/main/java/org/apache/shenyu/e2e/client/admin/AdminClient.java
index 5aad12144..1cc07cb4c 100644
--- a/shenyu-e2e/shenyu-e2e-client/src/main/java/org/apache/shenyu/e2e/client/admin/AdminClient.java
+++ b/shenyu-e2e/shenyu-e2e-client/src/main/java/org/apache/shenyu/e2e/client/admin/AdminClient.java
@@ -73,14 +73,13 @@ public class AdminClient {
private final String baseURL;
private final ImmutableMap<String, String> loginInfo;
- private static final TypeReference<PaginatedResources<PluginDTO>> PAGINATED_PLUGINS_TYPE_REFERENCE = new TypeReference<>() {
+ private static final TypeReference<PaginatedResources<PluginDTO>> PAGINATED_PLUGINS_TYPE_REFERENCE = new TypeReference<PaginatedResources<PluginDTO>>() {
};
-
- private static final TypeReference<SearchedResources<SelectorDTO>> SEARCHED_SELECTORS_TYPE_REFERENCE = new TypeReference<>() {
+ private static final TypeReference<SearchedResources<SelectorDTO>> SEARCHED_SELECTORS_TYPE_REFERENCE = new TypeReference<SearchedResources<SelectorDTO>>() {
};
- private static final TypeReference<SearchedResources<RuleDTO>> SEARCHED_RULES_TYPE_REFERENCE = new TypeReference<>() {
+ private static final TypeReference<SearchedResources<RuleDTO>> SEARCHED_RULES_TYPE_REFERENCE = new TypeReference<SearchedResources<RuleDTO>>() {
};
- private static final TypeReference<SearchedResources<FakeResourceDTO>> FAKE_VALUE_TYPE = new TypeReference<>() {
+ private static final TypeReference<SearchedResources<FakeResourceDTO>> FAKE_VALUE_TYPE = new TypeReference<SearchedResources<FakeResourceDTO>>() {
};
public AdminClient(String scenarioId, String baseURL, Properties properties) {
diff --git a/shenyu-e2e/shenyu-e2e-client/src/main/java/org/apache/shenyu/e2e/client/admin/model/Plugin.java b/shenyu-e2e/shenyu-e2e-client/src/main/java/org/apache/shenyu/e2e/client/admin/model/Plugin.java
index 2021d4cca..5bb9737d3 100644
--- a/shenyu-e2e/shenyu-e2e-client/src/main/java/org/apache/shenyu/e2e/client/admin/model/Plugin.java
+++ b/shenyu-e2e/shenyu-e2e-client/src/main/java/org/apache/shenyu/e2e/client/admin/model/Plugin.java
@@ -88,7 +88,7 @@ public enum Plugin {
}
public static Map<String, String> toMap() {
- return Arrays.stream(Plugin.values()).collect(Collectors.toUnmodifiableMap(Plugin::getAlias, Plugin::getId));
+ return Arrays.stream(Plugin.values()).collect(Collectors.toMap(Plugin::getAlias, Plugin::getId));
}
public static void check(List<PluginDTO> plugins) {
diff --git a/shenyu-e2e/shenyu-e2e-common/src/main/java/org/apache/shenyu/e2e/common/TableView.java b/shenyu-e2e/shenyu-e2e-common/src/main/java/org/apache/shenyu/e2e/common/TableView.java
index 56f0e8ae3..6c3a5858d 100644
--- a/shenyu-e2e/shenyu-e2e-common/src/main/java/org/apache/shenyu/e2e/common/TableView.java
+++ b/shenyu-e2e/shenyu-e2e-common/src/main/java/org/apache/shenyu/e2e/common/TableView.java
@@ -56,7 +56,10 @@ public class TableView {
StringBuilder separator = new StringBuilder("+");
for (int i = 0; i < maxContentLengthOfColumns.length; i++) {
int length = maxContentLengthOfColumns[i];
- separator.append("-".repeat(length + 2)).append("+");
+ for (int j = -2; j < length; j++) {
+ separator.append('-');
+ }
+ separator.append("+");
template[i] = String.format(" %%-%ds ", length);
}
separator.append(System.lineSeparator());
diff --git a/shenyu-e2e/shenyu-e2e-common/src/test/java/org/apache/shenyu/e2e/common/TableViewTest.java b/shenyu-e2e/shenyu-e2e-common/src/test/java/org/apache/shenyu/e2e/common/TableViewTest.java
index d62821ec6..bc3a6bcd7 100644
--- a/shenyu-e2e/shenyu-e2e-common/src/test/java/org/apache/shenyu/e2e/common/TableViewTest.java
+++ b/shenyu-e2e/shenyu-e2e-common/src/test/java/org/apache/shenyu/e2e/common/TableViewTest.java
@@ -20,9 +20,9 @@ package org.apache.shenyu.e2e.common;
import lombok.AllArgsConstructor;
import lombok.ToString;
import org.assertj.core.api.Assertions;
+import org.assertj.core.util.Lists;
import org.junit.jupiter.api.Test;
-import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -32,7 +32,7 @@ public class TableViewTest {
void testTableViewPrint() {
TableView tableView = new TableView("header 1", "header 2", "header 3", "header 4");
tableView.addRow("column 1", "column 2", "column 3", "column 4");
- tableView.addRow(1, new Cell("123"), 1d, List.of("a", "b"));
+ tableView.addRow(1, new Cell("123"), 1d, Lists.newArrayList("a", "b"));
Assertions.assertThat(tableView.printAsString())
.isEqualTo(Stream.<String>builder()
diff --git a/shenyu-e2e/shenyu-e2e-engine/src/main/java/org/apache/shenyu/e2e/engine/scenario/ShenYuScenarioInvocationContextProvider.java b/shenyu-e2e/shenyu-e2e-engine/src/main/java/org/apache/shenyu/e2e/engine/scenario/ShenYuScenarioInvocationContextProvider.java
index 4d6b33096..90e67b884 100644
--- a/shenyu-e2e/shenyu-e2e-engine/src/main/java/org/apache/shenyu/e2e/engine/scenario/ShenYuScenarioInvocationContextProvider.java
+++ b/shenyu-e2e/shenyu-e2e-engine/src/main/java/org/apache/shenyu/e2e/engine/scenario/ShenYuScenarioInvocationContextProvider.java
@@ -20,6 +20,7 @@ package org.apache.shenyu.e2e.engine.scenario;
import org.apache.shenyu.e2e.engine.annotation.ShenYuScenario;
import org.apache.shenyu.e2e.engine.scenario.specification.ScenarioSpec;
import org.apache.shenyu.e2e.engine.scenario.specification.ScenarioSpecLogProxy;
+import org.assertj.core.util.Lists;
import org.junit.jupiter.api.extension.Extension;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
@@ -80,7 +81,7 @@ public class ShenYuScenarioInvocationContextProvider implements TestTemplateInvo
@Override
public List<Extension> getAdditionalExtensions() {
- return List.of(new ShenYuScenarioParameterResolver(scenarioSpec));
+ return Lists.newArrayList(new ShenYuScenarioParameterResolver(scenarioSpec));
}
}
diff --git a/shenyu-e2e/shenyu-e2e-engine/src/main/java/org/apache/shenyu/e2e/engine/service/NamingResolver.java b/shenyu-e2e/shenyu-e2e-engine/src/main/java/org/apache/shenyu/e2e/engine/service/NamingResolver.java
index 8bc7b34fe..a12579fe3 100644
--- a/shenyu-e2e/shenyu-e2e-engine/src/main/java/org/apache/shenyu/e2e/engine/service/NamingResolver.java
+++ b/shenyu-e2e/shenyu-e2e-engine/src/main/java/org/apache/shenyu/e2e/engine/service/NamingResolver.java
@@ -29,6 +29,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
@Slf4j
@@ -39,7 +40,7 @@ public enum NamingResolver {
public void ofHostConfigure(List<HostServiceConfigure> serviceConfigures) {
namingMap = serviceConfigures.stream()
- .collect(Collectors.toUnmodifiableMap(
+ .collect(Collectors.toMap(
HostServiceConfigure::getServiceName,
c -> getAddressFromBaseUrl(c.getBaseUrl())
)
@@ -54,18 +55,21 @@ public enum NamingResolver {
Map<String, ?> serviceInstanceMap = (Map<String, ?>) field.get(container);
serviceInstanceMap.keySet().forEach(e -> {
- container.getContainerByServiceName(e).ifPresentOrElse(
- c -> {
- c.getContainerInfo().getNetworkSettings().getNetworks().entrySet()
- .stream()
- .findFirst()
- .ifPresent(net -> {
- String ip = net.getValue().getIpAddress();
- net.getValue().getAliases().forEach(alias -> _namingMap.put(alias, ip));
- });
- },
- () -> log.warn("service {} not exists", e)
- );
+ if (container.getContainerByServiceName(e).isPresent()) {
+ container.getContainerByServiceName(e).get()
+ .getContainerInfo()
+ .getNetworkSettings()
+ .getNetworks()
+ .entrySet()
+ .stream()
+ .findFirst()
+ .ifPresent(net -> {
+ String ip = net.getValue().getIpAddress();
+ Objects.requireNonNull(net.getValue().getAliases()).forEach(alias -> _namingMap.put(alias, ip));
+ });
+ } else {
+ log.warn("service {} not exists", e);
+ }
});
System.out.println(_namingMap);
} catch (NoSuchFieldException | IllegalAccessException ignore) {
@@ -105,7 +109,7 @@ public enum NamingResolver {
} catch (UnknownHostException ignore) {
}
log.info("failed to resolve {}", name);
-
+
return name;
}
}