You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shenyu.apache.org by yu...@apache.org on 2021/09/15 03:39:23 UTC
[incubator-shenyu] branch master updated: some refactor (#2077)
This is an automated email from the ASF dual-hosted git repository.
yui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 02e5362 some refactor (#2077)
02e5362 is described below
commit 02e53627aa60d240d9bf2afbe1e53478c8d12a3f
Author: xiaoyu <xi...@apache.org>
AuthorDate: Wed Sep 15 11:39:16 2021 +0800
some refactor (#2077)
---
.../plugin/cryptor/request/CryptorRequestPlugin.java | 3 ++-
.../plugin/cryptor/response/CryptorResponsePlugin.java | 3 ++-
.../org/apache/shenyu/plugin/cryptor/utils/HttpUtil.java | 1 -
.../org/apache/shenyu/plugin/cryptor/utils/JsonUtil.java | 2 --
.../apache/shenyu/web/loader/ShenyuPluginPathBuilder.java | 14 ++++++++++----
.../main/java/org/apache/shenyu/web/logo/ShenyuLogo.java | 1 +
6 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/request/CryptorRequestPlugin.java b/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/request/CryptorRequestPlugin.java
index ad0da8f..605aed3 100644
--- a/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/request/CryptorRequestPlugin.java
+++ b/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/request/CryptorRequestPlugin.java
@@ -98,7 +98,8 @@ public class CryptorRequestPlugin extends AbstractShenyuPlugin {
public String named() {
return PluginEnum.CRYPTOR_REQUEST.getName();
}
-
+
+ @SuppressWarnings("rawtypes")
private Mono strategyMatch(final CryptorRequestRuleHandle ruleHandle, final String originalBody, final ServerWebExchange exchange) {
String parseBody = JsonUtil.parser(originalBody, ruleHandle.getFieldNames());
if (null == parseBody) {
diff --git a/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/response/CryptorResponsePlugin.java b/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/response/CryptorResponsePlugin.java
index f515b09..071605f 100644
--- a/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/response/CryptorResponsePlugin.java
+++ b/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/response/CryptorResponsePlugin.java
@@ -99,7 +99,8 @@ public class CryptorResponsePlugin extends AbstractShenyuPlugin {
public String named() {
return PluginEnum.CRYPTOR_RESPONSE.getName();
}
-
+
+ @SuppressWarnings("rawtypes")
private Mono strategyMatch(final String originalBody, final CryptorResponseRuleHandle ruleHandle) {
AtomicInteger initDeep = new AtomicInteger();
initDeep.set(0);
diff --git a/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/utils/HttpUtil.java b/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/utils/HttpUtil.java
index 5361631..44194fd 100644
--- a/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/utils/HttpUtil.java
+++ b/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/utils/HttpUtil.java
@@ -71,5 +71,4 @@ public class HttpUtil {
}
return Mono.error(throwable);
}
-
}
diff --git a/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/utils/JsonUtil.java b/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/utils/JsonUtil.java
index b96bdb2..54328bc 100644
--- a/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/utils/JsonUtil.java
+++ b/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/utils/JsonUtil.java
@@ -114,7 +114,6 @@ public class JsonUtil {
JsonObject object = jsonElement.getAsJsonObject();
JsonObject objectNew = new JsonObject();
for (Map.Entry<String, JsonElement> entry : object.entrySet()) {
-
if (deepKey.get(initDeep.get()).equals(entry.getKey())) {
initDeep.incrementAndGet();
}
@@ -131,5 +130,4 @@ public class JsonUtil {
}
return jsonElement;
}
-
}
diff --git a/shenyu-web/src/main/java/org/apache/shenyu/web/loader/ShenyuPluginPathBuilder.java b/shenyu-web/src/main/java/org/apache/shenyu/web/loader/ShenyuPluginPathBuilder.java
index f0b89ea..af6b349 100644
--- a/shenyu-web/src/main/java/org/apache/shenyu/web/loader/ShenyuPluginPathBuilder.java
+++ b/shenyu-web/src/main/java/org/apache/shenyu/web/loader/ShenyuPluginPathBuilder.java
@@ -25,6 +25,7 @@ import java.io.File;
import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.net.URL;
+import java.util.Optional;
/**
* The type Shenyu plugin path builder.
@@ -35,6 +36,10 @@ public final class ShenyuPluginPathBuilder {
private static final String PLUGIN_PATH = "plugin-ext";
+ private static final String DEFAULT_EXT_PLUGIN_PATH = "/ext-lib/";
+
+ private static final String FILE_PRE = "file:";
+
/**
* Gets plugin path.
*
@@ -49,7 +54,7 @@ public final class ShenyuPluginPathBuilder {
if (StringUtils.isNotEmpty(pluginPath)) {
return new File(pluginPath);
}
- return new File(String.join("", buildPluginJarPath().getPath(), "/ext-lib"));
+ return buildPluginJarPath();
}
private static File buildPluginJarPath() {
@@ -62,17 +67,18 @@ public final class ShenyuPluginPathBuilder {
boolean isInJar = existFileInJarIndex > -1;
return isInJar ? getFileInJar(url, existFileInJarIndex) : getFileInResource(url, classResourcePath);
}
- return new File("/ext-lib");
+ URL url = ShenyuPluginPathBuilder.class.getResource(DEFAULT_EXT_PLUGIN_PATH);
+ return Optional.ofNullable(url).map(u -> new File(u.getFile())).orElse(new File(DEFAULT_EXT_PLUGIN_PATH));
}
private static File getFileInResource(final String url, final String classResourcePath) {
- int prefixLength = "file:".length();
+ int prefixLength = FILE_PRE.length();
String classLocation = url.substring(prefixLength, url.length() - classResourcePath.length());
return new File(classLocation);
}
private static File getFileInJar(final String url, final int fileInJarIndex) {
- String realUrl = url.substring(url.indexOf("file:"), fileInJarIndex);
+ String realUrl = url.substring(url.indexOf(FILE_PRE), fileInJarIndex);
try {
File jarFile = new File(new URL(realUrl).toURI());
return jarFile.exists() ? jarFile.getParentFile() : null;
diff --git a/shenyu-web/src/main/java/org/apache/shenyu/web/logo/ShenyuLogo.java b/shenyu-web/src/main/java/org/apache/shenyu/web/logo/ShenyuLogo.java
index db8eff2..72685a1 100644
--- a/shenyu-web/src/main/java/org/apache/shenyu/web/logo/ShenyuLogo.java
+++ b/shenyu-web/src/main/java/org/apache/shenyu/web/logo/ShenyuLogo.java
@@ -32,6 +32,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
*/
@Order(LoggingApplicationListener.DEFAULT_ORDER + 1)
public class ShenyuLogo implements ApplicationListener<ApplicationEnvironmentPreparedEvent> {
+
/**
* logger.
*/