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

Updated OperationsId 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@101877 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-12-03 16:04:24 +00:00
parent 0e3c568178
commit 92ab3b8a0c
35 changed files with 78 additions and 331 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,8 +149,6 @@ import org.gcube.portlets.user.td.gwtservice.server.trservice.TDTypeValueMap;
import org.gcube.portlets.user.td.gwtservice.server.trservice.TabularResourceTypeMap;
import org.gcube.portlets.user.td.gwtservice.server.trservice.TaskStateMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.UIOperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.chart.ChartTopRatingSession;
import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingSession;
import org.gcube.portlets.user.td.gwtservice.shared.csv.AvailableCharsetList;
@ -260,6 +258,8 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.union.UnionSession;
import org.gcube.portlets.user.td.gwtservice.shared.uriresolver.UriResolverSession;
import org.gcube.portlets.user.td.gwtservice.shared.user.UserInfo;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.UIOperationsId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.RelationshipData;
import org.gcube.portlets.user.uriresolvermanager.UriResolverManager;
import org.gcube.resources.discovery.client.api.DiscoveryClient;
@ -4845,7 +4845,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
OpExecutionDirector director = new OpExecutionDirector();
director.setOperationExecutionBuilder(opEx);
director.constructOperationExecution();
List<OperationExecution> invocations = director
/*List<OperationExecution> invocations = director
.getListOperationExecution();
if (invocations == null) {
@ -4853,7 +4853,14 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
}
logger.debug("OperationInvocation: \n" + invocations);
*/
OperationExecution invocation =director.getOperationExecution();
logger.debug("OperationInvocation: \n" + invocation);
service.executeSynchMetadataOperation(invocation, tabularResourceId);
/*
for(OperationExecution op:invocations){
service.executeSynchMetadataOperation(op, tabularResourceId);
//executeBatch(invocations, tabularResourceId);

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

@ -12,10 +12,10 @@ import org.gcube.portlets.user.td.gwtservice.server.trservice.ColumnTypeCodeMap;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.server.trservice.TDTypeValueMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.tr.DefNewColumn;
import org.gcube.portlets.user.td.gwtservice.shared.tr.column.AddColumnSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeCode;
import org.slf4j.Logger;

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

@ -11,9 +11,9 @@ import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.SessionUtil;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVExportSession;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -14,7 +14,6 @@ import org.gcube.data.analysis.tabulardata.service.TabularDataService;
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.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.DimensionRow;
@ -22,6 +21,7 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.column.mapping.ColumnMapp
import org.gcube.portlets.user.td.gwtservice.shared.tr.column.mapping.ColumnMappingList;
import org.gcube.portlets.user.td.gwtservice.shared.tr.column.type.ChangeColumnTypeSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeCode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -8,9 +8,9 @@ import org.gcube.data.analysis.tabulardata.commons.webservice.types.operations.O
import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.tr.table.ChangeTableTypeSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -8,9 +8,9 @@ import org.gcube.data.analysis.tabulardata.commons.webservice.types.operations.O
import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.chart.ChartTopRatingSession;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -9,10 +9,10 @@ import org.gcube.data.analysis.tabulardata.model.table.TableId;
import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.tr.clone.CloneTabularResourceSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -11,10 +11,10 @@ import org.gcube.data.analysis.tabulardata.model.table.TableId;
import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingSession;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -8,10 +8,10 @@ import org.gcube.data.analysis.tabulardata.commons.webservice.types.operations.O
import org.gcube.data.analysis.tabulardata.commons.webservice.types.operations.OperationExecution;
import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.column.DeleteColumnSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -9,9 +9,9 @@ import org.gcube.data.analysis.tabulardata.commons.webservice.types.operations.O
import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DeleteRowsSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -11,11 +11,11 @@ import org.gcube.data.analysis.tabulardata.model.table.TableId;
import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.DenormalizationSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -12,11 +12,11 @@ import org.gcube.data.analysis.tabulardata.model.table.TableId;
import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DuplicatesSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -12,9 +12,9 @@ import org.gcube.portlets.user.td.gwtservice.server.trservice.ExpressionGenerato
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.server.trservice.ValueMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.EditRowSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -10,9 +10,9 @@ import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.ExtractCodelistOperationMap;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.extract.ExtractCodelistSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -9,9 +9,9 @@ import org.gcube.data.analysis.tabulardata.expression.Expression;
import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.tr.column.FilterColumnSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -6,9 +6,9 @@ import org.gcube.data.analysis.tabulardata.commons.webservice.types.operations.O
import org.gcube.data.analysis.tabulardata.commons.webservice.types.operations.OperationExecution;
import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.tr.groupby.GroupBySession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -11,9 +11,9 @@ import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.SessionUtil;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.json.JSONExportSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

57
src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4LabelColumn.java
View File

@ -1,19 +1,23 @@
package org.gcube.portlets.user.td.gwtservice.server.opexecution;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import org.gcube.data.analysis.tabulardata.commons.webservice.types.operations.OperationDefinition;
import org.gcube.data.analysis.tabulardata.commons.webservice.types.operations.OperationExecution;
import org.gcube.data.analysis.tabulardata.model.column.ColumnLocalId;
import org.gcube.data.analysis.tabulardata.model.column.ColumnReference;
import org.gcube.data.analysis.tabulardata.model.metadata.common.ImmutableLocalizedText;
import org.gcube.data.analysis.tabulardata.model.metadata.common.LocalizedText;
import org.gcube.data.analysis.tabulardata.model.table.TableId;
import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.column.LabelColumnSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -40,31 +44,44 @@ public class OpExecution4LabelColumn extends OpExecutionBuilder {
@Override
public void buildOpEx() throws TDGWTServiceException {
logger.debug("LabelColumnSession :" + labelColumnSession);
ArrayList<OperationExecution> invocations = new ArrayList<OperationExecution>();
HashMap<ColumnData, String> columnsMaps = labelColumnSession.getMaps();
Map<ColumnReference, LocalizedText> labels = new HashMap<ColumnReference, LocalizedText>();
TRId trId=labelColumnSession.getTrId();
long tabId;
if(trId.isViewTable()){
tabId = new Long(trId.getReferenceTargetTableId());
} else {
tabId = new Long(trId.getTableId());
}
TableId tId = new TableId(tabId);
for (ColumnData key : columnsMaps.keySet()) {
OperationExecution invocation = null;
OperationDefinition operationDefinition;
Map<String, Object> map = new HashMap<String, Object>();
ColumnLocalId cId=new ColumnLocalId(key.getColumnId());
ColumnReference columnReference = new ColumnReference(tId, cId);
ImmutableLocalizedText localizedText = new ImmutableLocalizedText(
columnsMaps.get(key));
map.put(Constants.NAME_PARAMETER_ID, localizedText);
operationDefinition = OperationDefinitionMap.map(
OperationsId.ColumnNameAdd.toString(), service);
invocation = new OperationExecution(key.getColumnId(),
operationDefinition.getOperationId(), map);
invocations.add(invocation);
labels.put(columnReference, localizedText);
}
operationExecutionSpec.setOps(invocations);
OperationExecution invocation = null;
OperationDefinition operationDefinition;
operationDefinition = OperationDefinitionMap.map(
OperationsId.ColumnNameAdd.toString(), service);
Map<String, Object> map = new HashMap<String, Object>();
map.put(Constants.NAME_PARAMETER_ID, labels);
invocation = new OperationExecution(operationDefinition.getOperationId(), map);
operationExecutionSpec.setOp(invocation);
}

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

@ -12,10 +12,10 @@ import org.gcube.data.analysis.tabulardata.model.table.TableId;
import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.map.MapCreationSession;
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -13,9 +13,9 @@ import org.gcube.portlets.user.td.gwtservice.server.trservice.ColumnDataTypeMap;
import org.gcube.portlets.user.td.gwtservice.server.trservice.ColumnTypeCodeMap;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.tr.column.MergeColumnSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -13,11 +13,11 @@ import org.gcube.data.analysis.tabulardata.model.table.TableId;
import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.NormalizationSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -11,10 +11,10 @@ import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.ExpressionGenerator;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.ReplaceBatchColumnSession;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.ReplaceEntry;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -15,10 +15,10 @@ import org.gcube.data.analysis.tabulardata.model.table.TableId;
import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.tr.replacebyexternal.ReplaceByExternalColumnsMapping;
import org.gcube.portlets.user.td.gwtservice.shared.tr.replacebyexternal.ReplaceByExternalSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -10,9 +10,9 @@ import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.ExpressionGenerator;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.tr.column.ReplaceColumnSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -10,9 +10,9 @@ import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.ExpressionGenerator;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.tr.column.ReplaceColumnByExpressionSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -11,10 +11,10 @@ import org.gcube.datapublishing.sdmx.api.model.SDMXRegistryInterfaceType;
import org.gcube.datapublishing.sdmx.impl.model.GCubeSDMXRegistryDescriptor;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportSession;
import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Codelist;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -13,9 +13,9 @@ import org.gcube.portlets.user.td.gwtservice.server.trservice.ColumnDataTypeMap;
import org.gcube.portlets.user.td.gwtservice.server.trservice.ColumnTypeCodeMap;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.tr.column.SplitColumnSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -9,9 +9,9 @@ import org.gcube.data.analysis.tabulardata.commons.webservice.types.operations.O
import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.statistical.StatisticalOperationSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -6,9 +6,9 @@ import org.gcube.data.analysis.tabulardata.commons.webservice.types.operations.O
import org.gcube.data.analysis.tabulardata.commons.webservice.types.operations.OperationExecution;
import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.tr.groupby.TimeAggregationSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -10,9 +10,9 @@ import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.ColumnMap;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.tr.union.UnionSession;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -5,8 +5,8 @@ import java.util.Map;
import org.gcube.data.analysis.tabulardata.commons.webservice.types.operations.OperationExecution;
import org.gcube.data.analysis.tabulardata.model.column.ColumnReference;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.tr.RefColumn;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.OperationsId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

150
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/OperationsId.java
View File

@ -1,150 +0,0 @@
package org.gcube.portlets.user.td.gwtservice.shared;
/**
*
* Tabular Data Service Operations Id
*
* <table>
* <tr><td>CSVImport</td><td>100</td></tr>
* <tr><td>CSVExport</td><td>101</td></tr>
* <tr><td>SDMXCodelistImport</td><td>200</td></tr>
* <tr><td>SDMXCodelistExport</td><td>201</td></tr>
* <tr><td>SDMXDatasetImport</td><td>202</td></tr>
* <tr><td>SDMXDatasetExport</td><td>203</td></tr>
* <tr><td>JSONImport</td><td>300</td></tr>
* <tr><td>JSONExport</td><td>301</td></tr>
* <tr><td>ValidateCodelist</td><td>1000</td></tr>
* <tr><td>ValidateDataset</td><td>1001</td></tr>
* <tr><td>ChangeTableType</td><td>1002</td></tr>
* <tr><td>CreateDatasetView</td><td>1003</td></tr>
* <tr><td>RemoveColumn</td><td>1004</td></tr>
* <tr><td>AddsAColumn</td><td>1005</td></tr>
* <tr><td>ColumnNameAdd</td><td>1006</td></tr>
* <tr><td>ColumnNameRemove</td><td>1007</td></tr>
* <tr><td>TableNameAdd</td><td>1008</td></tr>
* <tr><td>TableNameRemove</td><td>1009</td></tr>
* <tr><td>ChangeToAnnotationColumn</td><td>2000</td></tr>
* <tr><td>ChangeToAttributeColumn</td><td>2001</td></tr>
* <tr><td>ChangeToMeasureColumn</td><td>2002</td></tr>
* <tr><td>ChangeToCodeColumn</td><td>2003</td></tr>
* <tr><td>ChangeToCodeName</td><td>2004</td></tr>
* <tr><td>ChangeToCodeDescription</td><td>2005</td></tr>
* <tr><td>ChangeToDimensionColumn</td><td>2006</td></tr>
* <tr><td>ChangeToTimeDimensionColumn</td><td>2007</td></tr>
* <tr><td>ModifyTuplesValuesByExpression</td><td>3000</td></tr>
* <tr><td>ModifyTuplesValuesById</td><td>3001</td></tr>
* <tr><td>ModifyTuplesValuesByValidation</td><td>3002</td></tr>
* <tr><td>AddRow</td><td>3004</td></tr>
* <tr><td>Denormalize</td><td>3005</td></tr>
* <tr><td>GroupBy</td><td>3006</td></tr>
* <tr><td>RemoveDuplicateTuples</td><td>3007</td></tr>
* <tr><td>ReplaceColumnByExpression</td><td>3101</td></tr>
* <tr><td>ReplaceById</td><td>3102</td></tr>
* <tr><td>FilterByExpression</td><td>3201</td></tr>
* <tr><td>RemoveRowById</td><td>3202</td></tr>
* <tr><td>Union</td><td>3208</td></tr>
* <tr><td>CodelistValidation</td><td>5001</td></tr>
* <tr><td>ColumnTypeCastCheck</td><td>5002</td></tr>
* <tr><td>DuplicateTupleValidation</td><td>5003</td></tr>
* <tr><td>DuplicateValuesInColumnValidator</td><td>5004</td></tr>
* <tr><td>PeriodFormatCheck</td><td>5005</td></tr>
* <tr><td>ExpressionValidation</td><td>5006</td></tr>
* <tr><td>AmbiguousExternalReferenceCheck</td><td>5007</td></tr>
* <tr><td>DimensionColumnValidator</td><td>5010</td></tr>
* <tr><td>ValidateTable</td><td>5011</td></tr>
* <tr><td>ValidateDataSet</td><td>5012</td></tr>
* <tr><td>ValidateGeneric</td><td>5013</td></tr>
* <tr><td>ExtractCodelist</td><td>11001</td></tr>
* </table>
*
* @author "Giancarlo Panichi"
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*
*/
public enum OperationsId {
CSVImport("100"),
CSVExport("101"),
CLONE("102"),
SDMXCodelistImport("200"),
SDMXCodelistExport("201"),
SDMXDatasetImport("202"),
SDMXDatasetExport("203"),
JSONImport("300"),
JSONExport("301"),
ValidateCodelist("1000"),
ValidateDataset("1001"),
ChangeTableType("1002"),
CreateDatasetView("1003"),
RemoveColumn("1004"),
AddColumn("1005"),
ColumnNameAdd("1006"),
ColumnNameRemove("1007"),
TableNameAdd("1008"),
TableNameRemove("1009"),
GenerateMap("1010"),
ChangeToAnnotationColumn("2000"),
ChangeToAttributeColumn("2001"),
ChangeToMeasureColumn("2002"),
ChangeToCodeColumn("2003"),
ChangeToCodeName("2004"),
ChangeToCodeDescription("2005"),
ChangeToDimensionColumn("2006"),
ChangeToTimeDimensionColumn("2007"),
ModifyTuplesValuesByExpression("3000"),
ModifyTuplesValuesById("3001"),
ModifyTuplesValuesByValidation("3002"),
AddRow("3004"),
Denormalize("3005"),
GroupBy("3006"),
RemoveDuplicateTuples("3007"),
Normalize("3008"),
TimeAggregation("3009"),
ReplaceColumnByExpression("3101"),
ReplaceById("3102"),
FilterByExpression("3201"),
RemoveRowById("3202"),
Union("3208"),
CodelistValidation("5001"),
ColumnTypeCastCheck("5002"),
DuplicateTupleValidation("5003"),
DuplicateValuesInColumnValidator("5004"),
PeriodFormatCheck("5005"),
ExpressionValidation("5006"),
AmbiguousExternalReferenceCheck("5007"),
DimensionColumnValidator("5010"),
ValidateTable("5011"),
ValidateDataSet("5012"),
ValidateGeneric("5013"),
TopRatingChart("9000"),
StatisticalOperation("10001"),
ExportToStatisticalOperation("10002"),
ImportFromStatistical("10003"),
ExtractCodelist("11001"),
GuessCodelist("11002"),
CodelistMappingImport("12001");
/**
* @param text
*/
private OperationsId(final String id) {
this.id = id;
}
private final String id;
@Override
public String toString() {
return id;
}
public Long toLong(){
return Long.valueOf(id);
}
}

126
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/UIOperationsId.java
View File

@ -1,126 +0,0 @@
package org.gcube.portlets.user.td.gwtservice.shared;
/**
*
* Tabular Data Service User Interface Operations Id
*
* <table>
* <tr><td>CSVImport</td><td>100</td></tr>
* <tr><td>CSVExport</td><td>101</td></tr>
* <tr><td>SDMXCodelistImport</td><td>200</td></tr>
* <tr><td>SDMXCodelistExport</td><td>201</td></tr>
* <tr><td>SDMXDatasetImport</td><td>202</td></tr>
* <tr><td>SDMXDatasetExport</td><td>203</td></tr>
* <tr><td>JSONImport</td><td>300</td></tr>
* <tr><td>JSONExport</td><td>301</td></tr>
* <tr><td>ValidateCodelist</td><td>1000</td></tr>
* <tr><td>ValidateDataset</td><td>1001</td></tr>
* <tr><td>ChangeTableType</td><td>1002</td></tr>
* <tr><td>CreateDatasetView</td><td>1003</td></tr>
* <tr><td>RemoveColumn</td><td>1004</td></tr>
* <tr><td>AddsAColumn</td><td>1005</td></tr>
* <tr><td>ColumnNameAdd</td><td>1006</td></tr>
* <tr><td>ColumnNameRemove</td><td>1007</td></tr>
* <tr><td>TableNameAdd</td><td>1008</td></tr>
* <tr><td>TableNameRemove</td><td>1009</td></tr>
* <tr><td>ChangeToAnnotationColumn</td><td>2000</td></tr>
* <tr><td>ChangeToAttributeColumn</td><td>2001</td></tr>
* <tr><td>ChangeToMeasureColumn</td><td>2002</td></tr>
* <tr><td>ChangeToCodeColumn</td><td>2003</td></tr>
* <tr><td>ChangeToCodeName</td><td>2004</td></tr>
* <tr><td>ChangeToCodeDescription</td><td>2005</td></tr>
* <tr><td>ChangeToDimensionColumn</td><td>2006</td></tr>
* <tr><td>ChangeToTimeDimensionColumn</td><td>2007</td></tr>
* <tr><td>ModifyTuplesValuesByExpression</td><td>3000</td></tr>
* <tr><td>ModifyTuplesValuesById</td><td>3001</td></tr>
* <tr><td>ModifyTuplesValuesByValidation</td><td>3002</td></tr>
* <tr><td>AddRow</td><td>3004</td></tr>
* <tr><td>Denormalize</td><td>3005</td></tr>
* <tr><td>GroupBy</td><td>3006</td></tr>
* <tr><td>RemoveDuplicateTuples</td><td>3007</td></tr>
* <tr><td>ReplaceColumnByExpression</td><td>3101</td></tr>
* <tr><td>ReplaceById</td><td>3102</td></tr>
* <tr><td>FilterByExpression</td><td>3201</td></tr>
* <tr><td>RemoveRowById</td><td>3202</td></tr>
* <tr><td>Union</td><td>3208</td></tr>
* <tr><td>CodelistValidation</td><td>5001</td></tr>
* <tr><td>ColumnTypeCastCheck</td><td>5002</td></tr>
* <tr><td>DuplicateTupleValidation</td><td>5003</td></tr>
* <tr><td>DuplicateValuesInColumnValidator</td><td>5004</td></tr>
* <tr><td>PeriodFormatCheck</td><td>5005</td></tr>
* <tr><td>ExpressionValidation</td><td>5006</td></tr>
* <tr><td>AmbiguousExternalReferenceCheck</td><td>5007</td></tr>
* <tr><td>DimensionColumnValidator</td><td>5010</td></tr>
* <tr><td>ValidateTable</td><td>5011</td></tr>
* <tr><td>ValidateDataSet</td><td>5012</td></tr>
* <tr><td>ValidateGeneric</td><td>5013</td></tr>
* <tr><td>ExtractCodelist</td><td>11001</td></tr>
* </table>
*
* @author "Giancarlo Panichi"
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*
*/
public enum UIOperationsId {
CSVImport("CSV Import"),
CSVExport("CSV Export"),
Clone("Clone"),
SDMXImport("SDMX Import"),
SDMXExport("SDMX Export"),
JSONImport("JSON Import"),
JSONExport("JSON Export"),
ChangeTableType("Change Table Type"),
DeleteColumn("Delete Column"),
AddColumn("Add Column"),
ChangeColumnLabel("Change Column Label"),
ChangeColumnType("Change Column Type"),
EditRow("Edit Row"),
DeleteRow("Delete Row"),
Denormalize("Denormalize"),
GroupBy("Group By"),
MergeColumn("Merge Column"),
SplitColumn("Split Column"),
Normalize("Normalize"),
TimeAggregation("Time Aggregation"),
ReplaceValue("Replace Value"),
ReplaceByExpression("Replace By Expression"),
ReplaceByExternal("Replace By External"),
ReplaceBatch("Replace Batch"),
FilterColumn("Filter Column"),
Union("Union"),
DuplicateTuples("Duplicate Tuples"),
ExtractCodelist("Extract Codelist"),
CodelistMappingImport("Codelist Mapping Import"),
ResumeTask("Resume Task"),
ResubmitTask("ResubmitTask"),
RollBack("Roll Back"),
ApplyTemplate("Apply Template"),
GenerateMap("Generate Map"),
StatisticalOperation("Statistical Operation"),
ChartTopRating("Top Rating Chart");
/**
* @param text
*/
private UIOperationsId(final String id) {
this.id = id;
}
private final String id;
@Override
public String toString() {
return id;
}
public Long toLong(){
return Long.valueOf(id);
}
}

2
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/OperationMonitor.java
View File

@ -5,9 +5,9 @@ package org.gcube.portlets.user.td.gwtservice.shared.monitor;
import java.io.Serializable;
import org.gcube.portlets.user.td.gwtservice.shared.UIOperationsId;
import org.gcube.portlets.user.td.gwtservice.shared.task.TaskS;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.UIOperationsId;
/**
*

3
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/TaskWrapper.java
View File

@ -2,10 +2,9 @@ package org.gcube.portlets.user.td.gwtservice.shared.task;
import java.io.Serializable;
import org.gcube.data.analysis.tabulardata.service.operation.Task;
import org.gcube.portlets.user.td.gwtservice.shared.UIOperationsId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.operations.UIOperationsId;
/**
*