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 f0ff9dfdc6ea50fb4e80f7e2b9f1a693c214fb1e..25ae612b7782dd7ccd8383106d9cbcc7016767a0 100644 --- a/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResourceImpl.java +++ b/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResourceImpl.java @@ -86,6 +86,7 @@ public class ManagerResourceImpl implements ManagerResource{ @GET @Path("models") @Produces("text/plain;charset=UTF-8") + @Override public Response printModelList() { return this.printModelList(Model.DEFAULT_LANGUAGE); @@ -99,6 +100,7 @@ public class ManagerResourceImpl implements ManagerResource{ @GET @Path("models/{language}") @Produces("text/plain;charset=UTF-8") + @Override public Response printModelList(@PathParam("language") String language) { ModelResource res = this.getModelResource(); @@ -115,6 +117,7 @@ public class ManagerResourceImpl implements ManagerResource{ @GET @Path("models/json") @Produces("application/json;charset=UTF-8") + @Override public Response printModelListJSON() { return this.printModelListJSON(Model.DEFAULT_LANGUAGE); @@ -128,6 +131,7 @@ public class ManagerResourceImpl implements ManagerResource{ @GET @Path("models/json/{language}") @Produces("application/json;charset=UTF-8") + @Override public Response printModelListJSON(@PathParam("language") String language) { String result = this.getModelResource().printModelListJSON(language).readEntity(String.class); @@ -140,6 +144,7 @@ public class ManagerResourceImpl implements ManagerResource{ @GET @Path("models/{modelId}/name") @Produces("text/plain;charset=UTF-8") + @Override public Response printModelName(@PathParam("modelId") String modelId) { return this.printModelName(modelId, Model.DEFAULT_LANGUAGE); } @@ -147,6 +152,7 @@ public class ManagerResourceImpl implements ManagerResource{ @GET @Path("models/{modelId}/name/{language}") @Produces("text/plain;charset=UTF-8") + @Override public Response printModelName(@PathParam("modelId") String modelId, @PathParam("language") String language) { return Response.ok().entity(this.getModelResource().printModelName(modelId, language).readEntity(String.class)).build(); } @@ -154,6 +160,7 @@ public class ManagerResourceImpl implements ManagerResource{ @GET @Path("models/{modelId}/license") @Produces("text/plain;charset=UTF-8") + @Override public Response printModelLicense(@PathParam("modelId") String modelId) { return Response.ok().entity(this.getModelResource().printModelLicense(modelId).readEntity(String.class)).build(); @@ -162,6 +169,7 @@ public class ManagerResourceImpl implements ManagerResource{ @GET @Path("models/{modelId}/copyright") @Produces("text/plain;charset=UTF-8") + @Override public Response printModelCopyright(@PathParam("modelId") String modelId) { return Response.ok().entity(this.getModelResource().printModelCopyright(modelId).readEntity(String.class)).build(); @@ -170,6 +178,7 @@ public class ManagerResourceImpl implements ManagerResource{ @GET @Path("models/{modelId}/description") @Produces("text/plain;charset=UTF-8") + @Override public Response printModelDescription(@PathParam("modelId") String modelId) { return this.printModelDescription(modelId, Model.DEFAULT_LANGUAGE); @@ -179,11 +188,32 @@ public class ManagerResourceImpl implements ManagerResource{ @GET @Path("models/{modelId}/description/{language}") @Produces("text/plain;charset=UTF-8") + @Override public Response printModelDescription(@PathParam("modelId") String modelId,@PathParam("language") String language) { return Response.ok().entity(this.getModelResource().printModelDescription(modelId, language).readEntity(String.class)).build(); } + + + @GET + @Path("models/{modelId}/warningstatusinterpretation") + @Produces("text/plain;charset=UTF-8") + @Override + public Response printModelWarningStatusInterpretation(@PathParam("modelId") String modelId) + { + return this.printModelWarningStatusInterpretation(modelId, Model.DEFAULT_LANGUAGE); + } + + @GET + @Path("models/{modelId}/warningstatusinterpretation/{language}") + @Produces("text/plain;charset=UTF-8") + @Override + public Response printModelWarningStatusInterpretation(@PathParam("modelId") String modelId,@PathParam("language") String language) + { + return Response.ok().entity(this.getModelResource().printModelWarningStatusInterpretation(modelId, language).readEntity(String.class)).build(); + } + /** * Prints the usage instructions from the requested model * @param modelId @@ -193,6 +223,7 @@ public class ManagerResourceImpl implements ManagerResource{ @GET @Path("models/{modelId}/usage/{language}") @Produces("text/plain;charset=UTF-8") + @Override public Response printModelUsage(@PathParam("modelId") String modelId, @PathParam("language") String language) { @@ -209,6 +240,7 @@ public class ManagerResourceImpl implements ManagerResource{ @GET @Path("models/{modelId}/usage") @Produces("text/plain;charset=UTF-8") + @Override public Response printModelUsage(@PathParam("modelId") String modelId) { return this.printModelUsage(modelId, Model.DEFAULT_LANGUAGE); @@ -222,6 +254,7 @@ public class ManagerResourceImpl implements ManagerResource{ @GET @Path("models/{modelId}/sampleconfig") @Produces("text/plain;charset=UTF-8") + @Override public Response printModelSampleConfig(@PathParam("modelId") String modelId) {