From 983bb4fdc29b65c24735566029a474ec2bc0b7fb Mon Sep 17 00:00:00 2001
From: Christos Tranoris <tranoris@ece.upatras.gr>
Date: Sat, 11 Jan 2025 18:44:17 +0200
Subject: [PATCH] fixes for metrico events
---
.../pm628/api/MeasurementCollectionJobApiRouteBuilder.java | 5 ++++-
.../pm628/reposervices/MeasurementCollectionJobService.java | 2 ++
.../org/etsi/osl/tmf/sim638/service/ServiceRepoService.java | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
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 a56998c..b8fbcca 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 46960b7..ada0cd1 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 c8761b4..62d067a 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;
--
GitLab