Skip to content
Snippets Groups Projects
Commit 722df418 authored by OZGCloud's avatar OZGCloud
Browse files

Merge pull request 'OZG-4390 Konfiguration Eingangstrigger' (#1) from...

Merge pull request 'OZG-4390 Konfiguration Eingangstrigger' (#1) from OZG-4390-Konfiguration-Eingangstrigger into master

Reviewed-on: https://git.ozg-sh.de/mgm/ozgcloud-api-lib/pulls/1
parents 882b7ad3 3cd3a7de
Branches
Tags
No related merge requests found
...@@ -6,9 +6,6 @@ import java.util.List; ...@@ -6,9 +6,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.stereotype.Service;
import de.ozgcloud.apilib.common.errorhandling.NotFoundException; import de.ozgcloud.apilib.common.errorhandling.NotFoundException;
import de.ozgcloud.apilib.file.dummy.DummyOzgCloudFileService; import de.ozgcloud.apilib.file.dummy.DummyOzgCloudFileService;
import de.ozgcloud.apilib.vorgang.OzgCloudAntragsteller; import de.ozgcloud.apilib.vorgang.OzgCloudAntragsteller;
...@@ -21,8 +18,6 @@ import de.ozgcloud.apilib.vorgang.OzgCloudVorgangStatus; ...@@ -21,8 +18,6 @@ import de.ozgcloud.apilib.vorgang.OzgCloudVorgangStatus;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangStub; import de.ozgcloud.apilib.vorgang.OzgCloudVorgangStub;
import de.ozgcloud.apilib.vorgang.Page; import de.ozgcloud.apilib.vorgang.Page;
@Service
@ConditionalOnMissingBean(OzgCloudVorgangService.class)
public class DummyVorgangService implements OzgCloudVorgangService { public class DummyVorgangService implements OzgCloudVorgangService {
private final Map<OzgCloudVorgangId, OzgCloudVorgang> idToVorgang; private final Map<OzgCloudVorgangId, OzgCloudVorgang> idToVorgang;
......
...@@ -2,9 +2,6 @@ package de.ozgcloud.apilib.vorgang.grpc; ...@@ -2,9 +2,6 @@ package de.ozgcloud.apilib.vorgang.grpc;
import java.util.List; import java.util.List;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Service;
import de.itvsh.ozg.pluto.vorgang.GrpcFilterBy; import de.itvsh.ozg.pluto.vorgang.GrpcFilterBy;
import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangRequest; import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangRequest;
import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangRequest.GrpcOrderBy; import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangRequest.GrpcOrderBy;
...@@ -19,8 +16,6 @@ import lombok.NonNull; ...@@ -19,8 +16,6 @@ import lombok.NonNull;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import net.devh.boot.grpc.client.inject.GrpcClient; import net.devh.boot.grpc.client.inject.GrpcClient;
@Service
@ConditionalOnProperty("ozgcloud.vorgang-manager.address")
@RequiredArgsConstructor @RequiredArgsConstructor
public class GrpcOzgCloudVorgangService implements OzgCloudVorgangService { public class GrpcOzgCloudVorgangService implements OzgCloudVorgangService {
......
...@@ -10,6 +10,7 @@ import org.mockito.Spy; ...@@ -10,6 +10,7 @@ import org.mockito.Spy;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangEingangTestFactory; import de.ozgcloud.apilib.vorgang.OzgCloudVorgangEingangTestFactory;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangHeaderTestFactory; import de.ozgcloud.apilib.vorgang.OzgCloudVorgangHeaderTestFactory;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangIdMapper;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangTestFactory; import de.ozgcloud.apilib.vorgang.OzgCloudVorgangTestFactory;
class OzgCloudVorgangMapperTest { class OzgCloudVorgangMapperTest {
...@@ -19,6 +20,8 @@ class OzgCloudVorgangMapperTest { ...@@ -19,6 +20,8 @@ class OzgCloudVorgangMapperTest {
@Spy @Spy
private OzgCloudEingangMapper eingangMapper = Mappers.getMapper(OzgCloudEingangMapper.class); private OzgCloudEingangMapper eingangMapper = Mappers.getMapper(OzgCloudEingangMapper.class);
@Spy
private OzgCloudVorgangIdMapper idMapper = Mappers.getMapper(OzgCloudVorgangIdMapper.class);
@Nested @Nested
class TestFromGrpc { class TestFromGrpc {
......
...@@ -13,6 +13,7 @@ import org.springframework.context.annotation.ComponentScan; ...@@ -13,6 +13,7 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import de.itvsh.ozg.pluto.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub; import de.itvsh.ozg.pluto.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
import de.itvsh.ozg.pluto.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
import de.ozgcloud.apilib.alfa.AlfaService; import de.ozgcloud.apilib.alfa.AlfaService;
import de.ozgcloud.apilib.alfa.CommandAlfaService; import de.ozgcloud.apilib.alfa.CommandAlfaService;
import de.ozgcloud.apilib.alfa.dummy.DummyAlfaService; import de.ozgcloud.apilib.alfa.dummy.DummyAlfaService;
...@@ -24,8 +25,14 @@ import de.ozgcloud.apilib.common.command.grpc.CommandMapper; ...@@ -24,8 +25,14 @@ import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
import de.ozgcloud.apilib.common.command.grpc.GrpcOzgCloudCommandService; import de.ozgcloud.apilib.common.command.grpc.GrpcOzgCloudCommandService;
import de.ozgcloud.apilib.file.dummy.DummyOzgCloudFileService; import de.ozgcloud.apilib.file.dummy.DummyOzgCloudFileService;
import de.ozgcloud.apilib.file.grpc.GrpcOzgCloudFileService; import de.ozgcloud.apilib.file.grpc.GrpcOzgCloudFileService;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangIdMapperImpl;
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.OzgCloudEingangMapperImpl;
import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangMapper;
import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangMapperImpl;
import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangStubMapper;
import net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration; import net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration;
import net.devh.boot.grpc.client.config.GrpcChannelProperties; import net.devh.boot.grpc.client.config.GrpcChannelProperties;
import net.devh.boot.grpc.client.config.GrpcChannelsProperties; import net.devh.boot.grpc.client.config.GrpcChannelsProperties;
...@@ -34,9 +41,9 @@ import net.devh.boot.grpc.client.inject.GrpcClient; ...@@ -34,9 +41,9 @@ import net.devh.boot.grpc.client.inject.GrpcClient;
@AutoConfiguration(before = GrpcClientAutoConfiguration.class) @AutoConfiguration(before = GrpcClientAutoConfiguration.class)
@ComponentScan("de.ozgcloud.client.autoconfigure") @ComponentScan("de.ozgcloud.client.autoconfigure")
@Import({ @Import({
GrpcOzgCloudVorgangService.class, DummyVorgangService.class,
GrpcOzgCloudFileService.class, DummyOzgCloudFileService.class, GrpcOzgCloudFileService.class, DummyOzgCloudFileService.class,
OzgCloudCallContextAttachingInterceptor.class OzgCloudCallContextAttachingInterceptor.class,
OzgCloudVorgangMapperImpl.class, OzgCloudEingangMapperImpl.class, OzgCloudVorgangIdMapperImpl.class
}) })
public class OzgCloudClientAutoConfiguration { public class OzgCloudClientAutoConfiguration {
...@@ -118,4 +125,17 @@ public class OzgCloudClientAutoConfiguration { ...@@ -118,4 +125,17 @@ public class OzgCloudClientAutoConfiguration {
AlfaService alfaService() { AlfaService alfaService() {
return new DummyAlfaService(); return new DummyAlfaService();
} }
@Bean("ozgCloudVorgangService")
@ConditionalOnProperty("ozgcloud.vorgang-manager.address")
public OzgCloudVorgangService grpcOzgCloudVorgangService(VorgangServiceBlockingStub vorgangServiceStub, OzgCloudVorgangMapper mapper,
OzgCloudVorgangStubMapper stubMapper) {
return new GrpcOzgCloudVorgangService(vorgangServiceStub, mapper, stubMapper);
}
@Bean("ozgCloudVorgangService")
@ConditionalOnMissingBean(OzgCloudVorgangService.class)
public OzgCloudVorgangService dummyOzgCloudVorgangService() {
return new DummyVorgangService();
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment