From 77c42ad7e3dd3910e904cf36ba5e0db6160f39dd Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Mon, 23 Jun 2014 09:08:15 +0000 Subject: [PATCH] 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 --- .../gwtservice/server/TDGWTServiceImpl.java | 77 ++++++++++++++----- ...Column.java => OpExecution4AddColumn.java} | 6 +- ...java => OpExecution4ChangeColumnType.java} | 6 +- ....java => OpExecution4ChangeTableType.java} | 6 +- ....java => OpExecution4CodelistMapping.java} | 6 +- ...umn.java => OpExecution4DeleteColumn.java} | 6 +- ...eRows.java => OpExecution4DeleteRows.java} | 6 +- ...cates.java => OpExecution4Duplicates.java} | 6 +- ...4EditRow.java => OpExecution4EditRow.java} | 6 +- ....java => OpExecution4ExtractCodelist.java} | 8 +- ...lumn.java => OpExecution4LabelColumn.java} | 6 +- ...lumn.java => OpExecution4MergeColumn.java} | 6 +- ...tch.java => OpExecution4ReplaceBatch.java} | 6 +- ...mn.java => OpExecution4ReplaceColumn.java} | 6 +- ...lumn.java => OpExecution4SplitColumn.java} | 6 +- ...onBuilder.java => OpExecutionBuilder.java} | 8 +- ...Director.java => OpExecutionDirector.java} | 10 +-- ...xecutionSpec.java => OpExecutionSpec.java} | 27 ++++--- 18 files changed, 125 insertions(+), 83 deletions(-) rename src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/{OperationExecution4AddColumn.java => OpExecution4AddColumn.java} (96%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/{OperationExecution4ChangeColumnType.java => OpExecution4ChangeColumnType.java} (96%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/{OperationExecution4ChangeTableType.java => OpExecution4ChangeTableType.java} (91%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/{OperationExecution4CodelistMapping.java => OpExecution4CodelistMapping.java} (91%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/{OperationExecution4DeleteColumn.java => OpExecution4DeleteColumn.java} (90%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/{OperationExecution4DeleteRows.java => OpExecution4DeleteRows.java} (91%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/{OperationExecution4Duplicates.java => OpExecution4Duplicates.java} (94%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/{OperationExecution4EditRow.java => OpExecution4EditRow.java} (92%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/{OperationExecution4ExtractCodelist.java => OpExecution4ExtractCodelist.java} (91%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/{OperationExecution4LabelColumn.java => OpExecution4LabelColumn.java} (91%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/{OperationExecution4MergeColumn.java => OpExecution4MergeColumn.java} (93%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/{OperationExecution4ReplaceBatch.java => OpExecution4ReplaceBatch.java} (94%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/{OperationExecution4ReplaceColumn.java => OpExecution4ReplaceColumn.java} (94%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/{OperationExecution4SplitColumn.java => OpExecution4SplitColumn.java} (94%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/{OperationExecutionBuilder.java => OpExecutionBuilder.java} (68%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/{OperationExecutionDirector.java => OpExecutionDirector.java} (78%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/{OperationExecutionSpec.java => OpExecutionSpec.java} (51%) diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java index 0994de0..2f13332 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java @@ -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 invocation = retrieveOperationExecution( - service, deleteColumnSession); + OpExecution4DeleteColumn opEx=new OpExecution4DeleteColumn(service, deleteColumnSession); + OpExecutionDirector director=new OpExecutionDirector(); + director.setOperationExecutionBuilder(opEx); + director.constructOperationExecution(); + + ArrayList 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"); diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4AddColumn.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4AddColumn.java similarity index 96% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4AddColumn.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4AddColumn.java index 1325d8e..5811b13 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4AddColumn.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4AddColumn.java @@ -28,14 +28,14 @@ import org.slf4j.LoggerFactory; * href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it * */ -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; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4ChangeColumnType.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChangeColumnType.java similarity index 96% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4ChangeColumnType.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChangeColumnType.java index 728eb92..3d437ed 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4ChangeColumnType.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChangeColumnType.java @@ -29,14 +29,14 @@ import org.slf4j.LoggerFactory; * href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it * */ -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; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4ChangeTableType.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChangeTableType.java similarity index 91% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4ChangeTableType.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChangeTableType.java index 74ece6a..659e6e5 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4ChangeTableType.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ChangeTableType.java @@ -21,14 +21,14 @@ import org.slf4j.LoggerFactory; * href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it * */ -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; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4CodelistMapping.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4CodelistMapping.java similarity index 91% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4CodelistMapping.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4CodelistMapping.java index f1c4908..2789d7c 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4CodelistMapping.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4CodelistMapping.java @@ -21,15 +21,15 @@ import org.slf4j.LoggerFactory; * href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it * */ -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; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4DeleteColumn.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4DeleteColumn.java similarity index 90% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4DeleteColumn.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4DeleteColumn.java index e109f11..473ffbb 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4DeleteColumn.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4DeleteColumn.java @@ -22,14 +22,14 @@ import org.slf4j.LoggerFactory; * href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it * */ -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; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4DeleteRows.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4DeleteRows.java similarity index 91% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4DeleteRows.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4DeleteRows.java index af2388f..729ce95 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4DeleteRows.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4DeleteRows.java @@ -22,14 +22,14 @@ import org.slf4j.LoggerFactory; * href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it * */ -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; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4Duplicates.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Duplicates.java similarity index 94% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4Duplicates.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Duplicates.java index aa671f7..2ad5cad 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4Duplicates.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Duplicates.java @@ -27,14 +27,14 @@ import org.slf4j.LoggerFactory; * href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it * */ -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; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4EditRow.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4EditRow.java similarity index 92% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4EditRow.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4EditRow.java index 05f0212..489517a 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4EditRow.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4EditRow.java @@ -25,14 +25,14 @@ import org.slf4j.LoggerFactory; * href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it * */ -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; } diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4ExtractCodelist.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ExtractCodelist.java similarity index 91% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4ExtractCodelist.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ExtractCodelist.java index 14eafa6..9ab1f15 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4ExtractCodelist.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ExtractCodelist.java @@ -23,15 +23,15 @@ import org.slf4j.LoggerFactory; * href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it * */ -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; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4LabelColumn.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4LabelColumn.java similarity index 91% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4LabelColumn.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4LabelColumn.java index cae67b1..c597c65 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4LabelColumn.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4LabelColumn.java @@ -22,14 +22,14 @@ import org.slf4j.LoggerFactory; * href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it * */ -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; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4MergeColumn.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4MergeColumn.java similarity index 93% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4MergeColumn.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4MergeColumn.java index 6340aeb..fb5f752 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4MergeColumn.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4MergeColumn.java @@ -25,14 +25,14 @@ import org.slf4j.LoggerFactory; * href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it * */ -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; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4ReplaceBatch.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceBatch.java similarity index 94% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4ReplaceBatch.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceBatch.java index 067c1df..6e2eb95 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4ReplaceBatch.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceBatch.java @@ -26,14 +26,14 @@ import org.slf4j.LoggerFactory; * email: g.panichi@isti.cnr.it * */ -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; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4ReplaceColumn.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceColumn.java similarity index 94% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4ReplaceColumn.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceColumn.java index f2dab5e..bf4a836 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4ReplaceColumn.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceColumn.java @@ -23,14 +23,14 @@ import org.slf4j.LoggerFactory; * href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it * */ -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; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4SplitColumn.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SplitColumn.java similarity index 94% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4SplitColumn.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SplitColumn.java index 55400b6..cbb2256 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecution4SplitColumn.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SplitColumn.java @@ -26,14 +26,14 @@ import org.slf4j.LoggerFactory; * href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it * */ -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; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecutionBuilder.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecutionBuilder.java similarity index 68% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecutionBuilder.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecutionBuilder.java index 5f4d4ce..1ee4f28 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecutionBuilder.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecutionBuilder.java @@ -9,14 +9,14 @@ import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceExcept * email: g.panichi@isti.cnr.it * */ -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(); } diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecutionDirector.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecutionDirector.java similarity index 78% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecutionDirector.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecutionDirector.java index 364e9d1..eb97967 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecutionDirector.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecutionDirector.java @@ -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: g.panichi@isti.cnr.it * */ -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 getListOperationExecution() { + public ArrayList getListOperationExecution() { return operationExecutionBuilder.getOperationExecutionSpec().getOps(); } diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecutionSpec.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecutionSpec.java similarity index 51% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecutionSpec.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecutionSpec.java index 5b21956..84c2ffa 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OperationExecutionSpec.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecutionSpec.java @@ -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: g.panichi@isti.cnr.it + * + */ +public class OpExecutionSpec { private OperationExecution op; - private List ops; + private ArrayList ops; + public OperationExecution getOp() { return op; } + public void setOp(OperationExecution op) { this.op = op; } - public List getOps() { + + public ArrayList getOps() { return ops; } - public void setOps(List ops) { + + public void setOps(ArrayList ops) { this.ops = ops; } - - - - - - + }