Skip to content
Snippets Groups Projects
Commit 983bb4fd authored by tranoris's avatar tranoris
Browse files

fixes for metrico events

parent 9fe493a0
No related branches found
No related tags found
2 merge requests!59MR for Release 2024Q4,!55TMF628 fixes for METRICO
Pipeline #11094 passed
......@@ -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 );
}
......
......@@ -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);
......
......@@ -866,7 +866,7 @@ public class ServiceRepoService {
return res;
}
@Transactional
public Service getServiceEager(String id) {
if ( id == null || id.equals("")) {
return null;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment