From 3420a3d126b139f25b2c8c6b4240b17fdb73caa2 Mon Sep 17 00:00:00 2001 From: elinuxhenrik Date: Mon, 23 Nov 2020 10:30:47 +0100 Subject: [PATCH] Use Lombok to add builder to EiJob Change-Id: Icc95da45a7b1726fe36f803f1fb73c1394480076 Issue-ID: NONRTRIC-173 Signed-off-by: elinuxhenrik --- .../controllers/consumer/ConsumerController.java | 14 ++++++++------ .../main/java/org/oransc/enrichment/repository/EiJob.java | 14 +++----------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/consumer/ConsumerController.java b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/consumer/ConsumerController.java index 43169151..f45ff736 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/consumer/ConsumerController.java +++ b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/consumer/ConsumerController.java @@ -314,12 +314,14 @@ public class ConsumerController { } private EiJob toEiJob(ConsumerEiJobInfo info, String id, EiType type) { - return new EiJob(id, // - type.getId(), // - info.owner, // - info.jobData, // - info.targetUri, // - info.statusNotificationUri == null ? "" : info.statusNotificationUri); + return EiJob.builder() // + .id(id) // + .typeId(type.getId()) // + .owner(info.owner) // + .jobData(info.jobData) // + .targetUrl(info.targetUri) // + .jobStatusUrl(info.statusNotificationUri == null ? "" : info.statusNotificationUri) // + .build(); } private ConsumerEiTypeInfo toEiTypeInfo() { diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/EiJob.java b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/EiJob.java index 47ed53c1..ed0187aa 100644 --- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/EiJob.java +++ b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/EiJob.java @@ -21,7 +21,7 @@ package org.oransc.enrichment.repository; import java.lang.invoke.MethodHandles; - +import lombok.Builder; import lombok.Getter; import org.slf4j.Logger; @@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory; /** * Represents the dynamic information about a EI job */ - +@Builder public class EiJob { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); @@ -53,17 +53,9 @@ public class EiJob { private final String jobStatusUrl; @Getter + @Builder.Default private boolean isLastStatusReportedEnabled = true; - public EiJob(String id, String typeId, String owner, Object jobData, String targetUrl, String jobStatusUrl) { - this.id = id; - this.typeId = typeId; - this.owner = owner; - this.jobData = jobData; - this.targetUrl = targetUrl; - this.jobStatusUrl = jobStatusUrl; - } - public void setLastReportedStatus(boolean isEnabled) { this.isLastStatusReportedEnabled = isEnabled; logger.debug("Job status id: {}, enabled: {}", this.isLastStatusReportedEnabled, isEnabled); -- 2.16.6