From 286feaeb4713d6d4955bacb6342cdc88cd47e081 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 25 Mar 2014 15:45:28 +0000 Subject: [PATCH] Speeded up the open git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@93529 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../gwtservice/server/TDGWTServiceImpl.java | 338 ++++++++++-------- .../tr/metadata/TRCreationDateMetadata.java | 43 --- .../td/gwtservice/client/TestMetadata.java | 143 ++++---- 3 files changed, 265 insertions(+), 259 deletions(-) delete mode 100644 src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/metadata/TRCreationDateMetadata.java 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 cf37616..75fa01e 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 @@ -125,7 +125,6 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.column.LabelColumnSession import org.gcube.portlets.user.td.gwtservice.shared.tr.column.type.ChangeColumnTypeMonitor; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.type.ChangeColumnTypeSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRAgencyMetadata; -import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRCreationDateMetadata; import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRDescriptionMetadata; import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRLocalizedText; import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRMetadata; @@ -236,13 +235,13 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements "CURRENT_TABULAR_RESOURCE is null"); } logger.debug("GetTabResourceInformation():" + currentTR.toString()); - - if(currentTR.getTrId()==null){ + + if (currentTR.getTrId() == null) { logger.error("CURRENT_TABULAR_RESOURCE has TRId null"); throw new TDGWTServiceException( "CURRENT_TABULAR_RESOURCE has TRId null"); } - + ArrayList trMetadatas = getTRMetadata(currentTR .getTrId()); updateTabResourceInformation(currentTR, trMetadatas); @@ -273,16 +272,16 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements @SuppressWarnings("unused") HttpSession session = this.getThreadLocalRequest().getSession(); // ASLSession aslSession = SessionUtil.getAslSession(session); - if(trId==null){ + if (trId == null) { logger.error("GetTabularREsourceInformation TRId is null"); throw new TDGWTServiceException( "GetTabularREsourceInformation TRId is null"); } - + logger.debug("GetTabResourceInformation:" + trId.toString()); TabResource currentTR = new TabResource(); currentTR.setTrId(trId); - + ArrayList trMetadatas = getTRMetadata(currentTR .getTrId()); updateTabResourceInformation(currentTR, trMetadatas); @@ -316,18 +315,12 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements tabResource.setAgency(((TRAgencyMetadata) trMetadata) .getValue()); } else { - if (trMetadata instanceof TRCreationDateMetadata) { + if (trMetadata instanceof TRRightsMetadata) { tabResource - .setDate(((TRCreationDateMetadata) trMetadata) - .getDate()); + .setRight(((TRRightsMetadata) trMetadata) + .getValue()); } else { - if (trMetadata instanceof TRRightsMetadata) { - tabResource - .setRight(((TRRightsMetadata) trMetadata) - .getValue()); - } else { - } } } @@ -604,7 +597,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements try { HttpSession session = this.getThreadLocalRequest().getSession(); ASLSession aslSession = SessionUtil.getAslSession(session); - logger.debug("getLastTable: "+trId); + logger.debug("getLastTable: " + trId); AuthorizationProvider.instance.set(new AuthorizationToken( aslSession.getUsername())); TabularDataService service = TabularDataServiceFactory.getService(); @@ -613,7 +606,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements .valueOf(trId.getId()))); TableData tData = new TableData(); - + tData.setName(table.getName()); tData.setTypeName(table.getTableType().getName()); tData.setTypeCode(table.getTableType().getCode()); @@ -637,7 +630,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } tData.setListColumnData(lColumnData); - logger.debug("getLastTable: "+tData); + logger.debug("getLastTable: " + tData); return tData; } catch (Throwable e) { @@ -748,9 +741,10 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements * @param tr * @throws TDGWTServiceException */ - protected void retrieveTRMetadataFromService(TabularDataService service, - TabularResource tr) throws TDGWTServiceException { - retrieveTRMetadataFromService(service, tr, 0); + protected void retrieveTRMetadataFromServiceAndLastTable( + TabularDataService service, TabularResource tr) + throws TDGWTServiceException { + retrieveTRMetadataFromServiceAndLastTable(service, tr, 0); } /** @@ -766,18 +760,48 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements protected TabResource retrieveTRMetadataFromService( TabularDataService service, TabularResource tr, int i) throws TDGWTServiceException { - TRId trId; - TabResource t; - trId = new TRId(String.valueOf(tr.getId().getValue())); - trId.setTabularResourceType(tr.getTableType()); - t = getTabResourceInformation(trId); - t.setId(String.valueOf(i)); + try { + TabResource t = new TabResource(); + TRId trId = new TRId(String.valueOf(tr.getId().getValue())); + trId.setTabularResourceType(tr.getTableType()); + t.setId(String.valueOf(i)); + t.setTrId(trId); + if (tr.contains(NameMetadata.class)) { + NameMetadata nameMeta = tr.getMetadata(NameMetadata.class); + if (nameMeta != null && nameMeta.getValue() != null) { + t.setName(nameMeta.getValue()); + } else { + t.setName("Unknown_" + trId.getId()); + } + } else { + t.setName("Unknown_" + trId.getId()); + } + if (tr.contains(AgencyMetadata.class)) { + AgencyMetadata agencyMeta = tr + .getMetadata(AgencyMetadata.class); + if (agencyMeta != null && agencyMeta.getValue() != null) { + t.setAgency(agencyMeta.getValue()); + } else { + t.setAgency(""); + } + } else { + t.setAgency(""); + } + t.setDate(sdf.format(tr.getCreationDate().getTime())); + //logger.debug("TabResource: "+t); + return t; - return t; + } catch (Throwable e) { + logger.error("Error retrieving tabular resources metadata in retrieveTRMetadataFromService(): " + + e.getLocalizedMessage()); + e.printStackTrace(); + throw new TDGWTServiceException("Error retrieving tabular resources metadata in retrieveTRMetadataFromService() on server"); + } } - + /** - * Retrieves the informations for a specific Tabular Resource and the Last Table from service + * Retrieves the informations for a specific Tabular Resource and the Last + * Table from service * * @param tr * TabularResource on service @@ -826,7 +850,6 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return t; } - /** * @@ -1192,7 +1215,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements /** * * {@inheritDoc} - */ + */ @Override public ArrayList getTabularResourcesAndLastTables() throws TDGWTServiceException { @@ -1212,10 +1235,10 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements int i; for (i = 0; i < trs.size(); i++) { TabularResource tr = trs.get(i); - logger.debug("GetTabularResources RetrieveMetadata"); + logger.debug("GetTabularResources RetrieveMetadataAndLastTables"); try { - TabResource t = retrieveTRMetadataFromServiceAndLastTable(service, tr, - i); + TabResource t = retrieveTRMetadataFromServiceAndLastTable( + service, tr, i); if (t.getTrId() != null) { ltr.add(t); @@ -1239,7 +1262,6 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } - /** * * @@ -1264,7 +1286,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements int i; for (i = 0; i < trs.size(); i++) { TabularResource tr = trs.get(i); - logger.debug("GetTabularResources RetrieveMetadata"); + //logger.debug("GetTabularResources RetrieveMetadata"); try { TabResource t = retrieveTRMetadataFromService(service, tr, i); @@ -1290,7 +1312,6 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } } - /** * @@ -1507,12 +1528,12 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements TabularResourceId tabularResourceId = new TabularResourceId( new Long(trId.getId())); TabularResource tr = service.getTabularResource(tabularResourceId); - Table table=service.getLastTable(tabularResourceId); - + Table table = service.getLastTable(tabularResourceId); + trId.setTabularResourceType(tr.getTableType()); trId.setTableId(String.valueOf(table.getId().getValue())); trId.setTableType(table.getTableType().getName()); - + logger.debug("Retrieved TRId type:" + trId.toString()); return trId; @@ -1556,15 +1577,18 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements importMonitor.setStatus(TaskStateMap.map(task .getStatus())); - //Table table; + // Table table; switch (importMonitor.getStatus()) { case SUCCEDED: importMonitor.setProgress(task.getProgress()); logger.debug("Task Result: " + task.getResult()); - /*table = task.getResult().getPrimaryTable(); - trId.setTableId(String.valueOf(table.getId() - .getValue())); - trId.setTableType(table.getTableType().getName());*/ + /* + * table = task.getResult().getPrimaryTable(); + * trId.setTableId(String.valueOf(table.getId() + * .getValue())); + * trId.setTableType(table.getTableType + * ().getName()); + */ retrieveTabularResourceBasicData(trId); sdmxImportTabResource.setTrId(trId); @@ -1590,10 +1614,13 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements case STOPPED: importMonitor.setProgress(task.getProgress()); logger.debug("Task Result: " + task.getResult()); - /*table = task.getResult().getPrimaryTable(); - trId.setTableId(String.valueOf(table.getId() - .getValue())); - trId.setTableType(table.getTableType().getName());*/ + /* + * table = task.getResult().getPrimaryTable(); + * trId.setTableId(String.valueOf(table.getId() + * .getValue())); + * trId.setTableType(table.getTableType + * ().getName()); + */ retrieveTabularResourceBasicData(trId); sdmxImportTabResource.setTrId(trId); @@ -1977,11 +2004,15 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements case SUCCEDED: logger.debug("Task Result: " + task.getResult()); importMonitor.setProgress(task.getProgress()); - /*table = task.getResult().getPrimaryTable(); - logger.debug("Table retrived: " + table.toString()); - trId.setTableId(String.valueOf(table.getId() - .getValue())); - trId.setTableType(table.getTableType().getName());*/ + /* + * table = task.getResult().getPrimaryTable(); + * logger.debug("Table retrived: " + + * table.toString()); + * trId.setTableId(String.valueOf(table.getId() + * .getValue())); + * trId.setTableType(table.getTableType + * ().getName()); + */ retrieveTabularResourceBasicData(trId); csvImportTabResource.setTrId(trId); @@ -2168,7 +2199,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements try { HttpSession session = this.getThreadLocalRequest().getSession(); ASLSession aslSession = SessionUtil.getAslSession(session); - + logger.debug("GetTRMetadata on " + trId); AuthorizationProvider.instance.set(new AuthorizationToken( @@ -3226,9 +3257,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements trId = new TRId(); trId.setId(changeColumnTypeSession.getColumnData() .getTrId().getId()); - /*trId.setTableId(String - .valueOf(table.getId().getValue())); - trId.setTableType(table.getTableType().getName());*/ + /* + * trId.setTableId(String + * .valueOf(table.getId().getValue())); + * trId.setTableType(table.getTableType().getName()); + */ retrieveTabularResourceBasicData(trId); changeColumnTypeMonitor.setTrId(trId); @@ -3251,9 +3284,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements trId = new TRId(); trId.setId(changeColumnTypeSession.getColumnData() .getTrId().getId()); - /*trId.setTableId(String - .valueOf(table.getId().getValue())); - trId.setTableType(table.getTableType().getName());*/ + /* + * trId.setTableId(String + * .valueOf(table.getId().getValue())); + * trId.setTableType(table.getTableType().getName()); + */ retrieveTabularResourceBasicData(trId); changeColumnTypeMonitor.setTrId(trId); @@ -3374,9 +3409,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements trId = new TRId(); trId.setId(deleteColumnSession.getColumnData() .getTrId().getId()); - /*trId.setTableId(String - .valueOf(table.getId().getValue())); - trId.setTableType(table.getTableType().getName());*/ + /* + * trId.setTableId(String + * .valueOf(table.getId().getValue())); + * trId.setTableType(table.getTableType().getName()); + */ retrieveTabularResourceBasicData(trId); deleteColumnMonitor.setTrId(trId); @@ -3401,9 +3438,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements trId = new TRId(); trId.setId(deleteColumnSession.getColumnData() .getTrId().getId()); - /*trId.setTableId(String - .valueOf(table.getId().getValue())); - trId.setTableType(table.getTableType().getName());*/ + /* + * trId.setTableId(String + * .valueOf(table.getId().getValue())); + * trId.setTableType(table.getTableType().getName()); + */ retrieveTabularResourceBasicData(trId); deleteColumnMonitor.setTrId(trId); @@ -3525,9 +3564,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements trId = new TRId(); trId.setId(labelColumnSession.getColumnData().getTrId() .getId()); - /*trId.setTableId(String - .valueOf(table.getId().getValue())); - trId.setTableType(table.getTableType().getName());*/ + /* + * trId.setTableId(String + * .valueOf(table.getId().getValue())); + * trId.setTableType(table.getTableType().getName()); + */ retrieveTabularResourceBasicData(trId); labelColumnMonitor.setTrId(trId); @@ -3552,9 +3593,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements trId = new TRId(); trId.setId(labelColumnSession.getColumnData().getTrId() .getId()); - /*trId.setTableId(String - .valueOf(table.getId().getValue())); - trId.setTableType(table.getTableType().getName());*/ + /* + * trId.setTableId(String + * .valueOf(table.getId().getValue())); + * trId.setTableType(table.getTableType().getName()); + */ retrieveTabularResourceBasicData(trId); labelColumnMonitor.setTrId(trId); @@ -3677,9 +3720,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("Table retrived: " + table.toString()); trId = new TRId(); trId.setId(changeTableTypeSession.getTrId().getId()); - /*trId.setTableId(String - .valueOf(table.getId().getValue())); - trId.setTableType(table.getTableType().getName());*/ + /* + * trId.setTableId(String + * .valueOf(table.getId().getValue())); + * trId.setTableType(table.getTableType().getName()); + */ retrieveTabularResourceBasicData(trId); changeTableTypeMonitor.setTrId(trId); @@ -3703,9 +3748,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("Table retrived: " + table.toString()); trId = new TRId(); trId.setId(changeTableTypeSession.getTrId().getId()); - /*trId.setTableId(String - .valueOf(table.getId().getValue())); - trId.setTableType(table.getTableType().getName());*/ + /* + * trId.setTableId(String + * .valueOf(table.getId().getValue())); + * trId.setTableType(table.getTableType().getName()); + */ retrieveTabularResourceBasicData(trId); changeTableTypeMonitor.setTrId(trId); @@ -3978,7 +4025,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements deleteRowsMonitor.setStatus(TaskStateMap.map(task .getStatus())); - //Table table; + // Table table; TRId trId; TabResource tabResource; switch (deleteRowsMonitor.getStatus()) { @@ -3998,11 +4045,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements case SUCCEDED: logger.debug("Task Result:" + task.getResult()); deleteRowsMonitor.setProgress(task.getProgress()); - //table = task.getResult().getPrimaryTable(); - //logger.debug("Table retrived: " + table.toString()); + // table = task.getResult().getPrimaryTable(); + // logger.debug("Table retrived: " + table.toString()); trId = new TRId(); trId.setId(deleteRowsSession.getTrId().getId()); - + retrieveTabularResourceBasicData(trId); deleteRowsMonitor.setTrId(trId); @@ -4022,13 +4069,15 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements case STOPPED: logger.debug("Task Result:" + task.getResult()); deleteRowsMonitor.setProgress(task.getProgress()); - //table = task.getResult().getPrimaryTable(); - //logger.debug("Table retrived: " + table.toString()); + // table = task.getResult().getPrimaryTable(); + // logger.debug("Table retrived: " + table.toString()); trId = new TRId(); trId.setId(deleteRowsSession.getTrId().getId()); - /*trId.setTableId(String - .valueOf(table.getId().getValue())); - trId.setTableType(table.getTableType().getName());*/ + /* + * trId.setTableId(String + * .valueOf(table.getId().getValue())); + * trId.setTableType(table.getTableType().getName()); + */ retrieveTabularResourceBasicData(trId); deleteRowsMonitor.setTrId(trId); @@ -4082,10 +4131,10 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements Table table = service.getLastTable(serviceTR); TRId trId = new TRId( - new Long(cloned.getId().getValue()).toString(), - cloned.getTableType(), - new Long( - table.getId().getValue()).toString(), table.getTableType().getName()); + new Long(cloned.getId().getValue()).toString(), + cloned.getTableType(), + new Long(table.getId().getValue()).toString(), table + .getTableType().getName()); TabResource tabResource = new TabResource(); tabResource.setTrId(trId); @@ -4194,9 +4243,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("Table retrived: " + table.toString()); trId = new TRId(); trId.setId(duplicatesSession.getTrId().getId()); - /*trId.setTableId(String - .valueOf(table.getId().getValue())); - trId.setTableType(table.getTableType().getName());*/ + /* + * trId.setTableId(String + * .valueOf(table.getId().getValue())); + * trId.setTableType(table.getTableType().getName()); + */ retrieveTabularResourceBasicData(trId); duplicatesMonitor.setTrId(trId); @@ -4220,9 +4271,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("Table retrived: " + table.toString()); trId = new TRId(); trId.setId(duplicatesSession.getTrId().getId()); - /*trId.setTableId(String - .valueOf(table.getId().getValue())); - trId.setTableType(table.getTableType().getName());*/ + /* + * trId.setTableId(String + * .valueOf(table.getId().getValue())); + * trId.setTableType(table.getTableType().getName()); + */ retrieveTabularResourceBasicData(trId); duplicatesMonitor.setTrId(trId); @@ -4405,7 +4458,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } } - + /** * * {@inheritDoc} @@ -4420,11 +4473,12 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements aslSession.getUsername())); TabularDataService service = TabularDataServiceFactory.getService(); - List templateDescriptorList=service.getTemplates(); - ArrayList templateDataList=new ArrayList(); + List templateDescriptorList = service + .getTemplates(); + ArrayList templateDataList = new ArrayList(); TemplateData templateData; - for(TemplateDescription desc:templateDescriptorList){ - templateData=new TemplateData(); + for (TemplateDescription desc : templateDescriptorList) { + templateData = new TemplateData(); templateData.setId(desc.getId()); templateData.setName(desc.getName()); templateData.setDescription(desc.getDescription()); @@ -4432,11 +4486,10 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements templateDataList.add(templateData); } logger.debug("Retrieved TemplateData List"); - + return templateDataList; } catch (Throwable e) { - logger.debug("Error in GetTemplates: " - + e.getLocalizedMessage()); + logger.debug("Error in GetTemplates: " + e.getLocalizedMessage()); e.printStackTrace(); throw new TDGWTServiceException( "Error in GetOccurencesForBatchReplace: " @@ -4445,47 +4498,47 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } - /** * * {@inheritDoc} */ @Override - public void startTemplateApply(TemplateApplySession templateApplySession) throws TDGWTServiceException { + public void startTemplateApply(TemplateApplySession templateApplySession) + throws TDGWTServiceException { try { HttpSession session = this.getThreadLocalRequest().getSession(); ASLSession aslSession = SessionUtil.getAslSession(session); - logger.debug("startTemplateApply: "+ templateApplySession); + logger.debug("startTemplateApply: " + templateApplySession); SessionUtil.setTemplateApplySession(session, templateApplySession); - + AuthorizationProvider.instance.set(new AuthorizationToken( aslSession.getUsername())); TabularDataService service = TabularDataServiceFactory.getService(); - - TemplateId templateId=new TemplateId(templateApplySession.getTemplateData().getId()); - TabularResourceId tabularResourceId=new TabularResourceId(new Long(templateApplySession.getTrId().getId())); - Task task=service.applyTemplate(templateId, tabularResourceId); + + TemplateId templateId = new TemplateId(templateApplySession + .getTemplateData().getId()); + TabularResourceId tabularResourceId = new TabularResourceId( + new Long(templateApplySession.getTrId().getId())); + Task task = service.applyTemplate(templateId, tabularResourceId); logger.debug("startTemplateApply task start"); SessionUtil.setTemplateApplyTask(session, task); - + } catch (Throwable e) { - logger.debug("Error StartTemplateApply: " - + e.getLocalizedMessage()); + logger.debug("Error StartTemplateApply: " + e.getLocalizedMessage()); e.printStackTrace(); - throw new TDGWTServiceException( - "Error StartTemplateApply: " - + e.getLocalizedMessage()); + throw new TDGWTServiceException("Error StartTemplateApply: " + + e.getLocalizedMessage()); } - } - + /** * * {@inheritDoc} */ @Override - public TemplateApplyMonitor getTemplateApplyMonitor() throws TDGWTServiceException { + public TemplateApplyMonitor getTemplateApplyMonitor() + throws TDGWTServiceException { try { HttpSession session = this.getThreadLocalRequest().getSession(); TemplateApplySession templateApplySession = SessionUtil @@ -4508,7 +4561,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements templateApplyMonitor.setStatus(TaskStateMap.map(task .getStatus())); - + TRId trId; TabResource tabResource; switch (templateApplyMonitor.getStatus()) { @@ -4528,10 +4581,10 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements case SUCCEDED: logger.debug("Task Result:" + task.getResult()); templateApplyMonitor.setProgress(task.getProgress()); - + trId = new TRId(); trId.setId(templateApplySession.getTrId().getId()); - + retrieveTabularResourceBasicData(trId); templateApplyMonitor.setTrId(trId); @@ -4551,11 +4604,10 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements case STOPPED: logger.debug("Task Result:" + task.getResult()); templateApplyMonitor.setProgress(task.getProgress()); - - + trId = new TRId(); trId.setId(templateApplySession.getTrId().getId()); - + retrieveTabularResourceBasicData(trId); templateApplyMonitor.setTrId(trId); @@ -4583,8 +4635,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } } - - + /** * * {@inheritDoc} @@ -4595,18 +4646,18 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements try { HttpSession session = this.getThreadLocalRequest().getSession(); ASLSession aslSession = SessionUtil.getAslSession(session); - logger.debug("startTemplateDelete: "+ templateDeleteSession); - + logger.debug("startTemplateDelete: " + templateDeleteSession); + AuthorizationProvider.instance.set(new AuthorizationToken( aslSession.getUsername())); TabularDataService service = TabularDataServiceFactory.getService(); - + TemplateId templateId; - for(TemplateData template: templateDeleteSession.getTemplates()){ - templateId=new TemplateId(template.getId()); - service.remove(templateId); + for (TemplateData template : templateDeleteSession.getTemplates()) { + templateId = new TemplateId(template.getId()); + service.remove(templateId); } - + } catch (NoSuchTemplateException e) { logger.debug("Error StartTemplateDelete: No such Template"); e.printStackTrace(); @@ -4616,13 +4667,10 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("Error StartTemplateDelete: " + e.getLocalizedMessage()); e.printStackTrace(); - throw new TDGWTServiceException( - "Error StartTemplateDelete: " - + e.getLocalizedMessage()); + throw new TDGWTServiceException("Error StartTemplateDelete: " + + e.getLocalizedMessage()); } - } - } diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/metadata/TRCreationDateMetadata.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/metadata/TRCreationDateMetadata.java deleted file mode 100644 index 2741b0c..0000000 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/metadata/TRCreationDateMetadata.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.gcube.portlets.user.td.gwtservice.shared.tr.metadata; - - - -/** - * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it - * - */ -public class TRCreationDateMetadata implements TRMetadata { - - - private static final long serialVersionUID = -431795849858460198L; - String id="CreationDateMetadata"; - String title="Creation Date"; - - private String date; - - public String getDate() { - return date; - } - - public void setDate(String date) { - this.date = date; - } - - @Override - public String toString() { - return "TRCreationDateMetadata [date=" + date + "]"; - } - - - public String getId() { - return id; - } - - public String getTitle() { - return title; - } - - -} diff --git a/src/test/java/org/gcube/portlets/user/td/gwtservice/client/TestMetadata.java b/src/test/java/org/gcube/portlets/user/td/gwtservice/client/TestMetadata.java index 2179bc7..0cb2770 100644 --- a/src/test/java/org/gcube/portlets/user/td/gwtservice/client/TestMetadata.java +++ b/src/test/java/org/gcube/portlets/user/td/gwtservice/client/TestMetadata.java @@ -19,7 +19,6 @@ import org.gcube.data.analysis.tabulardata.service.tabular.metadata.TabularResou import org.gcube.portlets.user.td.gwtservice.shared.Constants; import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource; import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRAgencyMetadata; -import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRCreationDateMetadata; import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRDescriptionMetadata; import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRMetadata; import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRNameMetadata; @@ -29,91 +28,100 @@ import org.junit.Test; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * + * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * */ public class TestMetadata { - + protected static SimpleDateFormat sdf = new SimpleDateFormat( "yyyy/MM/dd HH:mm"); - + @Test public void listTR() throws Exception { System.out.println("################ List TR ####################"); ScopeProvider.instance.set(Constants.DEFAULT_SCOPE); - AuthorizationProvider.instance.set(new AuthorizationToken(Constants.DEFAULT_USER)); + AuthorizationProvider.instance.set(new AuthorizationToken( + Constants.DEFAULT_USER)); TabularDataService service = TabularDataServiceFactory.getService(); - + List trs = service.getTabularResources(); Assert.assertTrue(trs.size() > 0); - Table lastTable=null; + Table lastTable = null; for (TabularResource tr : trs) { - lastTable=service.getLastTable(tr.getId()); - if(lastTable!=null){ - System.out.println("TabularResource: [" + tr.getId()+", lastTableId: "+lastTable.getId().getValue()+", lastTableType: "+lastTable.getTableType().getName()+"]"); + lastTable = service.getLastTable(tr.getId()); + if (lastTable != null) { + System.out.println("TabularResource: [" + tr.getId() + + ", lastTableId: " + lastTable.getId().getValue() + + ", lastTableType: " + + lastTable.getTableType().getName() + "]"); System.out.println("--------Column:"); List cols = lastTable.getColumns(); - for(Column c:cols){ + for (Column c : cols) { System.out.println(c.toString()); } - + } else { - System.out.println("TabularResource: [" + tr.getId()+", lastTable: "+lastTable+"]"); - + System.out.println("TabularResource: [" + tr.getId() + + ", lastTable: " + lastTable + "]"); + } - + System.out.println("---------Metadata:"); - - ArrayList metas=showMetadata(tr); - for(TRMetadata meta:metas){ + + ArrayList metas = showMetadata(tr); + for (TRMetadata meta : metas) { System.out.println(meta.toString()); } - System.out.println("############################################################"); - + System.out + .println("############################################################"); + } - - - //TabularResource tr=service.createTabularResource(); + + // TabularResource tr=service.createTabularResource(); // Date date = Calendar.getInstance().getTime(); - - //System.out.println("New TR [id="+tr.getId().getValue()+" date:"+sdf.format(tr.getCreationDate().getTime())+"]"); - //tr.setMetadata(new NameMetadata("Sinatra")); - //tr.setMetadata(new DescriptionMetadata("Sinatra Collection")); - //tr.setMetadata(new RightsMetadata("Sinatra free")); - - //TabResource tabResource=new TabResource(); - //updateTabResourceInformation(tabResource,metas); - //System.out.println("------"); - //System.out.println(tabResource.toString()); - - //showMoreInformation(service); - + + // System.out.println("New TR [id="+tr.getId().getValue()+" date:"+sdf.format(tr.getCreationDate().getTime())+"]"); + // tr.setMetadata(new NameMetadata("Sinatra")); + // tr.setMetadata(new DescriptionMetadata("Sinatra Collection")); + // tr.setMetadata(new RightsMetadata("Sinatra free")); + + // TabResource tabResource=new TabResource(); + // updateTabResourceInformation(tabResource,metas); + // System.out.println("------"); + // System.out.println(tabResource.toString()); + + // showMoreInformation(service); + } - - protected void showMoreInformation(TabularDataService service) throws Exception { + + protected void showMoreInformation(TabularDataService service) + throws Exception { List trs = service.getTabularResources(); Assert.assertTrue(trs.size() > 0); System.out.println("-----More Informations-----"); - Table lastTable=null; - for(TabularResource tr:trs){ - lastTable=service.getLastTable(tr.getId()); - if(lastTable!=null){ - System.out.println("TabularResource: [" + tr.getId()+", lastTableId: "+lastTable.getId().getValue()+" lastTableType:"+lastTable.getTableType().getName()+"]"); + Table lastTable = null; + for (TabularResource tr : trs) { + lastTable = service.getLastTable(tr.getId()); + if (lastTable != null) { + System.out.println("TabularResource: [" + tr.getId() + + ", lastTableId: " + lastTable.getId().getValue() + + " lastTableType:" + + lastTable.getTableType().getName() + "]"); } else { - System.out.println("TabularResource: [" + tr.getId()+", lastTable: "+lastTable+"]"); - + System.out.println("TabularResource: [" + tr.getId() + + ", lastTable: " + lastTable + "]"); + } System.out.println("-----------"); } } - - - protected ArrayList showMetadata(TabularResource tr){ + + protected ArrayList showMetadata(TabularResource tr) { Collection trMetas = tr.getAllMetadata(); - + ArrayList listTRMetadata = new ArrayList(); - + for (TabularResourceMetadata trMetadata : trMetas) { if (trMetadata instanceof org.gcube.data.analysis.tabulardata.service.tabular.metadata.DescriptionMetadata) { TRDescriptionMetadata trDescriptionMetadata = new TRDescriptionMetadata(); @@ -131,9 +139,8 @@ public class TestMetadata { } else { if (trMetadata instanceof AgencyMetadata) { TRAgencyMetadata trAgencyMetadata = new TRAgencyMetadata(); - trAgencyMetadata - .setValue(((AgencyMetadata) trMetadata) - .getValue()); + trAgencyMetadata.setValue(((AgencyMetadata) trMetadata) + .getValue()); listTRMetadata.add(trAgencyMetadata); } else { if (trMetadata instanceof RightsMetadata) { @@ -150,12 +157,11 @@ public class TestMetadata { } } } - - System.out.println("TR Metadata: "+listTRMetadata.toString()); + + System.out.println("TR Metadata: " + listTRMetadata.toString()); return listTRMetadata; } - - + protected void updateTabResourceInformation(TabResource tabResource, ArrayList trMetadatas) { for (TRMetadata trMetadata : trMetadatas) { @@ -171,18 +177,13 @@ public class TestMetadata { tabResource.setAgency(((TRAgencyMetadata) trMetadata) .getValue()); } else { - if (trMetadata instanceof TRCreationDateMetadata) { - tabResource - .setDate(((TRCreationDateMetadata) trMetadata) - .getDate()); - } else { - if (trMetadata instanceof TRRightsMetadata) { - tabResource - .setRight(((TRRightsMetadata) trMetadata) - .getValue()); - } else { - } + if (trMetadata instanceof TRRightsMetadata) { + tabResource + .setRight(((TRRightsMetadata) trMetadata) + .getValue()); + } else { + } } @@ -190,5 +191,5 @@ public class TestMetadata { } } } - + }