From d3b1ff0c83d8835f350e8dcdc8cb66e1cc12e5f9 Mon Sep 17 00:00:00 2001
From: Tobias Bruns <kontakt@tobias-bruns.de>
Date: Fri, 3 Jan 2025 11:14:59 +0100
Subject: [PATCH] OZG-6988 rename dtos
---
.../ozgcloud/admin/reporting/AggregationMapping.java | 2 +-
.../admin/reporting/AggregationMappingMapper.java | 2 +-
...sitory.java => AggregationMappingRepository.java} | 0
...ReportingAggregationManagerSettingDTOService.java | 6 +++---
...va => ReportingAggregationManagerSettingDto.java} | 2 +-
.../reporting/AggregationMappingTestFactory.java | 2 +-
.../reporting/ReportingSettingDtoTestFactory.java | 12 ++++++------
7 files changed, 13 insertions(+), 13 deletions(-)
rename src/main/java/de/ozgcloud/admin/reporting/{ReportingSettingRepository.java => AggregationMappingRepository.java} (100%)
rename src/main/java/de/ozgcloud/admin/reporting/{ReportingSettingDto.java => ReportingAggregationManagerSettingDto.java} (92%)
diff --git a/src/main/java/de/ozgcloud/admin/reporting/AggregationMapping.java b/src/main/java/de/ozgcloud/admin/reporting/AggregationMapping.java
index 03e7b292..970a1a1f 100644
--- a/src/main/java/de/ozgcloud/admin/reporting/AggregationMapping.java
+++ b/src/main/java/de/ozgcloud/admin/reporting/AggregationMapping.java
@@ -12,7 +12,7 @@ import org.springframework.data.mongodb.core.mapping.Document;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import de.ozgcloud.admin.reporting.ReportingSettingDto.FormIdentifierDto;
+import de.ozgcloud.admin.reporting.ReportingAggregationManagerSettingDto.FormIdentifierDto;
import lombok.Builder;
import lombok.Getter;
import lombok.Singular;
diff --git a/src/main/java/de/ozgcloud/admin/reporting/AggregationMappingMapper.java b/src/main/java/de/ozgcloud/admin/reporting/AggregationMappingMapper.java
index 27e00476..663be3b1 100644
--- a/src/main/java/de/ozgcloud/admin/reporting/AggregationMappingMapper.java
+++ b/src/main/java/de/ozgcloud/admin/reporting/AggregationMappingMapper.java
@@ -4,7 +4,7 @@ import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.NullValueCheckStrategy;
-import de.ozgcloud.admin.reporting.ReportingSettingDto.AggregationMappingDto;
+import de.ozgcloud.admin.reporting.ReportingAggregationManagerSettingDto.AggregationMappingDto;
@Mapper(nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface AggregationMappingMapper {
diff --git a/src/main/java/de/ozgcloud/admin/reporting/ReportingSettingRepository.java b/src/main/java/de/ozgcloud/admin/reporting/AggregationMappingRepository.java
similarity index 100%
rename from src/main/java/de/ozgcloud/admin/reporting/ReportingSettingRepository.java
rename to src/main/java/de/ozgcloud/admin/reporting/AggregationMappingRepository.java
diff --git a/src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDTOService.java b/src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDTOService.java
index 15186202..f75b2d10 100644
--- a/src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDTOService.java
+++ b/src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDTOService.java
@@ -15,12 +15,12 @@ class ReportingAggregationManagerSettingDTOService implements SettingDtoService
private final AggregationMappingMapper mapper;
@Override
- public ReportingSettingDto getDataTransferObject() {
+ public ReportingAggregationManagerSettingDto getDataTransferObject() {
return mapToDto(repository.findAll().stream());
}
- ReportingSettingDto mapToDto(Stream<AggregationMapping> settings) {
- return ReportingSettingDto.builder()
+ ReportingAggregationManagerSettingDto mapToDto(Stream<AggregationMapping> settings) {
+ return ReportingAggregationManagerSettingDto.builder()
.aggregationMappings(settings.map(mapper::toMapping).toList())
.build();
}
diff --git a/src/main/java/de/ozgcloud/admin/reporting/ReportingSettingDto.java b/src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDto.java
similarity index 92%
rename from src/main/java/de/ozgcloud/admin/reporting/ReportingSettingDto.java
rename to src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDto.java
index 5b25418b..82467552 100644
--- a/src/main/java/de/ozgcloud/admin/reporting/ReportingSettingDto.java
+++ b/src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDto.java
@@ -10,7 +10,7 @@ import lombok.ToString;
@Builder
@Getter
@ToString
-public class ReportingSettingDto {
+public class ReportingAggregationManagerSettingDto {
@Singular
private List<AggregationMappingDto> aggregationMappings;
diff --git a/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingTestFactory.java b/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingTestFactory.java
index e9579d39..a29204fd 100644
--- a/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingTestFactory.java
+++ b/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingTestFactory.java
@@ -3,7 +3,7 @@ package de.ozgcloud.admin.reporting;
import java.util.UUID;
import de.ozgcloud.admin.reporting.AggregationMapping.FieldMapping;
-import de.ozgcloud.admin.reporting.ReportingSettingDto.FormIdentifierDto;
+import de.ozgcloud.admin.reporting.ReportingAggregationManagerSettingDto.FormIdentifierDto;
class AggregationMappingTestFactory {
diff --git a/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingDtoTestFactory.java b/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingDtoTestFactory.java
index bb2ac38d..9bf014f1 100644
--- a/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingDtoTestFactory.java
+++ b/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingDtoTestFactory.java
@@ -2,20 +2,20 @@ package de.ozgcloud.admin.reporting;
import static de.ozgcloud.admin.reporting.AggregationMappingTestFactory.*;
-import de.ozgcloud.admin.reporting.ReportingSettingDto.AggregationMappingDto;
-import de.ozgcloud.admin.reporting.ReportingSettingDto.FieldMappingDto;
-import de.ozgcloud.admin.reporting.ReportingSettingDto.FormIdentifierDto;
+import de.ozgcloud.admin.reporting.ReportingAggregationManagerSettingDto.AggregationMappingDto;
+import de.ozgcloud.admin.reporting.ReportingAggregationManagerSettingDto.FieldMappingDto;
+import de.ozgcloud.admin.reporting.ReportingAggregationManagerSettingDto.FormIdentifierDto;
class ReportingSettingDtoTestFactory {
public static final FormIdentifierDto FORM_IDENTIFIER = FormIdentifierDto.builder().formId(FORM_ID).formEngineName(FORM_ENGINE_NAME).build();
- public static ReportingSettingDto create() {
+ public static ReportingAggregationManagerSettingDto create() {
return createBuilder().build();
}
- public static ReportingSettingDto.ReportingSettingDtoBuilder createBuilder() {
- return ReportingSettingDto.builder()
+ public static ReportingAggregationManagerSettingDto.ReportingSettingDtoBuilder createBuilder() {
+ return ReportingAggregationManagerSettingDto.builder()
.aggregationMapping(AggregationMappingDto.builder()
.formIdentifier(FORM_IDENTIFIER)
.fieldMapping(FieldMappingDto.builder().sourcePath(SOURCE_PATH).targetPath(TARGET_PATH).build())
--
GitLab