Minor Update

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@96664 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/portlets/user/td/gwtservice/server/CodelistMappingUploadServlet.java

@@ -68,7 +68,7 @@ public class CodelistMappingUploadServlet extends HttpServlet {
 		codelistMappingFileUploadSession.setId(session.getId());
 		codelistMappingFileUploadSession.setFileUploadState(FileUploadState.STARTED);
 		codelistMappingFileUploadSession.setCodelistMappingMonitor(codelistMappingMonitor);
-		codelistMappingFileUploadSession.setFileUploadMonitor(fileUploadMonitor);
+		SessionUtil.setFileUploadMonitor(session,fileUploadMonitor);
 		
 	
 		try {
@@ -99,7 +99,9 @@ public class CodelistMappingUploadServlet extends HttpServlet {
 				}
 			}
 		} catch (FileUploadException e) {
-			codelistMappingFileUploadSession.getFileUploadMonitor().setFailed("An error occured elaborating the HTTP request", FileUtil.exceptionDetailMessage(e));
+			FileUploadMonitor fum=SessionUtil.getFileUploadMonitor(session);
+			fum.setFailed("An error occured elaborating the HTTP request", FileUtil.exceptionDetailMessage(e));
+			SessionUtil.setFileUploadMonitor(session, fum);
 			codelistMappingFileUploadSession.setFileUploadState(FileUploadState.FAILED);
 			try {
 				SessionUtil.setCodelistMappingFileUploadSession(session, codelistMappingFileUploadSession);
@@ -114,7 +116,10 @@ public class CodelistMappingUploadServlet extends HttpServlet {
 		}
 		
 		if (uploadItem == null) {
-			codelistMappingFileUploadSession.getFileUploadMonitor().setFailed("An error occured elaborating the HTTP request: No file found", "Upload request without file");
+			FileUploadMonitor fum=SessionUtil.getFileUploadMonitor(session);
+			fum.setFailed("An error occured elaborating the HTTP request: No file found", "Upload request without file");
+			SessionUtil.setFileUploadMonitor(session, fum);
+		
 			codelistMappingFileUploadSession.setFileUploadState(FileUploadState.FAILED);
 			try {
 				SessionUtil.setCodelistMappingFileUploadSession(session, codelistMappingFileUploadSession);
@@ -136,7 +141,10 @@ public class CodelistMappingUploadServlet extends HttpServlet {
 		try {
 			FileUtil.setImportFileCodelistMapping(codelistMappingFileUploadSession, uploadItem.getInputStream(), uploadItem.getName(), contentType);
 		} catch (Exception e) {
-			codelistMappingFileUploadSession.getFileUploadMonitor().setFailed("An error occured elaborating the file", FileUtil.exceptionDetailMessage(e));
+			FileUploadMonitor fum=SessionUtil.getFileUploadMonitor(session);
+			fum.setFailed("An error occured elaborating the file", FileUtil.exceptionDetailMessage(e));
+			SessionUtil.setFileUploadMonitor(session, fum);
+	
 			codelistMappingFileUploadSession.setFileUploadState(FileUploadState.FAILED);
 			try {
 				SessionUtil.setCodelistMappingFileUploadSession(session, codelistMappingFileUploadSession);
@@ -154,7 +162,10 @@ public class CodelistMappingUploadServlet extends HttpServlet {
 		uploadItem.delete();
 		
 		logger.trace("changing state");
-		codelistMappingFileUploadSession.getFileUploadMonitor().setState(FileUploadState.COMPLETED);
+		FileUploadMonitor fum=SessionUtil.getFileUploadMonitor(session);
+		fum.setState(FileUploadState.COMPLETED);
+		SessionUtil.setFileUploadMonitor(session, fum);
+		
 		try {
 			SessionUtil.setCodelistMappingFileUploadSession(session, codelistMappingFileUploadSession);
 		} catch (TDGWTSessionExpiredException e) {

src/main/java/org/gcube/portlets/user/td/gwtservice/server/LocalUploadServlet.java

@@ -68,7 +68,7 @@ public class LocalUploadServlet extends HttpServlet {
 		fileUploadSession.setId(session.getId());
 		fileUploadSession.setFileUploadState(FileUploadState.STARTED);
 		fileUploadSession.setCsvImportMonitor(csvImportMonitor);
-		fileUploadSession.setFileUploadMonitor(fileUploadMonitor);
+		SessionUtil.setFileUploadMonitor(session, fileUploadMonitor);
 
 	
 		try {
@@ -99,7 +99,9 @@ public class LocalUploadServlet extends HttpServlet {
 				}
 			}
 		} catch (FileUploadException e) {
-			fileUploadSession.getFileUploadMonitor().setFailed("An error occured elaborating the HTTP request", FileUtil.exceptionDetailMessage(e));
+			FileUploadMonitor fum=SessionUtil.getFileUploadMonitor(session);
+			fum.setFailed("An error occured elaborating the HTTP request", FileUtil.exceptionDetailMessage(e));
+			SessionUtil.setFileUploadMonitor(session, fum);
 			fileUploadSession.setFileUploadState(FileUploadState.FAILED);
 			try {
 				SessionUtil.setCSVFileUploadSession(session, fileUploadSession);
@@ -114,7 +116,9 @@ public class LocalUploadServlet extends HttpServlet {
 		}
 		
 		if (uploadItem == null) {
-			fileUploadSession.getFileUploadMonitor().setFailed("An error occured elaborating the HTTP request: No file found", "Upload request without file");
+			FileUploadMonitor fum=SessionUtil.getFileUploadMonitor(session);
+			fum.setFailed("An error occured elaborating the HTTP request: No file found", "Upload request without file");		
+			SessionUtil.setFileUploadMonitor(session, fum);
 			fileUploadSession.setFileUploadState(FileUploadState.FAILED);
 			try {
 				SessionUtil.setCSVFileUploadSession(session, fileUploadSession);
@@ -136,7 +140,9 @@ public class LocalUploadServlet extends HttpServlet {
 		try {
 			FileUtil.setImportFileCSV(fileUploadSession, uploadItem.getInputStream(), uploadItem.getName(), contentType);
 		} catch (Exception e) {
-			fileUploadSession.getFileUploadMonitor().setFailed("An error occured elaborating the file", FileUtil.exceptionDetailMessage(e));
+			FileUploadMonitor fum=SessionUtil.getFileUploadMonitor(session);
+			fum.setFailed("An error occured elaborating the file", FileUtil.exceptionDetailMessage(e));		
+			SessionUtil.setFileUploadMonitor(session, fum);
 			fileUploadSession.setFileUploadState(FileUploadState.FAILED);
 			try {
 				SessionUtil.setCSVFileUploadSession(session, fileUploadSession);
@@ -154,7 +160,9 @@ public class LocalUploadServlet extends HttpServlet {
 		uploadItem.delete();
 		
 		logger.trace("changing state");
-		fileUploadSession.getFileUploadMonitor().setState(FileUploadState.COMPLETED);
+		FileUploadMonitor fum=SessionUtil.getFileUploadMonitor(session);
+		fum.setState(FileUploadState.COMPLETED);
+		SessionUtil.setFileUploadMonitor(session, fum);
 		try {
 			SessionUtil.setCSVFileUploadSession(session, fileUploadSession);
 		} catch (TDGWTSessionExpiredException e) {

src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionConstants.java

@@ -107,6 +107,8 @@ public class SessionConstants {
 	protected static final String CODELIST_MAPPING_TASK = "CODELIST_MAPPING_TASK";
 	protected static final String CODELIST_MAPPING_MONITOR = "CODELIST_MAPPING_MONITOR";
 	
+	protected static final String FILE_UPLOAD_MONITOR = "FILE_UPLOAD_MONITOR";
+
 	
 	
 }

src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java

@@ -25,6 +25,7 @@ import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportSession;
 import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException;
 import org.gcube.portlets.user.td.gwtservice.shared.extract.ExtractCodelistMonitor;
 import org.gcube.portlets.user.td.gwtservice.shared.extract.ExtractCodelistSession;
+import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadMonitor;
 import org.gcube.portlets.user.td.gwtservice.shared.history.RollBackSession;
 import org.gcube.portlets.user.td.gwtservice.shared.history.RollBackSessionMonitor;
 import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXExportSession;
@@ -328,6 +329,8 @@ public class SessionUtil {
 	}
 
 	
+	
+	
 	//TODO
 	public static void setCodelistMappingFileUploadSession(HttpSession httpSession,
 			CodelistMappingFileUploadSession s) throws TDGWTSessionExpiredException {
@@ -350,7 +353,31 @@ public class SessionUtil {
 		return fileUploadSession;
 	}
 
+	//
+	public static FileUploadMonitor getFileUploadMonitor(
+			HttpSession httpSession) {
+		FileUploadMonitor fileUploadMonitor = (FileUploadMonitor) httpSession
+				.getAttribute(SessionConstants.FILE_UPLOAD_MONITOR);
+		if (fileUploadMonitor != null) {
+			return fileUploadMonitor;
+		} else {
+			fileUploadMonitor = new FileUploadMonitor();
+			httpSession
+					.setAttribute(SessionConstants.FILE_UPLOAD_MONITOR, fileUploadMonitor);
+			return fileUploadMonitor;
+		}
+	}
 
+	public static void setFileUploadMonitor(HttpSession httpSession,
+			FileUploadMonitor fileUploadMonitor) {
+		FileUploadMonitor fum = (FileUploadMonitor) httpSession
+				.getAttribute(SessionConstants.FILE_UPLOAD_MONITOR);
+		if (fum != null) {
+			httpSession.removeAttribute(SessionConstants.FILE_UPLOAD_MONITOR);
+		}
+		httpSession.setAttribute(SessionConstants.FILE_UPLOAD_MONITOR, fileUploadMonitor);
+
+	}
 	
 	//
 	public static ArrayList<Codelist> retrieveCodelists(HttpSession httpSession)

src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java

@@ -2495,13 +2495,19 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 			throw new TDGWTServiceException(
 					"Error retrieving the session: null");
 		}
-		CSVFileUploadSession fileUploadSession = SessionUtil
+		
-				.getCSVFileUploadSession(session);
+		
-		if (fileUploadSession == null) {
+		
+		FileUploadMonitor fileUploadMonitor= SessionUtil
+				.getFileUploadMonitor(session);
+		if (fileUploadMonitor == null) {
 			throw new TDGWTServiceException(
-					"Error retrieving the fileUploadSession: null");
+					"Error retrieving the fileUploadMonitor: null");
 		}
-		return fileUploadSession.getFileUploadMonitor();
+		
+		logger.debug("FileUploadMonitor: "+fileUploadMonitor);
+		
+		return fileUploadMonitor;
 	}
 
 	/**
@@ -2900,10 +2906,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 		CSVImportMonitor csvImportMonitor = new CSVImportMonitor();
 		FileUploadMonitor fileUploadMonitor = new FileUploadMonitor();
 		
+		SessionUtil.setFileUploadMonitor(session, fileUploadMonitor);
+		
 		fileUploadSession.setId(session.getId());
 		fileUploadSession.setFileUploadState(FileUploadState.STARTED);
 		fileUploadSession.setCsvImportMonitor(csvImportMonitor);
-		fileUploadSession.setFileUploadMonitor(fileUploadMonitor);
 
 		SessionUtil.setCSVFileUploadSession(session, fileUploadSession);
 
@@ -2915,15 +2922,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 			FileUtil.setImportFileCSV(fileUploadSession, is, wi.getName(),
 					Constants.FILE_CSV_MIMETYPE);
 		} catch (Throwable e) {
-			fileUploadSession/**
+			FileUploadMonitor fum=SessionUtil.getFileUploadMonitor(session);
-			 * Get informations on tabular resource
+			fum.setFailed(
-			 * 
-			 * @return
-			 * @throws TDGWTServiceException
-			 */
-			.getFileUploadMonitor().setFailed(
 					"An error occured elaborating the file",
 					FileUtil.exceptionDetailMessage(e));
+			SessionUtil.setFileUploadMonitor(session, fum);
 			fileUploadSession.setFileUploadState(FileUploadState.FAILED);
 			SessionUtil.setCSVFileUploadSession(session, fileUploadSession);
 			logger.error("Error elaborating the input stream", e);
@@ -2933,8 +2936,10 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 		}
 
 		logger.trace("changing state");
-		fileUploadSession.getFileUploadMonitor().setState(
+		FileUploadMonitor fum=SessionUtil.getFileUploadMonitor(session);
+		fum.setState(
 				FileUploadState.COMPLETED);
+		SessionUtil.setFileUploadMonitor(session, fum);
 		SessionUtil.setCSVFileUploadSession(session, fileUploadSession);
 	}
 
@@ -8031,8 +8036,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 		fileUploadSession.setId(session.getId());
 		fileUploadSession.setFileUploadState(FileUploadState.STARTED);
 		fileUploadSession.setCodelistMappingMonitor(codelistMappingMonitor);
-		fileUploadSession.setFileUploadMonitor(fileUploadMonitor);
 		
+		SessionUtil.setFileUploadMonitor(session, fileUploadMonitor);
 		SessionUtil.setCodelistMappingFileUploadSession(session,
 				fileUploadSession);
 
@@ -8044,15 +8049,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 			FileUtil.setImportFileCodelistMapping(fileUploadSession, is,
 					wi.getName(), Constants.FILE_XML_MIMETYPE);
 		} catch (Throwable e) {
-			fileUploadSession/**
+			FileUploadMonitor fum=SessionUtil.getFileUploadMonitor(session);
-			 * Get informations on tabular resource
+			fum.setFailed(
-			 * 
-			 * @return
-			 * @throws TDGWTServiceException
-			 */
-			.getFileUploadMonitor().setFailed(
 					"An error occured elaborating the file",
 					FileUtil.exceptionDetailMessage(e));
+			SessionUtil.setFileUploadMonitor(session, fum);
 			fileUploadSession.setFileUploadState(FileUploadState.FAILED);
 			SessionUtil.setCodelistMappingFileUploadSession(session,
 					fileUploadSession);
@@ -8063,8 +8064,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 		}
 
 		logger.trace("changing state");
-		fileUploadSession.getFileUploadMonitor().setState(
+		FileUploadMonitor fum=SessionUtil.getFileUploadMonitor(session);
+		fum.setState(
 				FileUploadState.COMPLETED);
+		SessionUtil.setFileUploadMonitor(session, fum);
+		
 		SessionUtil.setCodelistMappingFileUploadSession(session,
 				fileUploadSession);
 

src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/CSVFileUploadSession.java

@@ -25,8 +25,6 @@ public class CSVFileUploadSession implements Serializable {
 	protected File csvFile;
 	protected String csvName;
 	
-	protected FileUploadMonitor fileUploadMonitor;
-	
 	protected CSVParserConfiguration parserConfiguration;
 	
 	protected CSVImportMonitor csvImportMonitor;
@@ -64,14 +62,6 @@ public class CSVFileUploadSession implements Serializable {
 		this.csvName = csvName;
 	}
 
-	public FileUploadMonitor getFileUploadMonitor() {
-		return fileUploadMonitor;
-	}
-
-	public void setFileUploadMonitor(FileUploadMonitor fileUploadMonitor) {
-		this.fileUploadMonitor = fileUploadMonitor;
-	}
-
 	public CSVParserConfiguration getParserConfiguration() {
 		return parserConfiguration;
 	}
@@ -90,13 +80,13 @@ public class CSVFileUploadSession implements Serializable {
 
 	@Override
 	public String toString() {
-		return "FileUploadSession [id=" + id + ", fileUploadState=" + fileUploadState
+		return "CSVFileUploadSession [id=" + id + ", fileUploadState="
-				+ ", csvFile=" + csvFile + ", csvName=" + csvName
+				+ fileUploadState + ", csvFile=" + csvFile + ", csvName="
-				+ ", fileUploadMonitor=" + fileUploadMonitor
+				+ csvName + ", parserConfiguration=" + parserConfiguration
-				+ ", parserConfiguration=" + parserConfiguration
+				+ ", csvImportMonitor=" + csvImportMonitor + "]";
-				+ ", csvImportMonitor=" + csvImportMonitor +"]";
 	}
 
 	
 	
+		
 }

src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/CodelistMappingFileUploadSession.java

@@ -4,7 +4,6 @@ import java.io.File;
 import java.io.Serializable;
 
 import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingMonitor;
-import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadMonitor;
 import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadState;
 
 /**
@@ -24,8 +23,6 @@ public class CodelistMappingFileUploadSession implements Serializable {
 	protected File codelistMappingFile;
 	protected String codelistMappingName;
 
-	protected FileUploadMonitor fileUploadMonitor;
-
 	protected CodelistMappingMonitor codelistMappingMonitor;
 
 	public String getId() {
@@ -44,13 +41,6 @@ public class CodelistMappingFileUploadSession implements Serializable {
 		this.fileUploadState = fileUploadState;
 	}
 
-	public FileUploadMonitor getFileUploadMonitor() {
-		return fileUploadMonitor;
-	}
-
-	public void setFileUploadMonitor(FileUploadMonitor fileUploadMonitor) {
-		this.fileUploadMonitor = fileUploadMonitor;
-	}
 	
 	public File getCodelistMappingFile() {
 		return codelistMappingFile;
@@ -83,8 +73,8 @@ public class CodelistMappingFileUploadSession implements Serializable {
 				+ ", fileUploadState=" + fileUploadState
 				+ ", codelistMappingFile=" + codelistMappingFile
 				+ ", codelistMappingName=" + codelistMappingName
-				+ ", fileUploadMonitor=" + fileUploadMonitor
 				+ ", codelistMappingMonitor=" + codelistMappingMonitor + "]";
 	}
 
+	
 }