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

Formatting test code

Browse Source
This commit is contained in:
Oleg Zhurakousky
2020-08-26 15:23:31 +02:00
parent ddd95cda17
commit 9922a0ca32
2 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-cloud-function-rsocket/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@@ -1,11 +0,0 @@
{
"properties": [
{
"name": "spring.cloud.function.web.path",
"type": "java.lang.String",
"description": "Path to web resources for functions (should start with / if not empty).",
"defaultValue": ""
}
]
}

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

@@ -96,23 +96,29 @@ public class RoutingBrokerTests {
int routingBrokerClusterPort = SocketUtils.findAvailableTcpPort(); int routingBrokerClusterPort = 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", "--spring.cloud.function.rsocket.enabled=false", "--logging.level.io.rsocket.routing.broker=TRACE",
"--io.rsocket.routing.client.enabled=false", "--io.rsocket.routing.broker.enabled=true", "--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.tcp.port=" + routingBrokerProxyPort,
"--io.rsocket.routing.broker.cluster.port=" + routingBrokerClusterPort); "--io.rsocket.routing.broker.cluster.port=" + routingBrokerClusterPort);
// 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", "--io.rsocket.routing.client.service-name=samplefn", "--io.rsocket.routing.client.enabled=true",
"--io.rsocket.routing.client.service-name=samplefn",
"--io.rsocket.routing.client.brokers[0].host=localhost", "--io.rsocket.routing.client.brokers[0].host=localhost",
"--io.rsocket.routing.client.brokers[0].port=" + routingBrokerProxyPort, "--io.rsocket.routing.client.brokers[0].port=" + routingBrokerProxyPort,
"--io.rsocket.routing.broker.enabled=false", "--spring.cloud.function.definition=uppercase"); "--io.rsocket.routing.broker.enabled=false",
"--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", "--spring.cloud.function.rsocket.enabled=false", "--logging.level.io.rsocket.routing.client=TRACE",
"--io.rsocket.routing.client.enabled=true", "--io.rsocket.routing.client.service-name=testclient", "--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.toupper.service_name=samplefn" : "", routingWithProperty ? "--io.rsocket.routing.client.address.toupper.service_name=samplefn" : "",
"--io.rsocket.routing.client.brokers[0].host=localhost", "--io.rsocket.routing.client.brokers[0].host=localhost",
"--io.rsocket.routing.client.brokers[0].port=" + routingBrokerProxyPort, "--io.rsocket.routing.client.brokers[0].port=" + routingBrokerProxyPort,