From ee6859daf4a10402744e503e780ad348fe14caae Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Fri, 30 Aug 2013 15:42:09 +0200
Subject: [PATCH] Avoiding nullpointerexceptions in REST clients
---
.../java/no/bioforsk/vips/core/VIPSCoreApplication.java | 2 ++
.../no/bioforsk/vips/core/service/ModelResourceImpl.java | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java b/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java
index d6b678b..a6c8938 100644
--- a/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java
+++ b/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java
@@ -37,5 +37,7 @@ 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 1e84ea0..caeb4fb 100644
--- a/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java
+++ b/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java
@@ -26,7 +26,7 @@ public class ModelResourceImpl implements ModelResource{
@Override
public Response printModelList()
{
- return this.printModelList(null);
+ return this.printModelList(Model.DEFAULT_LANGUAGE);
}
@@ -112,7 +112,7 @@ public class ModelResourceImpl implements ModelResource{
@Override
public Response printModelDescription(String modelId) {
- return this.printModelDescription(modelId, null);
+ return this.printModelDescription(modelId, Model.DEFAULT_LANGUAGE);
}
@Override
@@ -149,7 +149,7 @@ public class ModelResourceImpl implements ModelResource{
@Override
public Response printModelUsage(@PathParam("modelId") String modelId)
{
- return this.printModelUsage(modelId, null);
+ return this.printModelUsage(modelId, Model.DEFAULT_LANGUAGE);
}
/**
--
GitLab