From d29cc735f766089905ab831f1e6e92e8f5df7055 Mon Sep 17 00:00:00 2001
From: Tobias Bruns <kontakt@tobias-bruns.de>
Date: Fri, 3 Jan 2025 11:11:48 +0100
Subject: [PATCH] OZG-6988 rename data types
---
pom.xml | 10 ++++++++--
.../{ReportingSetting.java => AggregationMapping.java} | 6 +++---
.../admin/reporting/AggregationMappingMapper.java | 2 +-
.../ReportingAggregationManagerSettingDTOService.java | 4 ++--
.../admin/reporting/ReportingSettingRepository.java | 6 +++---
...Factory.java => AggregationMappingTestFactory.java} | 10 +++++-----
...portingAggregationManagerSettingDTOServiceTest.java | 2 +-
.../reporting/ReportingSettingDtoTestFactory.java | 2 +-
.../reporting/ReportingSettingRepositoryITCase.java | 4 ++--
9 files changed, 26 insertions(+), 20 deletions(-)
rename src/main/java/de/ozgcloud/admin/reporting/{ReportingSetting.java => AggregationMapping.java} (90%)
rename src/test/java/de/ozgcloud/admin/reporting/{ReportingSettingTestFactory.java => AggregationMappingTestFactory.java} (73%)
diff --git a/pom.xml b/pom.xml
index db4befb1..8b9b615b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -287,6 +287,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
+ <!--
<configuration>
<image>
<name>${imageName}:${imageTag}</name>
@@ -317,7 +318,7 @@
</additionalProperties>
</configuration>
</execution>
- </executions>
+ </executions>-->
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -327,7 +328,7 @@
<!-- <path>-->
<!-- <groupId>org.mapstruct</groupId>-->
<!-- <artifactId>mapstruct-processor</artifactId>-->
-<!-- <version>${mapstruct-processor.version}</version>-->
+<!-- <version>${mapstruct.version}</version>-->
<!-- </path>-->
<!-- <path>-->
<!-- <groupId>org.projectlombok</groupId>-->
@@ -339,6 +340,11 @@
<!-- <artifactId>lombok-mapstruct-binding</artifactId>-->
<!-- <version>${lombok-mapstruct-binding.version}</version>-->
<!-- </path>-->
+<!-- <path>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-configuration-processor</artifactId>-->
+<!-- <version>3.3.6</version>-->
+<!-- </path>-->
<!-- </annotationProcessorPaths>-->
<!-- </configuration>-->
</plugin>
diff --git a/src/main/java/de/ozgcloud/admin/reporting/ReportingSetting.java b/src/main/java/de/ozgcloud/admin/reporting/AggregationMapping.java
similarity index 90%
rename from src/main/java/de/ozgcloud/admin/reporting/ReportingSetting.java
rename to src/main/java/de/ozgcloud/admin/reporting/AggregationMapping.java
index 963c9d0c..03e7b292 100644
--- a/src/main/java/de/ozgcloud/admin/reporting/ReportingSetting.java
+++ b/src/main/java/de/ozgcloud/admin/reporting/AggregationMapping.java
@@ -19,17 +19,17 @@ import lombok.Singular;
import lombok.extern.jackson.Jacksonized;
@Document("settings")
-@TypeAlias("fieldMapping")
+@TypeAlias("aggregationMapping")
@Jacksonized
@Builder
@Getter
-public class ReportingSetting {
+public class AggregationMapping {
@Id
@JsonIgnore
private String id;
@Builder.Default
- private String name = "fieldMapping";
+ private String name = "aggregationMapping";
@Valid
private FormIdentifierDto formIdentifier;
diff --git a/src/main/java/de/ozgcloud/admin/reporting/AggregationMappingMapper.java b/src/main/java/de/ozgcloud/admin/reporting/AggregationMappingMapper.java
index 80ba34c4..27e00476 100644
--- a/src/main/java/de/ozgcloud/admin/reporting/AggregationMappingMapper.java
+++ b/src/main/java/de/ozgcloud/admin/reporting/AggregationMappingMapper.java
@@ -11,5 +11,5 @@ public interface AggregationMappingMapper {
@Mapping(target = "fieldMapping", ignore = true)
@Mapping(target = "fieldMappings", source = "mappings")
- AggregationMappingDto toMapping(ReportingSetting setting);
+ AggregationMappingDto toMapping(AggregationMapping setting);
}
diff --git a/src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDTOService.java b/src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDTOService.java
index b74146d6..15186202 100644
--- a/src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDTOService.java
+++ b/src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDTOService.java
@@ -11,7 +11,7 @@ import lombok.RequiredArgsConstructor;
@DtoService(SettingConstants.AGGREGATION_MANAGER)
class ReportingAggregationManagerSettingDTOService implements SettingDtoService {
- private final ReportingSettingRepository repository;
+ private final AggregationMappingRepository repository;
private final AggregationMappingMapper mapper;
@Override
@@ -19,7 +19,7 @@ class ReportingAggregationManagerSettingDTOService implements SettingDtoService
return mapToDto(repository.findAll().stream());
}
- ReportingSettingDto mapToDto(Stream<ReportingSetting> settings) {
+ ReportingSettingDto mapToDto(Stream<AggregationMapping> settings) {
return ReportingSettingDto.builder()
.aggregationMappings(settings.map(mapper::toMapping).toList())
.build();
diff --git a/src/main/java/de/ozgcloud/admin/reporting/ReportingSettingRepository.java b/src/main/java/de/ozgcloud/admin/reporting/ReportingSettingRepository.java
index 0c4f3ec7..e9dec7d5 100644
--- a/src/main/java/de/ozgcloud/admin/reporting/ReportingSettingRepository.java
+++ b/src/main/java/de/ozgcloud/admin/reporting/ReportingSettingRepository.java
@@ -7,8 +7,8 @@ import org.springframework.data.mongodb.repository.Query;
import org.springframework.data.rest.core.annotation.RepositoryRestResource;
@RepositoryRestResource
-interface ReportingSettingRepository extends MongoRepository<ReportingSetting, String> {
+interface AggregationMappingRepository extends MongoRepository<AggregationMapping, String> {
@Override
- @Query("{'_class': 'fieldMapping'}")
- List<ReportingSetting> findAll();
+ @Query("{'_class': 'aggregationMapping'}")
+ List<AggregationMapping> findAll();
}
diff --git a/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingTestFactory.java b/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingTestFactory.java
similarity index 73%
rename from src/test/java/de/ozgcloud/admin/reporting/ReportingSettingTestFactory.java
rename to src/test/java/de/ozgcloud/admin/reporting/AggregationMappingTestFactory.java
index b825f04d..e9579d39 100644
--- a/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingTestFactory.java
+++ b/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingTestFactory.java
@@ -2,10 +2,10 @@ package de.ozgcloud.admin.reporting;
import java.util.UUID;
-import de.ozgcloud.admin.reporting.ReportingSetting.FieldMapping;
+import de.ozgcloud.admin.reporting.AggregationMapping.FieldMapping;
import de.ozgcloud.admin.reporting.ReportingSettingDto.FormIdentifierDto;
-class ReportingSettingTestFactory {
+class AggregationMappingTestFactory {
public static final String ID = UUID.randomUUID().toString();
public static final String FORM_ENGINE_NAME = "A12";
@@ -14,12 +14,12 @@ class ReportingSettingTestFactory {
public static final String SOURCE_PATH = "name";
public static final String TARGET_PATH = "antragsteller.name";
- public static ReportingSetting create() {
+ public static AggregationMapping create() {
return createBuilder().build();
}
- public static ReportingSetting.ReportingSettingBuilder createBuilder() {
- return ReportingSetting.builder()
+ public static AggregationMapping.AggregationMappingBuilder createBuilder() {
+ return AggregationMapping.builder()
.id(UUID.randomUUID().toString())
.formIdentifier(FormIdentifierDto.builder()
.formEngineName(FORM_ENGINE_NAME)
diff --git a/src/test/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDTOServiceTest.java b/src/test/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDTOServiceTest.java
index a7b8213b..550a4364 100644
--- a/src/test/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDTOServiceTest.java
+++ b/src/test/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDTOServiceTest.java
@@ -21,7 +21,7 @@ class ReportingAggregationManagerSettingDTOServiceTest {
class TestMapToDto {
@Test
void shouldCreateDto() {
- var dto = service.mapToDto(Stream.of(ReportingSettingTestFactory.create()));
+ var dto = service.mapToDto(Stream.of(AggregationMappingTestFactory.create()));
assertThat(dto).usingRecursiveComparison().isEqualTo(ReportingSettingDtoTestFactory.create());
}
diff --git a/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingDtoTestFactory.java b/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingDtoTestFactory.java
index b465498c..bb2ac38d 100644
--- a/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingDtoTestFactory.java
+++ b/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingDtoTestFactory.java
@@ -1,6 +1,6 @@
package de.ozgcloud.admin.reporting;
-import static de.ozgcloud.admin.reporting.ReportingSettingTestFactory.*;
+import static de.ozgcloud.admin.reporting.AggregationMappingTestFactory.*;
import de.ozgcloud.admin.reporting.ReportingSettingDto.AggregationMappingDto;
import de.ozgcloud.admin.reporting.ReportingSettingDto.FieldMappingDto;
diff --git a/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingRepositoryITCase.java b/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingRepositoryITCase.java
index 96905a1b..6897345b 100644
--- a/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingRepositoryITCase.java
+++ b/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingRepositoryITCase.java
@@ -14,7 +14,7 @@ import de.ozgcloud.common.test.DataITCase;
class ReportingSettingRepositoryITCase {
@Autowired
- private ReportingSettingRepository repository;
+ private AggregationMappingRepository repository;
@Autowired
private MongoOperations operations;
@@ -26,7 +26,7 @@ class ReportingSettingRepositoryITCase {
@Test
void shouldLoadOnlyFieldMapping() {
- operations.save(ReportingSettingTestFactory.create());
+ operations.save(AggregationMappingTestFactory.create());
operations.save(SettingTestFactory.create());
var result = repository.findAll();
--
GitLab