[KNOWAGE-9289] Refactor getProperties to use layer label instead of ID

Author: eng-dedalus

knowage-core/src/main/java/it/eng/spagobi/mapcatalogue/service/LayerCRUD.java

@@ -113,36 +113,33 @@ public String loadLayers(@Context HttpServletRequest req) throws JSONException,
 	@Produces(MediaType.APPLICATION_JSON + "; charset=UTF-8")
 	@UserConstraint(functionalities = { CommunityFunctionalityConstants.GEO_LAYERS_MANAGEMENT })
 	public String getFilter(@Context HttpServletRequest req) throws JSONException {
-		Object id = null;
-		Integer layerId = null;
+		String layerLabel;
 
 		try {
-
-			id = req.getParameter("id");
-			if (id == null || id.equals("")) {
+			layerLabel = req.getParameter("label");
+			if (layerLabel == null || layerLabel.isEmpty()) {
 				throw new SpagoBIRuntimeException("The layer id passed in the request is null or empty");
 			}
-			layerId = new Integer(id.toString());
 		} catch (Exception e) {
 			logger.error("error loading filter", e);
 			throw new SpagoBIRuntimeException("error request", e);
 		}
 
 		ISbiGeoLayersDAO dao = DAOFactory.getSbiGeoLayerDao();
-		ArrayList<String> properties = null;
+		ArrayList<String> properties;
 		try {
-			properties = dao.getProperties(layerId);
+			properties = dao.getProperties(layerLabel);
 		} catch (Exception e2) {
-			logger.error("Error loading the properties for the layer with id " + id, e2);
-			throw new SpagoBIRuntimeException("Error loading the properties for the layer with id [" + id
+			logger.error("Error loading the properties for the layer with layer " + layerLabel, e2);
+			throw new SpagoBIRuntimeException("Error loading the properties for the layer with layer [" + layerLabel
 					+ "]. Please check the layer configuration or the file content.", e2);
 		}
 		ArrayList<JSONObject> prop = new ArrayList<>();
-		for (int i = 0; i < properties.size(); i++) {
-			JSONObject obj = new JSONObject();
-			obj.put("property", properties.get(i));
-			prop.add(obj);
-		}
+        for (String property : properties) {
+            JSONObject obj = new JSONObject();
+            obj.put("property", property);
+            prop.add(obj);
+        }
 
 		return prop.toString();
 	}

knowagedao/src/main/java/it/eng/spagobi/mapcatalogue/dao/ISbiGeoLayersDAO.java

@@ -47,7 +47,7 @@ public interface ISbiGeoLayersDAO extends ISpagoBIDao {
 
 	public Integer insertLayer(GeoLayer aLayer) throws EMFUserError, JSONException, UnsupportedEncodingException, IOException;
 
-	public ArrayList<String> getProperties(int layerId);
+	public ArrayList<String> getProperties(String layerLabel);
 
 	public void eraseLayer(Integer layerId) throws EMFUserError, JSONException;
 

knowagedao/src/main/java/it/eng/spagobi/mapcatalogue/dao/SbiGeoLayersDAOHibImpl.java

@@ -442,13 +442,13 @@ public Criteria evaluate(Session session) {
 	}
 
 	@Override
-	public ArrayList<String> getProperties(int layerId) {
+	public ArrayList<String> getProperties(String layerLabel) {
 		Session tmpSession = null;
 		ArrayList<String> keys = new ArrayList<>();
 		try {
 			tmpSession = getSession();
 			tmpSession.beginTransaction();
-			GeoLayer aLayer = loadLayerByID(layerId);
+			GeoLayer aLayer = loadLayerByLabel(layerLabel);
 			JSONObject layerDef = new JSONObject(new String(aLayer.getLayerDef()));
 			if (aLayer.getType().equals("Google") || aLayer.getType().equals("TMS") || aLayer.getType().equals("OSM")) {
 				return new ArrayList<>();
@@ -469,16 +469,7 @@ public ArrayList<String> getProperties(int layerId) {
 						if (c != null) {
 							JSONObject obj = new JSONObject(c);
 							content = obj.getJSONArray("features");
-							for (int j = 0; j < content.length(); j++) {
-								obj = content.getJSONObject(j).getJSONObject(PROPERTIES);
-								Iterator<String> it = obj.keys();
-								while (it.hasNext()) {
-									String key = it.next();
-									if (!keys.contains(key)) {
-										keys.add(key);
-									}
-								}
-							}
+							iterateFeatures(keys, content);
 						}
 
 					} while (c != null);
@@ -548,16 +539,7 @@ else if (aLayer.getType().equals("WFS") || aLayer.getType().equals("WMS")) {
 							JSONObject itaAdm1 = objects.getJSONObject(childObjects[0]);
 							content = itaAdm1.getJSONArray("geometries");
 
-							for (int j = 0; j < content.length(); j++) {
-								obj = content.getJSONObject(j).getJSONObject(PROPERTIES);
-								Iterator<String> it = obj.keys();
-								while (it.hasNext()) {
-									String key = it.next();
-									if (!keys.contains(key)) {
-										keys.add(key);
-									}
-								}
-							}
+							iterateFeatures(keys, content);
 
 						}
 
@@ -574,6 +556,20 @@ else if (aLayer.getType().equals("WFS") || aLayer.getType().equals("WMS")) {
 		return keys;
 	}
 
+	private void iterateFeatures(ArrayList<String> keys, JSONArray content) throws JSONException {
+		JSONObject obj;
+		for (int j = 0; j < content.length(); j++) {
+			obj = content.getJSONObject(j).getJSONObject(PROPERTIES);
+			Iterator<String> it = obj.keys();
+			while (it.hasNext()) {
+				String key = it.next();
+				if (!keys.contains(key)) {
+					keys.add(key);
+				}
+			}
+		}
+	}
+
 	private URL getURL(GeoLayer aLayer) throws Exception {
 
 		String resourcePath = SpagoBIUtilities.getResourcePath();