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

Add configurable base path for web resources

Browse Source
This commit is contained in:
Dave Syer
2017-03-13 13:43:26 +00:00
parent 2a0653b0e7
commit 9b24d23df8
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/FunctionController.java
View File

@@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
@@ -40,6 +41,7 @@ import reactor.core.publisher.Flux;
*/ */
@RestController @RestController
@ConditionalOnClass(RestController.class) @ConditionalOnClass(RestController.class)
@RequestMapping("${spring.cloud.function.web.path:}")
public class FunctionController { public class FunctionController {
@Value("${debug:${DEBUG:false}}") @Value("${debug:${DEBUG:false}}")

2
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FluxResponseBodyEmitter.java
View File

@@ -35,7 +35,7 @@ class FluxResponseBodyEmitter<T> extends ResponseBodyEmitter {
private final MediaType mediaType; private final MediaType mediaType;
public FluxResponseBodyEmitter(Flux<T> observable) { public FluxResponseBodyEmitter(Flux<T> observable) {
this(null, null, observable); this(1000L, null, observable);
} }
public FluxResponseBodyEmitter(Long timeout, MediaType mediaType, public FluxResponseBodyEmitter(Long timeout, MediaType mediaType,

9
spring-cloud-function-web/src/main/resources/META-INF/additional-spring-configuration-metadata.json Normal file
View File

@@ -0,0 +1,9 @@
{"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": ""
}]
}