diff --git a/applications/processor/filter-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/applications/processor/filter-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties index 523b1d70..b742b4cd 100644 --- a/applications/processor/filter-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties +++ b/applications/processor/filter-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties @@ -1 +1,2 @@ configuration-properties.classes=org.springframework.cloud.fn.spel.SpelFunctionProperties + diff --git a/applications/sink/rabbit-sink/README.adoc b/applications/sink/rabbit-sink/README.adoc index 872d260b..f5399841 100644 --- a/applications/sink/rabbit-sink/README.adoc +++ b/applications/sink/rabbit-sink/README.adoc @@ -10,6 +10,14 @@ The **$$rabbit$$** $$sink$$ has the following options: (See the Spring Boot documentation for RabbitMQ connection properties) //tag::configuration-properties[] +$$rabbit.converter-bean-name$$:: $$The bean name for a custom message converter; if omitted, a SimpleMessageConverter is used. If 'jsonConverter', a Jackson2JsonMessageConverter bean will be created for you.$$ *($$String$$, default: `$$$$`)* +$$rabbit.exchange$$:: $$Exchange name - overridden by exchangeNameExpression, if supplied.$$ *($$String$$, default: `$$$$`)* +$$rabbit.exchange-expression$$:: $$A SpEL expression that evaluates to an exchange name.$$ *($$Expression$$, default: `$$$$`)* +$$rabbit.mapped-request-headers$$:: $$Headers that will be mapped.$$ *($$String[]$$, default: `$$[*]$$`)* +$$rabbit.own-connection$$:: $$When true, use a separate connection based on the boot properties.$$ *($$Boolean$$, default: `$$false$$`)* +$$rabbit.persistent-delivery-mode$$:: $$Default delivery mode when 'amqp_deliveryMode' header is not present, true for PERSISTENT.$$ *($$Boolean$$, default: `$$false$$`)* +$$rabbit.routing-key$$:: $$Routing key - overridden by routingKeyExpression, if supplied.$$ *($$String$$, default: `$$$$`)* +$$rabbit.routing-key-expression$$:: $$A SpEL expression that evaluates to a routing key.$$ *($$Expression$$, default: `$$$$`)* $$spring.rabbitmq.addresses$$:: $$Comma-separated list of addresses to which the client should connect. When set, the host and port are ignored.$$ *($$String$$, default: `$$$$`)* $$spring.rabbitmq.connection-timeout$$:: $$Connection timeout. Set it to zero to wait forever.$$ *($$Duration$$, default: `$$$$`)* $$spring.rabbitmq.host$$:: $$RabbitMQ host. Ignored if an address is set.$$ *($$String$$, default: `$$localhost$$`)* diff --git a/applications/sink/rabbit-sink/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/applications/sink/rabbit-sink/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties index 52edb5a6..193cf0ee 100644 --- a/applications/sink/rabbit-sink/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties +++ b/applications/sink/rabbit-sink/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties @@ -1,2 +1,2 @@ -configuration-properties.classes=RabbitConsumerProperties, \ +configuration-properties.classes=org.springframework.cloud.fn.consumer.rabbit.RabbitConsumerProperties, \ org.springframework.boot.autoconfigure.amqp.RabbitProperties diff --git a/applications/source/file-source/README.adoc b/applications/source/file-source/README.adoc index c9b2a942..36b08f32 100644 --- a/applications/source/file-source/README.adoc +++ b/applications/source/file-source/README.adoc @@ -20,6 +20,14 @@ The payload of these 2 additional marker messages is of type `FileSplitter.FileM The **$$file$$** $$source$$ has the following options: //tag::configuration-properties[] +$$file.consumer.markers-json$$:: $$When 'fileMarkers == true', specify if they should be produced as FileSplitter.FileMarker objects or JSON.$$ *($$Boolean$$, default: `$$true$$`)* +$$file.consumer.mode$$:: $$The FileReadingMode to use for file reading sources. Values are 'ref' - The File object, 'lines' - a message per line, or 'contents' - the contents as bytes.$$ *($$FileReadingMode$$, default: `$$$$`, possible values: `ref`,`lines`,`contents`)* +$$file.consumer.with-markers$$:: $$Set to true to emit start of file/end of file marker messages before/after the data. Only valid with FileReadingMode 'lines'.$$ *($$Boolean$$, default: `$$$$`)* +$$file.supplier.delay-when-empty$$:: $$Duration of delay when no new files are detected.$$ *($$Duration$$, default: `$$1s$$`)* +$$file.supplier.directory$$:: $$The directory to poll for new files.$$ *($$File$$, default: `$$$$`)* +$$file.supplier.filename-pattern$$:: $$A simple ant pattern to match files.$$ *($$String$$, default: `$$$$`)* +$$file.supplier.filename-regex$$:: $$A regex pattern to match files.$$ *($$Pattern$$, default: `$$$$`)* +$$file.supplier.prevent-duplicates$$:: $$Set to true to include an AcceptOnceFileListFilter which prevents duplicates.$$ *($$Boolean$$, default: `$$true$$`)* //end::configuration-properties[] //end::ref-doc[] diff --git a/applications/source/file-source/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/applications/source/file-source/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties index cb35d57e..92db2c7a 100644 --- a/applications/source/file-source/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties +++ b/applications/source/file-source/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties @@ -1,2 +1,2 @@ -configuration-properties.classes=FileSupplierProperties,\ - FileConsumerProperties +configuration-properties.classes=org.springframework.cloud.fn.supplier.file.FileSupplierProperties,\ + org.springframework.cloud.fn.supplier.file.FileConsumerProperties diff --git a/applications/source/http-source/README.adoc b/applications/source/http-source/README.adoc index 29b2479e..38ddf66c 100644 --- a/applications/source/http-source/README.adoc +++ b/applications/source/http-source/README.adoc @@ -20,6 +20,11 @@ If content type does not match `text/*` or `application/json` The **$$http$$** $$source$$ supports the following configuration properties: //tag::configuration-properties[] +$$http.cors.allow-credentials$$:: $$Whether the browser should include any cookies associated with the domain of the request being annotated.$$ *($$Boolean$$, default: `$$$$`)* +$$http.cors.allowed-headers$$:: $$List of request headers that can be used during the actual request.$$ *($$String[]$$, default: `$$$$`)* +$$http.cors.allowed-origins$$:: $$List of allowed origins, e.g. "https://domain1.com".$$ *($$String[]$$, default: `$$$$`)* +$$http.mapped-request-headers$$:: $$Headers that will be mapped.$$ *($$String[]$$, default: `$$$$`)* +$$http.path-pattern$$:: $$HTTP endpoint path mapping.$$ *($$String$$, default: `$$/$$`)* $$server.port$$:: $$Server HTTP port.$$ *($$Integer$$, default: `$$8080$$`)* //end::configuration-properties[] 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 26d8b848..56482330 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=HttpSourceProperties,\ - HttpSourceProperties$Cors +configuration-properties.classes=org.springframework.cloud.fn.supplier.http.HttpSourceProperties,\ + org.springframework.cloud.fn.supplier.http.HttpSourceProperties$Cors configuration-properties.names=server.port diff --git a/applications/source/jdbc-source/README.adoc b/applications/source/jdbc-source/README.adoc index dc3711c6..78dd7544 100644 --- a/applications/source/jdbc-source/README.adoc +++ b/applications/source/jdbc-source/README.adoc @@ -13,6 +13,10 @@ This source is fully based on the `DataSourceAutoConfiguration`, so refer to the The **$$jdbc$$** $$source$$ has the following options: //tag::configuration-properties[] +$$jdbc.supplier.max-rows$$:: $$Max numbers of rows to process for query.$$ *($$Integer$$, default: `$$0$$`)* +$$jdbc.supplier.query$$:: $$The query to use to select data.$$ *($$String$$, default: `$$$$`)* +$$jdbc.supplier.split$$:: $$Whether to split the SQL result as individual messages.$$ *($$Boolean$$, default: `$$true$$`)* +$$jdbc.supplier.update$$:: $$An SQL update statement to execute for marking polled messages as 'seen'.$$ *($$String$$, default: `$$$$`)* $$spring.cloud.stream.poller.cron$$:: $$Cron expression value for the Cron Trigger.$$ *($$String$$, default: `$$$$`)* $$spring.cloud.stream.poller.fixed-delay$$:: $$Fixed delay for default poller.$$ *($$Long$$, default: `$$1000$$`)* $$spring.cloud.stream.poller.initial-delay$$:: $$Initial delay for periodic triggers.$$ *($$Integer$$, default: `$$0$$`)* diff --git a/applications/source/jdbc-source/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/applications/source/jdbc-source/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties index b37ecfd5..2e085abb 100644 --- a/applications/source/jdbc-source/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties +++ b/applications/source/jdbc-source/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties @@ -1,4 +1,4 @@ -configuration-properties.classes=JdbcSupplierProperties,\ +configuration-properties.classes=org.springframework.cloud.fn.supplier.jdbc.JdbcSupplierProperties,\ org.springframework.cloud.stream.config.DefaultPollerProperties configuration-properties.names=\ spring.datasource.url,\ diff --git a/applications/source/time-source/README.adoc b/applications/source/time-source/README.adoc index a7e2ae14..9358c5ce 100644 --- a/applications/source/time-source/README.adoc +++ b/applications/source/time-source/README.adoc @@ -12,6 +12,7 @@ $$spring.cloud.stream.poller.cron$$:: $$Cron expression value for the Cron Trigg $$spring.cloud.stream.poller.fixed-delay$$:: $$Fixed delay for default poller.$$ *($$Long$$, default: `$$1000$$`)* $$spring.cloud.stream.poller.initial-delay$$:: $$Initial delay for periodic triggers.$$ *($$Integer$$, default: `$$0$$`)* $$spring.cloud.stream.poller.max-messages-per-poll$$:: $$Maximum messages per poll for the default poller.$$ *($$Long$$, default: `$$1$$`)* +$$time.date-format$$:: $$Format for the date value.$$ *($$String$$, default: `$$MM/dd/yy HH:mm:ss$$`)* //end::configuration-properties[] //end::ref-doc[] diff --git a/applications/source/time-source/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/applications/source/time-source/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties index bdee747c..345286e2 100644 --- a/applications/source/time-source/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties +++ b/applications/source/time-source/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties @@ -1,2 +1,2 @@ -configuration-properties.classes=TimeProperties,\ +configuration-properties.classes=org.springframework.cloud.fn.supplier.time.TimeProperties,\ org.springframework.cloud.stream.config.DefaultPollerProperties