diff --git a/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java b/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java index a6c8938cfb7b8ece0474258991660d84d4134a92..41f57cb8abe9f4b00956ae0169be7e5b24bf0f33 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 caeb4fb3ecf63ee2c01c9e62e305cfaa1e01d32b..bfe9bc6cf6451e3033f82e8a73f33e2f33be20e9 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) {