-
Notifications
You must be signed in to change notification settings - Fork 826
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into fix-GrpcClientBeanPostProcessor
- Loading branch information
Showing
22 changed files
with
772 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,7 +27,7 @@ publishing { | |
| pom { | ||
| name = 'gRPC Spring Boot Starter' | ||
| description = 'gRPC Spring Boot Starter' | ||
| url = 'https://github.com/yidongnan/grpc-spring-boot-starter' | ||
| url = 'https://github.com/grpc-ecosystem/grpc-spring' | ||
| licenses { | ||
| license { | ||
| name = 'Apache 2.0' | ||
|
|
@@ -50,9 +50,9 @@ publishing { | |
| } | ||
| } | ||
| scm { | ||
| connection = 'scm:git:git://github.com/yidongnan/grpc-spring-boot-starter.git' | ||
| developerConnection = 'scm:git:[email protected]:yidongnan/grpc-spring-boot-starter.git' | ||
| url = 'https://github.com/yidongnan/grpc-spring-boot-starter' | ||
| connection = 'scm:git:git://github.com/grpc-ecosystem/grpc-spring.git' | ||
| developerConnection = 'scm:git:[email protected]/grpc-ecosystem/grpc-spring.git' | ||
| url = 'https://github.com/grpc-ecosystem/grpc-spring' | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 changes: 71 additions & 0 deletions
71
...devh/boot/grpc/client/autoconfigure/GrpcClientDefaultRequestTimeoutAutoConfiguration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| /* | ||
| * Copyright (c) 2016-2024 The gRPC-Spring Authors | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package net.devh.boot.grpc.client.autoconfigure; | ||
|
|
||
| import static java.util.Objects.requireNonNull; | ||
|
|
||
| import java.time.Duration; | ||
|
|
||
| import org.springframework.boot.autoconfigure.AutoConfigureBefore; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
|
|
||
| import io.grpc.ClientInterceptor; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import net.devh.boot.grpc.client.channelfactory.GrpcChannelConfigurer; | ||
| import net.devh.boot.grpc.client.config.GrpcChannelsProperties; | ||
| import net.devh.boot.grpc.client.interceptor.DefaultRequestTimeoutSetupClientInterceptor; | ||
|
|
||
| /** | ||
| * The default request timeout autoconfiguration for the client. | ||
| * | ||
| * <p> | ||
| * You can disable this config by using: | ||
| * </p> | ||
| * | ||
| * <pre> | ||
| * <code>@ImportAutoConfiguration(exclude = GrpcClientDefaultRequestTimeoutAutoConfiguration.class)</code> | ||
| * </pre> | ||
| * | ||
| * @author Sergei Batsura ([email protected]) | ||
| */ | ||
| @Slf4j | ||
| @Configuration(proxyBeanMethods = false) | ||
| @AutoConfigureBefore(GrpcClientAutoConfiguration.class) | ||
| public class GrpcClientDefaultRequestTimeoutAutoConfiguration { | ||
|
|
||
| /** | ||
| * Creates a {@link GrpcChannelConfigurer} bean applying the default request timeout from config to each new call | ||
| * using a {@link ClientInterceptor}. | ||
| * | ||
| * @param props The properties for timeout configuration. | ||
| * @return The GrpcChannelConfigurer bean with interceptor if timeout is configured. | ||
| * @see DefaultRequestTimeoutSetupClientInterceptor | ||
| */ | ||
| @Bean | ||
| GrpcChannelConfigurer timeoutGrpcChannelConfigurer(final GrpcChannelsProperties props) { | ||
| requireNonNull(props, "properties"); | ||
|
|
||
| return (channel, name) -> { | ||
| Duration timeout = props.getChannel(name).getDefaultRequestTimeout(); | ||
| if (timeout != null && timeout.toMillis() > 0L) { | ||
| channel.intercept(new DefaultRequestTimeoutSetupClientInterceptor(timeout)); | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
...va/net/devh/boot/grpc/client/interceptor/DefaultRequestTimeoutSetupClientInterceptor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * Copyright (c) 2016-2024 The gRPC-Spring Authors | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package net.devh.boot.grpc.client.interceptor; | ||
|
|
||
| import static java.util.Objects.requireNonNull; | ||
|
|
||
| import java.time.Duration; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| import io.grpc.CallOptions; | ||
| import io.grpc.Channel; | ||
| import io.grpc.ClientCall; | ||
| import io.grpc.ClientInterceptor; | ||
| import io.grpc.MethodDescriptor; | ||
| import lombok.extern.slf4j.Slf4j; | ||
|
|
||
| /** | ||
| * A client interceptor configuring the default request timeout / deadline for each call. | ||
| * | ||
| * @author Sergei Batsura ([email protected]) | ||
| */ | ||
| @Slf4j | ||
| public class DefaultRequestTimeoutSetupClientInterceptor implements ClientInterceptor { | ||
|
|
||
| private final Duration defaultRequestTimeout; | ||
|
|
||
| public DefaultRequestTimeoutSetupClientInterceptor(Duration defaultRequestTimeout) { | ||
| this.defaultRequestTimeout = requireNonNull(defaultRequestTimeout, "defaultRequestTimeout"); | ||
| } | ||
|
|
||
| @Override | ||
| public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall( | ||
| final MethodDescriptor<ReqT, RespT> method, | ||
| final CallOptions callOptions, | ||
| final Channel next) { | ||
|
|
||
| if (callOptions.getDeadline() == null) { | ||
| return next.newCall(method, | ||
| callOptions.withDeadlineAfter(defaultRequestTimeout.toMillis(), TimeUnit.MILLISECONDS)); | ||
| } else { | ||
| return next.newCall(method, callOptions); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.