From c77b55ffce60b5851cbadcf2a20b740a03a36eaa Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 29 Nov 2023 14:11:59 +0100
Subject: [PATCH] OZG-4194 OZG-4578 Renames in classes
---
.../eingang/formcycle/FormDataControllerITCase.java | 4 ++--
intelliform-adapter/src/main/resources/application-dev.yml | 2 +-
intelliform-adapter/src/main/resources/application-test.yml | 4 ++--
.../eingang/router/VorgangManagerServerResolver.java | 2 +-
.../de/ozgcloud/eingang/router/VorgangRemoteService.java | 6 +++---
.../eingang/router/VorgangManagerListPropertiesTest.java | 4 ++--
.../router/VorgangManagerListPropertiesTestFactory.java | 6 +++---
.../eingang/router/VorgangManagerServerResolverITCase.java | 2 +-
run_filereader.sh | 2 +-
9 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormDataControllerITCase.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormDataControllerITCase.java
index 4609bb637..72ac82bf1 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormDataControllerITCase.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormDataControllerITCase.java
@@ -47,8 +47,8 @@ import lombok.SneakyThrows;
@ITCase
//@SpringBootTest(properties = {
-// "grpc.client.pluto-local.address=static://127.0.0.1:9090",
-// "grpc.client.pluto-local.negotiationType=PLAINTEXT"
+// "grpc.client.vorgang-manager-local.address=static://127.0.0.1:9090",
+// "grpc.client.vorgang-manager-local.negotiationType=PLAINTEXT"
//})
//@ActiveProfiles("itcase")
@AutoConfigureMockMvc
diff --git a/intelliform-adapter/src/main/resources/application-dev.yml b/intelliform-adapter/src/main/resources/application-dev.yml
index 3e6f9c152..69939e057 100644
--- a/intelliform-adapter/src/main/resources/application-dev.yml
+++ b/intelliform-adapter/src/main/resources/application-dev.yml
@@ -1,7 +1,7 @@
grpc:
client:
vorgang-manager-kiel:
- address: pluto-clusterip.sh-kiel-dev:9090
+ address: vorgang-manager-clusterip.sh-kiel-dev:9090
negotiationType: PLAINTEXT
ozgcloud:
diff --git a/intelliform-adapter/src/main/resources/application-test.yml b/intelliform-adapter/src/main/resources/application-test.yml
index 9d7c0b3ad..6626522d8 100644
--- a/intelliform-adapter/src/main/resources/application-test.yml
+++ b/intelliform-adapter/src/main/resources/application-test.yml
@@ -1,10 +1,10 @@
grpc:
client:
vorgang-manager-kiel:
- address: pluto-clusterip.sh-kiel-test:9090
+ address: vorgang-manager-clusterip.sh-kiel-test:9090
negotiationType: PLAINTEXT
vorgang-manager-sl:
- address: pluto-clusterip.sh-sl-test:9090
+ address: vorgang-manager-clusterip.sh-sl-test:9090
negotiationType: PLAINTEXT
ozgcloud:
diff --git a/router/src/main/java/de/ozgcloud/eingang/router/VorgangManagerServerResolver.java b/router/src/main/java/de/ozgcloud/eingang/router/VorgangManagerServerResolver.java
index af80afe6e..a227052a1 100644
--- a/router/src/main/java/de/ozgcloud/eingang/router/VorgangManagerServerResolver.java
+++ b/router/src/main/java/de/ozgcloud/eingang/router/VorgangManagerServerResolver.java
@@ -123,7 +123,7 @@ public class VorgangManagerServerResolver {
throw new UnknownOrganisationseinheitException();
} else {
return properties.getFundstelleVorgangManagerName().map(this::addChannelPrefix).orElseThrow(() -> new AdapterConfigurationException(
- "Property 'fundstellePlutoName' is missing but required for fallbackStrategy 'FUNDSTELLE'"));
+ "Property 'fundstelleVorgangManagerName' is missing but required for fallbackStrategy 'FUNDSTELLE'"));
}
}).orElseThrow(() -> {
LOG.warn("Missing required routing fallback Strategy. Falling back to 'DENY'");
diff --git a/router/src/main/java/de/ozgcloud/eingang/router/VorgangRemoteService.java b/router/src/main/java/de/ozgcloud/eingang/router/VorgangRemoteService.java
index 1cab8804a..c2f5f07a7 100644
--- a/router/src/main/java/de/ozgcloud/eingang/router/VorgangRemoteService.java
+++ b/router/src/main/java/de/ozgcloud/eingang/router/VorgangRemoteService.java
@@ -67,10 +67,10 @@ public class VorgangRemoteService {
private VorgangManagerServerResolver vorgangManagerServerResolver;
public String createVorgang(FormData formData, GrpcEingang eingang, Optional<String> organisationsEinheitenId) {
- var plutoStub = vorgangManagerServerResolver.resolveVorgangServiceBlockingStubByOrganisationseinheitenId(organisationsEinheitenId);
- LOG.info("Connecting to pluto server " + plutoStub.getChannel().authority() + "; OrganisationsEinheitId: " + organisationsEinheitenId);
+ var vorgangManagerStub = vorgangManagerServerResolver.resolveVorgangServiceBlockingStubByOrganisationseinheitenId(organisationsEinheitenId);
+ LOG.info("Connecting to vorgang-manager server " + vorgangManagerStub.getChannel().authority() + "; OrganisationsEinheitId: " + organisationsEinheitenId);
- return createVorgang(formData, eingang, plutoStub, getBinaryFileServiceStub(organisationsEinheitenId));
+ return createVorgang(formData, eingang, vorgangManagerStub, getBinaryFileServiceStub(organisationsEinheitenId));
}
public String createVorgang(FormData formData, GrpcEingang eingang, VorgangServiceBlockingStub remoteStub,
diff --git a/router/src/test/java/de/ozgcloud/eingang/router/VorgangManagerListPropertiesTest.java b/router/src/test/java/de/ozgcloud/eingang/router/VorgangManagerListPropertiesTest.java
index 76c3e5673..c470ff21d 100644
--- a/router/src/test/java/de/ozgcloud/eingang/router/VorgangManagerListPropertiesTest.java
+++ b/router/src/test/java/de/ozgcloud/eingang/router/VorgangManagerListPropertiesTest.java
@@ -61,7 +61,7 @@ class VorgangManagerListPropertiesTest {
}
@Test
- void shouldViolateMissingTargetPlutoName() {
+ void shouldViolateMissingTargetVorgangManagerName() {
props.setTargetVorgangManagerName(Optional.empty());
var violations = getValidator().validate(props);
@@ -118,7 +118,7 @@ class VorgangManagerListPropertiesTest {
private VorgangManagerListProperties props = VorgangManagerListPropertiesTestFactory.createForMultiRouting();
@Test
- void shouldViolateMissingPluto() {
+ void shouldViolateMissingVorgangManager() {
Map<String, ClientProperty> clientMap = new HashMap<>(props.getClientProperties().get().getClient());
clientMap.remove("vorgang-manager-kiel");
props.getClientProperties().get().setClient(clientMap);
diff --git a/router/src/test/java/de/ozgcloud/eingang/router/VorgangManagerListPropertiesTestFactory.java b/router/src/test/java/de/ozgcloud/eingang/router/VorgangManagerListPropertiesTestFactory.java
index d97574384..99ed3490b 100644
--- a/router/src/test/java/de/ozgcloud/eingang/router/VorgangManagerListPropertiesTestFactory.java
+++ b/router/src/test/java/de/ozgcloud/eingang/router/VorgangManagerListPropertiesTestFactory.java
@@ -33,8 +33,8 @@ import de.ozgcloud.eingang.router.VorgangManagerListProperties.RoutingStrategy;
class VorgangManagerListPropertiesTestFactory {
static final FallbackStrategy FALLBACK_STRATEGY = FallbackStrategy.DENY;
- static final String FUNDSTELLE_PLUTO_NAME = "fundstelle";
- static final String FUNDSTELLE_CHANNEL_NAME = "vorgang-manager-" + FUNDSTELLE_PLUTO_NAME;
+ static final String FUNDSTELLE_VORGANG_MANAGER_NAME = "fundstelle";
+ static final String FUNDSTELLE_CHANNEL_NAME = "vorgang-manager-" + FUNDSTELLE_VORGANG_MANAGER_NAME;
static final String ORGANISATIONSEINHEIT_ID = "123";
static final String VORGANG_MANAGER_NAME = "kiel";
@@ -45,7 +45,7 @@ class VorgangManagerListPropertiesTestFactory {
static VorgangManagerListProperties createWithFundstelle() {
var props = createForMultiRouting();
props.setFallbackStrategy(Optional.of(FallbackStrategy.FUNDSTELLE));
- props.setFundstelleVorgangManagerName(Optional.of(FUNDSTELLE_PLUTO_NAME));
+ props.setFundstelleVorgangManagerName(Optional.of(FUNDSTELLE_VORGANG_MANAGER_NAME));
return props;
}
diff --git a/router/src/test/java/de/ozgcloud/eingang/router/VorgangManagerServerResolverITCase.java b/router/src/test/java/de/ozgcloud/eingang/router/VorgangManagerServerResolverITCase.java
index 0c1bf3d45..62d86f63f 100644
--- a/router/src/test/java/de/ozgcloud/eingang/router/VorgangManagerServerResolverITCase.java
+++ b/router/src/test/java/de/ozgcloud/eingang/router/VorgangManagerServerResolverITCase.java
@@ -35,7 +35,7 @@ import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServi
import de.ozgcloud.vorgang.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
@SpringBootTest(properties = {
- "grpc.client.pluto-kiel.address=static://127.0.0.1:9090"
+ "grpc.client.vorgang-manager-kiel.address=static://127.0.0.1:9090"
})
class VorgangManagerServerResolverITCase {
diff --git a/run_filereader.sh b/run_filereader.sh
index 9e47bc203..765453ab0 100755
--- a/run_filereader.sh
+++ b/run_filereader.sh
@@ -33,4 +33,4 @@ mkdir -p $TEST_DIR
cp -a src/test/resources/intelliform/filereader/example/* $TEST_DIR
-./mvnw spring-boot:run -Dspring-boot.run.arguments="--kop.adapter.intelliform.filereader.path=file:$TEST_DIR"
+./mvnw spring-boot:run -Dspring-boot.run.arguments="--ozgcloud.adapter.intelliform.filereader.path=file:$TEST_DIR"
--
GitLab