diff --git a/docs/pom.xml b/docs/pom.xml index 83ec1198b..9c7d7c448 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -15,7 +15,7 @@ index ${basedir}/.. - 0.1.0.RELEASE + 0.1.1.RELEASE 0.1.0.RELEASE 1.5.0-alpha.16 @@ -124,6 +124,8 @@ ${project.build.directory}/refdocs/ ${project.version} + http://cloud.spring.io/ + diff --git a/docs/src/main/asciidoc/index.adoc b/docs/src/main/asciidoc/home.adoc similarity index 100% rename from docs/src/main/asciidoc/index.adoc rename to docs/src/main/asciidoc/home.adoc diff --git a/docs/src/main/asciidoc/spring-cloud-function.adoc b/docs/src/main/asciidoc/spring-cloud-function.adoc index d4986ff02..5d4e85856 100644 --- a/docs/src/main/asciidoc/spring-cloud-function.adoc +++ b/docs/src/main/asciidoc/spring-cloud-function.adoc @@ -4,6 +4,9 @@ Mark Fisher, Dave Syer, Oleg Zhurakousky *{spring-cloud-function-version}* +[#index-link] +{docs-url}spring-cloud-function/{docs-version}home.html + --- :github: https://github.com/spring-cloud/spring-cloud-function diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebUtils.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebUtils.java index bb8315374..5e724629c 100644 --- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebUtils.java +++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebUtils.java @@ -34,7 +34,8 @@ public final class FunctionWebUtils { } - public static Object findFunction(HttpMethod method, FunctionCatalog functionCatalog, Map attributes, String path) { + public static Object findFunction(HttpMethod method, FunctionCatalog functionCatalog, + Map attributes, String path) { if (method.equals(HttpMethod.GET)) { return findFunctionForGet(functionCatalog, attributes, path); } @@ -46,7 +47,8 @@ public final class FunctionWebUtils { } } - private static Object findFunctionForGet(FunctionCatalog functionCatalog, Map attributes, String path) { + private static Object findFunctionForGet(FunctionCatalog functionCatalog, + Map attributes, String path) { path = path.startsWith("/") ? path.substring(1) : path; Object functionForGet = null; @@ -82,7 +84,8 @@ public final class FunctionWebUtils { return functionForGet; } - private static Object findFunctionForPost(FunctionCatalog functionCatalog, Map attributes, String path) { + private static Object findFunctionForPost(FunctionCatalog functionCatalog, + Map attributes, String path) { path = path.startsWith("/") ? path.substring(1) : path; Consumer> consumer = functionCatalog.lookup(Consumer.class, path); if (consumer != null) { diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerMVCTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerMVCTests.java index 57a640253..3c14a1ca3 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerMVCTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerMVCTests.java @@ -32,7 +32,12 @@ import org.springframework.util.SocketUtils; import static org.assertj.core.api.Assertions.assertThat; - +/** + * + * @author Oleg Zhurakousky + * @since 2.1 + * + */ public class FunctionEndpointInitializerMVCTests { @Before @@ -51,7 +56,8 @@ public class FunctionEndpointInitializerMVCTests { SpringApplication.run(ApplicationConfiguration.class); TestRestTemplate testRestTemplate = new TestRestTemplate(); String port = System.getProperty("server.port"); - ResponseEntity response = testRestTemplate.postForEntity(new URI("http://localhost:" + port + "/uppercase"), "stressed", String.class); + ResponseEntity response = testRestTemplate + .postForEntity(new URI("http://localhost:" + port + "/uppercase"), "stressed", String.class); assertThat(response.getBody()).isEqualTo("STRESSED"); response = testRestTemplate.postForEntity(new URI("http://localhost:" + port + "/reverse"), "stressed", String.class); assertThat(response.getBody()).isEqualTo("desserts"); @@ -62,7 +68,8 @@ public class FunctionEndpointInitializerMVCTests { SpringApplication.run(ApplicationConfiguration.class); TestRestTemplate testRestTemplate = new TestRestTemplate(); String port = System.getProperty("server.port"); - ResponseEntity response = testRestTemplate.postForEntity(new URI("http://localhost:" + port + "/uppercase,lowercase,reverse"), "stressed", String.class); + ResponseEntity response = testRestTemplate + .postForEntity(new URI("http://localhost:" + port + "/uppercase,lowercase,reverse"), "stressed", String.class); assertThat(response.getBody()).isEqualTo("desserts"); } @@ -84,20 +91,6 @@ public class FunctionEndpointInitializerMVCTests { public Function reverse() { return s -> new StringBuilder(s).reverse().toString(); } - -// @Override -// public void initialize(GenericApplicationContext applicationContext) { -// applicationContext.registerBean("uppercase", FunctionRegistration.class, -// () -> new FunctionRegistration<>(uppercase()) -// .type(FunctionType.from(String.class).to(String.class))); -// applicationContext.registerBean("reverse", FunctionRegistration.class, -// () -> new FunctionRegistration<>(reverse()) -// .type(FunctionType.from(String.class).to(String.class))); -// applicationContext.registerBean("lowercase", FunctionRegistration.class, -// () -> new FunctionRegistration<>(lowercase()) -// .type(FunctionType.from(String.class).to(String.class))); -// } - } } diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerTests.java index 37ff382b5..7a0ae2abc 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerTests.java @@ -35,7 +35,12 @@ import org.springframework.util.SocketUtils; import static org.assertj.core.api.Assertions.assertThat; - +/** +* +* @author Oleg Zhurakousky +* @since 2.1 +* +*/ public class FunctionEndpointInitializerTests { @Before @@ -55,7 +60,8 @@ public class FunctionEndpointInitializerTests { TestRestTemplate testRestTemplate = new TestRestTemplate(); String port = System.getProperty("server.port"); Thread.sleep(200); - ResponseEntity response = testRestTemplate.postForEntity(new URI("http://localhost:" + port + "/uppercase"), "stressed", String.class); + ResponseEntity response = testRestTemplate + .postForEntity(new URI("http://localhost:" + port + "/uppercase"), "stressed", String.class); assertThat(response.getBody()).isEqualTo("STRESSED"); response = testRestTemplate.postForEntity(new URI("http://localhost:" + port + "/reverse"), "stressed", String.class); assertThat(response.getBody()).isEqualTo("desserts"); @@ -67,7 +73,8 @@ public class FunctionEndpointInitializerTests { TestRestTemplate testRestTemplate = new TestRestTemplate(); String port = System.getProperty("server.port"); Thread.sleep(200); - ResponseEntity response = testRestTemplate.postForEntity(new URI("http://localhost:" + port + "/uppercase,lowercase,reverse"), "stressed", String.class); + ResponseEntity response = testRestTemplate + .postForEntity(new URI("http://localhost:" + port + "/uppercase,lowercase,reverse"), "stressed", String.class); assertThat(response.getBody()).isEqualTo("desserts"); }