gCubeSystem
/
tabular-data-gwt-service
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor Updated 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@91796 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-02-17 17:36:49 +00:00
parent 2f38ccfcd2
commit 13aa1bca0e
3 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,7 +94,7 @@ public class SessionUtil {
protected static Logger logger = LoggerFactory.getLogger(SessionUtil.class);
protected static ASLSession getAslSession(HttpSession httpSession) {
public static ASLSession getAslSession(HttpSession httpSession) {
String username = (String) httpSession
.getAttribute(ScopeHelper.USERNAME_ATTRIBUTE);
ASLSession session;

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

@ -71,6 +71,7 @@ import org.gcube.portlets.user.td.gwtservice.server.file.FileUploadSession;
import org.gcube.portlets.user.td.gwtservice.server.file.FileUtil;
import org.gcube.portlets.user.td.gwtservice.server.storage.FilesStorage;
import org.gcube.portlets.user.td.gwtservice.server.trservice.ColumnDataTypeMap;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.csv.AvailableCharsetList;
@ -980,7 +981,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
List<OperationDefinition> capabilities = service.getCapabilities();
// Import SDMX Codelist takes id 200
OperationDefinition importSDMXCodelistOperation = getOperationDescriptorWithId(
OperationDefinition importSDMXCodelistOperation = OperationDefinitionMap.map(
OperationsId.SDMXCodelistImport.toString(), capabilities);
TabResource sdmxImportTabResource = sdmxImportSession
@ -1015,25 +1016,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
}
}
/**
*
* @param op
* @param capabilities
* @return
* @throws TDGWTServiceException
*/
protected OperationDefinition getOperationDescriptorWithId(String op,
List<OperationDefinition> capabilities)
throws TDGWTServiceException {
for (OperationDefinition operation : capabilities) {
if (Long.valueOf(op) == operation.getOperationId()) {
return operation;
}
}
throw new TDGWTServiceException("OperationDescriptor not found");
}
protected State matchTaskState(TaskStatus status) {
switch (status) {
@ -1416,7 +1399,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
// Import CSV file
OperationDefinition importCSVFileOperation = getOperationDescriptorWithId(
OperationDefinition importCSVFileOperation = OperationDefinitionMap.map(
OperationsId.CSVImport.toString(), capabilities);
OperationExecution invocation = new OperationExecution(
@ -1979,7 +1962,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
List<OperationDefinition> capabilities = service.getCapabilities();
// Export SDMX Codelist
OperationDefinition exportSDMXOperation = getOperationDescriptorWithId(
OperationDefinition exportSDMXOperation = OperationDefinitionMap.map(
OperationsId.SDMXCodelistExport.toString(), capabilities);
OperationExecution invocation = new OperationExecution(
@ -2134,7 +2117,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
List<OperationDefinition> capabilities = service.getCapabilities();
// Export CSV file
OperationDefinition exportCSVFileOperation = getOperationDescriptorWithId(
OperationDefinition exportCSVFileOperation = OperationDefinitionMap.map(
OperationsId.CSVExport.toString(), capabilities);
OperationExecution invocation = new OperationExecution(
@ -2305,7 +2288,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
if (changeColumnTypeSession.getColumnTypeCodeTarget().compareTo(
ColumnTypeCode.MEASURE) == 0) {
operationDefinition = getOperationDescriptorWithId(
operationDefinition = OperationDefinitionMap.map(
OperationsId.ChangeToMeasureColumn.toString(), capabilities);
map.put(Constants.PARAMETER_TARGET_DATA_TYPE, ColumnDataTypeMap
@ -2316,7 +2299,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
} else {
if (changeColumnTypeSession.getColumnTypeCodeTarget().compareTo(
ColumnTypeCode.ATTRIBUTE) == 0) {
operationDefinition = getOperationDescriptorWithId(
operationDefinition = OperationDefinitionMap.map(
OperationsId.ChangeToAttributeColumn.toString(),
capabilities);
@ -2328,7 +2311,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
} else {
if (changeColumnTypeSession.getColumnTypeCodeTarget()
.compareTo(ColumnTypeCode.CODE) == 0) {
operationDefinition = getOperationDescriptorWithId(
operationDefinition = OperationDefinitionMap.map(
OperationsId.ChangeToCodeColumn.toString(),
capabilities);
invocation = new OperationExecution(changeColumnTypeSession
@ -2337,7 +2320,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
} else {
if (changeColumnTypeSession.getColumnTypeCodeTarget()
.compareTo(ColumnTypeCode.CODENAME) == 0) {
operationDefinition = getOperationDescriptorWithId(
operationDefinition = OperationDefinitionMap.map(
OperationsId.ChangeToCodeName.toString(),
capabilities);
invocation = new OperationExecution(
@ -2347,7 +2330,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
} else {
if (changeColumnTypeSession.getColumnTypeCodeTarget()
.compareTo(ColumnTypeCode.CODEDESCRIPTION) == 0) {
operationDefinition = getOperationDescriptorWithId(
operationDefinition = OperationDefinitionMap.map(
OperationsId.ChangeToCodeDescription
.toString(),
capabilities);
@ -2359,7 +2342,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
if (changeColumnTypeSession
.getColumnTypeCodeTarget().compareTo(
ColumnTypeCode.ANNOTATION) == 0) {
operationDefinition = getOperationDescriptorWithId(
operationDefinition = OperationDefinitionMap.map(
OperationsId.ChangeToAnnotationColumn
.toString(),
capabilities);
@ -2404,7 +2387,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
OperationDefinition operationDefinition;
Map<String, Object> map = new HashMap<String, Object>();
operationDefinition = getOperationDescriptorWithId(
operationDefinition = OperationDefinitionMap.map(
OperationsId.RemoveColumn.toString(), capabilities);
invocation = new OperationExecution(deleteColumnSession
@ -2426,7 +2409,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
OperationDefinition operationDefinition;
Map<String, Object> map = new HashMap<String, Object>();
operationDefinition = getOperationDescriptorWithId(
operationDefinition = OperationDefinitionMap.map(
OperationsId.ChangeLabel.toString(), capabilities);
invocation = new OperationExecution(labelColumnSession

21
src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/OperationDefinitionMap.java Normal file
View File

@ -0,0 +1,21 @@
package org.gcube.portlets.user.td.gwtservice.server.trservice;
import java.util.List;
import org.gcube.data.analysis.tabulardata.commons.webservice.types.operations.OperationDefinition;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
public class OperationDefinitionMap {
public static OperationDefinition map(String op,
List<OperationDefinition> capabilities)
throws TDGWTServiceException {
for (OperationDefinition operation : capabilities) {
if (Long.valueOf(op) == operation.getOperationId()) {
return operation;
}
}
throw new TDGWTServiceException("OperationDescriptor not found");
}
}