From a841beba154c19beb3587081a8d6d509f40c7537 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 13 Jun 2023 00:35:10 -0400 Subject: [PATCH] GH-475: Add some missed nested props for apps (#476) Fixes https://github.com/spring-cloud/stream-applications/issues/475 * Fix JDBC props for limited listed number of them --- .../aggregator-processor/README.adoc | 83 ++++++++++++------- .../processor/aggregator-processor/pom.xml | 4 + ...dataflow-configuration-metadata.properties | 14 +++- .../bridge-processor/README.adoc.tmp | 11 --- applications/sink/cassandra-sink/README.adoc | 74 ++++++++++++++--- ...dataflow-configuration-metadata.properties | 12 ++- .../sink/elasticsearch-sink/README.adoc | 9 ++ ...dataflow-configuration-metadata.properties | 5 +- ...dataflow-configuration-metadata.properties | 5 +- applications/sink/kafka-sink/README.adoc | 5 ++ ...dataflow-configuration-metadata.properties | 3 +- applications/sink/mongodb-sink/README.adoc | 10 +++ ...dataflow-configuration-metadata.properties | 5 +- applications/sink/rabbit-sink/README.adoc | 9 ++ ...dataflow-configuration-metadata.properties | 3 +- applications/sink/redis-sink/README.adoc | 14 ++++ ...dataflow-configuration-metadata.properties | 11 ++- ...dataflow-configuration-metadata.properties | 2 - ...dataflow-configuration-metadata.properties | 3 +- ...dataflow-configuration-metadata.properties | 5 +- applications/source/kafka-source/README.adoc | 2 +- applications/source/mail-source/README.adoc | 10 +-- .../source/mongodb-source/README.adoc | 10 +++ ...dataflow-configuration-metadata.properties | 5 +- applications/source/rabbit-source/README.adoc | 18 ++++ ...dataflow-configuration-metadata.properties | 4 +- ...dataflow-configuration-metadata.properties | 3 +- ...dataflow-configuration-metadata.properties | 4 +- ...dataflow-configuration-metadata.properties | 3 +- ...dataflow-configuration-metadata.properties | 3 +- .../tasklauncher-function/README.adoc | 5 -- 31 files changed, 257 insertions(+), 97 deletions(-) delete mode 100644 applications/processor/bridge-processor/README.adoc.tmp delete mode 100644 functions/function/tasklauncher-function/README.adoc diff --git a/applications/processor/aggregator-processor/README.adoc b/applications/processor/aggregator-processor/README.adoc index 298793c2..9feec308 100644 --- a/applications/processor/aggregator-processor/README.adoc +++ b/applications/processor/aggregator-processor/README.adoc @@ -30,48 +30,30 @@ $$release$$:: $$SpEL expression for release strategy. Default is based on the se === spring.data.mongodb +$$additional-hosts$$:: $$Additional server hosts. Cannot be set with URI or if 'host' is not specified. Additional hosts will use the default mongo port of 27017. If you want to use a different port you can use the "host:port" syntax.$$ *($$List$$, default: `$$$$`)* $$authentication-database$$:: $$Authentication database name.$$ *($$String$$, default: `$$$$`)* $$auto-index-creation$$:: $$Whether to enable auto-index creation.$$ *($$Boolean$$, default: `$$$$`)* $$database$$:: $$Database name.$$ *($$String$$, default: `$$$$`)* $$field-naming-strategy$$:: $$Fully qualified name of the FieldNamingStrategy to use.$$ *($$Class$$, default: `$$$$`)* -$$grid-fs-database$$:: $$$$ *($$String$$, default: `$$$$`)* $$host$$:: $$Mongo server host. Cannot be set with URI.$$ *($$String$$, default: `$$$$`)* $$password$$:: $$Login password of the mongo server. Cannot be set with URI.$$ *($$Character[]$$, default: `$$$$`)* $$port$$:: $$Mongo server port. Cannot be set with URI.$$ *($$Integer$$, default: `$$$$`)* $$replica-set-name$$:: $$Required replica set name for the cluster. Cannot be set with URI.$$ *($$String$$, default: `$$$$`)* -$$uri$$:: $$Mongo database URI. Cannot be set with host, port, credentials and replica set name.$$ *($$String$$, default: `$$mongodb://localhost/test$$`)* +$$uri$$:: $$Mongo database URI. Overrides host, port, username, password, and database.$$ *($$String$$, default: `$$mongodb://localhost/test$$`)* $$username$$:: $$Login user of the mongo server. Cannot be set with URI.$$ *($$String$$, default: `$$$$`)* $$uuid-representation$$:: $$Representation to use when converting a UUID to a BSON binary value.$$ *($$UuidRepresentation$$, default: `$$java-legacy$$`, possible values: `UNSPECIFIED`,`STANDARD`,`C_SHARP_LEGACY`,`JAVA_LEGACY`,`PYTHON_LEGACY`)* -=== spring.datasource +=== spring.data.mongodb.gridfs -$$continue-on-error$$:: $$Whether to stop if an error occurs while initializing the database.$$ *($$Boolean$$, default: `$$false$$`)* -$$data$$:: $$Data (DML) script resource references.$$ *($$List$$, default: `$$$$`)* -$$data-password$$:: $$Password of the database to execute DML scripts (if different).$$ *($$String$$, default: `$$$$`)* -$$data-username$$:: $$Username of the database to execute DML scripts (if different).$$ *($$String$$, default: `$$$$`)* -$$driver-class-name$$:: $$Fully qualified name of the JDBC driver. Auto-detected based on the URL by default.$$ *($$String$$, default: `$$$$`)* -$$embedded-database-connection$$:: $$Connection details for an embedded database. Defaults to the most suitable embedded database that is available on the classpath.$$ *($$EmbeddedDatabaseConnection$$, default: `$$$$`, possible values: `NONE`,`H2`,`DERBY`,`HSQL`,`HSQLDB`)* -$$generate-unique-name$$:: $$Whether to generate a random datasource name.$$ *($$Boolean$$, default: `$$true$$`)* -$$initialization-mode$$:: $$Mode to apply when determining if DataSource initialization should be performed using the available DDL and DML scripts.$$ *($$DataSourceInitializationMode$$, default: `$$embedded$$`, possible values: `ALWAYS`,`EMBEDDED`,`NEVER`)* -$$jndi-name$$:: $$JNDI location of the datasource. Class, url, username and password are ignored when set.$$ *($$String$$, default: `$$$$`)* -$$name$$:: $$Datasource name to use if "generate-unique-name" is false. Defaults to "testdb" when using an embedded database, otherwise null.$$ *($$String$$, default: `$$$$`)* -$$password$$:: $$Login password of the database.$$ *($$String$$, default: `$$$$`)* -$$platform$$:: $$Platform to use in the DDL or DML scripts (such as schema-${platform}.sql or data-${platform}.sql).$$ *($$String$$, default: `$$all$$`)* -$$schema$$:: $$Schema (DDL) script resource references.$$ *($$List$$, default: `$$$$`)* -$$schema-password$$:: $$Password of the database to execute DDL scripts (if different).$$ *($$String$$, default: `$$$$`)* -$$schema-username$$:: $$Username of the database to execute DDL scripts (if different).$$ *($$String$$, default: `$$$$`)* -$$separator$$:: $$Statement separator in SQL initialization scripts.$$ *($$String$$, default: `$$;$$`)* -$$sql-script-encoding$$:: $$SQL scripts encoding.$$ *($$Charset$$, default: `$$$$`)* -$$type$$:: $$Fully qualified name of the connection pool implementation to use. By default, it is auto-detected from the classpath.$$ *($$Class$$, default: `$$$$`)* -$$url$$:: $$JDBC URL of the database.$$ *($$String$$, default: `$$$$`)* -$$username$$:: $$Login username of the database.$$ *($$String$$, default: `$$$$`)* +$$bucket$$:: $$GridFS bucket name.$$ *($$String$$, default: `$$$$`)* +$$database$$:: $$GridFS database name.$$ *($$String$$, default: `$$$$`)* -=== spring.mongodb.embedded +=== spring.data.mongodb.ssl -$$features$$:: $$Comma-separated list of features to enable. Uses the defaults of the configured version by default.$$ *($$Set$$, default: `$$[sync_delay]$$`)* -$$version$$:: $$Version of Mongo to use.$$ *($$String$$, default: `$$3.5.5$$`)* +$$bundle$$:: $$SSL bundle name.$$ *($$String$$, default: `$$$$`)* +$$enabled$$:: $$Whether to enable SSL support. Enabled automatically if "bundle" is provided unless specified otherwise.$$ *($$Boolean$$, default: `$$$$`)* -=== spring.redis +=== spring.data.redis $$client-name$$:: $$Client name to be set on connections with CLIENT SETNAME.$$ *($$String$$, default: `$$$$`)* $$client-type$$:: $$Type of client to use. By default, auto-detected according to the classpath.$$ *($$ClientType$$, default: `$$$$`, possible values: `LETTUCE`,`JEDIS`)* @@ -80,10 +62,55 @@ $$database$$:: $$Database index used by the connection factory.$$ *($$Integer$$, $$host$$:: $$Redis server host.$$ *($$String$$, default: `$$localhost$$`)* $$password$$:: $$Login password of the redis server.$$ *($$String$$, default: `$$$$`)* $$port$$:: $$Redis server port.$$ *($$Integer$$, default: `$$6379$$`)* -$$ssl$$:: $$Whether to enable SSL support.$$ *($$Boolean$$, default: `$$false$$`)* $$timeout$$:: $$Read timeout.$$ *($$Duration$$, default: `$$$$`)* $$url$$:: $$Connection URL. Overrides host, port, and password. User is ignored. Example: redis://user:password@example.com:6379$$ *($$String$$, default: `$$$$`)* $$username$$:: $$Login username of the redis server.$$ *($$String$$, default: `$$$$`)* + +=== spring.data.redis.cluster + +$$max-redirects$$:: $$Maximum number of redirects to follow when executing commands across the cluster.$$ *($$Integer$$, default: `$$$$`)* +$$nodes$$:: $$Comma-separated list of "host:port" pairs to bootstrap from. This represents an "initial" list of cluster nodes and is required to have at least one entry.$$ *($$List$$, default: `$$$$`)* + +=== spring.data.redis.jedis.pool + +$$enabled$$:: $$Whether to enable the pool. Enabled automatically if "commons-pool2" is available. With Jedis, pooling is implicitly enabled in sentinel mode and this setting only applies to single node setup.$$ *($$Boolean$$, default: `$$$$`)* +$$max-active$$:: $$Maximum number of connections that can be allocated by the pool at a given time. Use a negative value for no limit.$$ *($$Integer$$, default: `$$8$$`)* +$$max-idle$$:: $$Maximum number of "idle" connections in the pool. Use a negative value to indicate an unlimited number of idle connections.$$ *($$Integer$$, default: `$$8$$`)* +$$max-wait$$:: $$Maximum amount of time a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely.$$ *($$Duration$$, default: `$$-1ms$$`)* +$$min-idle$$:: $$Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if both it and time between eviction runs are positive.$$ *($$Integer$$, default: `$$0$$`)* +$$time-between-eviction-runs$$:: $$Time between runs of the idle object evictor thread. When positive, the idle object evictor thread starts, otherwise no idle object eviction is performed.$$ *($$Duration$$, default: `$$$$`)* + +=== spring.data.redis.lettuce.pool + +$$enabled$$:: $$Whether to enable the pool. Enabled automatically if "commons-pool2" is available. With Jedis, pooling is implicitly enabled in sentinel mode and this setting only applies to single node setup.$$ *($$Boolean$$, default: `$$$$`)* +$$max-active$$:: $$Maximum number of connections that can be allocated by the pool at a given time. Use a negative value for no limit.$$ *($$Integer$$, default: `$$8$$`)* +$$max-idle$$:: $$Maximum number of "idle" connections in the pool. Use a negative value to indicate an unlimited number of idle connections.$$ *($$Integer$$, default: `$$8$$`)* +$$max-wait$$:: $$Maximum amount of time a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely.$$ *($$Duration$$, default: `$$-1ms$$`)* +$$min-idle$$:: $$Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if both it and time between eviction runs are positive.$$ *($$Integer$$, default: `$$0$$`)* +$$time-between-eviction-runs$$:: $$Time between runs of the idle object evictor thread. When positive, the idle object evictor thread starts, otherwise no idle object eviction is performed.$$ *($$Duration$$, default: `$$$$`)* + +=== spring.data.redis.lettuce + +$$shutdown-timeout$$:: $$Shutdown timeout.$$ *($$Duration$$, default: `$$100ms$$`)* + +=== spring.data.redis.sentinel + +$$master$$:: $$Name of the Redis server.$$ *($$String$$, default: `$$$$`)* +$$nodes$$:: $$Comma-separated list of "host:port" pairs.$$ *($$List$$, default: `$$$$`)* +$$password$$:: $$Password for authenticating with sentinel(s).$$ *($$String$$, default: `$$$$`)* +$$username$$:: $$Login username for authenticating with sentinel(s).$$ *($$String$$, default: `$$$$`)* + +=== spring.data.redis.ssl + +$$bundle$$:: $$SSL bundle name.$$ *($$String$$, default: `$$$$`)* +$$enabled$$:: $$Whether to enable SSL support. Enabled automatically if "bundle" is provided unless specified otherwise.$$ *($$Boolean$$, default: `$$$$`)* + +=== spring.datasource + +$$driver-class-name$$:: $$Fully qualified name of the JDBC driver. Auto-detected based on the URL by default.$$ *($$String$$, default: `$$$$`)* +$$password$$:: $$Login password of the database.$$ *($$String$$, default: `$$$$`)* +$$url$$:: $$JDBC URL of the database.$$ *($$String$$, default: `$$$$`)* +$$username$$:: $$Login username of the database.$$ *($$String$$, default: `$$$$`)* //end::configuration-properties[] //end::ref-doc[] diff --git a/applications/processor/aggregator-processor/pom.xml b/applications/processor/aggregator-processor/pom.xml index c92a7ad4..fb2aee6d 100644 --- a/applications/processor/aggregator-processor/pom.xml +++ b/applications/processor/aggregator-processor/pom.xml @@ -23,6 +23,10 @@ + + org.springframework.cloud + spring-cloud-dataflow-apps-docs-plugin + org.springframework.cloud spring-cloud-dataflow-apps-generator-plugin diff --git a/applications/processor/aggregator-processor/src/main/resources/META-INF/dataflow-configuration-metadata.properties b/applications/processor/aggregator-processor/src/main/resources/META-INF/dataflow-configuration-metadata.properties index d504c7f4..9fe06c7f 100644 --- a/applications/processor/aggregator-processor/src/main/resources/META-INF/dataflow-configuration-metadata.properties +++ b/applications/processor/aggregator-processor/src/main/resources/META-INF/dataflow-configuration-metadata.properties @@ -1,4 +1,16 @@ configuration-properties.classes=org.springframework.cloud.fn.aggregator.AggregatorFunctionProperties,\ org.springframework.boot.autoconfigure.mongo.MongoProperties,\ + org.springframework.boot.autoconfigure.mongo.MongoProperties$Ssl,\ + org.springframework.boot.autoconfigure.mongo.MongoProperties$Gridfs, \ org.springframework.boot.autoconfigure.data.redis.RedisProperties,\ - org.springframework.boot.autoconfigure.jdbc.DataSourceProperties + org.springframework.boot.autoconfigure.data.redis.RedisProperties$Sentinel,\ + org.springframework.boot.autoconfigure.data.redis.RedisProperties$Cluster,\ + org.springframework.boot.autoconfigure.data.redis.RedisProperties$Ssl,\ + org.springframework.boot.autoconfigure.data.redis.RedisProperties$Jedis,\ + org.springframework.boot.autoconfigure.data.redis.RedisProperties$Lettuce,\ + org.springframework.boot.autoconfigure.data.redis.RedisProperties$Pool +configuration-properties.names=\ +spring.datasource.url,\ +spring.datasource.driver-class-name,\ +spring.datasource.username,\ +spring.datasource.password diff --git a/applications/processor/bridge-processor/README.adoc.tmp b/applications/processor/bridge-processor/README.adoc.tmp deleted file mode 100644 index 9ab2f2d0..00000000 --- a/applications/processor/bridge-processor/README.adoc.tmp +++ /dev/null @@ -1,11 +0,0 @@ -//tag::ref-doc[] -= Bridge Processor - -A processor that bridges the input and ouput by simply passing the incoming payload to the outbound. - -=== Payload - -Any - -//end::ref-doc[] -null diff --git a/applications/sink/cassandra-sink/README.adoc b/applications/sink/cassandra-sink/README.adoc index dab83fde..fc857065 100644 --- a/applications/sink/cassandra-sink/README.adoc +++ b/applications/sink/cassandra-sink/README.adoc @@ -14,16 +14,70 @@ The **$$cassandra$$** $$sink$$ has the following options: //tag::configuration-properties[] -$$spring.cassandra.compression$$:: $$Compression supported by the Cassandra binary protocol.$$ *($$Compression$$, default: `$$none$$`, possible values: `LZ4`,`SNAPPY`,`NONE`)* -$$spring.cassandra.config$$:: $$Location of the configuration file to use.$$ *($$Resource$$, default: `$$$$`)* -$$spring.cassandra.contact-points$$:: $$Cluster node addresses in the form 'host:port', or a simple 'host' to use the configured port.$$ *($$List$$, default: `$$[127.0.0.1:9042]$$`)* -$$spring.cassandra.keyspace-name$$:: $$Keyspace name to use.$$ *($$String$$, default: `$$$$`)* -$$spring.cassandra.local-datacenter$$:: $$Datacenter that is considered "local". Contact points should be from this datacenter.$$ *($$String$$, default: `$$$$`)* -$$spring.cassandra.password$$:: $$Login password of the server.$$ *($$String$$, default: `$$$$`)* -$$spring.cassandra.port$$:: $$Port to use if a contact point does not specify one.$$ *($$Integer$$, default: `$$9042$$`)* -$$spring.cassandra.schema-action$$:: $$Schema action to take at startup.$$ *($$String$$, default: `$$none$$`)* -$$spring.cassandra.session-name$$:: $$Name of the Cassandra session.$$ *($$String$$, default: `$$$$`)* -$$spring.cassandra.username$$:: $$Login user of the server.$$ *($$String$$, default: `$$$$`)* +Properties grouped by prefix: + + +=== cassandra.cluster + +$$create-keyspace$$:: $$Flag to create (or not) keyspace on application startup.$$ *($$Boolean$$, default: `$$false$$`)* +$$entity-base-packages$$:: $$Base packages to scan for entities annotated with Table annotations.$$ *($$String[]$$, default: `$$[]$$`)* +$$init-script$$:: $$Resource with CQL scripts (delimited by ';') to initialize keyspace schema.$$ *($$Resource$$, default: `$$$$`)* +$$skip-ssl-validation$$:: $$Flag to validate the Servers' SSL certs.$$ *($$Boolean$$, default: `$$false$$`)* + +=== cassandra + +$$consistency-level$$:: $$The consistency level for write operation.$$ *($$ConsistencyLevel$$, default: `$$$$`)* +$$ingest-query$$:: $$Ingest Cassandra query.$$ *($$String$$, default: `$$$$`)* +$$query-type$$:: $$QueryType for Cassandra Sink.$$ *($$Type$$, default: `$$$$`, possible values: `INSERT`,`UPDATE`,`DELETE`,`STATEMENT`)* +$$statement-expression$$:: $$Expression in Cassandra query DSL style.$$ *($$Expression$$, default: `$$$$`)* +$$ttl$$:: $$Time-to-live option of WriteOptions.$$ *($$Integer$$, default: `$$0$$`)* + +=== spring.cassandra + +$$compression$$:: $$Compression supported by the Cassandra binary protocol.$$ *($$Compression$$, default: `$$none$$`, possible values: `LZ4`,`SNAPPY`,`NONE`)* +$$config$$:: $$Location of the configuration file to use.$$ *($$Resource$$, default: `$$$$`)* +$$contact-points$$:: $$Cluster node addresses in the form 'host:port', or a simple 'host' to use the configured port.$$ *($$List$$, default: `$$[127.0.0.1:9042]$$`)* +$$keyspace-name$$:: $$Keyspace name to use.$$ *($$String$$, default: `$$$$`)* +$$local-datacenter$$:: $$Datacenter that is considered "local". Contact points should be from this datacenter.$$ *($$String$$, default: `$$$$`)* +$$password$$:: $$Login password of the server.$$ *($$String$$, default: `$$$$`)* +$$port$$:: $$Port to use if a contact point does not specify one.$$ *($$Integer$$, default: `$$9042$$`)* +$$schema-action$$:: $$Schema action to take at startup.$$ *($$String$$, default: `$$none$$`)* +$$session-name$$:: $$Name of the Cassandra session.$$ *($$String$$, default: `$$$$`)* +$$username$$:: $$Login user of the server.$$ *($$String$$, default: `$$$$`)* + +=== spring.cassandra.connection + +$$connect-timeout$$:: $$Timeout to use when establishing driver connections.$$ *($$Duration$$, default: `$$5s$$`)* +$$init-query-timeout$$:: $$Timeout to use for internal queries that run as part of the initialization process, just after a connection is opened.$$ *($$Duration$$, default: `$$5s$$`)* + +=== spring.cassandra.controlconnection + +$$timeout$$:: $$Timeout to use for control queries.$$ *($$Duration$$, default: `$$5s$$`)* + +=== spring.cassandra.pool + +$$heartbeat-interval$$:: $$Heartbeat interval after which a message is sent on an idle connection to make sure it's still alive.$$ *($$Duration$$, default: `$$30s$$`)* +$$idle-timeout$$:: $$Idle timeout before an idle connection is removed.$$ *($$Duration$$, default: `$$5s$$`)* + +=== spring.cassandra.request + +$$consistency$$:: $$Queries consistency level.$$ *($$DefaultConsistencyLevel$$, default: `$$$$`, possible values: `ANY`,`ONE`,`TWO`,`THREE`,`QUORUM`,`ALL`,`LOCAL_ONE`,`LOCAL_QUORUM`,`EACH_QUORUM`,`SERIAL`,`LOCAL_SERIAL`)* +$$page-size$$:: $$How many rows will be retrieved simultaneously in a single network round-trip.$$ *($$Integer$$, default: `$$5000$$`)* +$$serial-consistency$$:: $$Queries serial consistency level.$$ *($$DefaultConsistencyLevel$$, default: `$$$$`, possible values: `ANY`,`ONE`,`TWO`,`THREE`,`QUORUM`,`ALL`,`LOCAL_ONE`,`LOCAL_QUORUM`,`EACH_QUORUM`,`SERIAL`,`LOCAL_SERIAL`)* +$$timeout$$:: $$How long the driver waits for a request to complete.$$ *($$Duration$$, default: `$$2s$$`)* + +=== spring.cassandra.request.throttler + +$$drain-interval$$:: $$How often the throttler attempts to dequeue requests. Set this high enough that each attempt will process multiple entries in the queue, but not delay requests too much.$$ *($$Duration$$, default: `$$$$`)* +$$max-concurrent-requests$$:: $$Maximum number of requests that are allowed to execute in parallel.$$ *($$Integer$$, default: `$$$$`)* +$$max-queue-size$$:: $$Maximum number of requests that can be enqueued when the throttling threshold is exceeded.$$ *($$Integer$$, default: `$$$$`)* +$$max-requests-per-second$$:: $$Maximum allowed request rate.$$ *($$Integer$$, default: `$$$$`)* +$$type$$:: $$Request throttling type.$$ *($$ThrottlerType$$, default: `$$none$$`, possible values: `CONCURRENCY_LIMITING`,`RATE_LIMITING`,`NONE`)* + +=== spring.cassandra.ssl + +$$bundle$$:: $$SSL bundle name.$$ *($$String$$, default: `$$$$`)* +$$enabled$$:: $$Whether to enable SSL support.$$ *($$Boolean$$, default: `$$$$`)* //end::configuration-properties[] //end::ref-doc[] diff --git a/applications/sink/cassandra-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties b/applications/sink/cassandra-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties index 5a73b4c9..c74f0d0c 100644 --- a/applications/sink/cassandra-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties +++ b/applications/sink/cassandra-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties @@ -1,3 +1,9 @@ -configuration-properties.classes=CassandraConsumerProperties, \ - CassandraClusterProperties, \ - org.springframework.boot.autoconfigure.cassandra.CassandraProperties +configuration-properties.classes=org.springframework.cloud.fn.consumer.cassandra.CassandraConsumerProperties, \ + org.springframework.cloud.fn.consumer.cassandra.cluster.CassandraClusterProperties, \ + org.springframework.boot.autoconfigure.cassandra.CassandraProperties, \ + org.springframework.boot.autoconfigure.cassandra.CassandraProperties$Ssl, \ + org.springframework.boot.autoconfigure.cassandra.CassandraProperties$Connection, \ + org.springframework.boot.autoconfigure.cassandra.CassandraProperties$Pool, \ + org.springframework.boot.autoconfigure.cassandra.CassandraProperties$Request, \ + org.springframework.boot.autoconfigure.cassandra.CassandraProperties$Controlconnection, \ + org.springframework.boot.autoconfigure.cassandra.CassandraProperties$Throttler diff --git a/applications/sink/elasticsearch-sink/README.adoc b/applications/sink/elasticsearch-sink/README.adoc index 482b365a..e7a63e4b 100644 --- a/applications/sink/elasticsearch-sink/README.adoc +++ b/applications/sink/elasticsearch-sink/README.adoc @@ -37,6 +37,15 @@ $$socket-keep-alive$$:: $$Whether to enable socket keep alive between client and $$socket-timeout$$:: $$Socket timeout used when communicating with Elasticsearch.$$ *($$Duration$$, default: `$$30s$$`)* $$uris$$:: $$Comma-separated list of the Elasticsearch instances to use.$$ *($$List$$, default: `$$[http://localhost:9200]$$`)* $$username$$:: $$Username for authentication with Elasticsearch.$$ *($$String$$, default: `$$$$`)* + +=== spring.elasticsearch.restclient.sniffer + +$$delay-after-failure$$:: $$Delay of a sniff execution scheduled after a failure.$$ *($$Duration$$, default: `$$1m$$`)* +$$interval$$:: $$Interval between consecutive ordinary sniff executions.$$ *($$Duration$$, default: `$$5m$$`)* + +=== spring.elasticsearch.restclient.ssl + +$$bundle$$:: $$SSL bundle name.$$ *($$String$$, default: `$$$$`)* //end::configuration-properties[] == Examples of running this sink diff --git a/applications/sink/elasticsearch-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties b/applications/sink/elasticsearch-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties index cd7e9f78..79b9dfca 100644 --- a/applications/sink/elasticsearch-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties +++ b/applications/sink/elasticsearch-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties @@ -1,2 +1,5 @@ configuration-properties.classes=org.springframework.cloud.fn.consumer.elasticsearch.ElasticsearchConsumerProperties, \ - org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchProperties + org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchProperties, \ + org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchProperties$Restclient, \ + org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchProperties$Restclient$Sniffer, \ + org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchProperties$Restclient$Ssl diff --git a/applications/sink/jdbc-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties b/applications/sink/jdbc-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties index 2f0ef975..7d21e1b4 100644 --- a/applications/sink/jdbc-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties +++ b/applications/sink/jdbc-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties @@ -3,7 +3,4 @@ configuration-properties.names=\ spring.datasource.url,\ spring.datasource.driver-class-name,\ spring.datasource.username,\ -spring.datasource.password,\ -spring.datasource.schema,\ -spring.datasource.data,\ -spring.datasource.initialization-mode +spring.datasource.password diff --git a/applications/sink/kafka-sink/README.adoc b/applications/sink/kafka-sink/README.adoc index 5a9436b9..52f337c4 100644 --- a/applications/sink/kafka-sink/README.adoc +++ b/applications/sink/kafka-sink/README.adoc @@ -47,6 +47,11 @@ $$properties$$:: $$Additional producer-specific properties used to configure the $$retries$$:: $$When greater than zero, enables retrying of failed sends.$$ *($$Integer$$, default: `$$$$`)* $$transaction-id-prefix$$:: $$When non empty, enables transaction support for producer.$$ *($$String$$, default: `$$$$`)* $$value-serializer$$:: $$Serializer class for values.$$ *($$Class$$, default: `$$$$`)* + +=== spring.kafka.template + +$$default-topic$$:: $$Default topic to which messages are sent.$$ *($$String$$, default: `$$$$`)* +$$transaction-id-prefix$$:: $$Transaction id prefix, override the transaction id prefix in the producer factory.$$ *($$String$$, default: `$$$$`)* //end::configuration-properties[] //end::ref-doc[] diff --git a/applications/sink/kafka-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties b/applications/sink/kafka-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties index 722db9ba..28edf8f5 100644 --- a/applications/sink/kafka-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties +++ b/applications/sink/kafka-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties @@ -1,3 +1,4 @@ configuration-properties.classes=org.springframework.cloud.fn.consumer.kafka.KafkaPublisherProperties, \ org.springframework.boot.autoconfigure.kafka.KafkaProperties, \ -org.springframework.boot.autoconfigure.kafka.KafkaProperties$Producer +org.springframework.boot.autoconfigure.kafka.KafkaProperties$Producer, \ +org.springframework.boot.autoconfigure.kafka.KafkaProperties$Template diff --git a/applications/sink/mongodb-sink/README.adoc b/applications/sink/mongodb-sink/README.adoc index 6f047c18..1b89979c 100644 --- a/applications/sink/mongodb-sink/README.adoc +++ b/applications/sink/mongodb-sink/README.adoc @@ -40,6 +40,16 @@ $$replica-set-name$$:: $$Required replica set name for the cluster. Cannot be se $$uri$$:: $$Mongo database URI. Overrides host, port, username, password, and database.$$ *($$String$$, default: `$$mongodb://localhost/test$$`)* $$username$$:: $$Login user of the mongo server. Cannot be set with URI.$$ *($$String$$, default: `$$$$`)* $$uuid-representation$$:: $$Representation to use when converting a UUID to a BSON binary value.$$ *($$UuidRepresentation$$, default: `$$java-legacy$$`, possible values: `UNSPECIFIED`,`STANDARD`,`C_SHARP_LEGACY`,`JAVA_LEGACY`,`PYTHON_LEGACY`)* + +=== spring.data.mongodb.gridfs + +$$bucket$$:: $$GridFS bucket name.$$ *($$String$$, default: `$$$$`)* +$$database$$:: $$GridFS database name.$$ *($$String$$, default: `$$$$`)* + +=== spring.data.mongodb.ssl + +$$bundle$$:: $$SSL bundle name.$$ *($$String$$, default: `$$$$`)* +$$enabled$$:: $$Whether to enable SSL support. Enabled automatically if "bundle" is provided unless specified otherwise.$$ *($$Boolean$$, default: `$$$$`)* //end::configuration-properties[] //end::ref-doc[] diff --git a/applications/sink/mongodb-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties b/applications/sink/mongodb-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties index 0072077e..75d473e0 100644 --- a/applications/sink/mongodb-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties +++ b/applications/sink/mongodb-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties @@ -1,3 +1,4 @@ configuration-properties.classes=org.springframework.cloud.fn.consumer.mongo.MongoDbConsumerProperties,\ - org.springframework.boot.autoconfigure.mongo.MongoProperties - + org.springframework.boot.autoconfigure.mongo.MongoProperties,\ + org.springframework.boot.autoconfigure.mongo.MongoProperties$Ssl,\ + org.springframework.boot.autoconfigure.mongo.MongoProperties$Gridfs diff --git a/applications/sink/rabbit-sink/README.adoc b/applications/sink/rabbit-sink/README.adoc index 6aba9f75..70a8cc00 100644 --- a/applications/sink/rabbit-sink/README.adoc +++ b/applications/sink/rabbit-sink/README.adoc @@ -40,6 +40,15 @@ $$requested-channel-max$$:: $$Number of channels per connection requested by the $$requested-heartbeat$$:: $$Requested heartbeat timeout; zero for none. If a duration suffix is not specified, seconds will be used.$$ *($$Duration$$, default: `$$$$`)* $$username$$:: $$Login user to authenticate to the broker.$$ *($$String$$, default: `$$guest$$`)* $$virtual-host$$:: $$Virtual host to use when connecting to the broker.$$ *($$String$$, default: `$$$$`)* + +=== spring.rabbitmq.template + +$$default-receive-queue$$:: $$Name of the default queue to receive messages from when none is specified explicitly.$$ *($$String$$, default: `$$$$`)* +$$exchange$$:: $$Name of the default exchange to use for send operations.$$ *($$String$$, default: `$$$$`)* +$$mandatory$$:: $$Whether to enable mandatory messages.$$ *($$Boolean$$, default: `$$$$`)* +$$receive-timeout$$:: $$Timeout for receive() operations.$$ *($$Duration$$, default: `$$$$`)* +$$reply-timeout$$:: $$Timeout for sendAndReceive() operations.$$ *($$Duration$$, default: `$$$$`)* +$$routing-key$$:: $$Value of a default routing key to use for send operations.$$ *($$String$$, default: `$$$$`)* //end::configuration-properties[] //end::ref-doc[] diff --git a/applications/sink/rabbit-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties b/applications/sink/rabbit-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties index 193cf0ee..119bff0b 100644 --- a/applications/sink/rabbit-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties +++ b/applications/sink/rabbit-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties @@ -1,2 +1,3 @@ configuration-properties.classes=org.springframework.cloud.fn.consumer.rabbit.RabbitConsumerProperties, \ - org.springframework.boot.autoconfigure.amqp.RabbitProperties + org.springframework.boot.autoconfigure.amqp.RabbitProperties, \ + org.springframework.boot.autoconfigure.amqp.RabbitProperties$Template diff --git a/applications/sink/redis-sink/README.adoc b/applications/sink/redis-sink/README.adoc index a7ad2493..18a8b973 100644 --- a/applications/sink/redis-sink/README.adoc +++ b/applications/sink/redis-sink/README.adoc @@ -33,6 +33,11 @@ $$timeout$$:: $$Read timeout.$$ *($$Duration$$, default: `$$$$`)* $$url$$:: $$Connection URL. Overrides host, port, and password. User is ignored. Example: redis://user:password@example.com:6379$$ *($$String$$, default: `$$$$`)* $$username$$:: $$Login username of the redis server.$$ *($$String$$, default: `$$$$`)* +=== spring.data.redis.cluster + +$$max-redirects$$:: $$Maximum number of redirects to follow when executing commands across the cluster.$$ *($$Integer$$, default: `$$$$`)* +$$nodes$$:: $$Comma-separated list of "host:port" pairs to bootstrap from. This represents an "initial" list of cluster nodes and is required to have at least one entry.$$ *($$List$$, default: `$$$$`)* + === spring.data.redis.jedis.pool $$enabled$$:: $$Whether to enable the pool. Enabled automatically if "commons-pool2" is available. With Jedis, pooling is implicitly enabled in sentinel mode and this setting only applies to single node setup.$$ *($$Boolean$$, default: `$$$$`)* @@ -51,12 +56,21 @@ $$max-wait$$:: $$Maximum amount of time a connection allocation should block bef $$min-idle$$:: $$Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if both it and time between eviction runs are positive.$$ *($$Integer$$, default: `$$0$$`)* $$time-between-eviction-runs$$:: $$Time between runs of the idle object evictor thread. When positive, the idle object evictor thread starts, otherwise no idle object eviction is performed.$$ *($$Duration$$, default: `$$$$`)* +=== spring.data.redis.lettuce + +$$shutdown-timeout$$:: $$Shutdown timeout.$$ *($$Duration$$, default: `$$100ms$$`)* + === spring.data.redis.sentinel $$master$$:: $$Name of the Redis server.$$ *($$String$$, default: `$$$$`)* $$nodes$$:: $$Comma-separated list of "host:port" pairs.$$ *($$List$$, default: `$$$$`)* $$password$$:: $$Password for authenticating with sentinel(s).$$ *($$String$$, default: `$$$$`)* $$username$$:: $$Login username for authenticating with sentinel(s).$$ *($$String$$, default: `$$$$`)* + +=== spring.data.redis.ssl + +$$bundle$$:: $$SSL bundle name.$$ *($$String$$, default: `$$$$`)* +$$enabled$$:: $$Whether to enable SSL support. Enabled automatically if "bundle" is provided unless specified otherwise.$$ *($$Boolean$$, default: `$$$$`)* //end::configuration-properties[] //end::ref-doc[] diff --git a/applications/sink/redis-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties b/applications/sink/redis-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties index e9370bf4..0ec53bb7 100644 --- a/applications/sink/redis-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties +++ b/applications/sink/redis-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties @@ -1,5 +1,8 @@ configuration-properties.classes=org.springframework.cloud.fn.consumer.redis.RedisConsumerProperties, \ - org.springframework.boot.autoconfigure.data.redis.RedisProperties, \ - org.springframework.boot.autoconfigure.data.redis.RedisProperties$Pool, \ - org.springframework.boot.autoconfigure.data.redis.RedisProperties$Sentinel - + org.springframework.boot.autoconfigure.data.redis.RedisProperties,\ + org.springframework.boot.autoconfigure.data.redis.RedisProperties$Sentinel,\ + org.springframework.boot.autoconfigure.data.redis.RedisProperties$Cluster,\ + org.springframework.boot.autoconfigure.data.redis.RedisProperties$Ssl,\ + org.springframework.boot.autoconfigure.data.redis.RedisProperties$Jedis,\ + org.springframework.boot.autoconfigure.data.redis.RedisProperties$Lettuce,\ + org.springframework.boot.autoconfigure.data.redis.RedisProperties$Pool diff --git a/applications/source/file-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties b/applications/source/file-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties index 83a17f10..7747c087 100644 --- a/applications/source/file-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties +++ b/applications/source/file-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties @@ -1,10 +1,8 @@ configuration-properties.classes=org.springframework.cloud.fn.supplier.file.FileSupplierProperties,\ org.springframework.cloud.fn.common.file.FileConsumerProperties, \ org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties, \ - org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Gemfire, \ org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Redis, \ org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$DynamoDb, \ org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Jdbc, \ org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Zookeeper, \ org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Mongo - diff --git a/applications/source/ftp-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties b/applications/source/ftp-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties index 25ea3cc2..4b140eae 100644 --- a/applications/source/ftp-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties +++ b/applications/source/ftp-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties @@ -2,9 +2,8 @@ configuration-properties.classes=org.springframework.cloud.fn.supplier.ftp.FtpSu org.springframework.cloud.fn.common.ftp.FtpSessionFactoryProperties, \ org.springframework.cloud.fn.common.file.FileConsumerProperties, \ org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties, \ - org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Gemfire, \ org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Redis, \ org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$DynamoDb, \ org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Jdbc, \ org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Zookeeper, \ - org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Mongo \ + org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Mongo diff --git a/applications/source/jdbc-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties b/applications/source/jdbc-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties index 0fbe08c3..0bd4bf40 100644 --- a/applications/source/jdbc-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties +++ b/applications/source/jdbc-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties @@ -4,7 +4,4 @@ configuration-properties.names=\ spring.datasource.url,\ spring.datasource.driver-class-name,\ spring.datasource.username,\ -spring.datasource.password,\ -spring.datasource.schema,\ -spring.datasource.data,\ -spring.datasource.initialization-mode +spring.datasource.password diff --git a/applications/source/kafka-source/README.adoc b/applications/source/kafka-source/README.adoc index 1c9826d4..d495cd61 100644 --- a/applications/source/kafka-source/README.adoc +++ b/applications/source/kafka-source/README.adoc @@ -15,7 +15,7 @@ Properties grouped by prefix: === kafka.supplier -$$ack-discarded$$:: $$Whether to acknowledge discarded records after 'RecordFilterStrategy'.$$ *($$Boolean$$, default: `$$$$`)* +$$ack-discarded$$:: $$Whether to acknowledge discarded records after 'RecordFilterStrategy'.$$ *($$Boolean$$, default: `$$false$$`)* $$record-filter$$:: $$SpEL expression for 'RecordFilterStrategy' with a 'ConsumerRecord' as a root object.$$ *($$Expression$$, default: `$$$$`)* $$topic-pattern$$:: $$Apache Kafka topics pattern to subscribe.$$ *($$Pattern$$, default: `$$$$`)* $$topics$$:: $$Apache Kafka topics to subscribe.$$ *($$String[]$$, default: `$$$$`)* diff --git a/applications/source/mail-source/README.adoc b/applications/source/mail-source/README.adoc index a0873759..48f8673c 100644 --- a/applications/source/mail-source/README.adoc +++ b/applications/source/mail-source/README.adoc @@ -8,12 +8,12 @@ A source application that listens for Emails and emits the message body as a mes The **$$mail$$** $$source$$ has the following options: //tag::configuration-properties[] -$$mail.supplier.charset$$:: $$The charset for byte[] mail-to-string transformation.$$ *($$String$$, default: `$$UTF-8$$`)* -$$mail.supplier.delete$$:: $$Set to true to delete email after download.$$ *($$Boolean$$, default: `$$false$$`)* -$$mail.supplier.expression$$:: $$Configure a SpEL expression to select messages.$$ *($$String$$, default: `$$true$$`)* -$$mail.supplier.idle-imap$$:: $$Set to true to use IdleImap Configuration.$$ *($$Boolean$$, default: `$$false$$`)* +$$mail.supplier.charset$$:: $$The charset for byte[] mail-to-string transformation.$$ *($$String$$, default: `$$$$`)* +$$mail.supplier.delete$$:: $$Set to true to delete email after download.$$ *($$Boolean$$, default: `$$$$`)* +$$mail.supplier.expression$$:: $$Configure a SpEL expression to select messages.$$ *($$String$$, default: `$$$$`)* +$$mail.supplier.idle-imap$$:: $$Set to true to use IdleImap Configuration.$$ *($$Boolean$$, default: `$$$$`)* $$mail.supplier.java-mail-properties$$:: $$JavaMail properties as a new line delimited string of name-value pairs, e.g. 'foo=bar\n baz=car'.$$ *($$Properties$$, default: `$$$$`)* -$$mail.supplier.mark-as-read$$:: $$Set to true to mark email as read.$$ *($$Boolean$$, default: `$$false$$`)* +$$mail.supplier.mark-as-read$$:: $$Set to true to mark email as read.$$ *($$Boolean$$, default: `$$$$`)* $$mail.supplier.url$$:: $$Mail connection URL for connection to Mail server e.g. 'imaps://username:password@imap.server.com:993/Inbox'.$$ *($$URLName$$, default: `$$$$`)* $$mail.supplier.user-flag$$:: $$The flag to mark messages when the server does not support \Recent.$$ *($$String$$, default: `$$$$`)* //end::configuration-properties[] diff --git a/applications/source/mongodb-source/README.adoc b/applications/source/mongodb-source/README.adoc index 18771d19..83818756 100644 --- a/applications/source/mongodb-source/README.adoc +++ b/applications/source/mongodb-source/README.adoc @@ -38,6 +38,16 @@ $$replica-set-name$$:: $$Required replica set name for the cluster. Cannot be se $$uri$$:: $$Mongo database URI. Overrides host, port, username, password, and database.$$ *($$String$$, default: `$$mongodb://localhost/test$$`)* $$username$$:: $$Login user of the mongo server. Cannot be set with URI.$$ *($$String$$, default: `$$$$`)* $$uuid-representation$$:: $$Representation to use when converting a UUID to a BSON binary value.$$ *($$UuidRepresentation$$, default: `$$java-legacy$$`, possible values: `UNSPECIFIED`,`STANDARD`,`C_SHARP_LEGACY`,`JAVA_LEGACY`,`PYTHON_LEGACY`)* + +=== spring.data.mongodb.gridfs + +$$bucket$$:: $$GridFS bucket name.$$ *($$String$$, default: `$$$$`)* +$$database$$:: $$GridFS database name.$$ *($$String$$, default: `$$$$`)* + +=== spring.data.mongodb.ssl + +$$bundle$$:: $$SSL bundle name.$$ *($$String$$, default: `$$$$`)* +$$enabled$$:: $$Whether to enable SSL support. Enabled automatically if "bundle" is provided unless specified otherwise.$$ *($$Boolean$$, default: `$$$$`)* //end::configuration-properties[] Also see the https://docs.spring.io/spring-boot/docs/current/reference/html/common-application-properties.html[Spring Boot Documentation] for additional `MongoProperties` properties. diff --git a/applications/source/mongodb-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties b/applications/source/mongodb-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties index 5123e6aa..8c1db6fd 100644 --- a/applications/source/mongodb-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties +++ b/applications/source/mongodb-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties @@ -1,3 +1,4 @@ configuration-properties.classes=org.springframework.cloud.fn.supplier.mongo.MongodbSupplierProperties,\ - org.springframework.boot.autoconfigure.mongo.MongoProperties - + org.springframework.boot.autoconfigure.mongo.MongoProperties,\ + org.springframework.boot.autoconfigure.mongo.MongoProperties$Ssl,\ + org.springframework.boot.autoconfigure.mongo.MongoProperties$Gridfs diff --git a/applications/source/rabbit-source/README.adoc b/applications/source/rabbit-source/README.adoc index d58758da..16cf2e66 100644 --- a/applications/source/rabbit-source/README.adoc +++ b/applications/source/rabbit-source/README.adoc @@ -52,6 +52,24 @@ $$requested-channel-max$$:: $$Number of channels per connection requested by the $$requested-heartbeat$$:: $$Requested heartbeat timeout; zero for none. If a duration suffix is not specified, seconds will be used.$$ *($$Duration$$, default: `$$$$`)* $$username$$:: $$Login user to authenticate to the broker.$$ *($$String$$, default: `$$guest$$`)* $$virtual-host$$:: $$Virtual host to use when connecting to the broker.$$ *($$String$$, default: `$$$$`)* + +=== spring.rabbitmq.listener.simple + +$$acknowledge-mode$$:: $$Acknowledge mode of container.$$ *($$AcknowledgeMode$$, default: `$$$$`, possible values: `NONE`,`MANUAL`,`AUTO`)* +$$auto-startup$$:: $$Whether to start the container automatically on startup.$$ *($$Boolean$$, default: `$$true$$`)* +$$batch-size$$:: $$Batch size, expressed as the number of physical messages, to be used by the container.$$ *($$Integer$$, default: `$$$$`)* +$$concurrency$$:: $$Minimum number of listener invoker threads.$$ *($$Integer$$, default: `$$$$`)* +$$consumer-batch-enabled$$:: $$Whether the container creates a batch of messages based on the 'receive-timeout' and 'batch-size'. Coerces 'de-batching-enabled' to true to include the contents of a producer created batch in the batch as discrete records.$$ *($$Boolean$$, default: `$$false$$`)* +$$de-batching-enabled$$:: $$Whether the container should present batched messages as discrete messages or call the listener with the batch.$$ *($$Boolean$$, default: `$$true$$`)* +$$default-requeue-rejected$$:: $$Whether rejected deliveries are re-queued by default.$$ *($$Boolean$$, default: `$$$$`)* +$$idle-event-interval$$:: $$How often idle container events should be published.$$ *($$Duration$$, default: `$$$$`)* +$$max-concurrency$$:: $$Maximum number of listener invoker threads.$$ *($$Integer$$, default: `$$$$`)* +$$missing-queues-fatal$$:: $$Whether to fail if the queues declared by the container are not available on the broker and/or whether to stop the container if one or more queues are deleted at runtime.$$ *($$Boolean$$, default: `$$true$$`)* +$$prefetch$$:: $$Maximum number of unacknowledged messages that can be outstanding at each consumer.$$ *($$Integer$$, default: `$$$$`)* + +=== spring.rabbitmq.listener + +$$type$$:: $$Listener container type.$$ *($$ContainerType$$, default: `$$simple$$`, possible values: `SIMPLE`,`DIRECT`,`STREAM`)* //end::configuration-properties[] Also see the https://docs.spring.io/spring-boot/docs/current/reference/html/common-application-properties.html[Spring Boot Documentation] diff --git a/applications/source/rabbit-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties b/applications/source/rabbit-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties index 04900eac..b97a0975 100644 --- a/applications/source/rabbit-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties +++ b/applications/source/rabbit-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties @@ -1,2 +1,4 @@ configuration-properties.classes=org.springframework.cloud.fn.supplier.rabbit.RabbitSupplierProperties, \ - org.springframework.boot.autoconfigure.amqp.RabbitProperties + org.springframework.boot.autoconfigure.amqp.RabbitProperties, \ + org.springframework.boot.autoconfigure.amqp.RabbitProperties$Listener, \ + org.springframework.boot.autoconfigure.amqp.RabbitProperties$SimpleContainer diff --git a/applications/source/s3-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties b/applications/source/s3-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties index d39ded0c..e80cd7dc 100644 --- a/applications/source/s3-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties +++ b/applications/source/s3-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties @@ -2,9 +2,8 @@ configuration-properties.classes=org.springframework.cloud.fn.supplier.s3.AwsS3S org.springframework.cloud.fn.common.file.FileConsumerProperties,\ org.springframework.cloud.fn.common.aws.s3.AmazonS3Properties, \ org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties, \ - org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Gemfire, \ org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Redis, \ org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$DynamoDb, \ org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Jdbc, \ org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Zookeeper, \ - org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Mongo \ + org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Mongo diff --git a/applications/source/sftp-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties b/applications/source/sftp-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties index ab5bd556..0412dce8 100644 --- a/applications/source/sftp-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties +++ b/applications/source/sftp-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties @@ -3,10 +3,8 @@ configuration-properties.classes=org.springframework.cloud.fn.supplier.sftp.Sftp org.springframework.cloud.fn.supplier.sftp.SftpSupplierProperties$SortSpec, \ org.springframework.cloud.fn.common.file.FileConsumerProperties, \ org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties, \ - org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Gemfire, \ org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Redis, \ org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$DynamoDb, \ org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Jdbc, \ org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Zookeeper, \ - org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Mongo \ - + org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Mongo diff --git a/applications/source/twitter-message-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties b/applications/source/twitter-message-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties index 4614731b..ca7fcfad 100644 --- a/applications/source/twitter-message-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties +++ b/applications/source/twitter-message-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties @@ -1,4 +1,3 @@ configuration-properties.classes=org.springframework.cloud.fn.common.twitter.TwitterConnectionProperties,\ org.springframework.cloud.fn.supplier.twitter.message.TwitterMessageSupplierProperties, \ - org.springframework.boot.autoconfigure.integration.IntegrationProperties$Poller - + org.springframework.boot.autoconfigure.integration.IntegrationProperties$Poller diff --git a/applications/source/twitter-search-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties b/applications/source/twitter-search-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties index 0afc4cd5..95ed0054 100644 --- a/applications/source/twitter-search-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties +++ b/applications/source/twitter-search-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties @@ -1,5 +1,4 @@ configuration-properties.classes=org.springframework.cloud.fn.common.twitter.TwitterConnectionProperties,\ org.springframework.cloud.fn.supplier.twitter.status.search.TwitterSearchSupplierProperties, \ org.springframework.cloud.fn.supplier.twitter.status.search.TwitterSearchSupplierProperties$Geocode, \ - org.springframework.boot.autoconfigure.integration.IntegrationProperties$Poller - + org.springframework.boot.autoconfigure.integration.IntegrationProperties$Poller diff --git a/functions/function/tasklauncher-function/README.adoc b/functions/function/tasklauncher-function/README.adoc deleted file mode 100644 index c3d2685b..00000000 --- a/functions/function/tasklauncher-function/README.adoc +++ /dev/null @@ -1,5 +0,0 @@ -# TaskLauncher Function - -[NOTE] -This module has been relocated to the https://github.com/spring-cloud/spring-cloud-dataflow/tree/main/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-function[spring-cloud-data-flow repository]. -As of SCDF 2.9.x, this function is included in the SCDF build to ensure version compatibility with the SCDF server going forward.