diff --git a/core/src/main/java/org/mapfish/print/config/ConfigurationFactory.java b/core/src/main/java/org/mapfish/print/config/ConfigurationFactory.java index c97a449322..557cd0cbf7 100644 --- a/core/src/main/java/org/mapfish/print/config/ConfigurationFactory.java +++ b/core/src/main/java/org/mapfish/print/config/ConfigurationFactory.java @@ -6,6 +6,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; import java.util.List; import javax.annotation.PostConstruct; import org.slf4j.Logger; @@ -63,7 +64,8 @@ public final Configuration getConfig(final File configFile, final InputStream co configuration.setConfigurationFile(configFile); MapfishPrintConstructor.setConfigurationUnderConstruction(configuration); - final Configuration config = this.yaml.load(new InputStreamReader(configData, "UTF-8")); + final Configuration config = + this.yaml.load(new InputStreamReader(configData, StandardCharsets.UTF_8)); if (this.doValidation) { final List validate = config.validate(); if (!validate.isEmpty()) { diff --git a/core/src/main/java/org/mapfish/print/map/style/SLDParserPlugin.java b/core/src/main/java/org/mapfish/print/map/style/SLDParserPlugin.java index aa1941d861..a42804a079 100644 --- a/core/src/main/java/org/mapfish/print/map/style/SLDParserPlugin.java +++ b/core/src/main/java/org/mapfish/print/map/style/SLDParserPlugin.java @@ -5,6 +5,7 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; +import java.nio.charset.Charset; import java.util.Optional; import java.util.function.Function; import javax.annotation.Nonnull; @@ -39,6 +40,8 @@ public class SLDParserPlugin implements StyleParserPlugin { */ public static final String STYLE_INDEX_REF_SEPARATOR = "##"; + public static final String RASTER = "raster"; + @Override public final Optional