SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-1245 Add initial proxy support

Browse Source 
This feature woudl allow request to be proxied to additional targets such as grpc, rsocket etc.

Resolves #1245
This commit is contained in:
Oleg Zhurakousky
2025-03-11 16:49:34 +01:00
parent 1234a94737
commit ef9c2462c4
5 changed files with 69 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
spring-cloud-function-adapters/spring-cloud-function-grpc/src/main/java/org/springframework/cloud/function/grpc/GrpcFunctionAutoConfiguration.java Normal file
View File

@@ -0,0 +1,60 @@
/*
* Copyright 2021-2021 the original author or 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
*
* https://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 org.springframework.cloud.function.grpc;
import java.util.function.Function;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.function.context.FunctionProperties;
import org.springframework.cloud.function.context.MessageRoutingCallback;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.messaging.Message;
/**
*
* @author Oleg Zhurakousky
* @since 3.2
*/
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(FunctionGrpcProperties.class)
public class GrpcFunctionAutoConfiguration {
public static String GRPC_INVOKER_FUNCTION = "grpcInvokerFunction";
public static String GRPC = "grpc";
@Bean
public Function<Message<byte[]>, Message<?>> grpcInvokerFunction() {
return input -> {
return GrpcUtils.requestReply(input);
};
}
@Bean
public MessageRoutingCallback routingCallback() {
return new MessageRoutingCallback() {
public String routingResult(Message<?> message) {
if (message.getHeaders().containsKey(FunctionProperties.PROXY)
&& message.getHeaders().get(FunctionProperties.PROXY).equals(GRPC)) {
return GRPC_INVOKER_FUNCTION;
}
return null;
}
};
}
}

31
spring-cloud-function-adapters/spring-cloud-function-grpc/src/main/java/org/springframework/cloud/function/grpc/GrpcServerMessageHandler.java
View File

@@ -32,36 +32,11 @@
package org.springframework.cloud.function.grpc;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
//
import io.grpc.Status;
import io.grpc.stub.ServerCallStreamObserver;
import io.grpc.stub.StreamObserver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Sinks;
import reactor.core.publisher.Sinks.Many;
//
import org.springframework.cloud.function.context.FunctionCatalog;
import org.springframework.cloud.function.context.FunctionProperties;
import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper;
import org.springframework.cloud.function.grpc.MessagingServiceGrpc.MessagingServiceImplBase;
import org.springframework.context.SmartLifecycle;
import org.springframework.messaging.Message;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import com.google.protobuf.GeneratedMessageV3;
//
//import com.google.protobuf.GeneratedMessage;
import io.grpc.stub.StreamObserver;
/**
*
@@ -72,12 +47,8 @@ import com.google.protobuf.GeneratedMessageV3;
@SuppressWarnings("rawtypes")
public class GrpcServerMessageHandler extends MessagingServiceImplBase {
private Log logger = LogFactory.getLog(GrpcServerMessageHandler.class);
private final MessageHandlingHelper helper;
private boolean running;
public GrpcServerMessageHandler(MessageHandlingHelper<GeneratedMessageV3> helper) {
this.helper = helper;
}

1
spring-cloud-function-adapters/spring-cloud-function-grpc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@@ -1 +1,2 @@
org.springframework.cloud.function.grpc.GrpcAutoConfiguration
org.springframework.cloud.function.grpc.GrpcFunctionAutoConfiguration

3
spring-cloud-function-adapters/spring-cloud-function-grpc/src/test/java/org/springframework/cloud/function/grpc/GrpcInteractionTests.java
View File

@@ -50,7 +50,7 @@ import static org.junit.jupiter.api.Assertions.fail;
* @author Oleg Zhurakousky
* @author Chris Bono
*/
@Disabled
//@Disabled
public class GrpcInteractionTests {
@BeforeEach
@@ -211,6 +211,7 @@ public class GrpcInteractionTests {
}
@Test
@Disabled
public void testClientStreaming() throws Exception {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(
SampleConfiguration.class).web(WebApplicationType.NONE).run(