Commit 983bb4fd authored by Christos Tranoris's avatar Christos Tranoris
Browse files

fixes for metrico events

parent 9fe493a0

src/main/java/org/etsi/osl/tmf/pm628/api/MeasurementCollectionJobApiRouteBuilder.java

+4 −1
Original line number Diff line number Diff line
@@ -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 );

    }

src/main/java/org/etsi/osl/tmf/pm628/reposervices/MeasurementCollectionJobService.java

+2 −0
Original line number Diff line number Diff line
@@ -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);

src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java

+1 −1
Original line number Diff line number Diff line
@@ -866,7 +866,7 @@ public class ServiceRepoService { 
		return res;

	}



    @Transactional  



	public Service getServiceEager(String id) {

		if ( id == null || id.equals("")) {

			return null;