Skip to content
Snippets Groups Projects
Commit 8d26e7be authored by OZGCloud's avatar OZGCloud
Browse files

OZG-6842 Add new QueryMapper to autostarter

parent ead0e8cf
Branches
Tags
No related merge requests found
...@@ -15,7 +15,7 @@ import de.ozgcloud.vorgang.vorgang.GrpcVorgangQueryExpression; ...@@ -15,7 +15,7 @@ import de.ozgcloud.vorgang.vorgang.GrpcVorgangQueryExpression;
import de.ozgcloud.vorgang.vorgang.GrpcVorgangQueryExpression.Builder; import de.ozgcloud.vorgang.vorgang.GrpcVorgangQueryExpression.Builder;
@Mapper(collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED, nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) @Mapper(collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED, nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
interface OzgCloudVorgangQueryMapper { public interface OzgCloudVorgangQueryMapper {
default GrpcQuery toGrpc(OzgCloudVorgangQuery query) { default GrpcQuery toGrpc(OzgCloudVorgangQuery query) {
var queryBuilder = GrpcQuery.newBuilder(); var queryBuilder = GrpcQuery.newBuilder();
......
...@@ -31,6 +31,7 @@ import de.ozgcloud.apilib.vorgang.OzgCloudVorgangService; ...@@ -31,6 +31,7 @@ import de.ozgcloud.apilib.vorgang.OzgCloudVorgangService;
import de.ozgcloud.apilib.vorgang.dummy.DummyVorgangService; import de.ozgcloud.apilib.vorgang.dummy.DummyVorgangService;
import de.ozgcloud.apilib.vorgang.grpc.GrpcOzgCloudVorgangService; import de.ozgcloud.apilib.vorgang.grpc.GrpcOzgCloudVorgangService;
import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangMapper; import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangMapper;
import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangQueryMapper;
import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangStubMapper; import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangStubMapper;
import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc; import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc;
import de.ozgcloud.vorgang.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub; import de.ozgcloud.vorgang.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
...@@ -136,10 +137,10 @@ public class OzgCloudClientAutoConfiguration { ...@@ -136,10 +137,10 @@ public class OzgCloudClientAutoConfiguration {
@Bean("ozgCloudVorgangService") @Bean("ozgCloudVorgangService")
@ConditionalOnProperty("ozgcloud.vorgang-manager.address") @ConditionalOnProperty("ozgcloud.vorgang-manager.address")
OzgCloudVorgangService grpcOzgCloudVorgangService(VorgangServiceBlockingStub vorgangServiceStub, OzgCloudVorgangService grpcOzgCloudVorgangService(VorgangServiceBlockingStub vorgangServiceStub,
OzgCloudVorgangMapper mapper, OzgCloudVorgangMapper mapper, OzgCloudVorgangStubMapper stubMapper, OzgCloudVorgangQueryMapper queryMapper,
OzgCloudVorgangStubMapper stubMapper, OzgCloudCallContextProvider contextProvider) { OzgCloudCallContextProvider contextProvider) {
return new GrpcOzgCloudVorgangService(vorgangServiceStub, mapper, stubMapper, contextProvider); return new GrpcOzgCloudVorgangService(vorgangServiceStub, mapper, stubMapper, queryMapper, contextProvider);
} }
@Bean @Bean
...@@ -152,6 +153,11 @@ public class OzgCloudClientAutoConfiguration { ...@@ -152,6 +153,11 @@ public class OzgCloudClientAutoConfiguration {
return Mappers.getMapper(OzgCloudVorgangStubMapper.class); return Mappers.getMapper(OzgCloudVorgangStubMapper.class);
} }
@Bean
OzgCloudVorgangQueryMapper ozgCloudVorgangQueryMapper() {
return Mappers.getMapper(OzgCloudVorgangQueryMapper.class);
}
@Bean("ozgCloudVorgangService") @Bean("ozgCloudVorgangService")
@ConditionalOnMissingBean(OzgCloudVorgangService.class) @ConditionalOnMissingBean(OzgCloudVorgangService.class)
OzgCloudVorgangService dummyOzgCloudVorgangService() { OzgCloudVorgangService dummyOzgCloudVorgangService() {
...@@ -206,7 +212,9 @@ public class OzgCloudClientAutoConfiguration { ...@@ -206,7 +212,9 @@ public class OzgCloudClientAutoConfiguration {
// @Bean // @Bean
// @ConditionalOnProperty("ozgcloud.user-manager.address") // @ConditionalOnProperty("ozgcloud.user-manager.address")
// OzgCloudUserProfileService grpcOzgCloudUserProfileService(@GrpcClient("ozgcloud-user-manager") UserProfileServiceBlockingStub grpcStub, // OzgCloudUserProfileService
// grpcOzgCloudUserProfileService(@GrpcClient("ozgcloud-user-manager")
// UserProfileServiceBlockingStub grpcStub,
// UserProfileMapper mapper) { // UserProfileMapper mapper) {
// System.out.println("#### building UM-ProfileService"); // System.out.println("#### building UM-ProfileService");
// return new GrpcOzgCloudUserProfileService(grpcStub, mapper); // return new GrpcOzgCloudUserProfileService(grpcStub, mapper);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment