From cf7b2a4adc606620b190cffc20d42e1c0e646bd0 Mon Sep 17 00:00:00 2001
From: Krzysztof <krzysztof.witukiewicz@mgm-tp.com>
Date: Wed, 30 Apr 2025 14:38:28 +0200
Subject: [PATCH] OZG-7811 OZG-8099 Rename loaders
---
...RemoteDataLoader.java => AggregationDataRemoteLoader.java} | 2 +-
...useDataLoader.java => AggregationDataWarehouseLoader.java} | 2 +-
...taLoaderTest.java => AggregationDataRemoteLoaderTest.java} | 4 ++--
.../de/ozgcloud/aggregation/extern/SpringContextITCase.java | 2 +-
...oaderTest.java => AggregationDataWarehouseLoaderTest.java} | 4 ++--
.../ozgcloud/aggregation/warehouse/SpringContextITCase.java | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
rename aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/extern/{AggregationRemoteDataLoader.java => AggregationDataRemoteLoader.java} (97%)
rename aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/warehouse/{AggregationWarehouseDataLoader.java => AggregationDataWarehouseLoader.java} (96%)
rename aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/extern/{AggregationRemoteDataLoaderTest.java => AggregationDataRemoteLoaderTest.java} (97%)
rename aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/warehouse/{AggregationWarehouseDataLoaderTest.java => AggregationDataWarehouseLoaderTest.java} (97%)
diff --git a/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/extern/AggregationRemoteDataLoader.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/extern/AggregationDataRemoteLoader.java
similarity index 97%
rename from aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/extern/AggregationRemoteDataLoader.java
rename to aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/extern/AggregationDataRemoteLoader.java
index 845c203..81701ad 100644
--- a/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/extern/AggregationRemoteDataLoader.java
+++ b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/extern/AggregationDataRemoteLoader.java
@@ -39,7 +39,7 @@ import lombok.extern.log4j.Log4j2;
@ConditionalOnProperty("grpc.client.aggregation-manager.address")
@RequiredArgsConstructor
@Log4j2
-public class AggregationRemoteDataLoader implements AggregationDataLoader {
+public class AggregationDataRemoteLoader implements AggregationDataLoader {
private final AggregationDataRemoteService service;
diff --git a/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/warehouse/AggregationWarehouseDataLoader.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/warehouse/AggregationDataWarehouseLoader.java
similarity index 96%
rename from aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/warehouse/AggregationWarehouseDataLoader.java
rename to aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/warehouse/AggregationDataWarehouseLoader.java
index 3e319bf..3ef137a 100644
--- a/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/warehouse/AggregationWarehouseDataLoader.java
+++ b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/warehouse/AggregationDataWarehouseLoader.java
@@ -35,7 +35,7 @@ import lombok.extern.log4j.Log4j2;
@Component
@RequiredArgsConstructor
@Log4j2
-public class AggregationWarehouseDataLoader implements AggregationDataLoader {
+public class AggregationDataWarehouseLoader implements AggregationDataLoader {
private final WarehouseRepository repository;
diff --git a/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/extern/AggregationRemoteDataLoaderTest.java b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/extern/AggregationDataRemoteLoaderTest.java
similarity index 97%
rename from aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/extern/AggregationRemoteDataLoaderTest.java
rename to aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/extern/AggregationDataRemoteLoaderTest.java
index 045febe..3c7b0b0 100644
--- a/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/extern/AggregationRemoteDataLoaderTest.java
+++ b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/extern/AggregationDataRemoteLoaderTest.java
@@ -44,13 +44,13 @@ import de.ozgcloud.aggregation.transformation.AggregationMapping;
import de.ozgcloud.common.errorhandling.TechnicalException;
import lombok.SneakyThrows;
-class AggregationRemoteDataLoaderTest {
+class AggregationDataRemoteLoaderTest {
@Mock
private AggregationDataRemoteService remoteService;
@Spy
@InjectMocks
- private AggregationRemoteDataLoader loader;
+ private AggregationDataRemoteLoader loader;
@Nested
class TestLoadIntoTarget {
diff --git a/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/extern/SpringContextITCase.java b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/extern/SpringContextITCase.java
index 2c7e93e..b5cd918 100644
--- a/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/extern/SpringContextITCase.java
+++ b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/extern/SpringContextITCase.java
@@ -51,7 +51,7 @@ class SpringContextITCase {
@Test
void shouldHaveOneLoader() {
- assertThat(getLoadersWithScopeExtern(loaders)).singleElement().isInstanceOf(AggregationRemoteDataLoader.class);
+ assertThat(getLoadersWithScopeExtern(loaders)).singleElement().isInstanceOf(AggregationDataRemoteLoader.class);
}
@Test
diff --git a/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/warehouse/AggregationWarehouseDataLoaderTest.java b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/warehouse/AggregationDataWarehouseLoaderTest.java
similarity index 97%
rename from aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/warehouse/AggregationWarehouseDataLoaderTest.java
rename to aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/warehouse/AggregationDataWarehouseLoaderTest.java
index ed86396..1348836 100644
--- a/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/warehouse/AggregationWarehouseDataLoaderTest.java
+++ b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/warehouse/AggregationDataWarehouseLoaderTest.java
@@ -45,13 +45,13 @@ import de.ozgcloud.aggregation.Aggregation;
import de.ozgcloud.aggregation.AggregationTestFactory;
import de.ozgcloud.aggregation.transformation.AggregationMapping;
-class AggregationWarehouseDataLoaderTest {
+class AggregationDataWarehouseLoaderTest {
@Mock
private WarehouseRepository repository;
@Spy
@InjectMocks
- private AggregationWarehouseDataLoader loader;
+ private AggregationDataWarehouseLoader loader;
@Nested
class TestLoadIntoTarget {
diff --git a/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/warehouse/SpringContextITCase.java b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/warehouse/SpringContextITCase.java
index ed88f4f..5504e78 100644
--- a/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/warehouse/SpringContextITCase.java
+++ b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/warehouse/SpringContextITCase.java
@@ -45,7 +45,7 @@ class SpringContextITCase {
@Test
void shouldHaveLoader() {
- assertThat(getLoadersWithScopeIntern(loaders)).singleElement().isInstanceOf(AggregationWarehouseDataLoader.class);
+ assertThat(getLoadersWithScopeIntern(loaders)).singleElement().isInstanceOf(AggregationDataWarehouseLoader.class);
}
@Test
--
GitLab