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

Fixed docs home page

Browse Source 
fixed some formatting issues
This commit is contained in:
Oleg Zhurakousky
2019-03-19 08:44:01 +01:00
parent 87a878879c
commit ee13ef4e09
6 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/pom.xml
View File

@@ -15,7 +15,7 @@
<properties> <properties>
<docs.main>index</docs.main> <docs.main>index</docs.main>
<main.basedir>${basedir}/..</main.basedir> <main.basedir>${basedir}/..</main.basedir>
<spring-doc-resources.version>0.1.0.RELEASE</spring-doc-resources.version> <spring-doc-resources.version>0.1.1.RELEASE</spring-doc-resources.version>
<spring-asciidoctor-extensions.version>0.1.0.RELEASE <spring-asciidoctor-extensions.version>0.1.0.RELEASE
</spring-asciidoctor-extensions.version> </spring-asciidoctor-extensions.version>
<asciidoctorj-pdf.version>1.5.0-alpha.16</asciidoctorj-pdf.version> <asciidoctorj-pdf.version>1.5.0-alpha.16</asciidoctorj-pdf.version>
@@ -124,6 +124,8 @@
<sourceDirectory>${project.build.directory}/refdocs/</sourceDirectory> <sourceDirectory>${project.build.directory}/refdocs/</sourceDirectory>
<attributes> <attributes>
<spring-cloud-function-version>${project.version}</spring-cloud-function-version> <spring-cloud-function-version>${project.version}</spring-cloud-function-version>
<docs-url>http://cloud.spring.io/</docs-url>
<docs-version></docs-version>
</attributes> </attributes>
</configuration> </configuration>
<executions> <executions>

0
docs/src/main/asciidoc/index.adoc → docs/src/main/asciidoc/home.adoc
View File

3
docs/src/main/asciidoc/spring-cloud-function.adoc
View File

