From b6c33db163d85fade99a225cf85c9abe853eb2c7 Mon Sep 17 00:00:00 2001
From: Krzysztof <krzysztof.witukiewicz@mgm-tp.com>
Date: Tue, 29 Apr 2025 16:14:11 +0200
Subject: [PATCH] OZG-7811 OZG-8114 Adjust properties
---
.../AggregationManagerConfiguration.java | 38 -------------------
.../AggregationManagerGrpcConfiguration.java | 6 +--
.../AggregationManagerProperties.java | 1 +
.../aggregation/AggregationManagerRunner.java | 4 +-
.../extern/AggregationDataRemoteService.java | 4 +-
.../src/main/resources/application-local.yml | 8 +---
.../src/main/resources/application.yml | 5 ++-
.../AggregationManagerRunnerTest.java | 10 ++---
.../AggregationDataRemoteServiceTest.java | 7 +---
.../src/test/resources/application-itcase.yml | 9 ++---
10 files changed, 22 insertions(+), 70 deletions(-)
delete mode 100644 aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerConfiguration.java
diff --git a/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerConfiguration.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerConfiguration.java
deleted file mode 100644
index 0054187..0000000
--- a/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerConfiguration.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-package de.ozgcloud.aggregation;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@ConfigurationProperties(prefix = "aggregation-manager")
-@Getter
-@Setter
-public class AggregationManagerConfiguration {
-
- private int fetchingBatchSize;
-
-}
diff --git a/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerGrpcConfiguration.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerGrpcConfiguration.java
index a9b23c1..3994100 100644
--- a/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerGrpcConfiguration.java
+++ b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerGrpcConfiguration.java
@@ -43,6 +43,7 @@ import net.devh.boot.grpc.client.inject.GrpcClientBean;
@GrpcClientBean(clazz = VorgangServiceGrpc.VorgangServiceBlockingStub.class, beanName = "vorgangServiceBlockingStub", client = @GrpcClient("vorgang-manager"))
@GrpcClientBean(clazz = AggregationDataServiceGrpc.AggregationDataServiceStub.class, beanName = "aggregationDataServiceStub", client = @GrpcClient("aggregation-manager"))
public class AggregationManagerGrpcConfiguration {
+
@GrpcClient("vorgang-manager")
VorgangServiceGrpc.VorgangServiceBlockingStub vorgangServiceBlockingStub;
@GrpcClient("aggregation-manager")
@@ -58,8 +59,7 @@ public class AggregationManagerGrpcConfiguration {
@Bean
@ConditionalOnProperty("grpc.client.aggregation-manager.address")
- AggregationDataRemoteService aggregationDataRemoteService(AggregationManagerProperties properties,
- AggregationManagerConfiguration configuration, GrpcAggregationDataMapper grpcAggregationDataMapper) {
- return new AggregationDataRemoteService(aggregationDataServiceStub, properties, configuration, grpcAggregationDataMapper);
+ AggregationDataRemoteService aggregationDataRemoteService(AggregationManagerProperties properties, GrpcAggregationDataMapper grpcAggregationDataMapper) {
+ return new AggregationDataRemoteService(aggregationDataServiceStub, properties, grpcAggregationDataMapper);
}
}
diff --git a/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerProperties.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerProperties.java
index 4ace2f5..c54be5d 100644
--- a/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerProperties.java
+++ b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerProperties.java
@@ -39,5 +39,6 @@ import lombok.extern.log4j.Log4j2;
@Log4j2
public class AggregationManagerProperties {
+ private int fetchingBatchSize;
private String mandant;
}
diff --git a/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerRunner.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerRunner.java
index 9debd13..8b0544e 100644
--- a/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerRunner.java
+++ b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerRunner.java
@@ -49,7 +49,7 @@ public abstract class AggregationManagerRunner implements CommandLineRunner {
private static final String MDC_EXECUTION = "execution";
- private final AggregationManagerConfiguration config;
+ private final AggregationManagerProperties aggregationManagerProperties;
private final TransformationProperties transformationProperties;
private final TransformationService transformationService;
private final AggregationDataLoaderRegistry loaderRegistry;
@@ -91,7 +91,7 @@ public abstract class AggregationManagerRunner implements CommandLineRunner {
Aggregator createAggregator(AggregationMapping.Scope scope) {
return createAggregator()
- .withBatchSize(config.getFetchingBatchSize())
+ .withBatchSize(aggregationManagerProperties.getFetchingBatchSize())
.withLoader(loaderRegistry.getLoader(scope));
}
diff --git a/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/extern/AggregationDataRemoteService.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/extern/AggregationDataRemoteService.java
index 531a02c..b0b91dc 100644
--- a/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/extern/AggregationDataRemoteService.java
+++ b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/extern/AggregationDataRemoteService.java
@@ -29,7 +29,6 @@ import java.util.concurrent.Future;
import java.util.stream.Stream;
import de.ozgcloud.aggregation.Aggregation;
-import de.ozgcloud.aggregation.AggregationManagerConfiguration;
import de.ozgcloud.aggregation.AggregationManagerProperties;
import de.ozgcloud.aggregation.data.AggregationDataServiceGrpc;
import de.ozgcloud.aggregation.data.GrpcAggregationData;
@@ -49,7 +48,6 @@ public class AggregationDataRemoteService {
@GrpcClient("aggregation-manager")
private final AggregationDataServiceGrpc.AggregationDataServiceStub serviceStub;
private final AggregationManagerProperties properties;
- private final AggregationManagerConfiguration configuration;
private final GrpcAggregationDataMapper grpcAggregationDataMapper;
public Future<Void> sendAggregationData(Aggregation aggregation) {
@@ -61,7 +59,7 @@ public class AggregationDataRemoteService {
SendAggregationDataResponseObserver buildSendAggregationDataResponseObserver(Aggregation aggregation) {
var requestData = new RequestData(properties.getMandant(), aggregation.aggregationName(),
toGrpcAggregationDataStream(aggregation.documentEntries()).iterator());
- return new SendAggregationDataResponseObserver(configuration.getFetchingBatchSize(), requestData);
+ return new SendAggregationDataResponseObserver(properties.getFetchingBatchSize(), requestData);
}
Stream<GrpcAggregationData> toGrpcAggregationDataStream(Stream<DocumentEntry> documentEntries) {
diff --git a/aggregation-manager-job/src/main/resources/application-local.yml b/aggregation-manager-job/src/main/resources/application-local.yml
index f971794..a038ff2 100644
--- a/aggregation-manager-job/src/main/resources/application-local.yml
+++ b/aggregation-manager-job/src/main/resources/application-local.yml
@@ -14,10 +14,6 @@ spring:
database: aggregation-manager-job
ozgcloud:
- vorgang-manager:
- address: static://127.0.0.1:9090
- negotiationType: PLAINTEXT
-
-aggregation-manager:
- fetching-batch-size: 5
+ fetching-batch-size: 5
+ mandant: "Landeshauptstadt Kiel"
diff --git a/aggregation-manager-job/src/main/resources/application.yml b/aggregation-manager-job/src/main/resources/application.yml
index 10ba491..8799164 100644
--- a/aggregation-manager-job/src/main/resources/application.yml
+++ b/aggregation-manager-job/src/main/resources/application.yml
@@ -39,6 +39,7 @@ spring:
application:
name: OzgCloud_AggregationManager
-aggregation-manager:
+ozgcloud:
fetching-batch-size: 100
- identifier: "id.value"
+ aggregation:
+ identifier: "id.value"
diff --git a/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/AggregationManagerRunnerTest.java b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/AggregationManagerRunnerTest.java
index a494e09..7048356 100644
--- a/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/AggregationManagerRunnerTest.java
+++ b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/AggregationManagerRunnerTest.java
@@ -53,7 +53,7 @@ import de.ozgcloud.aggregation.transformation.TransformationService;
class AggregationManagerRunnerTest {
@Mock
- private AggregationManagerConfiguration config;
+ private AggregationManagerProperties aggregationManagerProperties;
@Mock
private TransformationProperties transformationProperties;
@Mock
@@ -332,7 +332,7 @@ class AggregationManagerRunnerTest {
@BeforeEach
void init() {
- when(config.getFetchingBatchSize()).thenReturn(batchSize);
+ when(aggregationManagerProperties.getFetchingBatchSize()).thenReturn(batchSize);
when(loaderRegistry.getLoader(any())).thenReturn(loader);
when(aggregator.withBatchSize(anyInt())).thenReturn(aggregator);
when(aggregator.withLoader(any())).thenReturn(aggregator);
@@ -342,7 +342,7 @@ class AggregationManagerRunnerTest {
void shouldGetBatchSize() {
runner.createAggregator(scope);
- verify(config).getFetchingBatchSize();
+ verify(aggregationManagerProperties).getFetchingBatchSize();
}
@Test
@@ -376,9 +376,9 @@ class AggregationManagerRunnerTest {
static class AggregationManagerRunnerImpl extends AggregationManagerRunner {
- public AggregationManagerRunnerImpl(AggregationManagerConfiguration config, TransformationProperties transformationProperties,
+ public AggregationManagerRunnerImpl(AggregationManagerProperties aggregationManagerProperties, TransformationProperties transformationProperties,
TransformationService transformationService, AggregationDataLoaderRegistry loaderRegistry) {
- super(config, transformationProperties, transformationService, loaderRegistry);
+ super(aggregationManagerProperties, transformationProperties, transformationService, loaderRegistry);
}
@Override
diff --git a/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/extern/AggregationDataRemoteServiceTest.java b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/extern/AggregationDataRemoteServiceTest.java
index c3711cc..8d34461 100644
--- a/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/extern/AggregationDataRemoteServiceTest.java
+++ b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/extern/AggregationDataRemoteServiceTest.java
@@ -46,7 +46,6 @@ import org.mockito.Spy;
import com.thedeanda.lorem.LoremIpsum;
import de.ozgcloud.aggregation.Aggregation;
-import de.ozgcloud.aggregation.AggregationManagerConfiguration;
import de.ozgcloud.aggregation.AggregationManagerProperties;
import de.ozgcloud.aggregation.AggregationTestFactory;
import de.ozgcloud.aggregation.data.AggregationDataServiceGrpc;
@@ -65,8 +64,6 @@ class AggregationDataRemoteServiceTest {
@Mock
private AggregationManagerProperties properties;
@Mock
- private AggregationManagerConfiguration configuration;
- @Mock
private GrpcAggregationDataMapper grpcAggregationDataMapper;
@InjectMocks
@Spy
@@ -124,7 +121,7 @@ class AggregationDataRemoteServiceTest {
@BeforeEach
void init() {
doReturn(Stream.of(GrpcAggregationDataTestFactory.create())).when(service).toGrpcAggregationDataStream(any());
- when(configuration.getFetchingBatchSize()).thenReturn(BATCH_SIZE);
+ when(properties.getFetchingBatchSize()).thenReturn(BATCH_SIZE);
}
@Test
@@ -146,7 +143,7 @@ class AggregationDataRemoteServiceTest {
void shouldGetBatchSize() {
service.buildSendAggregationDataResponseObserver(AggregationTestFactory.create());
- verify(configuration).getFetchingBatchSize();
+ verify(properties).getFetchingBatchSize();
}
@Test
diff --git a/aggregation-manager-job/src/test/resources/application-itcase.yml b/aggregation-manager-job/src/test/resources/application-itcase.yml
index b370e11..c8eef97 100644
--- a/aggregation-manager-job/src/test/resources/application-itcase.yml
+++ b/aggregation-manager-job/src/test/resources/application-itcase.yml
@@ -10,14 +10,11 @@ spring:
banner-mode: "off"
ozgcloud:
- vorgang-manager:
- address: static://127.0.0.1:9090
- negotiationType: PLAINTEXT
command:
line:
runner:
enabled: false
-
-aggregation-manager:
+ mandant: "Landeshauptstadt Kiel"
fetching-batch-size: 2
- identifier: "id.value"
+ aggregation:
+ identifier: "id.value"
--
GitLab