Skip to content
Snippets Groups Projects
Commit 38b96b7f authored by OZGCloud's avatar OZGCloud
Browse files

OZG-5681 init custom command service instead of using default

parent f8a238d2
No related branches found
No related tags found
No related merge requests found
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<properties> <properties>
<vorgang-manager.version>2.7.0</vorgang-manager.version> <vorgang-manager.version>2.7.0</vorgang-manager.version>
<nachrichten-manager.version>2.7.0</nachrichten-manager.version> <nachrichten-manager.version>2.7.0</nachrichten-manager.version>
<api-lib.version>0.8.0</api-lib.version> <api-lib.version>0.9.0-SNAPSHOT</api-lib.version>
</properties> </properties>
<dependencies> <dependencies>
......
...@@ -36,7 +36,7 @@ import net.devh.boot.grpc.client.inject.GrpcClient; ...@@ -36,7 +36,7 @@ import net.devh.boot.grpc.client.inject.GrpcClient;
@Configuration @Configuration
public class BescheidManagerConfiguration { public class BescheidManagerConfiguration {
@GrpcClient("ozgcloud-command-manager") @GrpcClient("command-manager")
private CommandServiceGrpc.CommandServiceBlockingStub commandServiceStub; private CommandServiceGrpc.CommandServiceBlockingStub commandServiceStub;
@Bean("bescheid_OzgCloudCommandService") @Bean("bescheid_OzgCloudCommandService")
......
package de.ozgcloud.vorgang; package de.ozgcloud.vorgang;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories; import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
import org.springframework.data.mongodb.repository.config.EnableMongoRepositories; import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
import de.ozgcloud.apilib.common.command.grpc.GrpcOzgCloudCommandService;
import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc;
import io.mongock.runner.springboot.EnableMongock; import io.mongock.runner.springboot.EnableMongock;
import net.devh.boot.grpc.client.inject.GrpcClient;
@Configuration @Configuration
@EnableMongock @EnableMongock
...@@ -12,4 +19,13 @@ import io.mongock.runner.springboot.EnableMongock; ...@@ -12,4 +19,13 @@ import io.mongock.runner.springboot.EnableMongock;
@EnableElasticsearchRepositories(basePackages = "de.ozgcloud.vorgang.common.search") @EnableElasticsearchRepositories(basePackages = "de.ozgcloud.vorgang.common.search")
public class VorgangManagerServerConfiguration { public class VorgangManagerServerConfiguration {
@GrpcClient("command-manager")
private CommandServiceGrpc.CommandServiceBlockingStub commandServiceStub;
@Bean
@Primary
OzgCloudCommandService grpcOzgCloudCommandService(CommandMapper commandMapper, VorgangManagerCallContextProvider contextProvider) {
return new GrpcOzgCloudCommandService(commandServiceStub, commandMapper, contextProvider,
GrpcOzgCloudCommandService.DEFAULT_COMMAND_REQUEST_THRESHOLD_MILLIS);
}
} }
...@@ -37,6 +37,9 @@ grpc: ...@@ -37,6 +37,9 @@ grpc:
negotiationType: PLAINTEXT negotiationType: PLAINTEXT
info-manager: info-manager:
negotiationType: TLS negotiationType: TLS
command-manager:
address: self:self
negotiationType: PLAINTEXT
management: management:
server: server:
......
...@@ -83,6 +83,7 @@ import de.ozgcloud.vorgang.vorgang.VorgangTestFactory; ...@@ -83,6 +83,7 @@ import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
"grpc.client.vorgang-manager.address=in-process:test", "grpc.client.vorgang-manager.address=in-process:test",
"grpc.client.nachrichten-manager.address=in-process:test", "grpc.client.nachrichten-manager.address=in-process:test",
"grpc.client.pluto.address=in-process:test", "grpc.client.pluto.address=in-process:test",
"grpc.client.command-manager.address=in-process:test",
"ozgcloud.feature.bescheid.enable-dummy-document-processor=true", "ozgcloud.feature.bescheid.enable-dummy-document-processor=true",
}) })
@DataITCase @DataITCase
......
...@@ -57,7 +57,7 @@ import de.ozgcloud.vorgang.command.CommandTestFactory; ...@@ -57,7 +57,7 @@ import de.ozgcloud.vorgang.command.CommandTestFactory;
@SpringBootTest(classes = VorgangManagerServerApplication.class, properties = { @SpringBootTest(classes = VorgangManagerServerApplication.class, properties = {
"grpc.server.inProcessName=test", "grpc.server.inProcessName=test",
"grpc.server.port=-1", "grpc.server.port=-1",
"grpc.client.ozgcloud-command-manager.address=in-process:test", "grpc.client.command-manager.address=in-process:test",
"grpc.client.vorgang-manager.address=in-process:test" "grpc.client.vorgang-manager.address=in-process:test"
}) })
@DataITCase @DataITCase
......
...@@ -39,8 +39,8 @@ import de.ozgcloud.vorgang.vorgang.VorgangTestFactory; ...@@ -39,8 +39,8 @@ import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
"ozgcloud.processors.0.address=http://localhost:8090/testprocessor", "ozgcloud.processors.0.address=http://localhost:8090/testprocessor",
"ozgcloud.processors.0.forms.0.formEngineName=testFormEngine", "ozgcloud.processors.0.forms.0.formEngineName=testFormEngine",
"ozgcloud.processors.0.forms.0.formId=testForm", "ozgcloud.processors.0.forms.0.formId=testForm",
"grpc.server.port=9091", "grpc.server.inProcessName=test",
"ozgcloud.command-manager.address=static://127.0.0.1:9091" "grpc.client.command-manager.address=in-process:test",
}, classes = { VorgangManagerServerApplication.class }) }, classes = { VorgangManagerServerApplication.class })
@ActiveProfiles({ "local", "itcase" }) @ActiveProfiles({ "local", "itcase" })
@WithMockCustomUser @WithMockCustomUser
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment