Skip to content
Snippets Groups Projects
Commit c4a7b79e authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Added warning status interpretation as required part of Model's meta data

parent 040c6ecd
Branches
Tags
No related merge requests found
...@@ -56,6 +56,5 @@ public class VIPSCoreApplication extends Application ...@@ -56,6 +56,5 @@ public class VIPSCoreApplication extends Application
*/ */
private void addRestResourceClasses(Set<Class<?>> resources) { private void addRestResourceClasses(Set<Class<?>> resources) {
resources.add(no.bioforsk.vips.core.config.JacksonConfig.class); resources.add(no.bioforsk.vips.core.config.JacksonConfig.class);
resources.add(no.bioforsk.vips.core.service.ModelResourceImpl.class);
} }
} }
\ No newline at end of file
...@@ -37,7 +37,6 @@ import no.bioforsk.vips.model.Model; ...@@ -37,7 +37,6 @@ import no.bioforsk.vips.model.Model;
import no.bioforsk.vips.model.ModelExcecutionException; import no.bioforsk.vips.model.ModelExcecutionException;
import no.bioforsk.vips.model.factory.DuplicateModelIdException; import no.bioforsk.vips.model.factory.DuplicateModelIdException;
import no.bioforsk.vips.model.factory.ModelFactory; import no.bioforsk.vips.model.factory.ModelFactory;
import no.bioforsk.vips.util.ServletUtil;
/** /**
* The available resources in this system * The available resources in this system
...@@ -298,5 +297,16 @@ public class ModelResourceImpl implements ModelResource{ ...@@ -298,5 +297,16 @@ public class ModelResourceImpl implements ModelResource{
return Response.ok().entity(copyright).build(); 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();
}
} }
...@@ -292,6 +292,14 @@ public class ModelFactory { ...@@ -292,6 +292,14 @@ public class ModelFactory {
private String getDuplicateModelIdWarning() { private String getDuplicateModelIdWarning() {
return DUPLICATE_MODEL_ID_WARNING; 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();
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment