Spring/spring-grpc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tidy up conditions for servlet and inprocess

Browse Source
This commit is contained in:
Dave Syer
2024-11-19 13:11:37 +00:00
parent 6b4f649712
commit 9e6c27eda6
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerFactoryAutoConfiguration.java
View File

@@ -64,7 +64,7 @@ public class GrpcServerFactoryAutoConfiguration {
}
@Configuration(proxyBeanMethods = false)
@ConditionalOnWebApplication
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
static class GrpcServletConfiguration {
@Bean

5
spring-grpc-test/src/main/java/org/springframework/grpc/test/InProcessGrpcServerFactoryAutoConfiguration.java
View File

@@ -18,6 +18,8 @@ package org.springframework.grpc.test;
import java.util.List;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnNotWebApplication;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
@@ -26,14 +28,17 @@ import org.springframework.grpc.autoconfigure.server.GrpcServerFactoryAutoConfig
import org.springframework.grpc.server.ServerBuilderCustomizer;
import org.springframework.grpc.server.service.GrpcServiceDiscoverer;
import io.grpc.BindableService;
import io.grpc.inprocess.InProcessServerBuilder;
@AutoConfiguration(before = { GrpcServerFactoryAutoConfiguration.class, GrpcClientAutoConfiguration.class })
@ConditionalOnProperty(prefix = "spring.grpc.inprocess", name = "enabled", havingValue = "true", matchIfMissing = true)
@ConditionalOnClass(BindableService.class)
@ConditionalOnNotWebApplication
public class InProcessGrpcServerFactoryAutoConfiguration {
@Bean
@ConditionalOnBean(BindableService.class)
InProcessGrpcServerFactory grpcServerFactory(GrpcServiceDiscoverer grpcServicesDiscoverer,
List<ServerBuilderCustomizer<InProcessServerBuilder>> customizers) {
InProcessGrpcServerFactory factory = new InProcessGrpcServerFactory("0.0.0.0:0", customizers);

11
spring-grpc-test/src/main/resources/META-INF/additional-spring-configuration-metadata.json Normal file
View File

@@ -0,0 +1,11 @@
{
"groups": [],
"properties": [
{
"name": "spring.grpc.inprocess.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable the in-process server and client for testing.",
"defaultValue": true
}
]
}