Fix upgrade

mapfish · Mar 2, 2023 · cba807b · cba807b
1 parent d89efda
commit cba807b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/core/src/main/java/org/mapfish/print/config/ConfigurationFactory.java b/core/src/main/java/org/mapfish/print/config/ConfigurationFactory.java
@@ -44,12 +44,8 @@ public final void init() {
         if (maxAliases != null) {
             loaderOptions.setMaxAliasesForCollections(Integer.parseInt(maxAliases));
         }
-        Representer representer = new Representer();
         DumperOptions dumperOptions = new DumperOptions();
-        dumperOptions.setDefaultFlowStyle(representer.getDefaultFlowStyle());
-        dumperOptions.setDefaultScalarStyle(representer.getDefaultScalarStyle());
-        dumperOptions.setAllowReadOnlyProperties(representer.getPropertyUtils().isAllowReadOnlyProperties());
-        dumperOptions.setTimeZone(representer.getTimeZone());
+        Representer representer = new Representer(dumperOptions);
         this.yaml = new Yaml(constructor, representer, dumperOptions, loaderOptions);
     }
 

diff --git a/core/src/main/java/org/mapfish/print/config/MapfishPrintConstructor.java b/core/src/main/java/org/mapfish/print/config/MapfishPrintConstructor.java
@@ -4,6 +4,7 @@
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.TypeDescription;
 import org.yaml.snakeyaml.constructor.Constructor;
 import org.yaml.snakeyaml.nodes.Node;
@@ -34,7 +35,7 @@ public final class MapfishPrintConstructor extends Constructor {
      * @param context the application context object for creating
      */
     public MapfishPrintConstructor(final ConfigurableApplicationContext context) {
-        super(new TypeDescription(Configuration.class, CONFIGURATION_TAG));
+        super(new TypeDescription(Configuration.class, CONFIGURATION_TAG), new LoaderOptions());
         this.context = context;
         Map<String, ConfigurationObject> yamlObjects = context.getBeansOfType(ConfigurationObject.class);
         for (Map.Entry<String, ConfigurationObject> entry: yamlObjects.entrySet()) {