From c05fb4e51c1061c68715272f843d6c5b75eeb083 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 24 Jan 2017 11:32:02 +0000 Subject: [PATCH] refs 6548: TDM - Migrate TabMan to new PortalContext Task-Url: https://support.d4science.org/issues/6548 Updated Servlet behavior git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@141732 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 6 +- distro/changelog.xml | 3 + pom.xml | 2 +- .../server/CSVImportFileServlet.java | 91 ++++---- .../server/CodelistMappingUploadServlet.java | 8 +- .../gwtservice/server/LocalUploadServlet.java | 198 ++++++++++-------- .../server/RetrieveChartFileServlet.java | 46 ++-- ...etrieveFileAndDiscoverMimeTypeServlet.java | 18 +- .../td/gwtservice/server/TDLogsServlet.java | 25 ++- .../gwtservice/server/TDRStudioServlet.java | 71 ++++--- .../server/TabularDataRowsXServlet.java | 60 +++--- .../server/file/CSVFileUploadSession.java | 33 ++- .../CodelistMappingFileUploadSession.java | 8 +- .../server/file/FileUploadListener.java | 6 +- .../td/gwtservice/server/file/FileUtil.java | 8 +- .../opexecution/OpExecution4AddColumn.java | 2 +- .../opexecution/OpExecution4CSVExport.java | 2 +- .../opexecution/OpExecution4CSVImport.java | 2 +- .../OpExecution4ChangeColumnType.java | 2 +- .../OpExecution4ChangeTableType.java | 2 +- .../OpExecution4ChartTopRating.java | 2 +- .../server/opexecution/OpExecution4Clone.java | 2 +- .../OpExecution4CodelistMapping.java | 2 +- .../opexecution/OpExecution4DeleteColumn.java | 2 +- .../opexecution/OpExecution4DeleteRows.java | 2 +- .../OpExecution4Denormalization.java | 2 +- .../opexecution/OpExecution4Duplicates.java | 2 +- .../OpExecution4ExtractCodelist.java | 2 +- .../opexecution/OpExecution4FilterColumn.java | 2 +- .../OpExecution4GeometryCreatePoint.java | 2 +- ...Execution4GeospatialCreateCoordinates.java | 2 +- ...pExecution4GeospatialDownscaleCSquare.java | 2 +- .../opexecution/OpExecution4GroupBy.java | 2 +- .../opexecution/OpExecution4JSONExport.java | 2 +- .../opexecution/OpExecution4LabelColumn.java | 2 +- .../opexecution/OpExecution4MapCreation.java | 2 +- .../opexecution/OpExecution4MergeColumn.java | 2 +- .../OpExecution4Normalization.java | 2 +- .../opexecution/OpExecution4ReplaceBatch.java | 2 +- .../OpExecution4ReplaceByExternal.java | 2 +- .../OpExecution4ReplaceColumn.java | 2 +- ...OpExecution4ReplaceColumnByExpression.java | 2 +- .../OpExecution4SDMXCodelistExport.java | 2 +- .../OpExecution4SDMXCodelistImport.java | 2 +- .../opexecution/OpExecution4SplitColumn.java | 2 +- .../OpExecution4StatisticalOperation.java | 2 +- .../OpExecution4TimeAggregation.java | 2 +- .../server/opexecution/OpExecution4Union.java | 2 +- .../opexecution/OpExecutionDirector.java | 2 +- .../server/resource/ResourceTDCreator.java | 2 +- .../server/resource/ResourceTypeMap.java | 4 +- .../server/storage/FilesStorage.java | 2 +- .../server/trservice/ColumnMap.java | 2 +- .../server/trservice/ExpressionGenerator.java | 2 +- .../ExtractCodelistOperationMap.java | 2 +- .../server/trservice/ExtractReferences.java | 2 +- .../trservice/OperationDefinitionMap.java | 2 +- .../server/trservice/QueryService.java | 2 +- .../server/trservice/TDTypeValueMap.java | 2 +- .../server/trservice/TRTasksManager.java | 2 +- .../gwtservice/server/trservice/ValueMap.java | 2 +- .../CodelistMappingSession.java | 16 +- .../shared/csv/AvailableCharsetList.java | 25 ++- .../td/gwtservice/shared/csv/CSVFileUtil.java | 2 +- .../shared/csv/CSVImportSession.java | 16 +- .../shared/csv/CSVParserConfiguration.java | 10 +- .../td/gwtservice/shared/csv/CSVRowError.java | 10 +- .../shared/csv/CheckCSVSession.java | 7 +- .../shared/monitor/CSVExportMonitor.java | 12 +- .../shared/monitor/CSVImportMonitor.java | 10 +- .../shared/monitor/SDMXExportMonitor.java | 14 +- .../shared/monitor/SDMXImportMonitor.java | 10 +- 72 files changed, 442 insertions(+), 367 deletions(-) diff --git a/.classpath b/.classpath index 9c750aa..9501185 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -33,5 +33,5 @@ - + diff --git a/distro/changelog.xml b/distro/changelog.xml index f8eba66..95fafc6 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,7 @@ + + Updatetd to new PortalContext [issue #6548] + Updated storage support diff --git a/pom.xml b/pom.xml index 82e006d..6c0d3d4 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.gcube.portlets.user tabular-data-gwt-service - 2.14.0-SNAPSHOT + 2.15.0-SNAPSHOT tabular-data-gwt-service tabular-data-gwt-service allows communication between the GUI and services diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/CSVImportFileServlet.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/CSVImportFileServlet.java index ea70c21..f0506c1 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/CSVImportFileServlet.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/CSVImportFileServlet.java @@ -14,90 +14,107 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.gcube.application.framework.core.session.ASLSession; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.portlets.user.td.gwtservice.server.file.CSVFileUploadSession; +import org.gcube.portlets.user.td.gwtservice.server.util.ServiceCredentials; +import org.gcube.portlets.user.td.gwtservice.shared.Constants; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVFileUtil; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - /** * Returns a representation of the csv file in JSON * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author "Giancarlo Panichi" g.panichi@isti.cnr.it * */ public class CSVImportFileServlet extends HttpServlet { - protected static Logger logger = LoggerFactory.getLogger(CSVImportFileServlet.class); + protected static Logger logger = LoggerFactory + .getLogger(CSVImportFileServlet.class); /** * */ private static final long serialVersionUID = -4197748678713054285L; - protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + protected void doPost(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { handleRequest(req, resp); } - protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { handleRequest(req, resp); } - protected void handleRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + protected void handleRequest(HttpServletRequest request, + HttpServletResponse response) throws ServletException, IOException { logger.info("CSVImportFileServlet"); long startTime = System.currentTimeMillis(); - HttpSession session = request.getSession(); - - if(session==null){ - logger.error("Error getting the upload session, no session valid found: "+session); - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "ERROR-Error getting the user session, no session found"+session); - return ; + + if (session == null) { + logger.error("Error getting the upload session, no session valid found: " + + session); + response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, + "ERROR-Error getting the user session, no session found" + + session); + return; } - logger.info("CSVImportFileServlet import session id: "+session.getId()); + logger.info("CSVImportFileServlet import session id: " + + session.getId()); + + ServiceCredentials serviceCredentials; try { - ASLSession aslSession = SessionUtil.getAslSession(session); - String token = SessionUtil.getToken(aslSession); - logger.debug("UserToken: " + token); - ScopeProvider.instance.set(aslSession.getScope().toString()); + String scopeGroupId = request.getParameter(Constants.CURR_GROUP_ID); + serviceCredentials = SessionUtil.getServiceCredentials(request, + scopeGroupId); + + ScopeProvider.instance.set(serviceCredentials.getScope()); } catch (TDGWTServiceException e) { - logger.error(e.getLocalizedMessage()); - e.printStackTrace(); + logger.error( + "Error retrieving credentials:" + e.getLocalizedMessage(), + e); throw new ServletException(e.getLocalizedMessage()); } - - - CSVFileUploadSession fileUploadSession=SessionUtil.getCSVFileUploadSession(session); - - if (fileUploadSession == null) - { - logger.error("Error getting the upload session, no fileUploadSession found: "+fileUploadSession); - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "ERROR-Error getting the user session, no fileUploadSession found: "+fileUploadSession); - return ; + + CSVFileUploadSession fileUploadSession = SessionUtil + .getCSVFileUploadSession(request, serviceCredentials); + + if (fileUploadSession == null) { + logger.error("Error getting the upload session, no fileUploadSession found: " + + fileUploadSession); + response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, + "ERROR-Error getting the user session, no fileUploadSession found: " + + fileUploadSession); + return; } response.setContentType("application/json; charset=utf-8"); Charset outputCharset = Charset.forName("Utf-8"); ByteArrayOutputStream os = new ByteArrayOutputStream(); - CSVFileUtil.toJson(new FileInputStream(fileUploadSession.getCsvFile()), os, outputCharset, fileUploadSession.getParserConfiguration(), 100); - - logger.trace("json: "+os.toString()); - System.out.println("json: "+os.toString()); + CSVFileUtil.toJson(new FileInputStream(fileUploadSession.getCsvFile()), + os, outputCharset, fileUploadSession.getParserConfiguration(), + 100); + + logger.trace("json: " + os.toString()); + System.out.println("json: " + os.toString()); response.getOutputStream().write(os.toByteArray()); - //CSVFileUtil.toJson(new FileInputStream(importSession.getCsvFile()), response.getOutputStream(), outputCharset, importSession.getParserConfiguration(), 100); - + // CSVFileUtil.toJson(new FileInputStream(importSession.getCsvFile()), + // response.getOutputStream(), outputCharset, + // importSession.getParserConfiguration(), 100); + response.setStatus(HttpServletResponse.SC_OK); - logger.trace("Response in "+(System.currentTimeMillis()-startTime)); + logger.trace("Response in " + (System.currentTimeMillis() - startTime)); } } diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/CodelistMappingUploadServlet.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/CodelistMappingUploadServlet.java index 0f102a8..42531b5 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/CodelistMappingUploadServlet.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/CodelistMappingUploadServlet.java @@ -6,6 +6,7 @@ package org.gcube.portlets.user.td.gwtservice.server; import java.io.IOException; import java.util.Iterator; import java.util.List; +import java.util.UUID; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; @@ -25,7 +26,6 @@ import org.gcube.portlets.user.td.gwtservice.server.file.FileUtil; import org.gcube.portlets.user.td.gwtservice.server.util.ServiceCredentials; import org.gcube.portlets.user.td.gwtservice.shared.Constants; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException; -import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException; import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadMonitor; import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadState; import org.slf4j.Logger; @@ -94,8 +94,10 @@ public class CodelistMappingUploadServlet extends HttpServlet { // CodelistMappingMonitor codelistMappingMonitor=new // CodelistMappingMonitor(); FileUploadMonitor fileUploadMonitor = new FileUploadMonitor(); - - codelistMappingFileUploadSession.setId(session.getId()); + + String id=UUID.randomUUID().toString(); + logger.info("Upload Id: "+id); + codelistMappingFileUploadSession.setId(id); codelistMappingFileUploadSession .setFileUploadState(FileUploadState.STARTED); // codelistMappingFileUploadSession.setCodelistMappingMonitor(codelistMappingMonitor); diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/LocalUploadServlet.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/LocalUploadServlet.java index 3fc0494..866efc7 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/LocalUploadServlet.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/LocalUploadServlet.java @@ -6,6 +6,7 @@ package org.gcube.portlets.user.td.gwtservice.server; import java.io.IOException; import java.util.Iterator; import java.util.List; +import java.util.UUID; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; @@ -18,13 +19,13 @@ import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.FileUploadException; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.servlet.ServletFileUpload; -import org.gcube.application.framework.core.session.ASLSession; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.portlets.user.td.gwtservice.server.file.CSVFileUploadSession; import org.gcube.portlets.user.td.gwtservice.server.file.FileUploadListener; import org.gcube.portlets.user.td.gwtservice.server.file.FileUtil; +import org.gcube.portlets.user.td.gwtservice.server.util.ServiceCredentials; +import org.gcube.portlets.user.td.gwtservice.shared.Constants; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException; -import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException; import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadMonitor; import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadState; import org.slf4j.Logger; @@ -32,75 +33,78 @@ import org.slf4j.LoggerFactory; import com.allen_sauer.gwt.log.client.Log; - /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author "Giancarlo Panichi" g.panichi@isti.cnr.it * */ public class LocalUploadServlet extends HttpServlet { - protected static Logger logger = LoggerFactory.getLogger(LocalUploadServlet.class); - - + protected static Logger logger = LoggerFactory + .getLogger(LocalUploadServlet.class); + /** * */ private static final long serialVersionUID = -4197748678713054285L; @SuppressWarnings("rawtypes") - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + protected void doPost(HttpServletRequest request, + HttpServletResponse response) throws ServletException, IOException { logger.trace("Post"); - + HttpSession session = request.getSession(); - - if(session==null){ - logger.error("Error getting the upload session, no session valid found: "+session); - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "ERROR-Error getting the user session, no session found"+session); - return ; + + if (session == null) { + logger.error("Error getting the upload session, no session valid found: " + + session); + response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, + "ERROR-Error getting the user session, no session found" + + session); + return; } - logger.info("CSV Import session id: "+session.getId()); - + logger.info("CSV Import session id: " + session.getId()); + + ServiceCredentials serviceCredentials; + try { - ASLSession aslSession = SessionUtil.getAslSession(session); - String token = SessionUtil.getToken(aslSession); - logger.debug("UserToken: " + token); - ScopeProvider.instance.set(aslSession.getScope().toString()); + String scopeGroupId = request.getParameter(Constants.CURR_GROUP_ID); + serviceCredentials = SessionUtil.getServiceCredentials(request, + scopeGroupId); + + ScopeProvider.instance.set(serviceCredentials.getScope()); } catch (TDGWTServiceException e) { - logger.error(e.getLocalizedMessage()); - e.printStackTrace(); + logger.error( + "Error retrieving credentials:" + e.getLocalizedMessage(), + e); throw new ServletException(e.getLocalizedMessage()); } - CSVFileUploadSession fileUploadSession=new CSVFileUploadSession(); - //CSVImportMonitor csvImportMonitor=new CSVImportMonitor(); - FileUploadMonitor fileUploadMonitor=new FileUploadMonitor(); - - fileUploadSession.setId(session.getId()); + CSVFileUploadSession fileUploadSession = new CSVFileUploadSession(); + // CSVImportMonitor csvImportMonitor=new CSVImportMonitor(); + FileUploadMonitor fileUploadMonitor = new FileUploadMonitor(); + + String id = UUID.randomUUID().toString(); + logger.info("Upload Id: " + id); + fileUploadSession.setId(id); fileUploadSession.setFileUploadState(FileUploadState.STARTED); - //fileUploadSession.setCsvImportMonitor(csvImportMonitor); - SessionUtil.setFileUploadMonitor(session, fileUploadMonitor); + // fileUploadSession.setCsvImportMonitor(csvImportMonitor); + SessionUtil.setFileUploadMonitor(request, serviceCredentials, + fileUploadMonitor); - - try { - SessionUtil.setCSVFileUploadSession(session,fileUploadSession); - } catch (TDGWTSessionExpiredException e) { - logger.error(e.getLocalizedMessage()); - e.printStackTrace(); - throw new ServletException(e.getLocalizedMessage()); - } - + SessionUtil.setCSVFileUploadSession(request, serviceCredentials, + fileUploadSession); FileItemFactory factory = new DiskFileItemFactory(); ServletFileUpload upload = new ServletFileUpload(factory); - - - FileUploadListener uploadListener = new FileUploadListener(fileUploadMonitor); + + FileUploadListener uploadListener = new FileUploadListener( + fileUploadMonitor); upload.setProgressListener(uploadListener); - + FileItem uploadItem = null; Log.info("Start upload file "); try { @@ -108,82 +112,102 @@ public class LocalUploadServlet extends HttpServlet { Iterator it = items.iterator(); while (it.hasNext()) { FileItem item = (FileItem) it.next(); - if (!item.isFormField() && "uploadFormElement".equals(item.getFieldName())) { + if (!item.isFormField() + && "uploadFormElement".equals(item.getFieldName())) { uploadItem = item; } } } catch (FileUploadException 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); + FileUploadMonitor fum; try { - SessionUtil.setCSVFileUploadSession(session, fileUploadSession); - } catch (TDGWTSessionExpiredException e1) { - logger.error(e1.getLocalizedMessage()); - e1.printStackTrace(); + fum = SessionUtil.getFileUploadMonitor(request, + serviceCredentials); + } catch (TDGWTServiceException e1) { + logger.error(e1.getLocalizedMessage(), e1); throw new ServletException(e1.getLocalizedMessage()); } + fum.setFailed("An error occured elaborating the HTTP request", + FileUtil.exceptionDetailMessage(e)); + SessionUtil.setFileUploadMonitor(request, serviceCredentials, fum); + fileUploadSession.setFileUploadState(FileUploadState.FAILED); + + SessionUtil.setCSVFileUploadSession(request, serviceCredentials, + fileUploadSession); + logger.error("Error processing request in upload servlet", e); - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "ERROR-Error during request processing: "+e.getMessage()); + response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, + "ERROR-Error during request processing: " + e.getMessage()); return; } - + if (uploadItem == null) { - 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); + FileUploadMonitor fum; try { - SessionUtil.setCSVFileUploadSession(session, fileUploadSession); - } catch (TDGWTSessionExpiredException e) { - logger.error(e.getLocalizedMessage()); - e.printStackTrace(); + fum = SessionUtil.getFileUploadMonitor(request, + serviceCredentials); + } catch (TDGWTServiceException e) { + logger.error(e.getLocalizedMessage(), e); throw new ServletException(e.getLocalizedMessage()); } + fum.setFailed( + "An error occured elaborating the HTTP request: No file found", + "Upload request without file"); + SessionUtil.setFileUploadMonitor(request, serviceCredentials, fum); + fileUploadSession.setFileUploadState(FileUploadState.FAILED); + + SessionUtil.setCSVFileUploadSession(request, serviceCredentials, + fileUploadSession); + logger.error("Error processing request in upload servlet: No file to upload"); - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "No file to upload"); + response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, + "No file to upload"); return; } - + String contentType = uploadItem.getContentType(); - - logger.trace("ContentType: "+contentType); - - + + logger.trace("ContentType: " + contentType); + try { - FileUtil.setImportFileCSV(fileUploadSession, uploadItem.getInputStream(), uploadItem.getName(), contentType); + FileUtil.setImportFileCSV(fileUploadSession, + uploadItem.getInputStream(), uploadItem.getName(), + contentType); } catch (Exception 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); + FileUploadMonitor fum; try { - SessionUtil.setCSVFileUploadSession(session, fileUploadSession); - } catch (TDGWTSessionExpiredException e1) { - logger.error(e1.getLocalizedMessage()); - e1.printStackTrace(); + fum = SessionUtil.getFileUploadMonitor(request, + serviceCredentials); + } catch (TDGWTServiceException e1) { + logger.error(e1.getLocalizedMessage(), e1); throw new ServletException(e1.getLocalizedMessage()); } + fum.setFailed("An error occured elaborating the file", + FileUtil.exceptionDetailMessage(e)); + SessionUtil.setFileUploadMonitor(request, serviceCredentials, fum); + fileUploadSession.setFileUploadState(FileUploadState.FAILED); + SessionUtil.setCSVFileUploadSession(request, serviceCredentials, + fileUploadSession); logger.error("Error elaborating the stream", e); uploadItem.delete(); - response.getWriter().write("ERROR-"+e.getMessage()); + response.getWriter().write("ERROR-" + e.getMessage()); return; } - + uploadItem.delete(); - + logger.trace("changing state"); - FileUploadMonitor fum=SessionUtil.getFileUploadMonitor(session); - fum.setState(FileUploadState.COMPLETED); - SessionUtil.setFileUploadMonitor(session, fum); + FileUploadMonitor fum; try { - SessionUtil.setCSVFileUploadSession(session, fileUploadSession); - } catch (TDGWTSessionExpiredException e) { - logger.error(e.getLocalizedMessage()); - e.printStackTrace(); + fum = SessionUtil.getFileUploadMonitor(request, serviceCredentials); + } catch (TDGWTServiceException e) { + logger.error(e.getLocalizedMessage(), e); throw new ServletException(e.getLocalizedMessage()); } + fum.setState(FileUploadState.COMPLETED); + SessionUtil.setFileUploadMonitor(request, serviceCredentials, fum); + + SessionUtil.setCSVFileUploadSession(request, serviceCredentials, + fileUploadSession); response.getWriter().write("OK"); } diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/RetrieveChartFileServlet.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/RetrieveChartFileServlet.java index 281de2e..c428f02 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/RetrieveChartFileServlet.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/RetrieveChartFileServlet.java @@ -13,9 +13,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.gcube.application.framework.core.session.ASLSession; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.portlets.user.td.gwtservice.server.storage.FilesStorage; +import org.gcube.portlets.user.td.gwtservice.server.util.ServiceCredentials; +import org.gcube.portlets.user.td.gwtservice.shared.Constants; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,10 +30,10 @@ import org.slf4j.LoggerFactory; */ public class RetrieveChartFileServlet extends HttpServlet { private static final long serialVersionUID = -1649268678733476057L; - + private static Logger logger = LoggerFactory .getLogger(RetrieveChartFileServlet.class); - + private static final String ATTRIBUTE_STORAGE_URI = "storageURI"; private static final String IMAGE_MIME_TYPE = "image/jpeg"; private static final int BUFSIZE = 4096; @@ -66,32 +67,35 @@ public class RetrieveChartFileServlet extends HttpServlet { } logger.debug("RetrieveChartFileServlet session id: " + session.getId()); - + + ServiceCredentials serviceCredentials; + try { - ASLSession aslSession = SessionUtil.getAslSession(session); - String token = SessionUtil.getToken(aslSession); - logger.debug("UserToken: " + token); - ScopeProvider.instance.set(aslSession.getScope().toString()); + String scopeGroupId = request + .getParameter(Constants.CURR_GROUP_ID); + serviceCredentials = SessionUtil.getServiceCredentials(request, + scopeGroupId); + + ScopeProvider.instance.set(serviceCredentials.getScope()); } catch (TDGWTServiceException e) { - logger.error(e.getLocalizedMessage()); - e.printStackTrace(); + logger.error( + "Error retrieving credentials:" + + e.getLocalizedMessage(), e); throw new ServletException(e.getLocalizedMessage()); } String uri = (String) request.getParameter(ATTRIBUTE_STORAGE_URI); - logger.debug("Request storage uri: "+uri); - - if(uri==null|| uri.isEmpty()){ - logger.error("Error getting request uri: " - + uri); + logger.debug("Request storage uri: " + uri); + + if (uri == null || uri.isEmpty()) { + logger.error("Error getting request uri: " + uri); response.sendError( HttpServletResponse.SC_INTERNAL_SERVER_ERROR, - "ERROR-Error getting request uri: " - + session); + "ERROR-Error getting request uri: " + session); return; } - + FilesStorage storage = new FilesStorage(); InputStream in = storage.retrieveInputStream(uri); OutputStream out = response.getOutputStream(); @@ -112,9 +116,9 @@ public class RetrieveChartFileServlet extends HttpServlet { + (System.currentTimeMillis() - startTime)); } catch (Throwable e) { - logger.error("Error retrieving file from storage: " - + e.getLocalizedMessage()); - e.printStackTrace(); + logger.error( + "Error retrieving file from storage: " + + e.getLocalizedMessage(), e); response.sendError( HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Error retrieving file from storage: " diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/RetrieveFileAndDiscoverMimeTypeServlet.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/RetrieveFileAndDiscoverMimeTypeServlet.java index a884ad6..e416011 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/RetrieveFileAndDiscoverMimeTypeServlet.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/RetrieveFileAndDiscoverMimeTypeServlet.java @@ -11,8 +11,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.gcube.application.framework.core.session.ASLSession; import org.gcube.common.scope.api.ScopeProvider; +import org.gcube.portlets.user.td.gwtservice.server.util.ServiceCredentials; +import org.gcube.portlets.user.td.gwtservice.shared.Constants; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -62,15 +63,18 @@ public class RetrieveFileAndDiscoverMimeTypeServlet extends HttpServlet { } logger.debug("RetrieveFileAndDiscoverMimeTypeServlet session id: " + session.getId()); + ServiceCredentials serviceCredentials; + try { - ASLSession aslSession = SessionUtil.getAslSession(session); - String token = SessionUtil.getToken(aslSession); - logger.debug("UserToken: " + token); - ScopeProvider.instance.set(aslSession.getScope().toString()); + String scopeGroupId = request.getParameter(Constants.CURR_GROUP_ID); + serviceCredentials = SessionUtil.getServiceCredentials(request, + scopeGroupId); + ScopeProvider.instance.set(serviceCredentials.getScope()); } catch (TDGWTServiceException e) { - logger.error(e.getLocalizedMessage()); - e.printStackTrace(); + logger.error( + "Error retrieving credentials:" + e.getLocalizedMessage(), + e); throw new ServletException(e.getLocalizedMessage()); } diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDLogsServlet.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDLogsServlet.java index e935b84..823eed9 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDLogsServlet.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDLogsServlet.java @@ -17,8 +17,9 @@ import javax.servlet.http.HttpSession; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.gcube.application.framework.core.session.ASLSession; import org.gcube.common.scope.api.ScopeProvider; +import org.gcube.portlets.user.td.gwtservice.server.util.ServiceCredentials; +import org.gcube.portlets.user.td.gwtservice.shared.Constants; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -64,18 +65,22 @@ public class TDLogsServlet extends HttpServlet { logger.debug("TDLogsServlet import session id: " + session.getId()); + ServiceCredentials serviceCredentials; + try { - ASLSession aslSession = SessionUtil.getAslSession(session); - String token = SessionUtil.getToken(aslSession); - logger.debug("UserToken: " + token); - ScopeProvider.instance.set(aslSession.getScope().toString()); + String scopeGroupId = request.getParameter(Constants.CURR_GROUP_ID); + serviceCredentials = SessionUtil.getServiceCredentials(request, + scopeGroupId); + + ScopeProvider.instance.set(serviceCredentials.getScope()); } catch (TDGWTServiceException e) { - logger.error(e.getLocalizedMessage()); - e.printStackTrace(); + logger.error( + "Error retrieving credentials:" + e.getLocalizedMessage(), + e); throw new ServletException(e.getLocalizedMessage()); } - + ByteArrayInputStream in = null; ByteArrayOutputStream out = null; try { @@ -96,12 +101,12 @@ public class TDLogsServlet extends HttpServlet { response.setStatus(HttpServletResponse.SC_OK); } catch (FileNotFoundException e) { - logger.error("File not found: " + e.getLocalizedMessage()); + logger.error("File not found: " + e.getLocalizedMessage(), e); response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.getLocalizedMessage()); } catch (IOException e) { - logger.error("IO error: " + e.getLocalizedMessage()); + logger.error("IO error: " + e.getLocalizedMessage(), e); response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.getLocalizedMessage()); } finally { diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDRStudioServlet.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDRStudioServlet.java index fedfe67..33353f6 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDRStudioServlet.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDRStudioServlet.java @@ -14,8 +14,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.gcube.application.framework.core.session.ASLSession; import org.gcube.common.scope.api.ScopeProvider; +import org.gcube.portlets.user.td.gwtservice.server.util.ServiceCredentials; +import org.gcube.portlets.user.td.gwtservice.shared.Constants; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,14 +29,13 @@ import org.slf4j.LoggerFactory; * */ public class TDRStudioServlet extends HttpServlet { - private static final String TAB_RESOURCE_ID_PARAMETER="TabResourceId"; - //private static final String SECURITY_EXCEPTION_RIGHTS = "Security exception, you don't have the required rights!"; + private static final String TAB_RESOURCE_ID_PARAMETER = "TabResourceId"; + // private static final String SECURITY_EXCEPTION_RIGHTS = + // "Security exception, you don't have the required rights!"; private static final long serialVersionUID = -1649268678733476057L; private static Logger logger = LoggerFactory .getLogger(TDRStudioServlet.class); - - protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { @@ -64,47 +64,46 @@ public class TDRStudioServlet extends HttpServlet { + session); return; } - logger.debug("TDRSTudioServlet session id: " - + session.getId()); - - ASLSession aslSession=null; + logger.debug("TDRSTudioServlet session id: " + session.getId()); + + ServiceCredentials serviceCredentials; + try { - aslSession= SessionUtil.getAslSession(session); - String token = SessionUtil.getToken(aslSession); - logger.debug("UserToken: " + token); - ScopeProvider.instance.set(aslSession.getScope().toString()); + String scopeGroupId = request + .getParameter(Constants.CURR_GROUP_ID); + serviceCredentials = SessionUtil.getServiceCredentials(request, + scopeGroupId); + + ScopeProvider.instance.set(serviceCredentials.getScope()); } catch (TDGWTServiceException e) { - logger.error(e.getLocalizedMessage()); - e.printStackTrace(); + logger.error( + "Error retrieving credentials:" + + e.getLocalizedMessage(), e); throw new ServletException(e.getLocalizedMessage()); } - - String tabResourceId=request.getParameter(TAB_RESOURCE_ID_PARAMETER); - logger.debug("Request RStudio for TR: "+tabResourceId); - - URI url=rConnector().build().connect(Long.valueOf(tabResourceId)); - logger.debug("URL retrieved from rConnector: "+url.toString()); - - //response.setStatus(HttpServletResponse.SC_OK); + String tabResourceId = request + .getParameter(TAB_RESOURCE_ID_PARAMETER); + logger.debug("Request RStudio for TR: " + tabResourceId); + + URI url = rConnector().build().connect(Long.valueOf(tabResourceId)); + logger.debug("URL retrieved from rConnector: " + url.toString()); + + // response.setStatus(HttpServletResponse.SC_OK); response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY); response.setHeader("Location", url.toString()); - response.setHeader("gcube-scope", aslSession.getScope()); - //response.setHeader("Set-Cookie", "PippoPlutoPaperino"); - //response.setHeader("Set-Cookie", cookieValue); - - logger.debug("Response: "+response.toString()); - + response.setHeader("gcube-scope", serviceCredentials.getScope()); + // response.setHeader("Set-Cookie", "PippoPlutoPaperino"); + // response.setHeader("Set-Cookie", cookieValue); + + logger.debug("Response: " + response.toString()); + logger.trace("Response in " - + (System.currentTimeMillis() - startTime)+"ms"); - - - + + (System.currentTimeMillis() - startTime) + "ms"); + } catch (Throwable e) { - logger.error("Error TDRStudio: " - + e.getLocalizedMessage()); - e.printStackTrace(); + logger.error("Error TDRStudio: " + e.getLocalizedMessage(), e); response.sendError( HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Error retrieving file from storage: " diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TabularDataRowsXServlet.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TabularDataRowsXServlet.java index 4b3328c..8076fc0 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TabularDataRowsXServlet.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TabularDataRowsXServlet.java @@ -12,8 +12,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.gcube.application.framework.core.session.ASLSession; import org.gcube.common.scope.api.ScopeProvider; +import org.gcube.portlets.user.td.gwtservice.server.util.ServiceCredentials; +import org.gcube.portlets.user.td.gwtservice.shared.Constants; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException; import org.json.JSONArray; import org.json.JSONException; @@ -51,26 +52,35 @@ public class TabularDataRowsXServlet extends HttpServlet { try { HttpSession session = request.getSession(); - - if(session==null){ - logger.error("Error getting the upload session, no session valid found: "+session); - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "ERROR-Error getting the user session, no session found"+session); - return ; + + if (session == null) { + logger.error("Error getting the upload session, no session valid found: " + + session); + response.sendError( + HttpServletResponse.SC_INTERNAL_SERVER_ERROR, + "ERROR-Error getting the user session, no session found" + + session); + return; } - logger.info("Session id: "+session.getId()); - + logger.info("Session id: " + session.getId()); + + ServiceCredentials serviceCredentials; + try { - ASLSession aslSession = SessionUtil.getAslSession(session); - String token = SessionUtil.getToken(aslSession); - logger.debug("UserToken: " + token); - ScopeProvider.instance.set(aslSession.getScope().toString()); + String scopeGroupId = request + .getParameter(Constants.CURR_GROUP_ID); + serviceCredentials = SessionUtil.getServiceCredentials(request, + scopeGroupId); + + ScopeProvider.instance.set(serviceCredentials.getScope()); } catch (TDGWTServiceException e) { - logger.error(e.getLocalizedMessage()); - e.printStackTrace(); + logger.error( + "Error retrieving credentials:" + + e.getLocalizedMessage(), e); throw new ServletException(e.getLocalizedMessage()); } - + ServletInputStream in = request.getInputStream(); InputStreamReader buffIn = new InputStreamReader(in); char[] buffer = new char[1024]; @@ -84,31 +94,31 @@ public class TabularDataRowsXServlet extends HttpServlet { JSONObject jsonRequest = new JSONObject(out.toString()); logger.debug("JSON request:" + jsonRequest.toString()); - - //RowIds + + // RowIds JSONArray ids = null; - ArrayList rowsIds=new ArrayList(); + ArrayList rowsIds = new ArrayList(); try { ids = jsonRequest.getJSONArray("rowsIds"); } catch (JSONException e) { logger.debug("rowsIds: " + e.getLocalizedMessage()); } - + if (ids != null) { for (int i = 0; i < ids.length(); i++) { String filter = ids.getString(i); - + rowsIds.add(filter); } } logger.debug("rowsIds:" + rowsIds.size()); /* - DataSourceX dataSource = SessionUtil.getDataSource( - request.getSession(), tdSessionId);*/ - String json=new String();// = dataSource.getRowsAsJson(rowsIds); - - + * DataSourceX dataSource = SessionUtil.getDataSource( + * request.getSession(), tdSessionId); + */ + String json = new String();// = dataSource.getRowsAsJson(rowsIds); + response.getOutputStream().write(json.getBytes()); response.setStatus(HttpServletResponse.SC_OK); // logger.trace("JSON: "+json); diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/CSVFileUploadSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/CSVFileUploadSession.java index a538e41..2b20b18 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/CSVFileUploadSession.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/CSVFileUploadSession.java @@ -8,25 +8,24 @@ import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadState; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author "Giancarlo Panichi" g.panichi@isti.cnr.it * */ public class CSVFileUploadSession implements Serializable { - + private static final long serialVersionUID = -7906477664944910362L; - - protected String id; - - protected FileUploadState fileUploadState; - - protected File csvFile; - protected String csvName; - + + private String id; + + private FileUploadState fileUploadState; + + private File csvFile; + private String csvName; + protected CSVParserConfiguration parserConfiguration; - - //protected CSVImportMonitor csvImportMonitor; - + + // protected CSVImportMonitor csvImportMonitor; public String getId() { return id; @@ -64,7 +63,8 @@ public class CSVFileUploadSession implements Serializable { return parserConfiguration; } - public void setParserConfiguration(CSVParserConfiguration parserConfiguration) { + public void setParserConfiguration( + CSVParserConfiguration parserConfiguration) { this.parserConfiguration = parserConfiguration; } @@ -75,6 +75,5 @@ public class CSVFileUploadSession implements Serializable { + csvName + ", parserConfiguration=" + parserConfiguration + "]"; } - - + } diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/CodelistMappingFileUploadSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/CodelistMappingFileUploadSession.java index d61d482..bb95171 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/CodelistMappingFileUploadSession.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/CodelistMappingFileUploadSession.java @@ -15,12 +15,12 @@ public class CodelistMappingFileUploadSession implements Serializable { private static final long serialVersionUID = -5683392670926072167L; - protected String id; + private String id; - protected FileUploadState fileUploadState; + private FileUploadState fileUploadState; - protected File codelistMappingFile; - protected String codelistMappingName; + private File codelistMappingFile; + private String codelistMappingName; //protected CodelistMappingMonitor codelistMappingMonitor; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/FileUploadListener.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/FileUploadListener.java index 3aa21cd..394e285 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/FileUploadListener.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/FileUploadListener.java @@ -6,8 +6,6 @@ package org.gcube.portlets.user.td.gwtservice.server.file; import org.apache.commons.fileupload.ProgressListener; import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadMonitor; import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadState; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * @@ -17,11 +15,11 @@ import org.slf4j.LoggerFactory; */ public class FileUploadListener implements ProgressListener { - protected Logger logger=LoggerFactory.getLogger(FileUploadListener.class); + //private Logger logger=LoggerFactory.getLogger(FileUploadListener.class); - protected FileUploadMonitor fileUploadMonitor; + private FileUploadMonitor fileUploadMonitor; private long num100Ks = 0; private long theBytesRead = 0; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/FileUtil.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/FileUtil.java index f891b10..080bd5f 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/FileUtil.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/file/FileUtil.java @@ -17,9 +17,15 @@ import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * + * @author Giancarlo Panichi + * email: g.panichi@isti.cnr.it + * + */ public class FileUtil { - protected static final Logger logger = LoggerFactory + private static final Logger logger = LoggerFactory .getLogger(FileUtil.class); public static final String[] ZIP_MIMETYPES = new String[] { diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4AddColumn.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4AddColumn.java index 0c8afaf..f0f554b 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4AddColumn.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4AddColumn.java @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4AddColumn extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4AddColumn.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4CSVExport.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4CSVExport.java index 8ab9371..68dc186 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4CSVExport.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4CSVExport.java @@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4CSVExport extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4CSVExport.class); private HttpServletRequest httpRequest; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4CSVImport.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4CSVImport.java index bee02fd..bad99c2 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4CSVImport.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4CSVImport.java @@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4CSVImport extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4CSVImport.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChangeColumnType.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChangeColumnType.java index a529453..bd21f85 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChangeColumnType.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChangeColumnType.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4ChangeColumnType extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4ChangeColumnType.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChangeTableType.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChangeTableType.java index 9ac5edc..ccee048 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChangeTableType.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChangeTableType.java @@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4ChangeTableType extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4ChangeTableType.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChartTopRating.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChartTopRating.java index 3491e9e..5cfef23 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChartTopRating.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChartTopRating.java @@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4ChartTopRating extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4ChartTopRating.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Clone.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Clone.java index 73c033b..38e611c 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Clone.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Clone.java @@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4Clone extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4Clone.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4CodelistMapping.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4CodelistMapping.java index 3bb994a..644c6ff 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4CodelistMapping.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4CodelistMapping.java @@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4CodelistMapping extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4CodelistMapping.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4DeleteColumn.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4DeleteColumn.java index 0a25aa7..0fda58a 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4DeleteColumn.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4DeleteColumn.java @@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4DeleteColumn extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4DeleteColumn.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4DeleteRows.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4DeleteRows.java index 53329e0..fcb5e5a 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4DeleteRows.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4DeleteRows.java @@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4DeleteRows extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4DeleteRows.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Denormalization.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Denormalization.java index 744f304..c85b629 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Denormalization.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Denormalization.java @@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4Denormalization extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4Denormalization.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Duplicates.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Duplicates.java index e76cec8..ec985f9 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Duplicates.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Duplicates.java @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4Duplicates extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4Duplicates.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ExtractCodelist.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ExtractCodelist.java index 7388df0..e5daa4b 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ExtractCodelist.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ExtractCodelist.java @@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory; */ public class OpExecution4ExtractCodelist extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4ExtractCodelist.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4FilterColumn.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4FilterColumn.java index 5704557..6db4390 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4FilterColumn.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4FilterColumn.java @@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4FilterColumn extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4FilterColumn.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeometryCreatePoint.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeometryCreatePoint.java index 76404e1..73ff370 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeometryCreatePoint.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeometryCreatePoint.java @@ -41,7 +41,7 @@ import static org.gcube.data.analysis.tabulardata.expression.dsl.Types.*; public class OpExecution4GeometryCreatePoint extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4GeometryCreatePoint.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeospatialCreateCoordinates.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeospatialCreateCoordinates.java index f0ee614..b59b25f 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeospatialCreateCoordinates.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeospatialCreateCoordinates.java @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4GeospatialCreateCoordinates extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4GeospatialCreateCoordinates.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeospatialDownscaleCSquare.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeospatialDownscaleCSquare.java index 9090fec..41c0ba3 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeospatialDownscaleCSquare.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeospatialDownscaleCSquare.java @@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4GeospatialDownscaleCSquare extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4GeospatialDownscaleCSquare.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GroupBy.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GroupBy.java index 49c2a33..0abe290 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GroupBy.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GroupBy.java @@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4GroupBy extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4GroupBy.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4JSONExport.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4JSONExport.java index 4eedca0..01fa4ed 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4JSONExport.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4JSONExport.java @@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4JSONExport extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4JSONExport.class); private HttpServletRequest httpRequest; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4LabelColumn.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4LabelColumn.java index 0e6de6b..c5a6000 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4LabelColumn.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4LabelColumn.java @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4LabelColumn extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4LabelColumn.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4MapCreation.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4MapCreation.java index 9ab7b28..93e7594 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4MapCreation.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4MapCreation.java @@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4MapCreation extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4MapCreation.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4MergeColumn.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4MergeColumn.java index 5ccf9df..df85e92 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4MergeColumn.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4MergeColumn.java @@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4MergeColumn extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4MergeColumn.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Normalization.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Normalization.java index 96e484b..d2bbf9f 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Normalization.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Normalization.java @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4Normalization extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4Normalization.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceBatch.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceBatch.java index a944040..3ddd083 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceBatch.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceBatch.java @@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4ReplaceBatch extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4ReplaceBatch.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceByExternal.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceByExternal.java index c2a6363..e6f59b4 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceByExternal.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceByExternal.java @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4ReplaceByExternal extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4ReplaceByExternal.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceColumn.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceColumn.java index abeac69..d2b55e8 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceColumn.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceColumn.java @@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4ReplaceColumn extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4ReplaceColumn.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceColumnByExpression.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceColumnByExpression.java index 4d92d4c..b359a29 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceColumnByExpression.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceColumnByExpression.java @@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4ReplaceColumnByExpression extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4ReplaceColumnByExpression.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SDMXCodelistExport.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SDMXCodelistExport.java index 87902e3..b578d5d 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SDMXCodelistExport.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SDMXCodelistExport.java @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4SDMXCodelistExport extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4SDMXCodelistExport.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SDMXCodelistImport.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SDMXCodelistImport.java index 879409c..f80a688 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SDMXCodelistImport.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SDMXCodelistImport.java @@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4SDMXCodelistImport extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4SDMXCodelistImport.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SplitColumn.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SplitColumn.java index ad1fd4d..bdc96f5 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SplitColumn.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SplitColumn.java @@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4SplitColumn extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4SplitColumn.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4StatisticalOperation.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4StatisticalOperation.java index 2b62ee4..ddbcbba 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4StatisticalOperation.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4StatisticalOperation.java @@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4StatisticalOperation extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4StatisticalOperation.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4TimeAggregation.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4TimeAggregation.java index 3429f4b..59c87ff 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4TimeAggregation.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4TimeAggregation.java @@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4TimeAggregation extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4TimeAggregation.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Union.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Union.java index 628fa3a..38660ee 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Union.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Union.java @@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory; * */ public class OpExecution4Union extends OpExecutionBuilder { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OpExecution4Union.class); private TabularDataService service; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecutionDirector.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecutionDirector.java index eb97967..a354c35 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecutionDirector.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecutionDirector.java @@ -14,7 +14,7 @@ import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceExcept * */ public class OpExecutionDirector { - OpExecutionBuilder operationExecutionBuilder; + private OpExecutionBuilder operationExecutionBuilder; public void setOperationExecutionBuilder( OpExecutionBuilder operationExecutionBuilder) { diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/resource/ResourceTDCreator.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/resource/ResourceTDCreator.java index 531025d..2e215f1 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/resource/ResourceTDCreator.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/resource/ResourceTDCreator.java @@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory; * */ public class ResourceTDCreator { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(ResourceTDCreator.class); protected static SimpleDateFormat sdf = new SimpleDateFormat( diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/resource/ResourceTypeMap.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/resource/ResourceTypeMap.java index 713ffea..dba0d2e 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/resource/ResourceTypeMap.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/resource/ResourceTypeMap.java @@ -2,8 +2,6 @@ package org.gcube.portlets.user.td.gwtservice.server.resource; import org.gcube.data.analysis.tabulardata.model.resources.ResourceType; import org.gcube.portlets.user.td.gwtservice.shared.tr.resources.ResourceTDType; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * @@ -12,7 +10,7 @@ import org.slf4j.LoggerFactory; * */ public class ResourceTypeMap { - protected static Logger logger = LoggerFactory.getLogger(ResourceTypeMap.class); + //private static Logger logger = LoggerFactory.getLogger(ResourceTypeMap.class); public static ResourceType getResourceType(ResourceTDType resourceTDType){ switch (resourceTDType) { diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/storage/FilesStorage.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/storage/FilesStorage.java index a3138e6..6034f07 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/storage/FilesStorage.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/storage/FilesStorage.java @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; public class FilesStorage { - public static final Logger logger = LoggerFactory + private static final Logger logger = LoggerFactory .getLogger(FilesStorage.class); /** diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ColumnMap.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ColumnMap.java index 2ae16f3..0108aab 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ColumnMap.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ColumnMap.java @@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory; * */ public class ColumnMap { - protected static Logger logger = LoggerFactory.getLogger(ColumnMap.class); + private static Logger logger = LoggerFactory.getLogger(ColumnMap.class); public ColumnMap() { diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ExpressionGenerator.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ExpressionGenerator.java index cfaf8f6..229a68c 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ExpressionGenerator.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ExpressionGenerator.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; * */ public class ExpressionGenerator { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(ExpressionGenerator.class); public static Expression genReplaceValueParameterCondition( diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ExtractCodelistOperationMap.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ExtractCodelistOperationMap.java index b03255b..cadea86 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ExtractCodelistOperationMap.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ExtractCodelistOperationMap.java @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; * */ public class ExtractCodelistOperationMap { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(ExtractCodelistOperationMap.class); public ExtractCodelistOperationMap() { diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ExtractReferences.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ExtractReferences.java index 1c7b86d..d1df93b 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ExtractReferences.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ExtractReferences.java @@ -16,7 +16,7 @@ import org.slf4j.LoggerFactory; * */ public class ExtractReferences { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(ExtractReferences.class); public static RefColumn extract(OperationExecution op) { diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/OperationDefinitionMap.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/OperationDefinitionMap.java index 33a6e76..3b3e253 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/OperationDefinitionMap.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/OperationDefinitionMap.java @@ -14,7 +14,7 @@ import org.slf4j.LoggerFactory; * */ public class OperationDefinitionMap { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(OperationDefinitionMap.class); public static OperationDefinition map(String op, TabularDataService service) diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/QueryService.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/QueryService.java index 4d7c43f..75ba54b 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/QueryService.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/QueryService.java @@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory; */ public class QueryService { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(QueryService.class); public static ArrayList queryOccurences( diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/TDTypeValueMap.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/TDTypeValueMap.java index 63ff5dc..2a49d3d 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/TDTypeValueMap.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/TDTypeValueMap.java @@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory; * */ public class TDTypeValueMap { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(TDTypeValueMap.class); private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/TRTasksManager.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/TRTasksManager.java index d331d80..1bcba6f 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/TRTasksManager.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/TRTasksManager.java @@ -16,7 +16,7 @@ public class TRTasksManager implements Serializable { private static final long serialVersionUID = 4517156156005181775L; - protected HashMap trTasksMap=new HashMap(); + private HashMap trTasksMap=new HashMap(); public void add(Task trTask){ trTasksMap.put(Long.getLong(trTask.getId().getValue()),trTask); diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ValueMap.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ValueMap.java index 2604583..ea2147d 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ValueMap.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ValueMap.java @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; * */ public class ValueMap { - protected static Logger logger = LoggerFactory + private static Logger logger = LoggerFactory .getLogger(ValueMap.class); public ValueMap(){ diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/codelisthelper/CodelistMappingSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/codelisthelper/CodelistMappingSession.java index 4d3775f..55e0e7e 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/codelisthelper/CodelistMappingSession.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/codelisthelper/CodelistMappingSession.java @@ -18,14 +18,14 @@ public class CodelistMappingSession implements Serializable { private static final long serialVersionUID = 2381185326076784908L; - protected TRId trId; - protected Source source; - protected ResourceTDDescriptor resourceTDDescriptor; - protected String url; - protected String localFileName; - protected String itemId; - protected TabResource connectedTR; - protected ColumnData connectedColumn; + private TRId trId; + private Source source; + private ResourceTDDescriptor resourceTDDescriptor; + private String url; + private String localFileName; + private String itemId; + private TabResource connectedTR; + private ColumnData connectedColumn; public TRId getTrId() { return trId; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/AvailableCharsetList.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/AvailableCharsetList.java index 34fcbd4..a4766ad 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/AvailableCharsetList.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/AvailableCharsetList.java @@ -11,31 +11,34 @@ import java.util.ArrayList; * */ public class AvailableCharsetList implements Serializable { - + private static final long serialVersionUID = -1635081144303522534L; - - protected ArrayList charsetList; - protected String defaultCharset; - - protected AvailableCharsetList() - {} - + + private ArrayList charsetList; + private String defaultCharset; + + public AvailableCharsetList() { + super(); + } + /** * @param charsetList * @param defaultCharset */ - public AvailableCharsetList(ArrayList charsetList, String defaultCharset) { + public AvailableCharsetList(ArrayList charsetList, + String defaultCharset) { + super(); this.charsetList = charsetList; this.defaultCharset = defaultCharset; } - + /** * @return the charsetList */ public ArrayList getCharsetList() { return charsetList; } - + /** * @return the defaultCharset */ diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVFileUtil.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVFileUtil.java index 6fae5a8..ec8e364 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVFileUtil.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVFileUtil.java @@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory; public class CSVFileUtil { private static final int MAXROWCHECK = 1000000; - protected static Logger logger = LoggerFactory.getLogger(CSVFileUtil.class); + private static Logger logger = LoggerFactory.getLogger(CSVFileUtil.class); public static ArrayList getHeader(File csvFile, CSVParserConfiguration parserConfiguration) throws ParseException, diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVImportSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVImportSession.java index 5ba62e9..fda1c2c 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVImportSession.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVImportSession.java @@ -19,19 +19,19 @@ public class CSVImportSession implements Serializable { private static final long serialVersionUID = 4176034045408445284L; - protected String id; - protected Source source; + private String id; + private Source source; - protected TabResource tabResource; + private TabResource tabResource; - protected ArrayList headers = new ArrayList(); + private ArrayList headers = new ArrayList(); - protected boolean skipInvalidLines = false; + private boolean skipInvalidLines = false; - protected ArrayList columnToImportMask = new ArrayList(); + private ArrayList columnToImportMask = new ArrayList(); - protected String localFileName; - protected String itemId; + private String localFileName; + private String itemId; public String getId() { return id; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVParserConfiguration.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVParserConfiguration.java index 7813e6f..7d91f3d 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVParserConfiguration.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVParserConfiguration.java @@ -22,12 +22,13 @@ public class CSVParserConfiguration implements Serializable{ * */ private static final long serialVersionUID = 5585106307191211813L; - protected Charset charset; - protected char delimiter; - protected char comment; - protected HeaderPresence headerPresence; + private Charset charset; + private char delimiter; + private char comment; + private HeaderPresence headerPresence; public CSVParserConfiguration() { + super(); } /** @@ -37,6 +38,7 @@ public class CSVParserConfiguration implements Serializable{ * @param hasHeader */ public CSVParserConfiguration(Charset charset, char delimiter, char comment, HeaderPresence headerPresence) { + super(); this.charset = charset; this.delimiter = delimiter; this.comment = comment; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVRowError.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVRowError.java index 9c6f28d..64fdeb2 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVRowError.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVRowError.java @@ -17,12 +17,12 @@ public class CSVRowError implements Serializable { private static final long serialVersionUID = 4680781887858741657L; - protected static int seed; + private static int seed; - protected int id; - protected int lineNumber; - protected String lineValue; - protected String errorDescription; + private int id; + private int lineNumber; + private String lineValue; + private String errorDescription; public CSVRowError(){} diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CheckCSVSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CheckCSVSession.java index b01bf3d..0e56c2a 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CheckCSVSession.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CheckCSVSession.java @@ -13,15 +13,16 @@ public class CheckCSVSession implements Serializable { private static final long serialVersionUID = 7775024048559018931L; - protected ArrayList csvRowErrorList; - protected boolean csvFileUpperMaxSizeCheck; + private ArrayList csvRowErrorList; + private boolean csvFileUpperMaxSizeCheck; public CheckCSVSession() { - + super(); } public CheckCSVSession(ArrayList csvRowErrorList, boolean csvFileUpperMaxSizeCheck) { + super(); this.csvFileUpperMaxSizeCheck = csvFileUpperMaxSizeCheck; this.csvRowErrorList = csvRowErrorList; } diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/CSVExportMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/CSVExportMonitor.java index 5b09ea3..2df99b5 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/CSVExportMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/CSVExportMonitor.java @@ -19,12 +19,12 @@ public class CSVExportMonitor implements Serializable { private static final long serialVersionUID = -5998841163159590481L; - protected float progress; - protected State status; - protected String statusDescription; - protected Throwable error; - protected TRId trId; - protected TabExportMetadata trExportMetadata; + private float progress; + private State status; + private String statusDescription; + private Throwable error; + private TRId trId; + private TabExportMetadata trExportMetadata; public float getProgress(){ diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/CSVImportMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/CSVImportMonitor.java index 2e3fd2d..788d85d 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/CSVImportMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/CSVImportMonitor.java @@ -18,11 +18,11 @@ public class CSVImportMonitor implements Serializable { private static final long serialVersionUID = -5998841163159590481L; - protected float progress; - protected State status; - protected String statusDescription; - protected Throwable error; - protected TRId trId; + private float progress; + private State status; + private String statusDescription; + private Throwable error; + private TRId trId; public float getProgress(){ return progress; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/SDMXExportMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/SDMXExportMonitor.java index d33d363..1d03224 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/SDMXExportMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/SDMXExportMonitor.java @@ -17,13 +17,13 @@ public class SDMXExportMonitor implements Serializable { private static final long serialVersionUID = -5998841163159590481L; - protected float progress; - protected State status; - protected String statusDescription; - protected Throwable error; - protected String url; - protected TabExportMetadata tabExportMetadata; - protected TRId trId; + private float progress; + private State status; + private String statusDescription; + private Throwable error; + private String url; + private TabExportMetadata tabExportMetadata; + private TRId trId; public TRId getTrId() { return trId; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/SDMXImportMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/SDMXImportMonitor.java index d20e09b..da9bde5 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/SDMXImportMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/SDMXImportMonitor.java @@ -16,11 +16,11 @@ public class SDMXImportMonitor implements Serializable { private static final long serialVersionUID = -5998841163159590481L; - protected float progress; - protected State status; - protected String statusDescription; - protected Throwable error; - protected TRId trId; + private float progress; + private State status; + private String statusDescription; + private Throwable error; + private TRId trId; public float getProgress(){ return progress;