Merge branch 'main' into feat/openapi-create-app

apolloconfig · Aug 26, 2023 · 87de340 · 87de340
2 parents ae63015 + d2eca1f
commit 87de340
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -8,5 +8,6 @@ Apollo Java 2.2.0
 [refactor(apollo-client): Optimize the exception message when failing to retrieve configuration information.](https://github.com/apolloconfig/apollo-java/pull/22)
 [Add JUnit5 extension support for apollo mock server.](https://github.com/apolloconfig/apollo-java/pull/25)
 [Support concurrent loading of Config for different namespaces.](https://github.com/apolloconfig/apollo-java/pull/31)
+[Fix snakeyaml 2.x compatibility issues](https://github.com/apolloconfig/apollo-java/pull/35)
 ------------------
 All issues and pull requests are [here](https://github.com/apolloconfig/apollo-java/milestone/2?closed=1)
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/util/yaml/YamlParser.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/util/yaml/YamlParser.java
@@ -67,7 +67,9 @@ public void process(Properties properties, Map<String, Object> map) {
   private Yaml createYaml() {
     LoaderOptions loadingConfig = new LoaderOptions();
     loadingConfig.setAllowDuplicateKeys(false);
-    return new Yaml(new SafeConstructor(), new Representer(), new DumperOptions(), loadingConfig);
+    DumperOptions dumperOptions = new DumperOptions();
+    return new Yaml(new SafeConstructor(loadingConfig),
+            new Representer(dumperOptions), dumperOptions, loadingConfig);
   }
 
   private boolean process(MatchCallback callback, Yaml yaml, String content) {