This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 55f665d85 Bump snakeyaml from 1.32 to 1.33 (#3370)
55f665d85 is described below
commit 55f665d85d3833fb60d2b123ad3fc22cb008904f
Author: liubao68 <[email protected]>
AuthorDate: Thu Sep 29 16:13:40 2022 +0800
Bump snakeyaml from 1.32 to 1.33 (#3370)
---
dependencies/default/pom.xml | 2 +-
.../src/main/java/org/apache/servicecomb/config/YAMLUtil.java | 5 +++--
.../servicecomb/governance/properties/GovernanceProperties.java | 7 +++++--
.../java/org/apache/servicecomb/router/cache/RouterRuleCache.java | 7 +++++--
4 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml
index 41e01f479..c9e9f4d0a 100644
--- a/dependencies/default/pom.xml
+++ b/dependencies/default/pom.xml
@@ -91,7 +91,7 @@
<servo.version>0.13.2</servo.version>
<servlet-api.version>4.0.4</servlet-api.version>
<slf4j.version>1.7.36</slf4j.version>
- <snakeyaml.version>1.32</snakeyaml.version>
+ <snakeyaml.version>1.33</snakeyaml.version>
<spectator.version>1.3.8</spectator.version>
<spring.version>5.3.23</spring.version>
<spring-boot.version>2.6.7</spring-boot.version>
diff --git
a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/YAMLUtil.java
b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/YAMLUtil.java
index 21ace7c09..ec77cd4e4 100644
---
a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/YAMLUtil.java
+++
b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/YAMLUtil.java
@@ -24,6 +24,7 @@ import java.io.InputStream;
import java.util.LinkedHashMap;
import java.util.Map;
+import org.yaml.snakeyaml.LoaderOptions;
import org.yaml.snakeyaml.TypeDescription;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
@@ -35,7 +36,7 @@ public final class YAMLUtil {
private static Yaml safeParser() {
// Yaml instance is not thread safe, create a new instance for each parser
- return new Yaml(new SafeConstructor());
+ return new Yaml(new SafeConstructor(new LoaderOptions()));
}
/**
@@ -95,7 +96,7 @@ public final class YAMLUtil {
}
public static <T> T parserObject(String yamlContent, Class<T> clazz) {
- Yaml parser = new Yaml(new Constructor(new TypeDescription(clazz, clazz)));
+ Yaml parser = new Yaml(new Constructor(new TypeDescription(clazz, clazz),
new LoaderOptions()));
return parser.loadAs(yamlContent, clazz);
}
diff --git
a/governance/src/main/java/org/apache/servicecomb/governance/properties/GovernanceProperties.java
b/governance/src/main/java/org/apache/servicecomb/governance/properties/GovernanceProperties.java
index df824a573..615c2d522 100644
---
a/governance/src/main/java/org/apache/servicecomb/governance/properties/GovernanceProperties.java
+++
b/governance/src/main/java/org/apache/servicecomb/governance/properties/GovernanceProperties.java
@@ -39,6 +39,8 @@ import org.springframework.core.env.EnumerablePropertySource;
import org.springframework.core.env.Environment;
import org.springframework.core.env.PropertySource;
import org.springframework.util.CollectionUtils;
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.LoaderOptions;
import org.yaml.snakeyaml.TypeDescription;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
@@ -49,7 +51,7 @@ import com.google.common.eventbus.Subscribe;
public abstract class GovernanceProperties<T extends Configurable> implements
InitializingBean {
private static final Logger LOGGER =
LoggerFactory.getLogger(GovernanceProperties.class);
- private final Representer representer = new Representer();
+ private final Representer representer = new Representer(new DumperOptions());
private final String configKey;
@@ -169,7 +171,8 @@ public abstract class GovernanceProperties<T extends
Configurable> implements In
}
try {
- Yaml entityParser = new Yaml(new Constructor(new
TypeDescription(entityClass, entityClass)), representer);
+ Yaml entityParser = new Yaml(new Constructor(new
TypeDescription(entityClass, entityClass), new LoaderOptions()),
+ representer);
T result = entityParser.loadAs(value, entityClass);
result.setName(key);
diff --git
a/governance/src/main/java/org/apache/servicecomb/router/cache/RouterRuleCache.java
b/governance/src/main/java/org/apache/servicecomb/router/cache/RouterRuleCache.java
index 9d3133043..8ff480cea 100644
---
a/governance/src/main/java/org/apache/servicecomb/router/cache/RouterRuleCache.java
+++
b/governance/src/main/java/org/apache/servicecomb/router/cache/RouterRuleCache.java
@@ -31,6 +31,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.LoaderOptions;
import org.yaml.snakeyaml.TypeDescription;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
@@ -53,7 +55,7 @@ public class RouterRuleCache {
private final Object lock = new Object();
- private final Representer representer = new Representer();
+ private final Representer representer = new Representer(new DumperOptions());
@Autowired
public RouterRuleCache(Environment environment) {
@@ -98,7 +100,8 @@ public class RouterRuleCache {
List<PolicyRuleItem> policyRuleItemList;
try {
Yaml entityParser = new Yaml(
- new Constructor(new TypeDescription(PolicyRuleItem[].class,
PolicyRuleItem[].class)), representer);
+ new Constructor(new TypeDescription(PolicyRuleItem[].class,
PolicyRuleItem[].class), new LoaderOptions()),
+ representer);
policyRuleItemList = Arrays
.asList(entityParser.loadAs(ruleStr, PolicyRuleItem[].class));
} catch (Exception e) {
