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

Updates broker to 0.3.0

Browse Source 
Resolves #775
This commit is contained in:
spencergibb
2021-11-29 17:04:35 -05:00
committed by Oleg Zhurakousky
parent 6d872a20ee
commit 182e45ee00
5 changed files with 37 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@@ -172,14 +172,6 @@
</profile> </profile>
</profiles> </profiles>
<repositories> <repositories>
<repository>
<id>rsocket-snapshots</id>
<name>RSocket Snapshots</name>
<url>https://oss.jfrog.org/oss-snapshot-local</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository> <repository>
<id>spring-snapshots</id> <id>spring-snapshots</id>
<name>Spring Snapshots</name> <name>Spring Snapshots</name>

14
spring-cloud-function-rsocket/pom.xml
View File

@@ -16,7 +16,7 @@
</parent> </parent>
<properties> <properties>
<rsocket-routing.version>0.1.0</rsocket-routing.version> <rsocket-broker.version>0.3.0</rsocket-broker.version>
</properties> </properties>
<dependencies> <dependencies>
@@ -37,9 +37,9 @@
<artifactId>spring-cloud-function-context</artifactId> <artifactId>spring-cloud-function-context</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.rsocket.routing</groupId> <groupId>io.rsocket.broker</groupId>
<artifactId>rsocket-routing-client-spring</artifactId> <artifactId>rsocket-broker-client-spring</artifactId>
<version>${rsocket-routing.version}</version> <version>${rsocket-broker.version}</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
@@ -58,9 +58,9 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.rsocket.routing</groupId> <groupId>io.rsocket.broker</groupId>
<artifactId>rsocket-routing-broker-spring</artifactId> <artifactId>rsocket-broker-spring</artifactId>
<version>${rsocket-routing.version}</version> <version>${rsocket-broker.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

6
spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketRoutingAutoConfiguration.java
View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.function.rsocket; package org.springframework.cloud.function.rsocket;
import io.rsocket.routing.client.spring.RoutingClientAutoConfiguration; import io.rsocket.broker.client.spring.BrokerClientAutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -35,9 +35,9 @@ import org.springframework.messaging.rsocket.RSocketConnectorConfigurer;
* @since 3.1 * @since 3.1
*/ */
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@ConditionalOnClass(RoutingClientAutoConfiguration.class) @ConditionalOnClass(BrokerClientAutoConfiguration.class)
@ConditionalOnProperty(name = FunctionProperties.PREFIX + ".rsocket.enabled", matchIfMissing = true) @ConditionalOnProperty(name = FunctionProperties.PREFIX + ".rsocket.enabled", matchIfMissing = true)
@AutoConfigureBefore(RoutingClientAutoConfiguration.class) @AutoConfigureBefore(BrokerClientAutoConfiguration.class)
@AutoConfigureAfter(RSocketAutoConfiguration.class) @AutoConfigureAfter(RSocketAutoConfiguration.class)
class RSocketRoutingAutoConfiguration { class RSocketRoutingAutoConfiguration {

52
spring-cloud-function-rsocket/src/test/java/org/springframework/cloud/function/rsocket/RoutingBrokerTests.java
View File

@@ -16,9 +16,10 @@
package org.springframework.cloud.function.rsocket; package org.springframework.cloud.function.rsocket;
import java.time.Duration;
import java.util.function.Function; import java.util.function.Function;
import io.rsocket.routing.client.spring.RoutingMetadata; import io.rsocket.broker.client.spring.BrokerMetadata;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@@ -64,7 +65,7 @@ public class RoutingBrokerTests {
public void testRoutingWithProperty() throws Exception { public void testRoutingWithProperty() throws Exception {
this.setup(true); this.setup(true);
RSocketRequester requester = clientContext.getBean(RSocketRequester.class); RSocketRequester requester = clientContext.getBean(RSocketRequester.class);
// route(uppercase) used to find function, must match io.rsocket.routing.client.address entry // route(uppercase) used to find function, must match io.rsocket.broker.client.address entry
Mono<String> result = requester.route("uppercase") Mono<String> result = requester.route("uppercase")
// auto creates metadata // auto creates metadata
.data("\"hello\"") .data("\"hello\"")
@@ -74,14 +75,14 @@ public class RoutingBrokerTests {
.create(result) .create(result)
.expectNext("HELLO") .expectNext("HELLO")
.expectComplete() .expectComplete()
.verify(); .verify(Duration.ofSeconds(15));
} }
@Test @Test
public void testRoutingWithMessage() throws Exception { public void testRoutingWithMessage() throws Exception {
this.setup(false); this.setup(false);
RSocketRequester requester = clientContext.getBean(RSocketRequester.class); RSocketRequester requester = clientContext.getBean(RSocketRequester.class);
RoutingMetadata metadata = clientContext.getBean(RoutingMetadata.class); BrokerMetadata metadata = clientContext.getBean(BrokerMetadata.class);
Mono<String> result = requester.route("uppercase") // used to find function Mono<String> result = requester.route("uppercase") // used to find function
.metadata(metadata.address("samplefn")) .metadata(metadata.address("samplefn"))
.data("\"hello\"") .data("\"hello\"")
@@ -91,41 +92,40 @@ public class RoutingBrokerTests {
.create(result) .create(result)
.expectNext("HELLO") .expectNext("HELLO")
.expectComplete() .expectComplete()
.verify(); .verify(Duration.ofSeconds(15));
} }
private void setup(boolean routingWithProperty) { private void setup(boolean routingWithProperty) {
int routingBrokerProxyPort = SocketUtils.findAvailableTcpPort(); int brokerProxyPort = SocketUtils.findAvailableTcpPort();
int routingBrokerClusterPort = SocketUtils.findAvailableTcpPort(); int brokerClusterPort = SocketUtils.findAvailableTcpPort();
// start broker // start broker
brokerContext = new SpringApplicationBuilder(SimpleConfiguration.class).web(WebApplicationType.NONE).run( brokerContext = new SpringApplicationBuilder(SimpleConfiguration.class).web(WebApplicationType.NONE).run(
"--logging.level.io.rsocket.routing.broker=TRACE", "--logging.level.io.rsocket.broker=TRACE",
"--spring.cloud.function.rsocket.enabled=false", "--spring.cloud.function.rsocket.enabled=false",
"--io.rsocket.routing.client.enabled=false", "--io.rsocket.broker.client.enabled=false",
"--io.rsocket.routing.broker.enabled=true", "--io.rsocket.broker.enabled=true",
"--io.rsocket.routing.broker.tcp.port=" + routingBrokerProxyPort, "--io.rsocket.broker.uri=tcp://localhost:" + brokerProxyPort,
"--io.rsocket.routing.broker.cluster.port=" + routingBrokerClusterPort); "--io.rsocket.broker.cluster.uri=tcp://localhost:" + brokerClusterPort);
// start function connecting to broker, service-name=samplefn // start function connecting to broker, service-name=samplefn
functionContext = new SpringApplicationBuilder(SampleFunctionConfiguration.class).web(WebApplicationType.NONE) functionContext = new SpringApplicationBuilder(SampleFunctionConfiguration.class).web(WebApplicationType.NONE)
.run("--logging.level.org.springframework.cloud.function=DEBUG", .run("--logging.level.org.springframework.cloud.function=DEBUG",
"--io.rsocket.routing.client.enabled=true", "--logging.level.io.rsocket.broker.client=TRACE",
"--io.rsocket.routing.client.service-name=samplefn", "--io.rsocket.broker.client.enabled=true",
"--io.rsocket.routing.client.brokers[0].tcp.host=localhost", "--io.rsocket.broker.client.service-name=samplefn",
"--io.rsocket.routing.client.brokers[0].tcp.port=" + routingBrokerProxyPort, "--io.rsocket.broker.client.brokers[0]=tcp://localhost:" + brokerProxyPort,
"--io.rsocket.routing.broker.enabled=false", "--io.rsocket.broker.enabled=false",
"--spring.cloud.function.definition=uppercase"); "--spring.cloud.function.definition=uppercase");
// start testclient connecting to broker, for RSocketRequester // start testclient connecting to broker, for RSocketRequester
clientContext = new SpringApplicationBuilder(SimpleConfiguration.class).web(WebApplicationType.NONE).run( clientContext = new SpringApplicationBuilder(SimpleConfiguration.class).web(WebApplicationType.NONE).run(
"--logging.level.io.rsocket.routing.client=TRACE", "--logging.level.io.rsocket.broker.client=TRACE",
"--spring.cloud.function.rsocket.enabled=false", "--spring.cloud.function.rsocket.enabled=false",
"--io.rsocket.routing.client.enabled=true", "--io.rsocket.broker.client.enabled=true",
"--io.rsocket.routing.client.service-name=testclient", "--io.rsocket.broker.client.service-name=testclient",
routingWithProperty ? "--io.rsocket.routing.client.address.uppercase.service_name=samplefn" : "", routingWithProperty ? "--io.rsocket.broker.client.address.uppercase.service_name=samplefn" : "",
"--io.rsocket.routing.client.brokers[0].tcp.host=localhost", "--io.rsocket.broker.client.brokers[0]=tcp://localhost:" + brokerProxyPort,
"--io.rsocket.routing.client.brokers[0].tcp.port=" + routingBrokerProxyPort, "--io.rsocket.broker.enabled=false");
"--io.rsocket.routing.broker.enabled=false");
} }
@@ -140,9 +140,7 @@ public class RoutingBrokerTests {
public static class SampleFunctionConfiguration { public static class SampleFunctionConfiguration {
@Bean @Bean
public Function<String, String> uppercase() { public Function<String, String> uppercase() {
return v -> { return v -> v.toUpperCase();
return v.toUpperCase();
};
} }
} }
} }

4
spring-cloud-function-rsocket/src/test/resources/application.properties
View File

@@ -1,2 +1,2 @@
io.rsocket.routing.broker.enabled=false io.rsocket.broker.enabled=false
io.rsocket.routing.client.enabled=false io.rsocket.broker.client.enabled=false