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

Use Spring Boot Web Reactive instead of raw netty

Browse Source
This commit is contained in:
Dave Syer
2017-01-03 13:55:44 +00:00
parent c6736f959b
commit 5be3a3b08a
10 changed files with 40 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-function-deployer/pom.xml
View File

@@ -26,8 +26,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot.experimental</groupId>
<artifactId>spring-boot-starter-web-reactive</artifactId>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-web</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>

2
spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/ApplicationRunner.java
View File

@@ -58,7 +58,7 @@ import reactor.core.publisher.Flux;
// NOT a @Component (to prevent it from being scanned by the "main" application).
public class ApplicationRunner implements CommandLineRunner {
private static final String DEFAULT_REACTOR_VERSION = "3.0.3.RELEASE";
private static final String DEFAULT_REACTOR_VERSION = "3.0.4.RELEASE";
private static Log logger = LogFactory.getLog(ApplicationRunner.class);

1
spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/DeployedFunctionApplication.java
View File

@@ -23,4 +23,5 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
*/
@SpringBootApplication
public class DeployedFunctionApplication {
}

1
spring-cloud-function-deployer/thin-slim.properties
View File

@@ -1,4 +1,5 @@
exclusions.spring-web-reactive: org.springframework:spring-web-reactive
exclusions.spring-cloud-function-web: org.springframework.cloud:spring-cloud-function-web
exclusions.spring-web: org.springframework:spring-web
exclusions.reator-netty: io.projectreactor.ipc:reactor-netty
exclusions.spring-cloud-stream: org.springframework.cloud:spring-cloud-stream

46
spring-cloud-function-web/pom.xml
View File

@@ -20,39 +20,35 @@
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web-reactive</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor.ipc</groupId>
<artifactId>reactor-netty</artifactId>
<version>0.6.0.BUILD-SNAPSHOT</version>
<groupId>org.springframework.boot.experimental</groupId>
<artifactId>spring-boot-starter-web-reactive</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.0.BUILD-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot.experimental</groupId>
<artifactId>spring-boot-dependencies-web-reactive</artifactId>
<version>0.1.0.BUILD-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>

46
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/FunctionConfigurationProperties.java
View File

@@ -1,46 +0,0 @@
/*
* Copyright 2016 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
*
* 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 org.springframework.cloud.function.web;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* @author Mark Fisher
*/
@ConfigurationProperties(prefix = "function")
public class FunctionConfigurationProperties {
private String name;
private String code;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
}

20
spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/DeployedFunctionController.java → spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/FunctionController.java
View File

@@ -13,11 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.function.deployer;
package org.springframework.cloud.function.web;
import java.util.function.Function;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.context.embedded.ReactiveServerProperties;
import org.springframework.cloud.function.registry.FunctionCatalog;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -32,13 +35,14 @@ import reactor.core.publisher.Flux;
*
*/
@RestController
public class DeployedFunctionController {
@ConditionalOnClass({ RestController.class, ReactiveServerProperties.class })
public class FunctionController {
private final FunctionExtractingAppDeployer deployer;
private final FunctionCatalog functions;
@Autowired
public DeployedFunctionController(FunctionExtractingAppDeployer deployer) {
this.deployer = deployer;
public FunctionController(FunctionCatalog catalog) {
this.functions = catalog;
}
@PostMapping(path = "/{name}", consumes = MediaType.TEXT_PLAIN_VALUE)
@@ -46,10 +50,10 @@ public class DeployedFunctionController {
@RequestBody Flux<String> body) {
Function<Object, Object> function;
if (name.contains(",")) {
function = deployer.composeFunction(name.split(","));
function = functions.composeFunction(name.split(","));
}
else {
function = deployer.lookupFunction(name);
function = functions.lookupFunction(name);
}
@SuppressWarnings("unchecked")
Flux<String> result = (Flux<String>) function.apply(body);
@@ -59,7 +63,7 @@ public class DeployedFunctionController {
@GetMapping("/{name}")
public Flux<String> supplier(@PathVariable String name) {
@SuppressWarnings("unchecked")
Flux<String> result = (Flux<String>) deployer.lookupSupplier(name).get();
Flux<String> result = (Flux<String>) functions.lookupSupplier(name).get();
return result;
}

152
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/RestConfiguration.java
View File

@@ -1,152 +0,0 @@
/*
* Copyright 2016 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
*
* 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 org.springframework.cloud.function.web;
import java.util.function.Function;
import java.util.function.Supplier;
import org.reactivestreams.Publisher;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.function.registry.FunctionCatalog;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.MediaType;
import org.springframework.http.server.reactive.HttpHandler;
import org.springframework.http.server.reactive.ReactorHttpHandlerAdapter;
import org.springframework.util.StringUtils;
import org.springframework.web.reactive.function.server.RequestPredicates;
import org.springframework.web.reactive.function.server.RouterFunction;
import org.springframework.web.reactive.function.server.RouterFunctions;
import org.springframework.web.reactive.function.server.ServerRequest;
import org.springframework.web.reactive.function.server.ServerResponse;
import static org.springframework.web.reactive.function.BodyExtractors.toFlux;
import static org.springframework.web.reactive.function.BodyInserters.fromPublisher;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.ipc.netty.NettyContext;
import reactor.ipc.netty.http.server.HttpServer;
/**
* @author Mark Fisher
*/
@Configuration
@EnableConfigurationProperties({ WebConfigurationProperties.class })
@ConditionalOnClass({ HttpHandler.class, NettyContext.class })
public class RestConfiguration {
@Autowired
private WebConfigurationProperties webProperties;
@Bean
public HttpHandler httpHandler(FunctionCatalog registry) {
FunctionInvokingHandler handler = new FunctionInvokingHandler(registry);
RouterFunction<?> route = RouterFunctions
.route(RequestPredicates.POST(webProperties.getPath() + "/{name}")
.and(RequestPredicates.contentType(MediaType.TEXT_PLAIN)),
handler::handlePost)
.andRoute(RequestPredicates.GET(webProperties.getPath() + "/{name}"),
handler::handleGet);
return RouterFunctions.toHttpHandler(route);
}
@Bean
public LifecycleAwareHttpServer httpServer(HttpHandler handler) {
return new LifecycleAwareHttpServer(handler, webProperties.getPort());
}
private static class FunctionInvokingHandler {
private final FunctionCatalog registry;
private FunctionInvokingHandler(FunctionCatalog registry) {
this.registry = registry;
}
private Mono<ServerResponse> handlePost(ServerRequest request) {
Flux<String> input = request.body(toFlux(String.class));
String name = request.pathVariable("name");
Function<Flux<String>, Flux<String>> function = (name.indexOf(',') == -1)
? registry.lookupFunction(name)
: registry.composeFunction(
StringUtils.commaDelimitedListToStringArray(name));
Publisher<String> output = function.apply(input);
return ServerResponse.ok().body(fromPublisher(output, String.class));
}
private Mono<ServerResponse> handleGet(ServerRequest request) {
String name = request.pathVariable("name");
Supplier<Flux<String>> function = registry.lookupSupplier(name);
Publisher<String> output = function.get();
return ServerResponse.ok().body(fromPublisher(output, String.class));
}
}
private static class LifecycleAwareHttpServer
implements InitializingBean, DisposableBean {
private final HttpHandler handler;
private final int port;
private volatile NettyContext server;
private LifecycleAwareHttpServer(HttpHandler handler, int port) {
this.handler = handler;
this.port = port;
}
@Override
public void afterPropertiesSet() {
ReactorHttpHandlerAdapter adapter = new ReactorHttpHandlerAdapter(
this.handler);
final HttpServer server = HttpServer.create("localhost", port);
Thread thread = new Thread(new Runnable() {
@Override
public void run() {
LifecycleAwareHttpServer.this.server = server.newHandler(adapter)
.block();
while (LifecycleAwareHttpServer.this.server != null) {
try {
Thread.sleep(100L);
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
}
}
});
thread.setDaemon(false);
thread.start();
}
@Override
public void destroy() {
if (this.server != null) {
this.server.dispose();
this.server = null;
}
}
}
}

45
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/WebConfigurationProperties.java
View File

@@ -1,45 +0,0 @@
/*
* Copyright 2016-2017 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
*
* 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 org.springframework.cloud.function.web;
import org.springframework.boot.context.properties.ConfigurationProperties;
@ConfigurationProperties("server")
public class WebConfigurationProperties {
private int port = 8080;
private String path = "";
public int getPort() {
return port;
}
public void setPort(int port) {
this.port = port;
}
public String getPath() {
return path;
}
public void setPath(String path) {
while (path.endsWith("/")) {
path = path.substring(0, path.length() - 1);
}
this.path = path;
}
}

2
spring-cloud-function-web/src/main/resources/META-INF/spring.factories
View File

@@ -1,2 +1,2 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.springframework.cloud.function.web.RestConfiguration
org.springframework.cloud.function.web.FunctionController