diff --git a/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java b/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java index e890e15a4ac68bef4792f54448d20d1f958bbde8..c023ca8b9847980f7845245c492a76e06089a467 100644 --- a/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java +++ b/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java @@ -56,6 +56,5 @@ 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.ModelResourceImpl.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 4ee731a617c2dd9d1074fdc2d1abd932c7fcd9f6..7863ff1eafe4dcfd0331e778e64174f6f07d8126 100644 --- a/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java +++ b/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java @@ -37,7 +37,6 @@ import no.bioforsk.vips.model.Model; import no.bioforsk.vips.model.ModelExcecutionException; import no.bioforsk.vips.model.factory.DuplicateModelIdException; import no.bioforsk.vips.model.factory.ModelFactory; -import no.bioforsk.vips.util.ServletUtil; /** * The available resources in this system @@ -298,5 +297,16 @@ public class ModelResourceImpl implements ModelResource{ return Response.ok().entity(copyright).build(); } + @Override + public Response printModelWarningStatusInterpretation(String modelId) { + return this.printModelWarningStatusInterpretation(modelId, Model.DEFAULT_LANGUAGE); + } + + @Override + public Response printModelWarningStatusInterpretation(String modelId, String language) { + String interpretation = ModelFactory.getInstance().getModelWarningStatusInterpretation(modelId,language); + return Response.ok().entity(interpretation).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 04c4bcbe9b665fc240221c5de2d17be62794f05f..f3465c052d27f5f16ede6c74514ea1ac78127021 100644 --- a/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java +++ b/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java @@ -292,6 +292,14 @@ public class ModelFactory { private String getDuplicateModelIdWarning() { return DUPLICATE_MODEL_ID_WARNING; } + + public String getModelWarningStatusInterpretation(String modelId, String language) { + if(this.isDuplicateModelId(modelId)) + { + return this.getDuplicateModelIdWarning(); + } + return language != null ? this.models.get(modelId).getWarningStatusInterpretation(language) : this.models.get(modelId).getWarningStatusInterpretation(); + }