Little clean ups

content-resources/src/main/java/flyway/oskari/V1_35_5__update_layer_WMTS_matrixes.java

@@ -53,7 +53,7 @@ private void populateWMTS(Connection connection, OskariLayer layer) {
                 if (parsed != null) {
                     WMTSCapabilitiesLayer capsLayer = parsed.getLayer(layer.getName());
                     if (capsLayer != null) {
-                        JSONObject jscaps = LayerJSONFormatterWMTS.createCapabilitiesJSON(parsed, capsLayer);
+                        JSONObject jscaps = LayerJSONFormatterWMTS.createCapabilitiesJSON(capsLayer);
                         if (jscaps != null) {
                             updateCapabilities(layer.getId(), jscaps, connection);
                         }else {

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

@@ -1,6 +1,6 @@
 package fi.nls.oskari.control.layer;
 
-import fi.nls.oskari.service.capabilities.OskariLayerCapabilitiesHelper;
+import fi.nls.oskari.service.capabilities.OskariLayerCapabilities;
 
 import fi.mml.map.mapwindow.service.db.InspireThemeService;
 import fi.mml.map.mapwindow.service.db.MaplayerProjectionService;
@@ -23,6 +23,7 @@
 import fi.nls.oskari.permission.domain.Permission;
 import fi.nls.oskari.service.ServiceException;
 import fi.nls.oskari.service.capabilities.CapabilitiesCacheService;
+import fi.nls.oskari.service.capabilities.OskariLayerCapabilitiesHelper;
 import fi.nls.oskari.util.*;
 import fi.nls.oskari.wfs.WFSLayerConfigurationService;
 import fi.nls.oskari.wfs.util.WFSParserConfigs;
@@ -486,29 +487,29 @@ private void validateInsertLayer(final ActionParameters params, OskariLayer ml)
 
     }
 
-    private boolean handleWMSSpecific(final ActionParameters params, OskariLayer ml) throws ActionException {
-
-        HttpServletRequest request = params.getRequest();
-        final String xslt = request.getParameter("xslt");
+    private boolean handleWMSSpecific(final ActionParameters params, OskariLayer ml) {
+        final String xslt = params.getHttpParam("xslt");
         if(xslt != null) {
             // TODO: some validation of XSLT data
             ml.setGfiXslt(xslt);
         }
         ml.setGfiType(params.getHttpParam("gfiType", ml.getGfiType()));
 
         try {
-            OskariLayerCapabilitiesHelper.setPropertiesFromCapabilitiesWMS(capabilitiesService.getCapabilities(ml, true), ml);
+            OskariLayerCapabilities caps = capabilitiesService.getCapabilities(ml, true);
+            OskariLayerCapabilitiesHelper.setPropertiesFromCapabilitiesWMS(caps, ml);
             return true;
         } catch (ServiceException ex) {
             LOG.error(ex, "Couldn't update capabilities for layer", ml);
             return false;
         }
     }
 
-    private boolean handleWMTSSpecific(final ActionParameters params, OskariLayer ml) throws ActionException {
+    private boolean handleWMTSSpecific(final ActionParameters params, OskariLayer ml) {
         try {
-            final String currentCrs = params.getHttpParam(PARAM_SRS_NAME, ml.getSrs_name());
-            OskariLayerCapabilitiesHelper.setPropertiesFromCapabilitiesWMTS(capabilitiesService.getCapabilities(ml, true), ml, currentCrs);
+            String currentCrs = params.getHttpParam(PARAM_SRS_NAME, ml.getSrs_name());
+            OskariLayerCapabilities caps = capabilitiesService.getCapabilities(ml, true);
+            OskariLayerCapabilitiesHelper.setPropertiesFromCapabilitiesWMTS(caps, ml, currentCrs);
             return true;
         } catch (Exception ex) {
             LOG.error(ex, "Couldn't update capabilities for layer", ml);

control-base/src/test/java/fi/nls/oskari/control/layer/GetLayerCapabilitiesHandlerTest.java

@@ -15,24 +15,22 @@
 import fi.nls.oskari.service.OskariComponentManager;
 import fi.nls.oskari.service.capabilities.CapabilitiesCacheService;
 import fi.nls.oskari.service.capabilities.CapabilitiesCacheServiceMock;
+import fi.nls.oskari.util.PropertyUtil;
 import fi.nls.test.control.JSONActionRouteTest;
-
+import fi.nls.test.util.TestHelper;
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.modules.junit4.PowerMockRunner;
-
 import java.util.HashMap;
 import java.util.Map;
-
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 
-/**
- * Created by SMAKINEN on 28.8.2015.
- */
 @RunWith(PowerMockRunner.class)
 public class GetLayerCapabilitiesHandlerTest extends JSONActionRouteTest {
 
@@ -41,6 +39,7 @@ public class GetLayerCapabilitiesHandlerTest extends JSONActionRouteTest {
 
     @Before
     public void setup() {
+        assumeTrue(TestHelper.dbAvailable());
         OskariLayerService layerService = getOskariLayerService();
         PermissionsService permissionsService = getPermissionsService();
         // replace the cache service with a test service
@@ -117,5 +116,9 @@ private PermissionsService getPermissionsService() {
         return service;
     }
 
+    @AfterClass
+    public static void delete() {
+        PropertyUtil.clearProperties();
+    }
 
 }

control-base/src/test/java/fi/nls/oskari/service/capabilities/CapabilitiesCacheServiceMock.java

@@ -1,11 +1,10 @@
 package fi.nls.oskari.service.capabilities;
 
-import java.sql.Timestamp;
-
 import fi.nls.oskari.domain.map.OskariLayer;
 import fi.nls.oskari.service.ServiceException;
 import fi.nls.oskari.service.capabilities.CapabilitiesCacheService;
 import fi.nls.oskari.service.capabilities.OskariLayerCapabilities;
+import java.sql.Timestamp;
 
 public class CapabilitiesCacheServiceMock extends CapabilitiesCacheService {
 

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

@@ -5,7 +5,6 @@
 import fi.nls.oskari.util.JSONHelper;
 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;
@@ -61,13 +60,7 @@ public JSONObject getJSON(OskariLayer layer,
     }
 
 
-    /**
-     *
-     * @param wmts
-     * @param layer
-     * @return
-     */
-    public static JSONObject createCapabilitiesJSON(final WMTSCapabilities wmts,final WMTSCapabilitiesLayer layer) {
+    public static JSONObject createCapabilitiesJSON(final WMTSCapabilitiesLayer layer) {
         JSONObject capabilities = new JSONObject();
         if(layer == null) {
             return capabilities;

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

@@ -74,7 +74,7 @@ public static void setPropertiesFromCapabilitiesWMTS(OskariLayerCapabilities cap
             JSONHelper.putValue(options, "urlTemplate", resUrl.getTemplate());
         }
 
-        JSONObject jscaps = LayerJSONFormatterWMTS.createCapabilitiesJSON(caps, layer);
+        JSONObject jscaps = LayerJSONFormatterWMTS.createCapabilitiesJSON(layer);
         ml.setCapabilities(jscaps);
 
         crs = crs != null ? crs : ml.getSrs_name();

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

@@ -61,9 +61,9 @@ private static Map<String, TileMatrixSet> parseTileMatrixSets(OMElement contents
             throws IllegalArgumentException, XMLStreamException {
         Map<String, TileMatrixSet> tileMatrixSets = new HashMap<>();
 
-        Iterator<OMElement> matrixIterator = contents.getChildrenWithLocalName("TileMatrixSet");
-        while (matrixIterator.hasNext()) {
-            TileMatrixSet tms = parseTileMatrixSet(matrixIterator.next());
+        Iterator<OMElement> it = contents.getChildrenWithLocalName("TileMatrixSet");
+        while (it.hasNext()) {
+            TileMatrixSet tms = parseTileMatrixSet(it.next());
             tileMatrixSets.put(tms.getId(), tms);
         }
 
@@ -80,10 +80,6 @@ private static Map<String, TileMatrixSet> parseTileMatrixSets(OMElement contents
      */
     private static TileMatrixSet parseTileMatrixSet(OMElement tileMatrixSet)
             throws XMLStreamException, IllegalArgumentException {
-        if (tileMatrixSet == null) {
-            return null;
-        }
-
         String identifier = XmlHelper.getChildValue(tileMatrixSet, "Identifier");
         String crs = XmlHelper.getChildValue(tileMatrixSet, "SupportedCRS");
 
@@ -135,6 +131,7 @@ private static Map<String, WMTSCapabilitiesLayer> parseLayers(OMElement contents
         Iterator<OMElement> it = contents.getChildrenWithLocalName("Layer");
         while (it.hasNext()) {
             WMTSCapabilitiesLayer l = parseLayer(it.next(), tileMatrixSets);
+            layers.put(l.getId(), l);
         }
 
         return layers;
@@ -232,6 +229,7 @@ private static List<TileMatrixLink> parseLinks(OMElement capabilitiesLayer,
 
     private static List<TileMatrixLimits> parseLimits(OMElement eTMSLimits, TileMatrixSet tms)
             throws XMLStreamException, IllegalArgumentException {
+        // <TileMatrixSetLimits> might not exist
         if (eTMSLimits == null) {
             return null;
         }