[KNOWAGE-9298] Refactor eraseLayer method to use layer label instead of ID

Author: eng-dedalus

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

@@ -332,15 +332,15 @@ public String postItem(@Context HttpServletRequest req) throws EMFUserError, JSO
 	@Produces(MediaType.APPLICATION_JSON + "; charset=UTF-8")
 	@UserConstraint(functionalities = { CommunityFunctionalityConstants.GEO_LAYERS_MANAGEMENT })
 	public String deleteLayer(@Context HttpServletRequest req) throws JSONException {
-		Object id = null;
-		Integer layerId = null;
+		Object label = null;
+		String layerLabel = null;
 
 		try {
-			id = req.getParameter("id");
-			if (id == null || id.equals("")) {
+			label = req.getParameter("label");
+			if (label == null || label.equals("")) {
 				throw new SpagoBIRuntimeException("The layer id passed in the request is null or empty");
 			}
-			layerId = new Integer(id.toString());
+			layerLabel = label.toString();
 		} catch (Exception e) {
 			logger.error("error loading the layer to delete from the request", e);
 			throw new SpagoBIRuntimeException("error loading the layer to delete from the request", e);
@@ -349,10 +349,10 @@ public String deleteLayer(@Context HttpServletRequest req) throws JSONException
 		logger.debug("Deleting the layer");
 		ISbiGeoLayersDAO dao = DAOFactory.getSbiGeoLayerDao();
 		try {
-			dao.eraseLayer(layerId);
+			dao.eraseLayer(layerLabel);
 		} catch (EMFUserError e) {
-			logger.error("Error delationg the ayer with id " + id, e);
-			throw new SpagoBIRuntimeException("Error delationg the layer with id " + id, e);
+			logger.error("Error delationg the ayer with id " + label, e);
+			throw new SpagoBIRuntimeException("Error delationg the layer with id " + label, e);
 		}
 		return "{}";
 	}

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

@@ -49,7 +49,7 @@ public interface ISbiGeoLayersDAO extends ISpagoBIDao {
 
 	public ArrayList<String> getProperties(String layerLabel);
 
-	public void eraseLayer(Integer layerId) throws EMFUserError, JSONException;
+	public void eraseLayer(String layerLabel) throws EMFUserError, JSONException;
 
 	public void eraseRole(Integer roleId, Integer layerId) throws EMFUserError;
 

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

@@ -594,15 +594,15 @@ private URL getURL(GeoLayer aLayer) throws Exception {
 	 */
 
 	@Override
-	public void eraseLayer(Integer layerId) throws EMFUserError, JSONException {
+	public void eraseLayer(String label) throws EMFUserError, JSONException {
 
 		Session tmpSession = null;
 		Transaction tx = null;
 		try {
 			tmpSession = getSession();
 			tx = tmpSession.beginTransaction();
 
-			GeoLayer aLayer = loadLayerByID(layerId);
+			GeoLayer aLayer = loadLayerByLabel(label);
 			SbiGeoLayers hibLayer = new SbiGeoLayers(aLayer.getLayerId());
 			hibLayer.setLabel(aLayer.getLabel());
 			hibLayer.setName(aLayer.getName());