From d612a8c3672c25aa06989e8fae9e25c682f0ce54 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Sat, 7 Oct 2023 15:29:59 +0200 Subject: [PATCH] OZG-3931 [pluto-server] add autoconfiguration for grpc client since Spring Boot 3 doesn't support spring.factories, the grpc-spring-boot-starter doesn't currently work out-of-the-box with Spring Boot 3.0.0 https://github.com/yidongnan/grpc-spring-boot-starter/pull/775#issuecomment-1329023335 --- .../ozg/pluto/PlutoServerConfiguration.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pluto-server/src/main/java/de/itvsh/ozg/pluto/PlutoServerConfiguration.java b/pluto-server/src/main/java/de/itvsh/ozg/pluto/PlutoServerConfiguration.java index 8cdd25b05..9bfb1a79b 100644 --- a/pluto-server/src/main/java/de/itvsh/ozg/pluto/PlutoServerConfiguration.java +++ b/pluto-server/src/main/java/de/itvsh/ozg/pluto/PlutoServerConfiguration.java @@ -1,5 +1,6 @@ package de.itvsh.ozg.pluto; +import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories; import org.springframework.data.mongodb.repository.config.EnableMongoRepositories; @@ -7,6 +8,30 @@ import org.springframework.data.mongodb.repository.config.EnableMongoRepositorie import io.mongock.runner.springboot.EnableMongock; @Configuration +@ImportAutoConfiguration({ + net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration.class, + net.devh.boot.grpc.client.autoconfigure.GrpcClientMetricAutoConfiguration.class, + net.devh.boot.grpc.client.autoconfigure.GrpcClientHealthAutoConfiguration.class, + net.devh.boot.grpc.client.autoconfigure.GrpcClientSecurityAutoConfiguration.class, + net.devh.boot.grpc.client.autoconfigure.GrpcClientTraceAutoConfiguration.class, + net.devh.boot.grpc.client.autoconfigure.GrpcDiscoveryClientAutoConfiguration.class, + + net.devh.boot.grpc.common.autoconfigure.GrpcCommonCodecAutoConfiguration.class, + net.devh.boot.grpc.common.autoconfigure.GrpcCommonTraceAutoConfiguration.class, + + net.devh.boot.grpc.server.autoconfigure.GrpcAdviceAutoConfiguration.class, + net.devh.boot.grpc.server.autoconfigure.GrpcHealthServiceAutoConfiguration.class, + net.devh.boot.grpc.server.autoconfigure.GrpcMetadataConsulConfiguration.class, + net.devh.boot.grpc.server.autoconfigure.GrpcMetadataEurekaConfiguration.class, + net.devh.boot.grpc.server.autoconfigure.GrpcMetadataNacosConfiguration.class, + net.devh.boot.grpc.server.autoconfigure.GrpcMetadataZookeeperConfiguration.class, + net.devh.boot.grpc.server.autoconfigure.GrpcReflectionServiceAutoConfiguration.class, + net.devh.boot.grpc.server.autoconfigure.GrpcServerAutoConfiguration.class, + net.devh.boot.grpc.server.autoconfigure.GrpcServerFactoryAutoConfiguration.class, + net.devh.boot.grpc.server.autoconfigure.GrpcServerMetricAutoConfiguration.class, + net.devh.boot.grpc.server.autoconfigure.GrpcServerSecurityAutoConfiguration.class, + net.devh.boot.grpc.server.autoconfigure.GrpcServerTraceAutoConfiguration.class +}) @EnableMongock @EnableMongoRepositories(basePackages = { "de.itvsh.ozg.pluto.vorgang", "de.itvsh.ozg.pluto.attached_item", "de.itvsh.ozg.pluto.command" }) @EnableElasticsearchRepositories(basePackages = "de.itvsh.ozg.pluto.common.search") -- GitLab