diff --git a/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java b/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java index 41f57cb8abe9f4b00956ae0169be7e5b24bf0f33..8545d71c816e3c9a23869be6356d34cc38a36969 100644 --- a/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java +++ b/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java @@ -37,6 +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 bfe9bc6cf6451e3033f82e8a73f33e2f33be20e9..52aa00549c1dc4fcc6ecd559281a9764e5e76de2 100644 --- a/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java +++ b/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java @@ -241,5 +241,16 @@ public class ModelResourceImpl implements ModelResource{ } } + @Override + public Response printModelName(String modelId) { + return this.printModelName(modelId, Model.DEFAULT_LANGUAGE); + } + + @Override + public Response printModelName(String modelId, String language) { + String name = ModelFactory.getInstance().getModelName(modelId, language); + return Response.ok().entity(name).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 572ec1dccd618509de80cf7f4c4023ff0863c8a7..1a5c11709526e5ce7f815051ea9393f9157d4819 100644 --- a/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java +++ b/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java @@ -166,6 +166,21 @@ public class ModelFactory { return this.modelList; } + /** + * Gets the name of the model, in the appropriate language + * @param modelId + * @param language + * @return + */ + public String getModelName(String modelId, String language) + { + if(this.isDuplicateModelId(modelId)) + { + return this.getDuplicateModelIdWarning(); + } + return language != null ? this.models.get(modelId).getModelName(language) : this.models.get(modelId).getModelName(); + } + /** * * @param modelId ID of the requested model