gCubeSystem
/
perform-service_broken
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/application/perform-service@177188 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Fabio Sinibaldi 2019-02-19 17:18:50 +00:00
parent 76b8d6f4ee
commit a845d703b0
11 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/application/perform/service/rest/Performance.java
View File

@ -59,7 +59,7 @@ public class Performance {
request.addAreas(InterfaceCommons.getParameter(parameters, ServiceConstants.Performance.AREA_PARAMETER, false));
request.addQuarters(InterfaceCommons.getParameter(parameters, ServiceConstants.Performance.QUARTER_PARAMETER, false));
List<String> farmidsString=InterfaceCommons.getParameter(parameters, ServiceConstants.Performance.FARM_ID_PARAMETER, true);
List<String> farmidsString=InterfaceCommons.getParameter(parameters, ServiceConstants.Performance.FARM_ID_PARAMETER, false);
log.debug("FARMIDS : ",farmidsString);
for(String s:farmidsString) {
log.debug("Parsing {} ",s);

1
src/main/webapp/WEB-INF/schema/GROW_OUT_AGGREGATED/Anagraphic.properties
View File

@ -1,3 +1,4 @@
description=AnagraphicTable
routine=internal_routine_id
enable_analysis=false
csv=csv/GROW_OUT_AGGREGATED_anagraphic.csv

1
src/main/webapp/WEB-INF/schema/GROW_OUT_AGGREGATED_CLOSED_BATCHES/Anagraphic.properties
View File

@ -1,3 +1,4 @@
description=AnagraphicTable
routine=internal_routine_id
enable_analysis=false
csv=csv/GROW_OUT_AGGREGATED_anagraphic.csv

1
src/main/webapp/WEB-INF/schema/GROW_OUT_INDIVIDUAL/Anagraphic.properties
View File

@ -1,3 +1,4 @@
description=AnagraphicTable
routine=internal_routine_id
enable_analysis=false
csv=csv/GROW_OUT_INDIVIDUAL_anagraphic.csv

1
src/main/webapp/WEB-INF/schema/GROW_OUT_INDIVIDUAL_CLOSED_BATCHES/Anagraphic.properties
View File

@ -1,3 +1,4 @@
description=AnagraphicTable
routine=internal_routine_id
enable_analysis=false
csv=csv/GROW_OUT_INDIVIDUAL_anagraphic.csv

1
src/main/webapp/WEB-INF/schema/HATCHERY_AGGREGATED/Anagraphic.properties
View File

@ -1,3 +1,4 @@
description=AnagraphicTable
routine=internal_routine_id
enable_analysis=false
csv=csv/HATCHERY_AGGREGATED_anagraphic.csv

1
src/main/webapp/WEB-INF/schema/HATCHERY_INDIVIDUAL/Anagraphic.properties
View File

@ -1,3 +1,4 @@
description=AnagraphicTable
routine=internal_routine_id
enable_analysis=false
csv=csv/HATCHERY_INDIVIDUAL_anagraphic.csv

1
src/main/webapp/WEB-INF/schema/HATCHERY_INDIVIDUAL_CLOSED_BATCHES/Anagraphic.properties
View File

@ -1,3 +1,4 @@
description=AnagraphicTable
routine=internal_routine_id
enable_analysis=false
csv=csv/HATCHERY_INDIVIDUAL_CLOSED_BATCHES_anagraphic.csv

1
src/main/webapp/WEB-INF/schema/PRE_ONGROWING/Anagraphic.properties
View File

@ -1,3 +1,4 @@
description=AnagraphicTable
routine=internal_routine_id
enable_analysis=false
csv=csv/PRE_ONGROWING_anagraphic.csv

1
src/main/webapp/WEB-INF/schema/PRE_ONGROWING_CLOSED_BATCHES/Anagraphic.properties
View File

@ -1,3 +1,4 @@
description=AnagraphicTable
routine=internal_routine_id
enable_analysis=false
csv=csv/PRE_ONGROWING_anagraphic.csv

8
src/test/java/org/gcube/application/perform/service/PerformanceTest.java
View File

@ -30,15 +30,15 @@ public class PerformanceTest extends CommonTest{
File folder= Files.createTempDir();
// for(AnalysisType analysis:PerformanceManagerImpl.getAnalysisConfiguration().keySet()) {
AnalysisType analysis=new AnalysisType("GROW_OUT_INDIVIDUAL","GROW_OUT_INDIVIDUAL");
for(AnalysisType analysis:PerformanceManagerImpl.getAnalysisConfiguration().keySet()) {
// AnalysisType analysis=new AnalysisType("GROW_OUT_INDIVIDUAL","GROW_OUT_INDIVIDUAL");
WebTarget target=
target(ServiceConstants.Performance.PATH).
// queryParam(ServiceConstants.Performance.AREA_PARAMETER, "A1","A2").
//// queryParam(ServiceConstants.Performance.QUARTER_PARAMETER, "Q1","Q2").
// queryParam(ServiceConstants.Performance.SPECIES_ID_PARAMETER, "Gadilidae","Tonno").
// queryParam(ServiceConstants.Performance.PERIOD_PARAMETER, "First","Spring").
queryParam(ServiceConstants.Performance.FARM_ID_PARAMETER, "12682549").
// queryParam(ServiceConstants.Performance.FARM_ID_PARAMETER, "12682549").
queryParam(ServiceConstants.Performance.BATCH_TYPE_PARAMETER, analysis.getId());
System.out.println(target.getUri());
@ -58,7 +58,7 @@ public class PerformanceTest extends CommonTest{
// System.out.println(analysis.getId()+" "+resp.getStatus() + " : "+ resp.readEntity(String.class));
// }
}
System.out.println("Wrote to : "+ folder.getAbsolutePath());
}