From c4a7b79e91eb9764e3f233d7b4d1a4e6c9c4f26a Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Wed, 18 Feb 2015 20:29:48 +0100
Subject: [PATCH] Added warning status interpretation as required part of
Model's meta data
---
.../no/bioforsk/vips/core/VIPSCoreApplication.java | 1 -
.../vips/core/service/ModelResourceImpl.java | 12 +++++++++++-
.../no/bioforsk/vips/model/factory/ModelFactory.java | 8 ++++++++
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java b/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java
index e890e15..c023ca8 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 4ee731a..7863ff1 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 04c4bcb..f3465c0 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();
+ }
--
GitLab