diff --git a/src/main/java/org/etsi/osl/tmf/pm628/api/MeasurementCollectionJobApiRouteBuilder.java b/src/main/java/org/etsi/osl/tmf/pm628/api/MeasurementCollectionJobApiRouteBuilder.java index a56998cdbca8a1c2e09ecdf3cdb8da56300b4f6e..b8fbcca3e6274e3a625dcd4ba4440b3f5dc43959 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/api/MeasurementCollectionJobApiRouteBuilder.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/api/MeasurementCollectionJobApiRouteBuilder.java @@ -66,9 +66,11 @@ public class MeasurementCollectionJobApiRouteBuilder extends RouteBuilder { from(PM_ADD_MEASUREMENT_COLLECTION_JOB) .log(LoggingLevel.INFO, log, PM_ADD_MEASUREMENT_COLLECTION_JOB + " message received!") - .to("log:DEBUG?showBody=true&showHeaders=true").unmarshal() + .to("log:DEBUG?showBody=true&showHeaders=true") + .unmarshal() .json(JsonLibrary.Jackson, MeasurementCollectionJobFVO.class, true) .bean(measurementCollectionJobService, "createMeasurementCollectionJob(${body})") + .marshal().json( JsonLibrary.Jackson) .convertBodyTo( String.class ); from(PM_UPDATE_MEASUREMENT_COLLECTION_JOB) @@ -76,6 +78,7 @@ public class MeasurementCollectionJobApiRouteBuilder extends RouteBuilder { .to("log:DEBUG?showBody=true&showHeaders=true").unmarshal() .json(JsonLibrary.Jackson, MeasurementCollectionJobMVO.class, true) .bean(measurementCollectionJobService, "updateMeasurementCollectionJob(${header.mcjid}, ${body})") + .marshal().json( JsonLibrary.Jackson) .convertBodyTo( String.class ); } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/reposervices/MeasurementCollectionJobService.java b/src/main/java/org/etsi/osl/tmf/pm628/reposervices/MeasurementCollectionJobService.java index 46960b79cfa350f5ea52192ad1c66cc477a4066a..ada0cd1946fdc115921d8c38800d3f50c1b5b125 100755 --- a/src/main/java/org/etsi/osl/tmf/pm628/reposervices/MeasurementCollectionJobService.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/reposervices/MeasurementCollectionJobService.java @@ -384,6 +384,8 @@ public class MeasurementCollectionJobService { MeasurementCollectionJobRef ref = new MeasurementCollectionJobRef(); ref.setId(mcj.getUuid()); ref.setHref(mcj.getHref()); + ref.setName("MeasurementCollectionJob"); + MeasurementCollectionJobCreateEventPayload payload = new MeasurementCollectionJobCreateEventPayload(); payload.setMeasurementCollectionJob(ref); diff --git a/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java b/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java index c8761b4de9320e0a25d8efb53ba6e7277c39985a..62d067a5307a1a6dc038c2812e7d35f1c1bd89bf 100644 --- a/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java +++ b/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java @@ -866,7 +866,7 @@ public class ServiceRepoService { return res; } - @Transactional + public Service getServiceEager(String id) { if ( id == null || id.equals("")) { return null;