From 182e45ee00595d1537fe83df3a8492aba6ea07f6 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 29 Nov 2021 17:04:35 -0500 Subject: [PATCH] Updates broker to 0.3.0 Resolves #775 --- pom.xml | 8 --- spring-cloud-function-rsocket/pom.xml | 14 ++--- .../RSocketRoutingAutoConfiguration.java | 6 +-- .../function/rsocket/RoutingBrokerTests.java | 52 +++++++++---------- .../src/test/resources/application.properties | 4 +- 5 files changed, 37 insertions(+), 47 deletions(-) diff --git a/pom.xml b/pom.xml index 15bd9dbca..f6bfe5acc 100644 --- a/pom.xml +++ b/pom.xml @@ -172,14 +172,6 @@ - - rsocket-snapshots - RSocket Snapshots - https://oss.jfrog.org/oss-snapshot-local - - true - - spring-snapshots Spring Snapshots diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml index 9f316057e..735c6adee 100644 --- a/spring-cloud-function-rsocket/pom.xml +++ b/spring-cloud-function-rsocket/pom.xml @@ -16,7 +16,7 @@ - 0.1.0 + 0.3.0 @@ -37,9 +37,9 @@ spring-cloud-function-context - io.rsocket.routing - rsocket-routing-client-spring - ${rsocket-routing.version} + io.rsocket.broker + rsocket-broker-client-spring + ${rsocket-broker.version} true @@ -58,9 +58,9 @@ test - io.rsocket.routing - rsocket-routing-broker-spring - ${rsocket-routing.version} + io.rsocket.broker + rsocket-broker-spring + ${rsocket-broker.version} test diff --git a/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketRoutingAutoConfiguration.java b/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketRoutingAutoConfiguration.java index 23b7e0c70..abf37dbd2 100644 --- a/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketRoutingAutoConfiguration.java +++ b/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketRoutingAutoConfiguration.java @@ -16,7 +16,7 @@ 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.AutoConfigureBefore; @@ -35,9 +35,9 @@ import org.springframework.messaging.rsocket.RSocketConnectorConfigurer; * @since 3.1 */ @Configuration(proxyBeanMethods = false) -@ConditionalOnClass(RoutingClientAutoConfiguration.class) +@ConditionalOnClass(BrokerClientAutoConfiguration.class) @ConditionalOnProperty(name = FunctionProperties.PREFIX + ".rsocket.enabled", matchIfMissing = true) -@AutoConfigureBefore(RoutingClientAutoConfiguration.class) +@AutoConfigureBefore(BrokerClientAutoConfiguration.class) @AutoConfigureAfter(RSocketAutoConfiguration.class) class RSocketRoutingAutoConfiguration { diff --git a/spring-cloud-function-rsocket/src/test/java/org/springframework/cloud/function/rsocket/RoutingBrokerTests.java b/spring-cloud-function-rsocket/src/test/java/org/springframework/cloud/function/rsocket/RoutingBrokerTests.java index dbf77cd10..595fa57ce 100644 --- a/spring-cloud-function-rsocket/src/test/java/org/springframework/cloud/function/rsocket/RoutingBrokerTests.java +++ b/spring-cloud-function-rsocket/src/test/java/org/springframework/cloud/function/rsocket/RoutingBrokerTests.java @@ -16,9 +16,10 @@ package org.springframework.cloud.function.rsocket; +import java.time.Duration; 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.Disabled; import org.junit.jupiter.api.Test; @@ -64,7 +65,7 @@ public class RoutingBrokerTests { public void testRoutingWithProperty() throws Exception { this.setup(true); 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 result = requester.route("uppercase") // auto creates metadata .data("\"hello\"") @@ -74,14 +75,14 @@ public class RoutingBrokerTests { .create(result) .expectNext("HELLO") .expectComplete() - .verify(); + .verify(Duration.ofSeconds(15)); } @Test public void testRoutingWithMessage() throws Exception { this.setup(false); RSocketRequester requester = clientContext.getBean(RSocketRequester.class); - RoutingMetadata metadata = clientContext.getBean(RoutingMetadata.class); + BrokerMetadata metadata = clientContext.getBean(BrokerMetadata.class); Mono result = requester.route("uppercase") // used to find function .metadata(metadata.address("samplefn")) .data("\"hello\"") @@ -91,41 +92,40 @@ public class RoutingBrokerTests { .create(result) .expectNext("HELLO") .expectComplete() - .verify(); + .verify(Duration.ofSeconds(15)); } private void setup(boolean routingWithProperty) { - int routingBrokerProxyPort = SocketUtils.findAvailableTcpPort(); - int routingBrokerClusterPort = SocketUtils.findAvailableTcpPort(); + int brokerProxyPort = SocketUtils.findAvailableTcpPort(); + int brokerClusterPort = SocketUtils.findAvailableTcpPort(); // start broker 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", - "--io.rsocket.routing.client.enabled=false", - "--io.rsocket.routing.broker.enabled=true", - "--io.rsocket.routing.broker.tcp.port=" + routingBrokerProxyPort, - "--io.rsocket.routing.broker.cluster.port=" + routingBrokerClusterPort); + "--io.rsocket.broker.client.enabled=false", + "--io.rsocket.broker.enabled=true", + "--io.rsocket.broker.uri=tcp://localhost:" + brokerProxyPort, + "--io.rsocket.broker.cluster.uri=tcp://localhost:" + brokerClusterPort); // start function connecting to broker, service-name=samplefn functionContext = new SpringApplicationBuilder(SampleFunctionConfiguration.class).web(WebApplicationType.NONE) .run("--logging.level.org.springframework.cloud.function=DEBUG", - "--io.rsocket.routing.client.enabled=true", - "--io.rsocket.routing.client.service-name=samplefn", - "--io.rsocket.routing.client.brokers[0].tcp.host=localhost", - "--io.rsocket.routing.client.brokers[0].tcp.port=" + routingBrokerProxyPort, - "--io.rsocket.routing.broker.enabled=false", + "--logging.level.io.rsocket.broker.client=TRACE", + "--io.rsocket.broker.client.enabled=true", + "--io.rsocket.broker.client.service-name=samplefn", + "--io.rsocket.broker.client.brokers[0]=tcp://localhost:" + brokerProxyPort, + "--io.rsocket.broker.enabled=false", "--spring.cloud.function.definition=uppercase"); // start testclient connecting to broker, for RSocketRequester 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", - "--io.rsocket.routing.client.enabled=true", - "--io.rsocket.routing.client.service-name=testclient", - routingWithProperty ? "--io.rsocket.routing.client.address.uppercase.service_name=samplefn" : "", - "--io.rsocket.routing.client.brokers[0].tcp.host=localhost", - "--io.rsocket.routing.client.brokers[0].tcp.port=" + routingBrokerProxyPort, - "--io.rsocket.routing.broker.enabled=false"); + "--io.rsocket.broker.client.enabled=true", + "--io.rsocket.broker.client.service-name=testclient", + routingWithProperty ? "--io.rsocket.broker.client.address.uppercase.service_name=samplefn" : "", + "--io.rsocket.broker.client.brokers[0]=tcp://localhost:" + brokerProxyPort, + "--io.rsocket.broker.enabled=false"); } @@ -140,9 +140,7 @@ public class RoutingBrokerTests { public static class SampleFunctionConfiguration { @Bean public Function uppercase() { - return v -> { - return v.toUpperCase(); - }; + return v -> v.toUpperCase(); } } } diff --git a/spring-cloud-function-rsocket/src/test/resources/application.properties b/spring-cloud-function-rsocket/src/test/resources/application.properties index 7a1ee9c3e..83911652b 100644 --- a/spring-cloud-function-rsocket/src/test/resources/application.properties +++ b/spring-cloud-function-rsocket/src/test/resources/application.properties @@ -1,2 +1,2 @@ -io.rsocket.routing.broker.enabled=false -io.rsocket.routing.client.enabled=false +io.rsocket.broker.enabled=false +io.rsocket.broker.client.enabled=false