Skip to content

Commit 3ed3ff7

Browse files
author
Alexander Furer
committed
release 4.3.1
1 parent 14fb782 commit 3ed3ff7

File tree

5 files changed

+30
-14
lines changed

5 files changed

+30
-14
lines changed

README.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ repositories {
3131
3232
}
3333
dependencies {
34-
compile 'io.github.lognet:grpc-spring-boot-starter:4.3.0'
34+
compile 'io.github.lognet:grpc-spring-boot-starter:4.3.1'
3535
}
3636
3737

ReleaseNotes.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
== Version 4.3.1
2+
* Fixes https://github.com/LogNet/grpc-spring-boot-starter/issues/169[169]
3+
14
== Version 4.3.0
25
* Spring Validation (Java Beans) support
36
* gRPC version upgraded to 1.34.1

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ grpcVersion=1.34.1
22
springBootVersion=2.3.4.RELEASE
33
springCloudVersion=Hoxton.SR6
44

5-
version=4.3.1-SNAPSHOT
5+
version=4.3.1
66
group=io.github.lognet
77
description=Spring Boot starter for Google RPC.
88
gitHubUrl=https\://github.com/LogNet/grpc-spring-boot-starter

grpc-spring-boot-starter/src/main/java/org/lognet/springboot/grpc/autoconfigure/GRpcAutoConfiguration.java

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,26 @@
55
import io.grpc.netty.shaded.io.grpc.netty.NettyServerBuilder;
66
import io.grpc.services.HealthStatusManager;
77
import lombok.extern.slf4j.Slf4j;
8-
import org.lognet.springboot.grpc.GRpcGlobalInterceptor;
98
import org.lognet.springboot.grpc.GRpcServerBuilderConfigurer;
109
import org.lognet.springboot.grpc.GRpcServerRunner;
1110
import org.lognet.springboot.grpc.GRpcService;
12-
import org.lognet.springboot.grpc.validation.ValidatingInterceptor;
1311
import org.springframework.beans.factory.BeanCreationException;
1412
import org.springframework.beans.factory.annotation.Autowired;
1513
import org.springframework.beans.factory.annotation.Qualifier;
1614
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
1715
import org.springframework.boot.autoconfigure.AutoConfigureOrder;
1816
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
19-
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2017
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
2118
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2219
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2320
import org.springframework.boot.autoconfigure.validation.ValidationAutoConfiguration;
2421
import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
2522
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2623
import org.springframework.context.annotation.Bean;
27-
import org.springframework.context.annotation.Lazy;
24+
import org.springframework.context.annotation.Import;
2825
import org.springframework.core.convert.converter.Converter;
2926
import org.springframework.util.SocketUtils;
3027

31-
import javax.validation.Validator;
3228
import java.io.IOException;
3329
import java.net.InetSocketAddress;
3430
import java.util.Optional;
@@ -43,6 +39,7 @@
4339
@AutoConfigureAfter(ValidationAutoConfiguration.class)
4440
@ConditionalOnBean(annotation = GRpcService.class)
4541
@EnableConfigurationProperties(GRpcServerProperties.class)
42+
@Import(GRpcValidationConfiguration.class)
4643
@Slf4j
4744
public class GRpcAutoConfiguration {
4845

@@ -177,13 +174,7 @@ public InetSocketAddress convert(String source) {
177174
};
178175
}
179176

180-
@Bean
181-
@ConditionalOnClass(Validator.class)
182-
@ConditionalOnBean(Validator.class)
183-
@GRpcGlobalInterceptor
184-
public ValidatingInterceptor validatingInterceptor(@Lazy Validator validator){
185-
return new ValidatingInterceptor(validator);
186-
}
177+
187178

188179

189180
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package org.lognet.springboot.grpc.autoconfigure;
2+
3+
import org.lognet.springboot.grpc.GRpcGlobalInterceptor;
4+
import org.lognet.springboot.grpc.validation.ValidatingInterceptor;
5+
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
6+
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
7+
import org.springframework.context.annotation.Bean;
8+
import org.springframework.context.annotation.Configuration;
9+
import org.springframework.context.annotation.Lazy;
10+
11+
import javax.validation.Validator;
12+
13+
@Configuration
14+
@ConditionalOnClass(Validator.class)
15+
public class GRpcValidationConfiguration {
16+
@Bean
17+
@ConditionalOnBean(Validator.class)
18+
@GRpcGlobalInterceptor
19+
public ValidatingInterceptor validatingInterceptor(@Lazy Validator validator){
20+
return new ValidatingInterceptor(validator);
21+
}
22+
}

0 commit comments

Comments
 (0)