diff --git a/mycore-viewer/src/main/java/org/mycore/viewer/configuration/MCRViewerConfiguration.java b/mycore-viewer/src/main/java/org/mycore/viewer/configuration/MCRViewerConfiguration.java index 276e37f76d..7998237aea 100644 --- a/mycore-viewer/src/main/java/org/mycore/viewer/configuration/MCRViewerConfiguration.java +++ b/mycore-viewer/src/main/java/org/mycore/viewer/configuration/MCRViewerConfiguration.java @@ -68,10 +68,15 @@ */ public class MCRViewerConfiguration { - private static final Logger LOGGER = LogManager.getLogger(MCRViewerConfiguration.class); + private static final Logger LOGGER = LogManager.getLogger(); public enum ResourceType { - SCRIPT, MODULE, CSS + SCRIPT, MODULE, CSS; + + @Override + public String toString() { + return super.toString().toLowerCase(Locale.ROOT); + } } private final Multimap resources; @@ -353,7 +358,7 @@ public final List getProperties() { @XmlRootElement(name = "resource") private static class MCRIViewClientResource { - @XmlAttribute(name = "type", required = true) + @XmlTransient public ResourceType type; @XmlValue @@ -368,6 +373,11 @@ private static class MCRIViewClientResource { this.url = url; } + @XmlAttribute(name = "type", required = true) + public String getType() { + return type.name().toLowerCase(Locale.ROOT); + } + @Override public boolean equals(Object obj) { if (obj instanceof MCRIViewClientResource rhs) { @@ -412,7 +422,6 @@ public String getXMLValue() { private static final class MultimapSerializer implements JsonSerializer> { - @SuppressWarnings("serial") private static final Type T = new TypeToken>>() { }.getType();