[KNOWAGE-9270] remove whatif JSP files

Author: eng-dedalus

knowagewhatifengine/src/main/java/it/eng/spagobi/engines/whatif/api/DesignerResource.java

@@ -17,28 +17,6 @@
  */
 package it.eng.spagobi.engines.whatif.api;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-
-import org.apache.log4j.Logger;
-import org.jboss.resteasy.plugins.providers.html.View;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import it.eng.spagobi.commons.constants.SpagoBIConstants;
 import it.eng.spagobi.engines.whatif.WhatIfEngineInstance;
 import it.eng.spagobi.engines.whatif.common.AbstractWhatIfEngineService;
@@ -50,6 +28,18 @@
 import it.eng.spagobi.utilities.engines.SpagoBIEngineException;
 import it.eng.spagobi.writeback4j.mondrian.MondrianDriver;
 import it.eng.spagobi.writeback4j.mondrian.MondrianSchemaRetriver;
+import org.apache.log4j.Logger;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author spetrovic
@@ -63,7 +53,6 @@ public class DesignerResource extends AbstractWhatIfEngineService {
 	public static transient Logger logger = Logger.getLogger(DesignerResource.class);
 	private MondrianSchemaRetriver retriver = null;
 	private String reference;
-	private static final String SUCCESS_REQUEST_DISPATCHER_URL = "/WEB-INF/jsp/whatIf2.jsp";
 	@Context HttpServletRequest request;
 	@Context HttpServletResponse response;
 
@@ -159,14 +148,6 @@ public void saveMdx(String body) throws SpagoBIEngineException, JSONException {
 		logger.debug("OUT");
 	}
 
-	@GET
-	@Path("/cubes/start")
-	@Produces("text/html")
-	public View redirect() throws SpagoBIEngineException, ServletException, IOException {
-		logger.debug("IN");
-		return new View(SUCCESS_REQUEST_DISPATCHER_URL);
-	}
-
 	@GET
 	@Path("/measures/{id}/{cubeName}")
 	@Produces(MediaType.APPLICATION_JSON)

knowagewhatifengine/src/main/java/it/eng/spagobi/engines/whatif/api/page/PageResource.java

@@ -17,26 +17,18 @@
  */
 package it.eng.spagobi.engines.whatif.api.page;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-
+import it.eng.spagobi.services.rest.annotations.ManageAuthorization;
+import it.eng.spagobi.utilities.engines.SpagoBIEngineServiceExceptionHandler;
+import it.eng.spagobi.utilities.engines.rest.AbstractRestService;
 import org.apache.log4j.Logger;
 import org.jboss.resteasy.plugins.providers.html.View;
-import org.json.JSONException;
 import org.json.JSONObject;
 
-import it.eng.spagobi.services.rest.annotations.ManageAuthorization;
-import it.eng.spagobi.utilities.engines.SpagoBIEngineServiceExceptionHandler;
-import it.eng.spagobi.utilities.engines.rest.AbstractRestService;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import java.util.Map;
 
 @Path("/pages")
 @ManageAuthorization
@@ -55,22 +47,6 @@ public class PageResource extends AbstractRestService {
 	 * TODO Tutte le pagine dell'engine
 	 *
 	 */
-	static {
-		pages = new HashMap<>();
-		urls = new HashMap<>();
-
-		try {
-			pages.put("execute", new JSONObject("{name: 'execute', description: 'the Olap execution page', parameters: []}"));
-			urls.put("execute", "/WEB-INF/jsp/whatIf2.jsp");
-
-			pages.put("edit", new JSONObject("{name: 'execute', description: 'the Whatif execution page', parameters: []}"));
-			urls.put("edit", "/WEB-INF/jsp/edit.jsp");
-
-		} catch (JSONException t) {
-			logger.error(t);
-		}
-	}
-
 	@GET
 	@Path("/{pagename}")
 	@Produces("text/html")

knowagewhatifengine/src/main/java/it/eng/spagobi/engines/whatif/common/OlapEngineStartAction.java

@@ -18,16 +18,14 @@
 
 package it.eng.spagobi.engines.whatif.common;
 
+import it.eng.spagobi.services.rest.annotations.ManageAuthorization;
+import org.apache.log4j.Logger;
+
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 
-import org.apache.log4j.Logger;
-import org.jboss.resteasy.plugins.providers.html.View;
-
-import it.eng.spagobi.services.rest.annotations.ManageAuthorization;
-
 @Path("/olap/startolap")
 @ManageAuthorization
 public class OlapEngineStartAction extends WhatIfEngineAbstractStartAction {
@@ -37,25 +35,24 @@ public class OlapEngineStartAction extends WhatIfEngineAbstractStartAction {
 	@GET
 	@Path("/")
 	@Produces("text/html")
-	public View startActionOlapGet() {
-		return startAction();
+	public void startActionOlapGet() {
+        startAction();
 
 	}
 
 	@POST
 	@Path("/")
 	@Produces("text/html")
-	public View startActionOlapPost() {
-		return startAction();
-
+	public void startActionOlapPost() {
+        startAction();
 	}
 
 	/**
 	 * @return
 	 *
 	 */
-	private View startAction() {
+	private void startAction() {
 		logger.debug("Starting OLAP");
-		return startAction(false);
+        startAction(false);
 	}
 }