implement autostarter to configure grpc-client

api-lib-core/pom.xml

@@ -35,7 +35,8 @@
 		<!--spring -->
 		<dependency>
 			<groupId>net.devh</groupId>
-			<artifactId>grpc-client-spring-boot-starter</artifactId>
+			<artifactId>grpc-client-spring-boot-autoconfigure</artifactId>
+			<version>2.14.0.RELEASE</version>
 		</dependency>
 
 		<dependency>

api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudVorgang.java

@@ -5,9 +5,11 @@ import java.util.List;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Singular;
+import lombok.ToString;
 
 @Builder
 @Getter
+@ToString
 public class OzgCloudVorgang {
 
 	private OzgCloudVorgangId id;

api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/dummy/DummyVorgangService.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.stereotype.Service;
 
 import de.ozgcloud.apilib.errorhandling.NotFoundException;
@@ -18,6 +19,7 @@ import de.ozgcloud.apilib.vorgang.OzgCloudVorgangStub;
 import de.ozgcloud.apilib.vorgang.VorgangStatus;
 
 @Service
+@ConditionalOnMissingBean(OzgCloudVorgangService.class)
 class DummyVorgangService implements OzgCloudVorgangService {
 
 	private final Map<OzgCloudVorgangId, OzgCloudVorgang> idToVorgang;

api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/GrpcVorgangService.java

@@ -2,6 +2,7 @@ package de.ozgcloud.apilib.vorgang.grpc;
 
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangWithEingangRequest;
@@ -18,7 +19,7 @@ class GrpcVorgangService implements OzgCloudVorgangService {
 
 	@GrpcClient("vorgang-manager")
 	private VorgangServiceBlockingStub vorgangServiceStub;
-
+	@Autowired
 	private OzgCloudVorgangMapper mapper;
 
 	@Override

api-lib-demo/src/main/java/de/ozgcloud/apilib/demo/DemoRunner.java

@@ -5,6 +5,7 @@ import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.stereotype.Component;
 
+import de.ozgcloud.apilib.vorgang.OzgCloudVorgangId;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangService;
 
 @Component
@@ -15,7 +16,7 @@ class DemoRunner implements ApplicationListener<ContextRefreshedEvent> {
 
 	@Override
 	public void onApplicationEvent(ContextRefreshedEvent event) {
-		System.out.println(vorgangService.search("test"));
+		System.out.println(vorgangService.getById(OzgCloudVorgangId.from("647885a50b105b1e4995378e")));
 	}
 
 }

api-lib-demo/src/main/resources/application.yml

+ozgcloud:
+  vorgang-manager:
+    url: static://127.0.0.1:9090
\ No newline at end of file

ozg-cloud-spring-boot-starter/pom.xml

@@ -14,6 +14,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-autoconfigure</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>net.devh</groupId>
+			<artifactId>grpc-client-spring-boot-starter</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>de.ozgcloud.api-lib</groupId>

ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java

 package de.ozgcloud.client.autoconfigure;
 
 import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 
+import net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration;
+import net.devh.boot.grpc.client.config.GrpcChannelProperties;
+import net.devh.boot.grpc.client.config.GrpcChannelsProperties;
+import net.devh.boot.grpc.client.config.NegotiationType;
+
 @AutoConfiguration
 @ComponentScan(basePackages = "de.ozgcloud.apilib.**")
+@AutoConfigureBefore(GrpcClientAutoConfiguration.class)
+//TODO remove component scan
 public class OzgCloudClientAutoConfiguration {
 
+	@Bean
+	GrpcChannelsProperties channelProperties() {
+		var properties = new GrpcChannelsProperties();
+		var channelProps = new GrpcChannelProperties();
+
+		properties.getClient().put("vorgang-manager", channelProps);
+
+		channelProps.setAddress("static://127.0.0.1:9090");
+		channelProps.setNegotiationType(NegotiationType.PLAINTEXT);
+
+		return properties;
+	}
 }

ozg-cloud-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

 de.ozgcloud.client.autoconfigure.OzgCloudClientAutoConfiguration
+net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration
\ No newline at end of file

ozg-cloud-spring-boot-starter/src/main/resources/application.yml

+grpc:
+  client:
+    vorgang-manager:
+#      address: ${ozgcloud.vorgang-manager.url}
+      address: static://127.0.0.1:9090
+      negotiationType: PLAINTEXT
+  
\ No newline at end of file