gCubeSystem
/
grsf-publisher-ws
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added the support for grsf_pre VRE.

This commit is contained in:
Luca Frosini 2020-06-08 14:51:50 +02:00
parent c5e8cb8b7e
commit 6b21a61e6c
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.settings/org.eclipse.jdt.core.prefs
View File

@ -1,2 +1,5 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.8

7
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java
View File

@ -61,13 +61,17 @@ public class GrsfPublisherFisheryService {
// Logger // Logger
private static final org.slf4j.Logger logger = LoggerFactory.getLogger(GrsfPublisherFisheryService.class); private static final org.slf4j.Logger logger = LoggerFactory.getLogger(GrsfPublisherFisheryService.class);
/*
@GET @GET
@Path("hello") @Path("hello")
@Produces(MediaType.TEXT_PLAIN) @Produces(MediaType.TEXT_PLAIN)
public Response hello() { public Response hello() {
return Response.ok("Hello.. Fishery service is here").build(); return Response.ok("Hello.. Fishery service is here").build();
} }
*/
/*
* Already Managed By gCat
@GET @GET
@Path("get-licenses") @Path("get-licenses")
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
@ -88,6 +92,7 @@ public class GrsfPublisherFisheryService {
.build(); .build();
} }
} }
*/
@POST @POST
@Path("publish-product") @Path("publish-product")
@ -120,6 +125,8 @@ public class GrsfPublisherFisheryService {
String apiKey = catalogue.getApiKeyFromUsername(username); String apiKey = catalogue.getApiKeyFromUsername(username);
String organization = HelperMethods.retrieveOrgNameFromScope(context); String organization = HelperMethods.retrieveOrgNameFromScope(context);
CommonServiceUtils.hasAdminRole(username, catalogue, apiKey, organization); CommonServiceUtils.hasAdminRole(username, catalogue, apiKey, organization);
// extend this role to the other organizations in this context // extend this role to the other organizations in this context

5
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java
View File

@ -697,9 +697,10 @@ public class CommonServiceUtils {
* @return * @return
*/ */
public static String evaluateOrganization(String organization, Sources sourceInPath) { public static String evaluateOrganization(String organization, Sources sourceInPath) {
if(sourceInPath.equals(Sources.GRSF) && organization.equals(Constants.GRSF_ADMIN_ORGANIZATION_NAME)) if(sourceInPath.equals(Sources.GRSF) &&
(organization.compareTo(Constants.GRSF_ADMIN_ORGANIZATION_NAME)==0 || organization.compareTo(Constants.GRSF_PRE_ORGANIZATION_NAME)==0)){
return Constants.GRSF_ADMIN_ORGANIZATION_NAME; return Constants.GRSF_ADMIN_ORGANIZATION_NAME;
else }else
return sourceInPath.getOrigName().toLowerCase(); return sourceInPath.getOrigName().toLowerCase();
} }
} }