From 7b5a9cad3da5075c3dccda42d446f11c36efcf4e Mon Sep 17 00:00:00 2001 From: Katerina Date: Fri, 14 Jul 2023 15:53:56 +0300 Subject: [PATCH] Clean DataBaseProcessor from all dependenies. Everything is passed via messages --- .../processors/DataBaseProcessor.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/main/java/eu/dnetlib/validatorapi/processors/DataBaseProcessor.java b/src/main/java/eu/dnetlib/validatorapi/processors/DataBaseProcessor.java index 93de892..d33a2a6 100644 --- a/src/main/java/eu/dnetlib/validatorapi/processors/DataBaseProcessor.java +++ b/src/main/java/eu/dnetlib/validatorapi/processors/DataBaseProcessor.java @@ -1,28 +1,26 @@ package eu.dnetlib.validatorapi.processors; import eu.dnetlib.validatorapi.entities.ValidationJob; -import eu.dnetlib.validatorapi.repositories.ValidationResultRepository; import org.apache.camel.Exchange; import org.apache.camel.Processor; import java.util.Date; public class DataBaseProcessor implements Processor { - private final ValidationJob validationJob; - private final ValidationResultRepository validationResultRepository; - - public DataBaseProcessor(ValidationJob validationJob, - final ValidationResultRepository validationResultRepository){ - this.validationJob = validationJob; - this.validationResultRepository = validationResultRepository; - - } @Override public void process(Exchange exchange) throws Exception { + ValidationJob validationJob = new ValidationJob(); + validationJob.id = (Integer)exchange.getIn().getHeader("validationId"); + validationJob.baseUrl= (String)(exchange.getIn().getHeader("baseUrl")); + validationJob.startDate = (Date) exchange.getIn().getHeader("startDate"); + validationJob.guidelines = (String) exchange.getIn().getHeader("guidelines"); + validationJob.status = (String)exchange.getIn().getHeader("status"); + validationJob.recordsTested = (Integer) exchange.getIn().getHeader("recordsTested"); + validationJob.numberOfRecords = Math.toIntExact((Long) exchange.getIn().getHeader("maxNumberOfRecords")); + validationJob.score = (Integer) exchange.getIn().getHeader("score"); validationJob.progress = "COMPLETED"; validationJob.endDate = new Date(); - validationJob.status = validationResultRepository.getStatus(validationJob.id); exchange.getIn().setBody(validationJob, ValidationJob.class); } }