Added check on tabular resource of type flow
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@100985 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
ea14059285
commit
64bd8edf11
|
@ -3901,6 +3901,12 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
return parameterInstances;
|
return parameterInstances;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @param trId
|
||||||
|
* @throws TDGWTServiceException
|
||||||
|
*/
|
||||||
protected void checkTRId(TRId trId) throws TDGWTServiceException {
|
protected void checkTRId(TRId trId) throws TDGWTServiceException {
|
||||||
if (trId == null) {
|
if (trId == null) {
|
||||||
logger.error("TRId is null");
|
logger.error("TRId is null");
|
||||||
|
@ -4038,6 +4044,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
|
|
||||||
// Export SDMX Codelist
|
// Export SDMX Codelist
|
||||||
|
@ -4110,6 +4117,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
|
|
||||||
OpExecution4CSVExport opEx = new OpExecution4CSVExport(session,
|
OpExecution4CSVExport opEx = new OpExecution4CSVExport(session,
|
||||||
|
@ -4183,6 +4191,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
|
|
||||||
OpExecution4JSONExport opEx = new OpExecution4JSONExport(session,
|
OpExecution4JSONExport opEx = new OpExecution4JSONExport(session,
|
||||||
|
@ -4249,6 +4258,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
checkTabularResourceIsFinal(tabularResource);
|
checkTabularResourceIsFinal(tabularResource);
|
||||||
|
|
||||||
|
@ -4309,6 +4319,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
checkTabularResourceIsFinal(tabularResource);
|
checkTabularResourceIsFinal(tabularResource);
|
||||||
|
|
||||||
|
@ -4370,6 +4381,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
checkTabularResourceIsFinal(tabularResource);
|
checkTabularResourceIsFinal(tabularResource);
|
||||||
|
|
||||||
|
@ -4446,6 +4458,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
checkTabularResourceIsFinal(tabularResource);
|
checkTabularResourceIsFinal(tabularResource);
|
||||||
|
|
||||||
|
@ -4523,6 +4536,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
checkTabularResourceIsFinal(tabularResource);
|
checkTabularResourceIsFinal(tabularResource);
|
||||||
|
|
||||||
|
@ -4594,6 +4608,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
checkTabularResourceIsFinal(tabularResource);
|
checkTabularResourceIsFinal(tabularResource);
|
||||||
|
|
||||||
|
@ -4657,6 +4672,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
checkTabularResourceIsFinal(tabularResource);
|
checkTabularResourceIsFinal(tabularResource);
|
||||||
|
|
||||||
|
@ -4836,6 +4852,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
checkTabularResourceIsFinal(tabularResource);
|
checkTabularResourceIsFinal(tabularResource);
|
||||||
|
|
||||||
|
@ -4986,6 +5003,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
checkTabularResourceIsFinal(tabularResource);
|
checkTabularResourceIsFinal(tabularResource);
|
||||||
|
|
||||||
|
@ -5246,6 +5264,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
Long.valueOf(tabResource.getTrId().getId()));
|
Long.valueOf(tabResource.getTrId().getId()));
|
||||||
TabularResource tr = service.getTabularResource(tabularResourceId);
|
TabularResource tr = service.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
|
||||||
checkTabularResourceLocked(tr);
|
checkTabularResourceLocked(tr);
|
||||||
checkTabularResourceIsFinal(tr);
|
checkTabularResourceIsFinal(tr);
|
||||||
|
|
||||||
|
@ -5609,6 +5628,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
checkTabularResourceIsFinal(tabularResource);
|
checkTabularResourceIsFinal(tabularResource);
|
||||||
|
|
||||||
|
@ -5675,6 +5695,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
checkTabularResourceIsFinal(tabularResource);
|
checkTabularResourceIsFinal(tabularResource);
|
||||||
|
|
||||||
|
@ -6016,6 +6037,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
checkTabularResourceIsFinal(tabularResource);
|
checkTabularResourceIsFinal(tabularResource);
|
||||||
|
|
||||||
|
@ -6123,6 +6145,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
checkTabularResourceIsFinal(tabularResource);
|
checkTabularResourceIsFinal(tabularResource);
|
||||||
|
|
||||||
|
@ -6274,6 +6297,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
checkTabularResourceIsFinal(tabularResource);
|
checkTabularResourceIsFinal(tabularResource);
|
||||||
|
|
||||||
|
@ -6387,6 +6411,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
checkTabularResourceIsFinal(tabularResource);
|
checkTabularResourceIsFinal(tabularResource);
|
||||||
|
|
||||||
|
@ -6446,6 +6471,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
checkTabularResourceIsFinal(tabularResource);
|
checkTabularResourceIsFinal(tabularResource);
|
||||||
|
|
||||||
|
@ -6595,6 +6621,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
|
|
||||||
OpExecution4ExtractCodelist opEx = new OpExecution4ExtractCodelist(
|
OpExecution4ExtractCodelist opEx = new OpExecution4ExtractCodelist(
|
||||||
|
@ -6659,6 +6686,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
checkTabularResourceIsFinal(tabularResource);
|
checkTabularResourceIsFinal(tabularResource);
|
||||||
|
|
||||||
|
@ -6725,6 +6753,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
checkTabularResourceIsFinal(tabularResource);
|
checkTabularResourceIsFinal(tabularResource);
|
||||||
|
|
||||||
|
@ -6971,6 +7000,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
checkTabularResourceIsFinal(tabularResource);
|
checkTabularResourceIsFinal(tabularResource);
|
||||||
|
|
||||||
|
@ -7018,6 +7048,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
checkTabularResourceIsFinal(tabularResource);
|
checkTabularResourceIsFinal(tabularResource);
|
||||||
|
|
||||||
|
@ -7079,6 +7110,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
checkTabularResourceIsFinal(tabularResource);
|
checkTabularResourceIsFinal(tabularResource);
|
||||||
|
|
||||||
|
@ -7145,6 +7177,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
checkTabularResourceIsFinal(tabularResource);
|
checkTabularResourceIsFinal(tabularResource);
|
||||||
|
|
||||||
|
@ -7207,6 +7240,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
checkTabularResourceIsFinal(tabularResource);
|
checkTabularResourceIsFinal(tabularResource);
|
||||||
|
|
||||||
|
@ -7268,6 +7302,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularResource tabularResource = service
|
TabularResource tabularResource = service
|
||||||
.getTabularResource(tabularResourceId);
|
.getTabularResource(tabularResourceId);
|
||||||
|
|
||||||
|
checkTabularResourceIsFlow(tabularResource);
|
||||||
checkTabularResourceLocked(tabularResource);
|
checkTabularResourceLocked(tabularResource);
|
||||||
|
|
||||||
OpExecution4StatisticalOperation opEx = new OpExecution4StatisticalOperation(service, aslSession,
|
OpExecution4StatisticalOperation opEx = new OpExecution4StatisticalOperation(service, aslSession,
|
||||||
|
|
Loading…
Reference in New Issue