@@ -4,6 +4,9 @@ Mark Fisher, Dave Syer, Oleg Zhurakousky
*{spring-cloud-function-version}* *{spring-cloud-function-version}*
[#index-link]
{docs-url}spring-cloud-function/{docs-version}home.html
--- ---
:github: https://github.com/spring-cloud/spring-cloud-function :github: https://github.com/spring-cloud/spring-cloud-function

9
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebUtils.java
View File

@@ -34,7 +34,8 @@ public final class FunctionWebUtils {
} }
public static Object findFunction(HttpMethod method, FunctionCatalog functionCatalog, Map<String, Object> attributes, String path) { public static Object findFunction(HttpMethod method, FunctionCatalog functionCatalog,
Map<String, Object> attributes, String path) {
if (method.equals(HttpMethod.GET)) { if (method.equals(HttpMethod.GET)) {
return findFunctionForGet(functionCatalog, attributes, path); return findFunctionForGet(functionCatalog, attributes, path);
} }
@@ -46,7 +47,8 @@ public final class FunctionWebUtils {
} }
} }
private static Object findFunctionForGet(FunctionCatalog functionCatalog, Map<String, Object> attributes, String path) { private static Object findFunctionForGet(FunctionCatalog functionCatalog,
Map<String, Object> attributes, String path) {
path = path.startsWith("/") ? path.substring(1) : path; path = path.startsWith("/") ? path.substring(1) : path;
Object functionForGet = null; Object functionForGet = null;
@@ -82,7 +84,8 @@ public final class FunctionWebUtils {
return functionForGet; return functionForGet;
} }
private static Object findFunctionForPost(FunctionCatalog functionCatalog, Map<String, Object> attributes, String path) { private static Object findFunctionForPost(FunctionCatalog functionCatalog,
Map<String, Object> attributes, String path) {
path = path.startsWith("/") ? path.substring(1) : path; path = path.startsWith("/") ? path.substring(1) : path;
Consumer<Publisher<?>> consumer = functionCatalog.lookup(Consumer.class, path); Consumer<Publisher<?>> consumer = functionCatalog.lookup(Consumer.class, path);
if (consumer != null) { if (consumer != null) {

27
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerMVCTests.java
View File

@@ -32,7 +32,12 @@ import org.springframework.util.SocketUtils;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
/**
*
* @author Oleg Zhurakousky
* @since 2.1
*
*/
public class FunctionEndpointInitializerMVCTests { public class FunctionEndpointInitializerMVCTests {
@Before @Before
@@ -51,7 +56,8 @@ public class FunctionEndpointInitializerMVCTests {
SpringApplication.run(ApplicationConfiguration.class); SpringApplication.run(ApplicationConfiguration.class);
TestRestTemplate testRestTemplate = new TestRestTemplate(); TestRestTemplate testRestTemplate = new TestRestTemplate();
String port = System.getProperty("server.port"); String port = System.getProperty("server.port");
ResponseEntity<String> response = testRestTemplate.postForEntity(new URI("http://localhost:" + port + "/uppercase"), "stressed", String.class); ResponseEntity<String> response = testRestTemplate
.postForEntity(new URI("http://localhost:" + port + "/uppercase"), "stressed", String.class);
assertThat(response.getBody()).isEqualTo("STRESSED"); assertThat(response.getBody()).isEqualTo("STRESSED");
response = testRestTemplate.postForEntity(new URI("http://localhost:" + port + "/reverse"), "stressed", String.class); response = testRestTemplate.postForEntity(new URI("http://localhost:" + port + "/reverse"), "stressed", String.class);
assertThat(response.getBody()).isEqualTo("desserts"); assertThat(response.getBody()).isEqualTo("desserts");
@@ -62,7 +68,8 @@ public class FunctionEndpointInitializerMVCTests {
SpringApplication.run(ApplicationConfiguration.class); SpringApplication.run(ApplicationConfiguration.class);
TestRestTemplate testRestTemplate = new TestRestTemplate(); TestRestTemplate testRestTemplate = new TestRestTemplate();
String port = System.getProperty("server.port"); String port = System.getProperty("server.port");
ResponseEntity<String> response = testRestTemplate.postForEntity(new URI("http://localhost:" + port + "/uppercase,lowercase,reverse"), "stressed", String.class); ResponseEntity<String> response = testRestTemplate
.postForEntity(new URI("http://localhost:" + port + "/uppercase,lowercase,reverse"), "stressed", String.class);
assertThat(response.getBody()).isEqualTo("desserts"); assertThat(response.getBody()).isEqualTo("desserts");
} }
@@ -84,20 +91,6 @@ public class FunctionEndpointInitializerMVCTests {
public Function<String, String> reverse() { public Function<String, String> reverse() {
return s -> new StringBuilder(s).reverse().toString(); 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)));
// }
} }
} }

13
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerTests.java
View File

@@ -35,7 +35,12 @@ import org.springframework.util.SocketUtils;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
/**
*
* @author Oleg Zhurakousky
* @since 2.1
*
*/
public class FunctionEndpointInitializerTests { public class FunctionEndpointInitializerTests {
@Before @Before
@@ -55,7 +60,8 @@ public class FunctionEndpointInitializerTests {
TestRestTemplate testRestTemplate = new TestRestTemplate(); TestRestTemplate testRestTemplate = new TestRestTemplate();
String port = System.getProperty("server.port"); String port = System.getProperty("server.port");
Thread.sleep(200); Thread.sleep(200);
ResponseEntity<String> response = testRestTemplate.postForEntity(new URI("http://localhost:" + port + "/uppercase"), "stressed", String.class); ResponseEntity<String> response = testRestTemplate
.postForEntity(new URI("http://localhost:" + port + "/uppercase"), "stressed", String.class);
assertThat(response.getBody()).isEqualTo("STRESSED"); assertThat(response.getBody()).isEqualTo("STRESSED");
response = testRestTemplate.postForEntity(new URI("http://localhost:" + port + "/reverse"), "stressed", String.class); response = testRestTemplate.postForEntity(new URI("http://localhost:" + port + "/reverse"), "stressed", String.class);
assertThat(response.getBody()).isEqualTo("desserts"); assertThat(response.getBody()).isEqualTo("desserts");
@@ -67,7 +73,8 @@ public class FunctionEndpointInitializerTests {
TestRestTemplate testRestTemplate = new TestRestTemplate(); TestRestTemplate testRestTemplate = new TestRestTemplate();
String port = System.getProperty("server.port"); String port = System.getProperty("server.port");
Thread.sleep(200); Thread.sleep(200);
ResponseEntity<String> response = testRestTemplate.postForEntity(new URI("http://localhost:" + port + "/uppercase,lowercase,reverse"), "stressed", String.class); ResponseEntity<String> response = testRestTemplate
.postForEntity(new URI("http://localhost:" + port + "/uppercase,lowercase,reverse"), "stressed", String.class);
assertThat(response.getBody()).isEqualTo("desserts"); assertThat(response.getBody()).isEqualTo("desserts");
} }