From 0b310fc8d14810feaccd95def24849967bea99c5 Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@bioforsk.no> Date: Fri, 6 Dec 2013 17:04:28 +0100 Subject: [PATCH] Added methods getLicense and GetCopyright to REST service --- .../coremanager/VIPSCoreManagerApplication.java | 1 - .../coremanager/service/ManagerResourceImpl.java | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/no/bioforsk/vips/coremanager/VIPSCoreManagerApplication.java b/src/main/java/no/bioforsk/vips/coremanager/VIPSCoreManagerApplication.java index 138b18a..5defcfb 100644 --- a/src/main/java/no/bioforsk/vips/coremanager/VIPSCoreManagerApplication.java +++ b/src/main/java/no/bioforsk/vips/coremanager/VIPSCoreManagerApplication.java @@ -37,7 +37,6 @@ public class VIPSCoreManagerApplication extends Application * given list with all resources defined in the project. */ private void addRestResourceClasses(Set<Class<?>> resources) { - resources.add(no.bioforsk.vips.core.service.ModelResource.class); resources.add(no.bioforsk.vips.coremanager.service.JsonParseExceptionMapper.class); resources.add(no.bioforsk.vips.coremanager.service.ManagerResource.class); resources.add(no.bioforsk.vips.coremanager.service.ManagerResourceImpl.class); diff --git a/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResourceImpl.java b/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResourceImpl.java index 738f26b..cbe742c 100644 --- a/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResourceImpl.java +++ b/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResourceImpl.java @@ -131,6 +131,21 @@ public class ManagerResourceImpl implements ManagerResource{ return Response.ok().entity(this.getModelResource().printModelName(modelId, language).readEntity(String.class)).build(); } + @GET + @Path("models/{modelId}/license") + @Produces("text/plain;charset=UTF-8") + public Response printModelLicense(@PathParam("modelId") String modelId) + { + return Response.ok().entity(this.getModelResource().printModelLicense(modelId).readEntity(String.class)).build(); + } + + @GET + @Path("models/{modelId}/copyright") + @Produces("text/plain;charset=UTF-8") + public Response printModelCopyright(@PathParam("modelId") String modelId) + { + return Response.ok().entity(this.getModelResource().printModelCopyright(modelId).readEntity(String.class)).build(); + } @GET @Path("models/{modelId}/description") -- GitLab