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

prevent NPEs on using subobjects of eingang

parent a42ecb81
No related branches found
No related tags found
No related merge requests found
......@@ -6,6 +6,7 @@ import de.ozgcloud.apilib.file.OzgCloudFile;
import de.ozgcloud.apilib.file.OzgCloudFileGroup;
import lombok.Builder;
import lombok.Getter;
import lombok.Singular;
import lombok.ToString;
@Builder
......@@ -14,13 +15,17 @@ import lombok.ToString;
public class OzgCloudEingang {
@ToString.Include
private OzgCloudEingangHeader header;
private OzgCloudAntragsteller antragsteller;
@Builder.Default
private OzgCloudEingangHeader header = OzgCloudEingangHeader.builder().build();
@Builder.Default
private OzgCloudAntragsteller antragsteller = OzgCloudAntragsteller.builder().build();
@ToString.Include
private OzgCloudZustaendigeStelle zustaendigeStelle;
private List<OzgCloudFormDataEntry> formDataEntrys;
@Singular
private List<OzgCloudFileGroup> attachments;
@Singular
private List<OzgCloudFile> representations;
}
......@@ -58,10 +58,10 @@ public class OzgCloudClientAutoConfiguration {
@Autowired
private OzgCloudCommandManagerProperties commandManagerProperties;
@Bean
@ConditionalOnProperty("ozgcloud.vorgang-manager.address")
GrpcChannelsProperties channelProperties() {
var properties = new GrpcChannelsProperties();
// @Bean
// @ConditionalOnProperty("ozgcloud.vorgang-manager.address")
GrpcChannelsProperties channelProperties(GrpcChannelsProperties properties) {
// var properties = new GrpcChannelsProperties();
var clientMap = properties.getClient();
addVorgangManager(clientMap);
......@@ -101,6 +101,20 @@ public class OzgCloudClientAutoConfiguration {
return new DefaultOzgCloudCallContextProvider(ctxt);
}
@Bean("ozgCloudVorgangService")
@ConditionalOnProperty("ozgcloud.vorgang-manager.address")
OzgCloudVorgangService grpcOzgCloudVorgangService(VorgangServiceBlockingStub vorgangServiceStub, OzgCloudVorgangMapper mapper,
OzgCloudVorgangStubMapper stubMapper, OzgCloudCallContextProvider contextProvider) {
return new GrpcOzgCloudVorgangService(vorgangServiceStub, mapper, stubMapper, contextProvider);
}
@Bean("ozgCloudVorgangService")
@ConditionalOnMissingBean(OzgCloudVorgangService.class)
OzgCloudVorgangService dummyOzgCloudVorgangService() {
return new DummyVorgangService();
}
@Bean
@ConditionalOnProperty("ozgcloud.command-manager.address")
OzgCloudCommandService grpcCommandService(@GrpcClient("command-manager") CommandServiceBlockingStub commandServiceStub,
......@@ -126,16 +140,4 @@ public class OzgCloudClientAutoConfiguration {
return new DummyAlfaService();
}
@Bean("ozgCloudVorgangService")
@ConditionalOnProperty("ozgcloud.vorgang-manager.address")
public OzgCloudVorgangService grpcOzgCloudVorgangService(VorgangServiceBlockingStub vorgangServiceStub, OzgCloudVorgangMapper mapper,
OzgCloudVorgangStubMapper stubMapper, OzgCloudCallContextProvider contextProvider) {
return new GrpcOzgCloudVorgangService(vorgangServiceStub, mapper, stubMapper, contextProvider);
}
@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