Minor Update

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@97619 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-06-23 09:08:15 +00:00
parent c1f8e83fc0
commit 77c42ad7e3
18 changed files with 125 additions and 83 deletions

View File

@ -101,6 +101,14 @@ import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTService;
import org.gcube.portlets.user.td.gwtservice.server.file.CSVFileUploadSession;
import org.gcube.portlets.user.td.gwtservice.server.file.CodelistMappingFileUploadSession;
import org.gcube.portlets.user.td.gwtservice.server.file.FileUtil;
import org.gcube.portlets.user.td.gwtservice.server.opexecution.OpExecution4AddColumn;
import org.gcube.portlets.user.td.gwtservice.server.opexecution.OpExecution4ChangeColumnType;
import org.gcube.portlets.user.td.gwtservice.server.opexecution.OpExecution4ChangeTableType;
import org.gcube.portlets.user.td.gwtservice.server.opexecution.OpExecution4CodelistMapping;
import org.gcube.portlets.user.td.gwtservice.server.opexecution.OpExecution4DeleteColumn;
import org.gcube.portlets.user.td.gwtservice.server.opexecution.OpExecution4DeleteRows;
import org.gcube.portlets.user.td.gwtservice.server.opexecution.OpExecution4Duplicates;
import org.gcube.portlets.user.td.gwtservice.server.opexecution.OpExecutionDirector;
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.ColumnTypeCodeMap;
@ -4629,9 +4637,13 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername()));
TabularDataService service = TabularDataServiceFactory.getService();
OperationExecution invocation = retrieveOperationExecution(service,
changeColumnTypeSession);
OpExecution4ChangeColumnType opEx=new OpExecution4ChangeColumnType(service,changeColumnTypeSession);
OpExecutionDirector director=new OpExecutionDirector();
director.setOperationExecutionBuilder(opEx);
director.constructOperationExecution();
OperationExecution invocation = director.getOperationExecution();
if (invocation == null) {
throw new TDGWTServiceException(
"Error in ChangeColumnType: Operation not supported for now!");
@ -4785,9 +4797,13 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername()));
TabularDataService service = TabularDataServiceFactory.getService();
OperationExecution invocation = retrieveOperationExecution(service,
addColumnSession);
OpExecution4AddColumn opEx=new OpExecution4AddColumn(service, addColumnSession);
OpExecutionDirector director=new OpExecutionDirector();
director.setOperationExecutionBuilder(opEx);
director.constructOperationExecution();
OperationExecution invocation = director.getOperationExecution();
if (invocation == null) {
throw new TDGWTServiceException(
"Error Add Column: Operation not supported for now!");
@ -4938,8 +4954,13 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
aslSession.getUsername()));
TabularDataService service = TabularDataServiceFactory.getService();
ArrayList<OperationExecution> invocation = retrieveOperationExecution(
service, deleteColumnSession);
OpExecution4DeleteColumn opEx=new OpExecution4DeleteColumn(service, deleteColumnSession);
OpExecutionDirector director=new OpExecutionDirector();
director.setOperationExecutionBuilder(opEx);
director.constructOperationExecution();
ArrayList<OperationExecution> invocation = director.getListOperationExecution();
if (invocation == null) {
throw new TDGWTServiceException(
"Error Delete Column: Operation not supported for now!");
@ -5244,9 +5265,13 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername()));
TabularDataService service = TabularDataServiceFactory.getService();
OperationExecution invocation = retrieveOperationExecution(service,
changeTableTypeSession);
OpExecution4ChangeTableType opEx=new OpExecution4ChangeTableType(service, changeTableTypeSession);
OpExecutionDirector director=new OpExecutionDirector();
director.setOperationExecutionBuilder(opEx);
director.constructOperationExecution();
OperationExecution invocation = director.getOperationExecution();
if (invocation == null) {
throw new TDGWTServiceException(
"Error Change Table Type invocation: Operation not supported");
@ -5514,9 +5539,13 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername()));
TabularDataService service = TabularDataServiceFactory.getService();
OperationExecution invocation = retrieveOperationExecution(service,
deleteRowsSession);
OpExecution4DeleteRows opEx=new OpExecution4DeleteRows(service, deleteRowsSession);
OpExecutionDirector director=new OpExecutionDirector();
director.setOperationExecutionBuilder(opEx);
director.constructOperationExecution();
OperationExecution invocation = director.getOperationExecution();
if (invocation == null) {
throw new TDGWTServiceException(
"Error Delete Rows invocation: Operation not supported");
@ -5739,9 +5768,13 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername()));
TabularDataService service = TabularDataServiceFactory.getService();
OperationExecution invocation = retrieveOperationExecution(service,
duplicatesSession);
OpExecution4Duplicates opEx=new OpExecution4Duplicates(service, duplicatesSession);
OpExecutionDirector director=new OpExecutionDirector();
director.setOperationExecutionBuilder(opEx);
director.constructOperationExecution();
OperationExecution invocation = director.getOperationExecution();
if (invocation == null) {
throw new TDGWTServiceException(
"Error Delete Rows invocation: Operation not supported");
@ -8472,9 +8505,13 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
AuthorizationProvider.instance.set(new AuthorizationToken(aslSession
.getUsername()));
TabularDataService service = TabularDataServiceFactory.getService();
OperationExecution invocation = retrieveOperationExecution(service,
codelistMappingSession, importUrl);
OpExecution4CodelistMapping opEx=new OpExecution4CodelistMapping(service, codelistMappingSession, importUrl);
OpExecutionDirector director=new OpExecutionDirector();
director.setOperationExecutionBuilder(opEx);
director.constructOperationExecution();
OperationExecution invocation = director.getOperationExecution();
if (invocation == null) {
throw new TDGWTServiceException(
"Error in invocation: Operation not supported");

View File

@ -28,14 +28,14 @@ import org.slf4j.LoggerFactory;
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class OperationExecution4AddColumn extends OperationExecutionBuilder {
public class OpExecution4AddColumn extends OpExecutionBuilder {
protected static Logger logger = LoggerFactory
.getLogger(OperationExecution4AddColumn.class);
.getLogger(OpExecution4AddColumn.class);
private TabularDataService service;
private AddColumnSession addColumnSession;
public OperationExecution4AddColumn(TabularDataService service,
public OpExecution4AddColumn(TabularDataService service,
AddColumnSession addColumnSession) {
this.service = service;
this.addColumnSession = addColumnSession;

View File

@ -29,14 +29,14 @@ import org.slf4j.LoggerFactory;
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class OperationExecution4ChangeColumnType extends OperationExecutionBuilder {
public class OpExecution4ChangeColumnType extends OpExecutionBuilder {
protected static Logger logger = LoggerFactory
.getLogger(OperationExecution4ChangeColumnType.class);
.getLogger(OpExecution4ChangeColumnType.class);
private TabularDataService service;
private ChangeColumnTypeSession changeColumnTypeSession;
public OperationExecution4ChangeColumnType(
public OpExecution4ChangeColumnType(
TabularDataService service,
ChangeColumnTypeSession changeColumnTypeSession) {
this.service = service;

View File

@ -21,14 +21,14 @@ import org.slf4j.LoggerFactory;
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class OperationExecution4ChangeTableType extends OperationExecutionBuilder {
public class OpExecution4ChangeTableType extends OpExecutionBuilder {
protected static Logger logger = LoggerFactory
.getLogger(OperationExecution4ChangeTableType.class);
.getLogger(OpExecution4ChangeTableType.class);
private TabularDataService service;
private ChangeTableTypeSession changeTableTypeSession;
public OperationExecution4ChangeTableType(
public OpExecution4ChangeTableType(
TabularDataService service,
ChangeTableTypeSession changeTableTypeSession) {
this.service = service;

View File

@ -21,15 +21,15 @@ import org.slf4j.LoggerFactory;
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class OperationExecution4CodelistMapping extends OperationExecutionBuilder {
public class OpExecution4CodelistMapping extends OpExecutionBuilder {
protected static Logger logger = LoggerFactory
.getLogger(OperationExecution4CodelistMapping.class);
.getLogger(OpExecution4CodelistMapping.class);
private TabularDataService service;
private CodelistMappingSession codelistMappingSession;
private String importUrl;
public OperationExecution4CodelistMapping(
public OpExecution4CodelistMapping(
TabularDataService service,
CodelistMappingSession codelistMappingSession, String importUrl) {
this.service = service;

View File

@ -22,14 +22,14 @@ import org.slf4j.LoggerFactory;
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class OperationExecution4DeleteColumn extends OperationExecutionBuilder {
public class OpExecution4DeleteColumn extends OpExecutionBuilder {
protected static Logger logger = LoggerFactory
.getLogger(OperationExecution4DeleteColumn.class);
.getLogger(OpExecution4DeleteColumn.class);
private TabularDataService service;
private DeleteColumnSession deleteColumnSession;
public OperationExecution4DeleteColumn(TabularDataService service,
public OpExecution4DeleteColumn(TabularDataService service,
DeleteColumnSession deleteColumnSession) {
this.service = service;
this.deleteColumnSession = deleteColumnSession;

View File

@ -22,14 +22,14 @@ import org.slf4j.LoggerFactory;
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class OperationExecution4DeleteRows extends OperationExecutionBuilder {
public class OpExecution4DeleteRows extends OpExecutionBuilder {
protected static Logger logger = LoggerFactory
.getLogger(OperationExecution4DeleteRows.class);
.getLogger(OpExecution4DeleteRows.class);
private TabularDataService service;
private DeleteRowsSession deleteRowsSession;
public OperationExecution4DeleteRows(TabularDataService service,
public OpExecution4DeleteRows(TabularDataService service,
DeleteRowsSession deleteRowsSession) {
this.service = service;
this.deleteRowsSession = deleteRowsSession;

View File

@ -27,14 +27,14 @@ import org.slf4j.LoggerFactory;
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class OperationExecution4Duplicates extends OperationExecutionBuilder {
public class OpExecution4Duplicates extends OpExecutionBuilder {
protected static Logger logger = LoggerFactory
.getLogger(OperationExecution4Duplicates.class);
.getLogger(OpExecution4Duplicates.class);
private TabularDataService service;
private DuplicatesSession duplicatesSession;
public OperationExecution4Duplicates(TabularDataService service,
public OpExecution4Duplicates(TabularDataService service,
DuplicatesSession duplicatesSession) {
this.service = service;
this.duplicatesSession = duplicatesSession;

View File

@ -25,14 +25,14 @@ import org.slf4j.LoggerFactory;
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class OperationExecution4EditRow extends OperationExecutionBuilder {
public class OpExecution4EditRow extends OpExecutionBuilder {
protected static Logger logger = LoggerFactory
.getLogger(OperationExecution4EditRow.class);
.getLogger(OpExecution4EditRow.class);
private TabularDataService service;
private EditRowSession editRowSession;
public OperationExecution4EditRow(TabularDataService service, EditRowSession editRowSession) {
public OpExecution4EditRow(TabularDataService service, EditRowSession editRowSession) {
this.service = service;
this.editRowSession = editRowSession;
}

View File

@ -23,15 +23,15 @@ import org.slf4j.LoggerFactory;
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class OperationExecution4ExtractCodelist extends
OperationExecutionBuilder {
public class OpExecution4ExtractCodelist extends
OpExecutionBuilder {
protected static Logger logger = LoggerFactory
.getLogger(OperationExecution4ExtractCodelist.class);
.getLogger(OpExecution4ExtractCodelist.class);
private TabularDataService service;
private ExtractCodelistSession extractCodelistSession;
public OperationExecution4ExtractCodelist(TabularDataService service,
public OpExecution4ExtractCodelist(TabularDataService service,
ExtractCodelistSession extractCodelistSession) {
this.service = service;
this.extractCodelistSession = extractCodelistSession;

View File

@ -22,14 +22,14 @@ import org.slf4j.LoggerFactory;
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class OperationExecution4LabelColumn extends OperationExecutionBuilder {
public class OpExecution4LabelColumn extends OpExecutionBuilder {
protected static Logger logger = LoggerFactory
.getLogger(OperationExecution4LabelColumn.class);
.getLogger(OpExecution4LabelColumn.class);
private TabularDataService service;
private LabelColumnSession labelColumnSession;
public OperationExecution4LabelColumn(TabularDataService service,
public OpExecution4LabelColumn(TabularDataService service,
LabelColumnSession labelColumnSession) {
this.service = service;
this.labelColumnSession = labelColumnSession;

View File

@ -25,14 +25,14 @@ import org.slf4j.LoggerFactory;
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class OperationExecution4MergeColumn extends OperationExecutionBuilder {
public class OpExecution4MergeColumn extends OpExecutionBuilder {
protected static Logger logger = LoggerFactory
.getLogger(OperationExecution4MergeColumn.class);
.getLogger(OpExecution4MergeColumn.class);
private TabularDataService service;
private MergeColumnSession mergeColumnSession;
public OperationExecution4MergeColumn(TabularDataService service,
public OpExecution4MergeColumn(TabularDataService service,
MergeColumnSession mergeColumnSession) {
this.service = service;
this.mergeColumnSession = mergeColumnSession;

View File

@ -26,14 +26,14 @@ import org.slf4j.LoggerFactory;
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class OperationExecution4ReplaceBatch extends OperationExecutionBuilder {
public class OpExecution4ReplaceBatch extends OpExecutionBuilder {
protected static Logger logger = LoggerFactory
.getLogger(OperationExecution4ReplaceBatch.class);
.getLogger(OpExecution4ReplaceBatch.class);
private TabularDataService service;
private ReplaceBatchColumnSession replaceBatchColumnSession;
public OperationExecution4ReplaceBatch(TabularDataService service,
public OpExecution4ReplaceBatch(TabularDataService service,
ReplaceBatchColumnSession replaceBatchColumnSession){
this.service=service;
this.replaceBatchColumnSession=replaceBatchColumnSession;

View File

@ -23,14 +23,14 @@ import org.slf4j.LoggerFactory;
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class OperationExecution4ReplaceColumn extends OperationExecutionBuilder {
public class OpExecution4ReplaceColumn extends OpExecutionBuilder {
protected static Logger logger = LoggerFactory
.getLogger(OperationExecution4ReplaceColumn.class);
.getLogger(OpExecution4ReplaceColumn.class);
private TabularDataService service;
private ReplaceColumnSession replaceColumnSession;
public OperationExecution4ReplaceColumn(TabularDataService service,
public OpExecution4ReplaceColumn(TabularDataService service,
ReplaceColumnSession replaceColumnSession) {
this.service = service;
this.replaceColumnSession = replaceColumnSession;

View File

@ -26,14 +26,14 @@ import org.slf4j.LoggerFactory;
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class OperationExecution4SplitColumn extends OperationExecutionBuilder {
public class OpExecution4SplitColumn extends OpExecutionBuilder {
protected static Logger logger = LoggerFactory
.getLogger(OperationExecution4SplitColumn.class);
.getLogger(OpExecution4SplitColumn.class);
private TabularDataService service;
private SplitColumnSession splitColumnSession;
public OperationExecution4SplitColumn(TabularDataService service,
public OpExecution4SplitColumn(TabularDataService service,
SplitColumnSession splitColumnSession) {
this.service = service;
this.splitColumnSession = splitColumnSession;

View File

@ -9,14 +9,14 @@ import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceExcept
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
abstract class OperationExecutionBuilder {
protected OperationExecutionSpec operationExecutionSpec;
abstract class OpExecutionBuilder {
protected OpExecutionSpec operationExecutionSpec;
public OperationExecutionSpec getOperationExecutionSpec(){
public OpExecutionSpec getOperationExecutionSpec(){
return operationExecutionSpec;
}
public void createSpec(){
operationExecutionSpec=new OperationExecutionSpec();
operationExecutionSpec=new OpExecutionSpec();
}

View File

@ -1,6 +1,6 @@
package org.gcube.portlets.user.td.gwtservice.server.opexecution;
import java.util.List;
import java.util.ArrayList;
import org.gcube.data.analysis.tabulardata.commons.webservice.types.operations.OperationExecution;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
@ -13,11 +13,11 @@ import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceExcept
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class OperationExecutionDirector {
OperationExecutionBuilder operationExecutionBuilder;
public class OpExecutionDirector {
OpExecutionBuilder operationExecutionBuilder;
public void setOperationExecutionBuilder(
OperationExecutionBuilder operationExecutionBuilder) {
OpExecutionBuilder operationExecutionBuilder) {
this.operationExecutionBuilder = operationExecutionBuilder;
}
@ -26,7 +26,7 @@ public class OperationExecutionDirector {
}
public List<OperationExecution> getListOperationExecution() {
public ArrayList<OperationExecution> getListOperationExecution() {
return operationExecutionBuilder.getOperationExecutionSpec().getOps();
}

View File

@ -1,28 +1,33 @@
package org.gcube.portlets.user.td.gwtservice.server.opexecution;
import java.util.List;
import java.util.ArrayList;
import org.gcube.data.analysis.tabulardata.commons.webservice.types.operations.OperationExecution;
public class OperationExecutionSpec {
/**
*
* @author "Giancarlo Panichi"
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class OpExecutionSpec {
private OperationExecution op;
private List<OperationExecution> ops;
private ArrayList<OperationExecution> ops;
public OperationExecution getOp() {
return op;
}
public void setOp(OperationExecution op) {
this.op = op;
}
public List<OperationExecution> getOps() {
public ArrayList<OperationExecution> getOps() {
return ops;
}
public void setOps(List<OperationExecution> ops) {
public void setOps(ArrayList<OperationExecution> ops) {
this.ops = ops;
}
}