From fbfffe44fd6d2fb8e255f0a7e2a9b8d6e5fa6196 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Wed, 30 Oct 2013 10:40:33 +0100
Subject: [PATCH] First version with support for piping of config from
VIPSLogic to VIPSCore and piping of results from VIPSCore all the way back to
VIPSLogic.
---
src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java | 1 -
.../no/bioforsk/vips/core/service/ModelResourceImpl.java | 5 ++++-
2 files changed, 4 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 a6c8938..41f57cb 100644
--- a/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java
+++ b/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java
@@ -38,6 +38,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.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 caeb4fb..bfe9bc6 100644
--- a/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java
+++ b/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java
@@ -1,11 +1,13 @@
package no.bioforsk.vips.core.service;
+import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.ws.rs.PathParam;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
import no.bioforsk.vips.entity.ModelConfiguration;
+import no.bioforsk.vips.entity.Result;
import no.bioforsk.vips.model.ConfigValidationException;
import no.bioforsk.vips.model.Model;
import no.bioforsk.vips.model.ModelExcecutionException;
@@ -222,7 +224,8 @@ public class ModelResourceImpl implements ModelResource{
{
Model calledModel = ModelFactory.getInstance().getModelInstance(modelId);
calledModel.setConfiguration(config);
- return Response.ok().entity(calledModel.getResult()).build();
+ List<Result> results = calledModel.getResult();
+ return Response.ok().entity(results).build();
}
catch(InstantiationException | IllegalAccessException | ConfigValidationException | ModelExcecutionException | DuplicateModelIdException ex)
{
--
GitLab