Remove Collection.unmodifiableXXX() wrappers

control-base/src/main/java/fi/nls/oskari/control/layer/GetWSCapabilitiesHandler.java

@@ -14,6 +14,7 @@
 import fi.nls.oskari.wfs.GetGtWFSCapabilities;
 import fi.nls.oskari.wms.GetGtWMSCapabilities;
 import fi.nls.oskari.wmts.WMTSCapabilitiesParser;
+import fi.nls.oskari.wmts.domain.WMTSCapabilities;
 import org.json.JSONObject;
 
 /**
@@ -60,8 +61,6 @@ public void handleAction(ActionParameters params) throws ActionException {
             }
             else {
                 if (OskariLayer.TYPE_WMTS.equals(layerType)) {
-                    WMTSCapabilitiesParser parser = new WMTSCapabilitiesParser();
-
                     // setup capabilities URL
                     OskariLayerCapabilities caps  = capabilitiesService.getCapabilities(url, OskariLayer.TYPE_WMTS, user, pw, version);
                     String capabilitiesXML = caps.getData();
@@ -70,7 +69,8 @@ public void handleAction(ActionParameters params) throws ActionException {
                         caps = capabilitiesService.getCapabilities(url, OskariLayer.TYPE_WMTS, user, pw, version, true);
                         capabilitiesXML = caps.getData();
                     }
-                    JSONObject resultJSON = parser.parseCapabilitiesToJSON(capabilitiesXML, url, currentCrs);
+                    WMTSCapabilities wmtsCaps = WMTSCapabilitiesParser.parseCapabilities(capabilitiesXML);
+                    JSONObject resultJSON = WMTSCapabilitiesParser.asJSON(wmtsCaps, url, currentCrs);
                     JSONHelper.putValue(resultJSON, "xml", caps.getData());
                     ResponseHelper.writeResponse(params, resultJSON);
                 }

service-map/src/main/java/fi/nls/oskari/map/layer/formatters/LayerJSONFormatterWMTS.java

@@ -3,21 +3,14 @@
 import fi.nls.oskari.domain.map.OskariLayer;
 import fi.nls.oskari.map.geometry.ProjectionHelper;
 import fi.nls.oskari.util.JSONHelper;
-import fi.nls.oskari.wmts.domain.TileMatrixLimits;
+import fi.nls.oskari.wmts.domain.TileMatrixSet;
+import fi.nls.oskari.wmts.domain.TileMatrixLink;
 import fi.nls.oskari.wmts.domain.WMTSCapabilities;
 import fi.nls.oskari.wmts.domain.WMTSCapabilitiesLayer;
 import org.json.JSONArray;
 import org.json.JSONObject;
-
 import java.util.*;
 
-/**
- * Created with IntelliJ IDEA.
- * User: SMAKINEN
- * Date: 17.12.2013
- * Time: 15:37
- * To change this template use File | Settings | File Templates.
- */
 public class LayerJSONFormatterWMTS extends LayerJSONFormatter {
 
     public static final String KEY_TILEMATRIXIDS = "tileMatrixIds";
@@ -75,69 +68,58 @@ public JSONObject getJSON(OskariLayer layer,
      * @return
      */
     public static JSONObject createCapabilitiesJSON(final WMTSCapabilities wmts,final WMTSCapabilitiesLayer layer) {
-
         JSONObject capabilities = new JSONObject();
         if(layer == null) {
             return capabilities;
         }
 
-        List<JSONObject> tileMatrix = LayerJSONFormatterWMTS.createTileMatrixArray(wmts, layer);
+        List<JSONObject> tileMatrix = LayerJSONFormatterWMTS.createTileMatrixArray(layer);
         JSONHelper.putValue(capabilities, KEY_TILEMATRIXIDS, new JSONArray(tileMatrix));
 
         return capabilities;
     }
 
     /**
      * Return array of wmts tilematrixsets  (Crs code and Identifier)
-     * @param wmts wmts service capabilities
-     * @param layer  wmts layer capabilities
+     * @param layer wmts layer capabilities
      * @return
      */
-    public static List<JSONObject> createTileMatrixArray(final WMTSCapabilities wmts, final WMTSCapabilitiesLayer layer) {
+    public static List<JSONObject> createTileMatrixArray(final WMTSCapabilitiesLayer layer) {
         final List<JSONObject> tileMatrix = new ArrayList<>();
-        Map<String, Set<TileMatrixLimits>> links = layer.getLinks();
-        if (links.size() > 0 ) {
-            //Loop matrixSet links
-            for (Map.Entry<String, Set<TileMatrixLimits>> entry : links.entrySet()) {
-                String crs = wmts.getMatrixCRS(entry.getKey());
-                if(crs != null){
-                    tileMatrix.add(JSONHelper.createJSONObject(ProjectionHelper.shortSyntaxEpsg(crs), entry.getKey()));
-                }
-            }
+        if (layer == null) {
+            return tileMatrix;
+        }
+
+        for (TileMatrixLink link : layer.getLinks()) {
+            TileMatrixSet tms = link.getTileMatrixSet();
+            String identifier = tms.getId();
+            String crs = tms.getCrs();
+            String epsg = ProjectionHelper.shortSyntaxEpsg(crs);
+            JSONHelper.createJSONObject(epsg, identifier);
         }
         return tileMatrix;
     }
 
     /**
-     * Constructs a  csr set containing the supported coordinate ref systems of WMS service
-     *
-     * @param wmts WebMapService
-     * @return Set<String> containing the supported coordinate ref systems of WMS service
+     * Constructs a Set containing the supported Coordinate Reference Systems of WMTS service
      */
-    public static Set<String> getCRSs(final WMTSCapabilities wmts, final WMTSCapabilitiesLayer layer) {
-        if(layer == null || wmts == null){
+    public static Set<String> getCRSs(final WMTSCapabilitiesLayer layer) {
+        if (layer == null) {
             return null;
         }
 
-        Set<String>  crss = new HashSet<String>();
-
-        Map<String, Set<TileMatrixLimits>> links = layer.getLinks();
-        if (links.size() > 0 ) {
-            //Loop matrixSet links
-            for (Map.Entry<String, Set<TileMatrixLimits>> entry : links.entrySet()) {
-                String crs = wmts.getMatrixCRS(entry.getKey());
-                crss.add(ProjectionHelper.shortSyntaxEpsg(crs));
-            }
-            return crss;
+        Set<String> crss = new HashSet<String>();
+        for (TileMatrixLink link : layer.getLinks()) {
+            TileMatrixSet tms = link.getTileMatrixSet();
+            String crs = tms.getCrs();
+            String epsg = ProjectionHelper.shortSyntaxEpsg(crs);
+            crss.add(epsg);
         }
-
-        return null;
+        return crss;
     }
 
     /**
      * Get matrix id by current crs
-     * @param crs
-     * @return
      */
     public static String getTileMatrixSetId(final JSONObject capabilities, final String crs) {
         if (capabilities.has("tileMatrixIds")) {

service-map/src/main/java/fi/nls/oskari/service/capabilities/OskariLayerCapabilitiesHelper.java

@@ -80,7 +80,7 @@ public static void setPropertiesFromCapabilitiesWMTS(OskariLayerCapabilities cap
         crs = crs != null ? crs : ml.getSrs_name();
         ml.setTileMatrixSetId(LayerJSONFormatterWMTS.getTileMatrixSetId(jscaps, crs));
 
-        ml.setSupportedCRSs(LayerJSONFormatterWMTS.getCRSs(caps, layer));
+        ml.setSupportedCRSs(LayerJSONFormatterWMTS.getCRSs(layer));
     }
 
     public static void setPropertiesFromCapabilitiesWFS(OskariLayer ml) {

service-map/src/main/java/fi/nls/oskari/wmts/WMTSCapabilitiesParser.java

@@ -35,7 +35,10 @@ public class WMTSCapabilitiesParser {
     public static WMTSCapabilities parseCapabilities(String xml)
             throws IllegalArgumentException, XMLStreamException {
         OMElement doc = XmlHelper.parseXML(xml);
-        return doc != null ? parseCapabilities(doc) : null;
+        if (doc == null) {
+            throw new XMLStreamException("Failed to parse XML");
+        }
+        return parseCapabilities(doc);
     }
 
     public static WMTSCapabilities parseCapabilities(InputStream in)

service-map/src/main/java/fi/nls/oskari/wmts/domain/TileMatrixLink.java

@@ -1,6 +1,5 @@
 package fi.nls.oskari.wmts.domain;
 
-import java.util.Collections;
 import java.util.List;
 
 public class TileMatrixLink {
@@ -10,7 +9,7 @@ public class TileMatrixLink {
 
     public TileMatrixLink(TileMatrixSet tms, List<TileMatrixLimits> limits) {
         this.tms = tms;
-        this.limits = limits != null ? Collections.unmodifiableList(limits) : null;
+        this.limits = limits;
     }
 
     public TileMatrixSet getTileMatrixSet() {

service-map/src/main/java/fi/nls/oskari/wmts/domain/TileMatrixSet.java

@@ -1,10 +1,9 @@
 package fi.nls.oskari.wmts.domain;
 
-import java.util.Collections;
-import java.util.stream.Collectors;
 import fi.nls.oskari.util.JSONHelper;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -23,8 +22,8 @@ public TileMatrixSet(String id, String crs, List<TileMatrix> tileMatrises)
             throws IllegalArgumentException {
         this.id = id;
         this.crs = crs;
-        this.tileMatrixMap = Collections.unmodifiableMap(tileMatrises.stream()
-                .collect(Collectors.toMap(TileMatrix::getId, tm -> tm)));
+        this.tileMatrixMap = tileMatrises.stream()
+                .collect(Collectors.toMap(TileMatrix::getId, tm -> tm));
         validate();
     }
 

service-map/src/main/java/fi/nls/oskari/wmts/domain/WMTSCapabilities.java

@@ -1,8 +1,6 @@
 package fi.nls.oskari.wmts.domain;
 
 import java.util.Collection;
-
-import java.util.Collections;
 import java.util.Map;
 
 public class WMTSCapabilities {
@@ -12,8 +10,8 @@ public class WMTSCapabilities {
 
     public WMTSCapabilities(Map<String, TileMatrixSet> tileMatrixSets,
             Map<String, WMTSCapabilitiesLayer> layers) {
-        this.tileMatrixSets = Collections.unmodifiableMap(tileMatrixSets);
-        this.layers = Collections.unmodifiableMap(layers);
+        this.tileMatrixSets = tileMatrixSets;
+        this.layers = layers;
     }
 
     public Collection<TileMatrixSet> getTileMatrixSets() {

service-map/src/main/java/fi/nls/oskari/wmts/domain/WMTSCapabilitiesLayer.java

@@ -4,7 +4,6 @@
 import fi.nls.oskari.map.layer.formatters.LayerJSONFormatterWMS;
 import fi.nls.oskari.util.JSONHelper;
 import fi.nls.oskari.wms.WMSStyle;
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import org.json.JSONArray;
@@ -28,32 +27,27 @@ public WMTSCapabilitiesLayer(String id, String title,
             List<TileMatrixLink> links) {
         this.id = id;
         this.title = title;
-        this.styles = Collections.unmodifiableList(styles);
+        this.styles = styles;
         this.defaultStyle = defaultStyle;
-        this.formats = Collections.unmodifiableSet(formats);
-        this.infoFormats = Collections.unmodifiableSet(infoFormats);
-        this.resourceUrls = Collections.unmodifiableList(resourceUrls);
-        this.links = Collections.unmodifiableList(links);
+        this.formats = formats;
+        this.infoFormats = infoFormats;
+        this.resourceUrls = resourceUrls;
+        this.links = links;
     }
 
-
     public List<ResourceUrl> getResourceUrls() {
         return resourceUrls;
     }
 
-    public void addResourceUrl(ResourceUrl url) {
-        getResourceUrls().add(url);
-    }
     public ResourceUrl getResourceUrlByType(final String type) {
-        for(ResourceUrl url : resourceUrls) {
-            if(url.getType().equalsIgnoreCase(type)) {
+        for (ResourceUrl url : resourceUrls) {
+            if (url.getType().equalsIgnoreCase(type)) {
                 return url;
             }
         }
         return null;
     }
 
-
     public boolean isQueryable() {
         return infoFormats.size() > 0;
     }