From d3e1aa3ba021ea52b562194b8383c97d998357cb Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Tue, 28 May 2024 09:26:18 +0200 Subject: [PATCH] RED-8670: integrate table inference from research * introduce controllerAdvice to ControllerV2 package * remove unnecessary analysis requirement calculation for deleted files * silence javadoc lint warnings (e.g. no comment) --- .../FileStatusPersistenceService.java | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java index f9e286140..16b45a1c9 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java @@ -2,6 +2,7 @@ package com.iqser.red.service.persistence.management.v1.processor.service.persis import java.time.OffsetDateTime; import java.time.temporal.ChronoUnit; +import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -67,6 +68,7 @@ public class FileStatusPersistenceService { file.setFileManipulationDate(now); file.setProcessingErrorCounter(0); file.setFileSize(size); + file.setComponentMappingVersions(new ArrayList<>()); fileRepository.save(file); } @@ -97,21 +99,15 @@ public class FileStatusPersistenceService { private int calculateProcessingErrorCounter(String fileId, ProcessingStatus processingStatus) { - switch (processingStatus) { - case ERROR: - return fileRepository.findById(fileId) - .map(FileEntity::getProcessingErrorCounter) - .orElse(0) + 1; - - case PROCESSED: - case REPROCESS: - return 0; - - default: - return fileRepository.findById(fileId) - .map(FileEntity::getProcessingErrorCounter) - .orElse(0); - } + return switch (processingStatus) { + case ERROR -> fileRepository.findById(fileId) + .map(FileEntity::getProcessingErrorCounter) + .orElse(0) + 1; + case PROCESSED, REPROCESS -> 0; + default -> fileRepository.findById(fileId) + .map(FileEntity::getProcessingErrorCounter) + .orElse(0); + }; }