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

OZG-6710 fix bean initialization

parent f08a1661
Branches
Tags
No related merge requests found
......@@ -17,7 +17,7 @@
<description>OZG-Cloud Processor Manager</description>
<properties>
<vorgang-manager.version>2.15.0-PR-458-SNAPSHOT</vorgang-manager.version>
<vorgang-manager.version>2.17.0-PR-458-SNAPSHOT</vorgang-manager.version>
<api-lib.version>0.13.0-PR-31-SNAPSHOT</api-lib.version>
<tyrus-standalone-client.version>2.2.0</tyrus-standalone-client.version>
<okio.version>3.9.1</okio.version>
......
......@@ -23,12 +23,14 @@
*/
package de.ozgcloud.processor;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangService;
import de.ozgcloud.apilib.vorgang.grpc.GrpcOzgCloudVorgangService;
import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangMapper;
import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangQueryMapper;
import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangStubMapper;
import de.ozgcloud.vorgang.vorgang.VorgangServiceGrpc;
import net.devh.boot.grpc.client.inject.GrpcClient;
......@@ -39,9 +41,10 @@ public class ProcessorManagerConfiguration {
@GrpcClient("vorgang-manager")
private VorgangServiceGrpc.VorgangServiceBlockingStub vorgangServiceStub;
@ConditionalOnProperty(prefix = "ozgcloud.processors[0]", name = "address")
@Bean("processorManager_OzgCloudCommandService")
OzgCloudVorgangService grpcOzgCloudCommandService(OzgCloudVorgangMapper vorgangMapper, OzgCloudVorgangStubMapper vorgangStubMapper,
ProzessorManagerCallContextProvider contextProvider) {
return new GrpcOzgCloudVorgangService(vorgangServiceStub, vorgangMapper, vorgangStubMapper, contextProvider);
OzgCloudVorgangQueryMapper vorgangQueryMapper, ProzessorManagerCallContextProvider contextProvider) {
return new GrpcOzgCloudVorgangService(vorgangServiceStub, vorgangMapper, vorgangStubMapper, vorgangQueryMapper, contextProvider);
}
}
......@@ -6,6 +6,7 @@ import java.util.Optional;
import java.util.stream.Stream;
import org.apache.commons.lang3.StringUtils;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpStatusCode;
import org.springframework.http.MediaType;
......@@ -24,6 +25,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import reactor.core.publisher.Mono;
@ConditionalOnProperty(prefix = "ozgcloud.processors[0]", name = "address")
@Service
@RequiredArgsConstructor
@Log4j2
......
......@@ -2,12 +2,14 @@ package de.ozgcloud.processor.vorgang;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Service;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangId;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangService;
import lombok.NonNull;
@ConditionalOnProperty(prefix = "ozgcloud.processors[0]", name = "address")
@Service("processorVorgangService")
public class VorgangService {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment