From 8594687a8359982c4f7258fcaaf753b4a5a23398 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Wed, 20 Nov 2013 16:10:43 +0100
Subject: [PATCH] Added printing of model name to services
---
.../bioforsk/vips/core/VIPSCoreApplication.java | 2 +-
.../vips/core/service/ModelResourceImpl.java | 11 +++++++++++
.../bioforsk/vips/model/factory/ModelFactory.java | 15 +++++++++++++++
3 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java b/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java
index 41f57cb..8545d71 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 bfe9bc6..52aa005 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 572ec1d..1a5c117 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
--
GitLab