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

Compare commits

merge into: gCubeSystem:snap-closed
Branches Tags
gCubeSystem:master
gCubeSystem:Incident_#18568
gCubeSystem:snap-closed
...
pull from: gCubeSystem:master
Branches Tags
gCubeSystem:master
gCubeSystem:Incident_#18568
gCubeSystem:snap-closed

4 Commits
snap-close ... master

Author SHA1 Message Date
Fabio Sinibaldi 11cf88987a Update 'src/test/java/org/gcube/application/perform/service/LoadSchemaTest.java' 
Removed token from comment
 2023-01-18 17:22:36 +01:00
Fabio Sinibaldi 73090605bd Update 'src/main/java/org/gcube/application/perform/service/engine/impl/ImporterImpl.java' 
Remove token from comment
 2023-01-18 15:35:06 +01:00
Fabio Sinibaldi 3bfabe6082 AuthorizationControl integration. Use of allowedUsers 2020-02-10 12:41:21 +01:00
Fabio Sinibaldi 74bbd12c81 AuthorizationControl integration. Use of "allowed Users" 2020-02-10 12:40:44 +01:00
3 changed files with 4 additions and 4 deletions
Show Stats Expand all files Collapse all files

2
src/main/java/org/gcube/application/perform/service/engine/impl/ImporterImpl.java
View File

@ -141,7 +141,7 @@ public class ImporterImpl implements Importer {
private ComputationId submit(ImportRequest request) throws DMException, InvalidRequestException {
/**
* dataminer-prototypes.d4science.org/wps/WebProcessingService?
* request=Execute&service=WPS&Version=1.0.0&gcube-token=***REMOVED***&lang=en-US&
* request=Execute&service=WPS&Version=1.0.0&gcube-token=...&lang=en-US&
* Identifier=org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.transducerers.PERFORMFISH_DATA_EXTRACTOR
* &
* DataInputs=

4
src/main/java/org/gcube/application/perform/service/rest/Mappings.java
View File

@ -58,7 +58,7 @@ public class Mappings {
@GET
@Path(ServiceConstants.Mappings.BATCHES_METHOD)
@Produces(MediaType.APPLICATION_JSON)
@AuthorizationControl(allowed={ServiceConstants.Mappings.AUTH}, exception=MyAuthException.class)
@AuthorizationControl(allowedUsers={ServiceConstants.Mappings.AUTH}, exception=MyAuthException.class)
public Batch getBatch(@QueryParam(ServiceConstants.Mappings.BATCH_NAME_PARAMETER) String name,
@QueryParam(ServiceConstants.Mappings.BATCH_TYPE_PARAMETER) String type,
@QueryParam(ServiceConstants.Mappings.FARM_ID_PARAMETER) Long farmid) {
@ -106,7 +106,7 @@ public class Mappings {
@GET
@Path(ServiceConstants.Mappings.FARM_METHOD)
@Produces(MediaType.APPLICATION_JSON)
@AuthorizationControl(allowed={ServiceConstants.Mappings.AUTH}, exception=MyAuthException.class)
@AuthorizationControl(allowedUsers={ServiceConstants.Mappings.AUTH}, exception=MyAuthException.class)
public Farm getFarm(@Context UriInfo info){

2
src/test/java/org/gcube/application/perform/service/LoadSchemaTest.java
View File

@ -30,7 +30,7 @@ public class LoadSchemaTest {
* [id=26,
* farmId=12682101,
* batch_type=HATCHERY_INDIVIDUAL,
* sourceUrl=https://data1-d.d4science.org/shub/E_aUJUbDNzeUlLL29KL2xlZUloWFQ5TEdlZ0ZnZzlNNTVLNUEzeDVRNFVoVHlLMW5DVG5RbVVXVzlYeUUzZWFXRA==, sourceVersion=1.1, startTime=2019-01-25T14:52:31.442Z, endTime=null, status=ACCEPTED, lock=localhost, caller=MSgXVCkHb0SDoQLlCLQV9Kj8dPJlJ6gY+XicZJhenQkyuxA11kGUIdhxKs3jUdGK, computationId=7c6f5d7e-b778-42be-af20-b99229fa99ee, computationUrl=http://dataminer1-pre.d4science.org:80//wps/RetrieveResultServlet?id=7c6f5d7e-b778-42be-af20-b99229fa99ee, computationOperator=org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.transducerers.PERFORMFISH_DATA_EXTRACTOR, computationOperatorName=Performfish Data Extractor, computationRequest=https://dataminer1-pre.d4science.org/wps/WebProcessingService?request=Execute&service=WPS&Version=1.0.0&gcube-token=***REMOVED***&lang=en-US&Identifier=org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.transducerers.PERFORMFISH_DATA_EXTRACTOR&DataInputs=InputData=https%3A%2F%2Fdata1-d.d4science.org%2Fshub%2FE_aUJUbDNzeUlLL29KL2xlZUloWFQ5TEdlZ0ZnZzlNNTVLNUEzeDVRNFVoVHlLMW5DVG5RbVVXVzlYeUUzZWFXRA%3D%3D;BatchType=HATCHERY_INDIVIDUAL;FarmID=12682101;]
* sourceUrl=https://data1-d.d4science.org/shub/E_aUJUbDNzeUlLL29KL2xlZUloWFQ5TEdlZ0ZnZzlNNTVLNUEzeDVRNFVoVHlLMW5DVG5RbVVXVzlYeUUzZWFXRA==, sourceVersion=1.1, startTime=2019-01-25T14:52:31.442Z, endTime=null, status=ACCEPTED, lock=localhost, caller=MSgXVCkHb0SDoQLlCLQV9Kj8dPJlJ6gY+XicZJhenQkyuxA11kGUIdhxKs3jUdGK, computationId=7c6f5d7e-b778-42be-af20-b99229fa99ee, computationUrl=http://dataminer1-pre.d4science.org:80//wps/RetrieveResultServlet?id=7c6f5d7e-b778-42be-af20-b99229fa99ee, computationOperator=org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.transducerers.PERFORMFISH_DATA_EXTRACTOR, computationOperatorName=Performfish Data Extractor, computationRequest=https://dataminer1-pre.d4science.org/wps/WebProcessingService?request=Execute&service=WPS&Version=1.0.0&gcube-token=...&lang=en-US&Identifier=org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.transducerers.PERFORMFISH_DATA_EXTRACTOR&DataInputs=InputData=https%3A%2F%2Fdata1-d.d4science.org%2Fshub%2FE_aUJUbDNzeUlLL29KL2xlZUloWFQ5TEdlZ0ZnZzlNNTVLNUEzeDVRNFVoVHlLMW5DVG5RbVVXVzlYeUUzZWFXRA%3D%3D;BatchType=HATCHERY_INDIVIDUAL;FarmID=12682101;]
*/
// RELOAD DATA FROM COMPLETED ROUTINES