Skip to content
Snippets Groups Projects
Commit 50ce6e31 authored by OZG-Cloud Team's avatar OZG-Cloud Team
Browse files

OZG-4194 OZG-4578 Renames in classes

parent c9608f58
No related branches found
No related tags found
No related merge requests found
Showing with 16 additions and 16 deletions
...@@ -47,8 +47,8 @@ import lombok.SneakyThrows; ...@@ -47,8 +47,8 @@ import lombok.SneakyThrows;
@ITCase @ITCase
//@SpringBootTest(properties = { //@SpringBootTest(properties = {
// "grpc.client.pluto-local.address=static://127.0.0.1:9090", // "grpc.client.vorgang-manager-local.address=static://127.0.0.1:9090",
// "grpc.client.pluto-local.negotiationType=PLAINTEXT" // "grpc.client.vorgang-manager-local.negotiationType=PLAINTEXT"
//}) //})
//@ActiveProfiles("itcase") //@ActiveProfiles("itcase")
@AutoConfigureMockMvc @AutoConfigureMockMvc
......
grpc: grpc:
client: client:
vorgang-manager-kiel: vorgang-manager-kiel:
address: pluto-clusterip.sh-kiel-dev:9090 address: vorgang-manager-clusterip.sh-kiel-dev:9090
negotiationType: PLAINTEXT negotiationType: PLAINTEXT
ozgcloud: ozgcloud:
......
grpc: grpc:
client: client:
vorgang-manager-kiel: vorgang-manager-kiel:
address: pluto-clusterip.sh-kiel-test:9090 address: vorgang-manager-clusterip.sh-kiel-test:9090
negotiationType: PLAINTEXT negotiationType: PLAINTEXT
vorgang-manager-sl: vorgang-manager-sl:
address: pluto-clusterip.sh-sl-test:9090 address: vorgang-manager-clusterip.sh-sl-test:9090
negotiationType: PLAINTEXT negotiationType: PLAINTEXT
ozgcloud: ozgcloud:
......
...@@ -123,7 +123,7 @@ public class VorgangManagerServerResolver { ...@@ -123,7 +123,7 @@ public class VorgangManagerServerResolver {
throw new UnknownOrganisationseinheitException(); throw new UnknownOrganisationseinheitException();
} else { } else {
return properties.getFundstelleVorgangManagerName().map(this::addChannelPrefix).orElseThrow(() -> new AdapterConfigurationException( 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(() -> { }).orElseThrow(() -> {
LOG.warn("Missing required routing fallback Strategy. Falling back to 'DENY'"); LOG.warn("Missing required routing fallback Strategy. Falling back to 'DENY'");
......
...@@ -67,10 +67,10 @@ public class VorgangRemoteService { ...@@ -67,10 +67,10 @@ public class VorgangRemoteService {
private VorgangManagerServerResolver vorgangManagerServerResolver; private VorgangManagerServerResolver vorgangManagerServerResolver;
public String createVorgang(FormData formData, GrpcEingang eingang, Optional<String> organisationsEinheitenId) { public String createVorgang(FormData formData, GrpcEingang eingang, Optional<String> organisationsEinheitenId) {
var plutoStub = vorgangManagerServerResolver.resolveVorgangServiceBlockingStubByOrganisationseinheitenId(organisationsEinheitenId); var vorgangManagerStub = vorgangManagerServerResolver.resolveVorgangServiceBlockingStubByOrganisationseinheitenId(organisationsEinheitenId);
LOG.info("Connecting to pluto server " + plutoStub.getChannel().authority() + "; OrganisationsEinheitId: " + 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, public String createVorgang(FormData formData, GrpcEingang eingang, VorgangServiceBlockingStub remoteStub,
......
...@@ -61,7 +61,7 @@ class VorgangManagerListPropertiesTest { ...@@ -61,7 +61,7 @@ class VorgangManagerListPropertiesTest {
} }
@Test @Test
void shouldViolateMissingTargetPlutoName() { void shouldViolateMissingTargetVorgangManagerName() {
props.setTargetVorgangManagerName(Optional.empty()); props.setTargetVorgangManagerName(Optional.empty());
var violations = getValidator().validate(props); var violations = getValidator().validate(props);
...@@ -118,7 +118,7 @@ class VorgangManagerListPropertiesTest { ...@@ -118,7 +118,7 @@ class VorgangManagerListPropertiesTest {
private VorgangManagerListProperties props = VorgangManagerListPropertiesTestFactory.createForMultiRouting(); private VorgangManagerListProperties props = VorgangManagerListPropertiesTestFactory.createForMultiRouting();
@Test @Test
void shouldViolateMissingPluto() { void shouldViolateMissingVorgangManager() {
Map<String, ClientProperty> clientMap = new HashMap<>(props.getClientProperties().get().getClient()); Map<String, ClientProperty> clientMap = new HashMap<>(props.getClientProperties().get().getClient());
clientMap.remove("vorgang-manager-kiel"); clientMap.remove("vorgang-manager-kiel");
props.getClientProperties().get().setClient(clientMap); props.getClientProperties().get().setClient(clientMap);
......
...@@ -33,8 +33,8 @@ import de.ozgcloud.eingang.router.VorgangManagerListProperties.RoutingStrategy; ...@@ -33,8 +33,8 @@ import de.ozgcloud.eingang.router.VorgangManagerListProperties.RoutingStrategy;
class VorgangManagerListPropertiesTestFactory { class VorgangManagerListPropertiesTestFactory {
static final FallbackStrategy FALLBACK_STRATEGY = FallbackStrategy.DENY; static final FallbackStrategy FALLBACK_STRATEGY = FallbackStrategy.DENY;
static final String FUNDSTELLE_PLUTO_NAME = "fundstelle"; static final String FUNDSTELLE_VORGANG_MANAGER_NAME = "fundstelle";
static final String FUNDSTELLE_CHANNEL_NAME = "vorgang-manager-" + FUNDSTELLE_PLUTO_NAME; static final String FUNDSTELLE_CHANNEL_NAME = "vorgang-manager-" + FUNDSTELLE_VORGANG_MANAGER_NAME;
static final String ORGANISATIONSEINHEIT_ID = "123"; static final String ORGANISATIONSEINHEIT_ID = "123";
static final String VORGANG_MANAGER_NAME = "kiel"; static final String VORGANG_MANAGER_NAME = "kiel";
...@@ -45,7 +45,7 @@ class VorgangManagerListPropertiesTestFactory { ...@@ -45,7 +45,7 @@ class VorgangManagerListPropertiesTestFactory {
static VorgangManagerListProperties createWithFundstelle() { static VorgangManagerListProperties createWithFundstelle() {
var props = createForMultiRouting(); var props = createForMultiRouting();
props.setFallbackStrategy(Optional.of(FallbackStrategy.FUNDSTELLE)); props.setFallbackStrategy(Optional.of(FallbackStrategy.FUNDSTELLE));
props.setFundstelleVorgangManagerName(Optional.of(FUNDSTELLE_PLUTO_NAME)); props.setFundstelleVorgangManagerName(Optional.of(FUNDSTELLE_VORGANG_MANAGER_NAME));
return props; return props;
} }
......
...@@ -35,7 +35,7 @@ import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServi ...@@ -35,7 +35,7 @@ import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServi
import de.ozgcloud.vorgang.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub; import de.ozgcloud.vorgang.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
@SpringBootTest(properties = { @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 { class VorgangManagerServerResolverITCase {
......
...@@ -33,4 +33,4 @@ mkdir -p $TEST_DIR ...@@ -33,4 +33,4 @@ mkdir -p $TEST_DIR
cp -a src/test/resources/intelliform/filereader/example/* $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"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment