diff --git a/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java b/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java index a6c8938cfb7b8ece0474258991660d84d4134a92..8545d71c816e3c9a23869be6356d34cc38a36969 100644 --- a/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java +++ b/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java @@ -37,7 +37,6 @@ public class VIPSCoreApplication extends Application */ private void addRestResourceClasses(Set<Class<?>> resources) { resources.add(no.bioforsk.vips.core.config.JacksonConfig.class); - resources.add(no.bioforsk.vips.core.service.ModelResource.class); resources.add(no.bioforsk.vips.coremanager.service.ManagerResource.class); } } \ No newline at end of file diff --git a/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java b/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java index 52aa00549c1dc4fcc6ecd559281a9764e5e76de2..c0ba930b9a284cb6642fbba9db69652092895a49 100644 --- a/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java +++ b/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java @@ -187,10 +187,6 @@ public class ModelResourceImpl implements ModelResource{ * @param config input data for the model * @return list of result objects */ - //@POST - //@Path("models/run") - //@Consumes("application/json") - //@Produces("application/json") @Override public Response runModel(ModelConfiguration config) { @@ -213,10 +209,6 @@ public class ModelResourceImpl implements ModelResource{ * @param config input data for the model * @return list of result objects */ - //@POST - //@Path("models/{modelId}/run") - //@Consumes("application/json") - //@Produces("application/json") @Override public Response runModel(@PathParam("modelId") String modelId, ModelConfiguration config) { @@ -252,5 +244,17 @@ public class ModelResourceImpl implements ModelResource{ return Response.ok().entity(name).build(); } + @Override + public Response printModelLicense(String modelId) { + String license = ModelFactory.getInstance().getModelLicense(modelId); + return Response.ok().entity(license).build(); + } + + @Override + public Response printModelCopyright(String modelId) { + String copyright = ModelFactory.getInstance().getModelCopyright(modelId); + return Response.ok().entity(copyright).build(); + } + } diff --git a/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java b/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java index 1a5c11709526e5ce7f815051ea9393f9157d4819..7e0718e0a1c4013e98b1cf8b3ccf5820125493a7 100644 --- a/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java +++ b/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java @@ -181,6 +181,34 @@ public class ModelFactory { return language != null ? this.models.get(modelId).getModelName(language) : this.models.get(modelId).getModelName(); } + /** + * + * @param modelId + * @return The license for the requested model + */ + public String getModelLicense(String modelId) + { + if(this.isDuplicateModelId(modelId)) + { + return this.getDuplicateModelIdWarning(); + } + return this.models.get(modelId).getLicense(); + } + + /** + * + * @param modelId + * @return the copyright information for the requested model + */ + public String getModelCopyright(String modelId) + { + if(this.isDuplicateModelId(modelId)) + { + return this.getDuplicateModelIdWarning(); + } + return this.models.get(modelId).getCopyright(); + } + /** * * @param modelId ID of the requested model