diff --git a/applications/source/http-source/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/applications/source/http-source/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties index 56482330..0e7811b9 100644 --- a/applications/source/http-source/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties +++ b/applications/source/http-source/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties @@ -1,3 +1,3 @@ -configuration-properties.classes=org.springframework.cloud.fn.supplier.http.HttpSourceProperties,\ - org.springframework.cloud.fn.supplier.http.HttpSourceProperties$Cors +configuration-properties.classes=org.springframework.cloud.fn.supplier.http.HttpSupplierProperties,\ + org.springframework.cloud.fn.supplier.http.HttpSupplierProperties$Cors configuration-properties.names=server.port diff --git a/functions/supplier/http-supplier/README.adoc b/functions/supplier/http-supplier/README.adoc index 25f6d226..9e506407 100644 --- a/functions/supplier/http-supplier/README.adoc +++ b/functions/supplier/http-supplier/README.adoc @@ -22,11 +22,11 @@ Once injected, you can use the `get` method of the `Supplier` to invoke it and t All configuration properties are prefixed with `http`. -For more information on the various options available, please see https://github.com/spring-cloud/stream-applications/blob/master/functions/supplier/http-supplier/src/main/java/org/springframework/cloud/fn/supplier/http/HttpSupplierProperties.java[FileSupplierProperties]. +For more information on the various options available, please see link:src/main/java/org/springframework/cloud/fn/supplier/http/HttpSupplierProperties.java[HttpSupplierProperties]. ## Tests -See this https://github.com/spring-cloud/stream-applications/blob/master/functions/supplier/http-supplier/src/test/java/org/springframework/cloud/fn/supplier/http/HttpSupplierApplicationTests.java[test suite] for the various ways, this supplier is used. +See this link:src/test/java/org/springframework/cloud/fn/supplier/http/HttpSupplierApplicationTests.java[test suite] for the various ways, this supplier is used. ## Other usage diff --git a/functions/supplier/http-supplier/src/main/java/org/springframework/cloud/fn/supplier/http/HttpSupplierConfiguration.java b/functions/supplier/http-supplier/src/main/java/org/springframework/cloud/fn/supplier/http/HttpSupplierConfiguration.java index f1325438..12aae265 100644 --- a/functions/supplier/http-supplier/src/main/java/org/springframework/cloud/fn/supplier/http/HttpSupplierConfiguration.java +++ b/functions/supplier/http-supplier/src/main/java/org/springframework/cloud/fn/supplier/http/HttpSupplierConfiguration.java @@ -39,21 +39,21 @@ import org.springframework.messaging.Message; * * @author Artem Bilan */ -@EnableConfigurationProperties(HttpSourceProperties.class) +@EnableConfigurationProperties(HttpSupplierProperties.class) @Configuration public class HttpSupplierConfiguration { @Bean - public Publisher> httpSupplierFlow(HttpSourceProperties httpSourceProperties) { + public Publisher> httpSupplierFlow(HttpSupplierProperties httpSupplierProperties) { return IntegrationFlows.from( - WebFlux.inboundChannelAdapter(httpSourceProperties.getPathPattern()) + WebFlux.inboundChannelAdapter(httpSupplierProperties.getPathPattern()) .requestPayloadType(byte[].class) .statusCodeExpression(new ValueExpression<>(HttpStatus.ACCEPTED)) - .mappedRequestHeaders(httpSourceProperties.getMappedRequestHeaders()) + .mappedRequestHeaders(httpSupplierProperties.getMappedRequestHeaders()) .crossOrigin(crossOrigin -> - crossOrigin.origin(httpSourceProperties.getCors().getAllowedOrigins()) - .allowedHeaders(httpSourceProperties.getCors().getAllowedHeaders()) - .allowCredentials(httpSourceProperties.getCors().getAllowCredentials())) + crossOrigin.origin(httpSupplierProperties.getCors().getAllowedOrigins()) + .allowedHeaders(httpSupplierProperties.getCors().getAllowedHeaders()) + .allowCredentials(httpSupplierProperties.getCors().getAllowCredentials())) .autoStartup(false)) .toReactivePublisher(); } diff --git a/functions/supplier/http-supplier/src/main/java/org/springframework/cloud/fn/supplier/http/HttpSourceProperties.java b/functions/supplier/http-supplier/src/main/java/org/springframework/cloud/fn/supplier/http/HttpSupplierProperties.java similarity index 98% rename from functions/supplier/http-supplier/src/main/java/org/springframework/cloud/fn/supplier/http/HttpSourceProperties.java rename to functions/supplier/http-supplier/src/main/java/org/springframework/cloud/fn/supplier/http/HttpSupplierProperties.java index ef1a7ecb..242c5ab2 100644 --- a/functions/supplier/http-supplier/src/main/java/org/springframework/cloud/fn/supplier/http/HttpSourceProperties.java +++ b/functions/supplier/http-supplier/src/main/java/org/springframework/cloud/fn/supplier/http/HttpSupplierProperties.java @@ -30,7 +30,7 @@ import org.springframework.web.cors.CorsConfiguration; */ @ConfigurationProperties("http") @Validated -public class HttpSourceProperties { +public class HttpSupplierProperties { /** * HTTP endpoint path mapping. diff --git a/functions/supplier/jdbc-supplier/README.adoc b/functions/supplier/jdbc-supplier/README.adoc index 0e033cc0..be307c4a 100644 --- a/functions/supplier/jdbc-supplier/README.adoc +++ b/functions/supplier/jdbc-supplier/README.adoc @@ -23,11 +23,11 @@ In the case of splitting you get a `Flux` which you have to subscribe in your ap All configuration properties are prefixed with `jdbc.supplier`. -For more information on the various options available, please see https://github.com/spring-cloud/stream-applications/blob/master/functions/supplier/jdbc-supplier/src/main/java/org/springframework/cloud/fn/supplier/jdbc/JdbcSupplierProperties.java[JdbcSupplierProperties] +For more information on the various options available, please see link:src/main/java/org/springframework/cloud/fn/supplier/jdbc/JdbcSupplierProperties.java[JdbcSupplierProperties] ## Tests -See this https://github.com/spring-cloud/stream-applications/tree/master/functions/supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc[test suite] for the various ways, this supplier is used. +See this link:src/test/java/org/springframework/cloud/fn/supplier/jdbc[test suite] for the various ways, this supplier is used. ## Other usage diff --git a/functions/supplier/mongodb-supplier/README.adoc b/functions/supplier/mongodb-supplier/README.adoc index 435e06a5..066dc562 100644 --- a/functions/supplier/mongodb-supplier/README.adoc +++ b/functions/supplier/mongodb-supplier/README.adoc @@ -23,11 +23,11 @@ In the case of splitting you get a `Flux` which you have to subscribe in your ap All configuration properties are prefixed with `mongodb.supplier`. -For more information on the various options available, please see https://github.com/spring-cloud/stream-applications/blob/master/functions/supplier/mongodb-supplier/src/main/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierProperties.java[MongoDBSupplierProperties] +For more information on the various options available, please see link:src/main/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierProperties.java[MongoDBSupplierProperties] ## Tests -See this https://github.com/spring-cloud/stream-applications/blob/master/functions/supplier/mongodb-supplier/src/test/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierApplicationTests.java[test suite] for the various ways, this supplier is used. +See this link:src/test/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierApplicationTests.java[test suite] for the various ways, this supplier is used. ## Other usage diff --git a/functions/supplier/mqtt-supplier/README.adoc b/functions/supplier/mqtt-supplier/README.adoc index 2894d509..33b1a24c 100644 --- a/functions/supplier/mqtt-supplier/README.adoc +++ b/functions/supplier/mqtt-supplier/README.adoc @@ -22,12 +22,12 @@ Once injected, you can use the `get` method of the `Supplier` to invoke it and t All configuration properties are prefixed with `mqtt.supplier` and `mqtt`. -For more information on the various options available, please see https://github.com/spring-cloud/stream-applications/blob/master/functions/supplier/mqtt-supplier/src/main/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierProperties.java[MqttSupplierProperties]. +For more information on the various options available, please see link:src/main/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierProperties.java[MqttSupplierProperties]. ## Tests -See this https://github.com/spring-cloud/stream-applications/blob/master/functions/supplier/mqtt-supplier/src/test/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierTests.java[test suite] for the various ways, this supplier is used. -In addition to this, there is also https://github.com/spring-cloud/stream-applications/blob/master/functions/common/mqtt-common/src/main/java/org/springframework/cloud/fn/common/mqtt/MqttProperties.java[this set of properties] to consider. +See this link:src/test/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierTests.java[test suite] for the various ways, this supplier is used. +In addition to this, there is also link:../../common/mqtt-common/src/main/java/org/springframework/cloud/fn/common/mqtt/MqttProperties.java[this set of properties] to consider. ## Other usage diff --git a/functions/supplier/tcp-supplier/README.adoc b/functions/supplier/tcp-supplier/README.adoc index 0fbca3b0..0d36a235 100644 --- a/functions/supplier/tcp-supplier/README.adoc +++ b/functions/supplier/tcp-supplier/README.adoc @@ -22,12 +22,12 @@ Once injected, you can use the `get` method of the `Supplier` to invoke it and t All configuration properties are prefixed with `tcp.supplier` and `tcp`. -For more information on the various options available, please see https://github.com/spring-cloud/stream-applications/blob/master/functions/supplier/tcp-supplier/src/main/java/org/springframework/cloud/fn/supplier/tcp/TcpSupplierProperties.java[TcpSupplierProperties]. -In addition to this, there is also https://github.com/spring-cloud/stream-applications/blob/master/functions/common/tcp-common/src/main/java/org/springframework/cloud/fn/common/tcp/TcpConnectionFactoryProperties.java[this set of properties] to consider. +For more information on the various options available, please see link:src/main/java/org/springframework/cloud/fn/supplier/tcp/TcpSupplierProperties.java[TcpSupplierProperties]. +In addition to this, there is also link:../../common/tcp-common/src/main/java/org/springframework/cloud/fn/common/tcp/TcpConnectionFactoryProperties.java[this set of properties] to consider. ## Tests -See this https://github.com/spring-cloud/stream-applications/tree/master/functions/supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp[test suite] for the various ways, this supplier is used. +See this link:src/test/java/org/springframework/cloud/fn/supplier/tcp[test suite] for the various ways, this supplier is used. ## Other usage diff --git a/functions/supplier/time-supplier/README.adoc b/functions/supplier/time-supplier/README.adoc index 6805cabc..66b2657c 100644 --- a/functions/supplier/time-supplier/README.adoc +++ b/functions/supplier/time-supplier/README.adoc @@ -20,11 +20,11 @@ Once injected, you can use the `get` method of the `Supplier` to invoke it. All configuration properties are prefixed with `time`. -For more information on the various options available, please see https://github.com/spring-cloud/stream-applications/blob/master/functions/supplier/time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/TimeSupplierProperties.java[TimeSupplierProperties]. +For more information on the various options available, please see link:src/main/java/org/springframework/cloud/fn/supplier/time/TimeSupplierProperties.java[TimeSupplierProperties]. ## Tests -See this https://github.com/spring-cloud/stream-applications/tree/master/functions/supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time[test suite] for the various ways, this supplier is used. +See this link:src/test/java/org/springframework/cloud/fn/supplier/time[test suite] for the various ways, this supplier is used. ## Other usage