Prepare for release

* Upgrade to SCSt-1.3.0.RELEASE
* Revert to SC-build-1.3.5.RELEASE

.mvn/wrapper/MavenWrapperDownloader.java

@@ -1,110 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-import java.net.*;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-    /**
-     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
-     */
-    private static final String DEFAULT_DOWNLOAD_URL =
-            "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar";
-
-    /**
-     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
-     * use instead of the default one.
-     */
-    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-            ".mvn/wrapper/maven-wrapper.properties";
-
-    /**
-     * Path where the maven-wrapper.jar will be saved to.
-     */
-    private static final String MAVEN_WRAPPER_JAR_PATH =
-            ".mvn/wrapper/maven-wrapper.jar";
-
-    /**
-     * Name of the property which should be used to override the default download url for the wrapper.
-     */
-    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-    public static void main(String args[]) {
-        System.out.println("- Downloader started");
-        File baseDirectory = new File(args[0]);
-        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
-
-        // If the maven-wrapper.properties exists, read it and check if it contains a custom
-        // wrapperUrl parameter.
-        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
-        String url = DEFAULT_DOWNLOAD_URL;
-        if(mavenWrapperPropertyFile.exists()) {
-            FileInputStream mavenWrapperPropertyFileInputStream = null;
-            try {
-                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
-                Properties mavenWrapperProperties = new Properties();
-                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-            } catch (IOException e) {
-                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-            } finally {
-                try {
-                    if(mavenWrapperPropertyFileInputStream != null) {
-                        mavenWrapperPropertyFileInputStream.close();
-                    }
-                } catch (IOException e) {
-                    // Ignore ...
-                }
-            }
-        }
-        System.out.println("- Downloading from: : " + url);
-
-        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
-        if(!outputFile.getParentFile().exists()) {
-            if(!outputFile.getParentFile().mkdirs()) {
-                System.out.println(
-                        "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'");
-            }
-        }
-        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
-        try {
-            downloadFileFromURL(url, outputFile);
-            System.out.println("Done");
-            System.exit(0);
-        } catch (Throwable e) {
-            System.out.println("- Error downloading");
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
-        URL website = new URL(urlString);
-        ReadableByteChannel rbc;
-        rbc = Channels.newChannel(website.openStream());
-        FileOutputStream fos = new FileOutputStream(destination);
-        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
-        fos.close();
-        rbc.close();
-    }
-
-}

.mvn/wrapper/maven-wrapper.properties

@@ -1 +1 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.3/apache-maven-3.3.3-bin.zip

.settings.xml

@@ -21,7 +21,7 @@
 				<repository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>https://repo.spring.io/libs-snapshot-local</url>
+					<url>http://repo.spring.io/libs-snapshot-local</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -29,7 +29,7 @@
 				<repository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
+					<url>http://repo.spring.io/libs-milestone-local</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -37,7 +37,7 @@
 				<repository>
 					<id>spring-releases</id>
 					<name>Spring Releases</name>
-					<url>https://repo.spring.io/release</url>
+					<url>http://repo.spring.io/release</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -47,7 +47,7 @@
 				<pluginRepository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>https://repo.spring.io/libs-snapshot-local</url>
+					<url>http://repo.spring.io/libs-snapshot-local</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -55,7 +55,7 @@
 				<pluginRepository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
+					<url>http://repo.spring.io/libs-milestone-local</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>

LICENSE

@@ -1,6 +1,6 @@
                                  Apache License
                            Version 2.0, January 2004
-                        https://www.apache.org/licenses/
+                        http://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -192,7 +192,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       https://www.apache.org/licenses/LICENSE-2.0
+       http://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,

README.adoc

@@ -1,740 +1 @@
-////
-DO NOT EDIT THIS FILE. IT WAS GENERATED.
-Manual changes to this file will be lost when it is generated again.
-Edit the files in the src/main/asciidoc/ directory instead.
-////
-
-:jdkversion: 1.8
-:github-tag: master
-:github-repo: spring-cloud/spring-cloud-stream-binder-kafka
-
-:github-raw: https://raw.githubusercontent.com/{github-repo}/{github-tag}
-:github-code: https://github.com/{github-repo}/tree/{github-tag}
-
-image::https://circleci.com/gh/spring-cloud/spring-cloud-stream-binder-kafka.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-stream-binder-kafka"]
-image::https://codecov.io/gh/spring-cloud/spring-cloud-stream-binder-kafka/branch/{github-tag}/graph/badge.svg["codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-stream-binder-kafka"]
-image::https://badges.gitter.im/spring-cloud/spring-cloud-stream-binder-kafka.svg[Gitter, link="https://gitter.im/spring-cloud/spring-cloud-stream-binder-kafka?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"]
-
-// ======================================================================================
-
-//= Overview
-[partintro]
---
-This guide describes the Apache Kafka implementation of the Spring Cloud Stream Binder.
-It contains information about its design, usage, and configuration options, as well as information on how the Stream Cloud Stream concepts map onto Apache Kafka specific constructs.
-In addition, this guide explains the Kafka Streams binding capabilities of Spring Cloud Stream.
---
-
-== Apache Kafka Binder
-
-=== Usage
-
-To use Apache Kafka binder, you need to add `spring-cloud-stream-binder-kafka` as a dependency to your Spring Cloud Stream application, as shown in the following example for Maven:
-
-[source,xml]
-----
-<dependency>
-  <groupId>org.springframework.cloud</groupId>
-  <artifactId>spring-cloud-stream-binder-kafka</artifactId>
-</dependency>
-----
-
-Alternatively, you can also use the Spring Cloud Stream Kafka Starter, as shown inn the following example for Maven:
-
-[source,xml]
-----
-<dependency>
-  <groupId>org.springframework.cloud</groupId>
-  <artifactId>spring-cloud-starter-stream-kafka</artifactId>
-</dependency>
-----
-
-=== Overview
-
-The following image shows a simplified diagram of how the Apache Kafka binder operates:
-
-.Kafka Binder
-image::{github-raw}/docs/src/main/asciidoc/images/kafka-binder.png[width=300,scaledwidth="50%"]
-
-The Apache Kafka Binder implementation maps each destination to an Apache Kafka topic.
-The consumer group maps directly to the same Apache Kafka concept.
-Partitioning also maps directly to Apache Kafka partitions as well.
-
-The binder currently uses the Apache Kafka `kafka-clients` 1.0.0 jar and is designed to be used with a broker of at least that version.
-This client can communicate with older brokers (see the Kafka documentation), but certain features may not be available.
-For example, with versions earlier than 0.11.x.x, native headers are not supported.
-Also, 0.11.x.x does not support the `autoAddPartitions` property.
-
-=== Configuration Options
-
-This section contains the configuration options used by the Apache Kafka binder.
-
-For common configuration options and properties pertaining to binder, see the <<binding-properties,core documentation>>.
-
-==== Kafka Binder Properties
-
-spring.cloud.stream.kafka.binder.brokers::
-A list of brokers to which the Kafka binder connects.
-+
-Default: `localhost`.
-spring.cloud.stream.kafka.binder.defaultBrokerPort::
-`brokers` allows hosts specified with or without port information (for example, `host1,host2:port2`).
-This sets the default port when no port is configured in the broker list.
-+
-Default: `9092`.
-spring.cloud.stream.kafka.binder.configuration::
-Key/Value map of client properties (both producers and consumer) passed to all clients created by the binder.
-Due to the fact that these properties are used by both producers and consumers, usage should be restricted to common properties -- for example, security settings.
-Unknown Kafka producer or consumer properties provided through this configuration are filtered out and not allowed to propagate.
-Properties here supersede any properties set in boot.
-+
-Default: Empty map.
-spring.cloud.stream.kafka.binder.consumerProperties::
-Key/Value map of arbitrary Kafka client consumer properties.
-In addition to support known Kafka consumer properties, unknown consumer properties are allowed here as well.
-Properties here supersede any properties set in boot and in the `configuration` property above.
-+
-Default: Empty map.
-spring.cloud.stream.kafka.binder.headers::
-The list of custom headers that are transported by the binder.
-Only required when communicating with older applications (<= 1.3.x) with a `kafka-clients` version < 0.11.0.0. Newer versions support headers natively.
-+
-Default: empty.
-spring.cloud.stream.kafka.binder.healthTimeout::
-The time to wait to get partition information, in seconds.
-Health reports as down if this timer expires.
-+
-Default: 10.
-spring.cloud.stream.kafka.binder.requiredAcks::
-The number of required acks on the broker.
-See the Kafka documentation for the producer `acks` property.
-+
-Default: `1`.
-spring.cloud.stream.kafka.binder.minPartitionCount::
-Effective only if `autoCreateTopics` or `autoAddPartitions` is set.
-The global minimum number of partitions that the binder configures on topics on which it produces or consumes data.
-It can be superseded by the `partitionCount` setting of the producer or by the value of `instanceCount * concurrency` settings of the producer (if either is larger).
-+
-Default: `1`.
-spring.cloud.stream.kafka.binder.producerProperties::
-Key/Value map of arbitrary Kafka client producer properties.
-In addition to support known Kafka producer properties, unknown producer properties are allowed here as well.
-Properties here supersede any properties set in boot and in the `configuration` property above.
-+
-Default: Empty map.
-spring.cloud.stream.kafka.binder.replicationFactor::
-The replication factor of auto-created topics if `autoCreateTopics` is active.
-Can be overridden on each binding.
-+
-Default: `1`.
-spring.cloud.stream.kafka.binder.autoCreateTopics::
-If set to `true`, the binder creates new topics automatically.
-If set to `false`, the binder relies on the topics being already configured.
-In the latter case, if the topics do not exist, the binder fails to start.
-+
-NOTE: This setting is independent of the `auto.create.topics.enable` setting of the broker and does not influence it.
-If the server is set to auto-create topics, they may be created as part of the metadata retrieval request, with default broker settings.
-+
-Default: `true`.
-spring.cloud.stream.kafka.binder.autoAddPartitions::
-If set to `true`, the binder creates new partitions if required.
-If set to `false`, the binder relies on the partition size of the topic being already configured.
-If the partition count of the target topic is smaller than the expected value, the binder fails to start.
-+
-Default: `false`.
-spring.cloud.stream.kafka.binder.transaction.transactionIdPrefix::
-Enables transactions in the binder. See `transaction.id` in the Kafka documentation and https://docs.spring.io/spring-kafka/reference/html/_reference.html#transactions[Transactions] in the `spring-kafka` documentation.
-When transactions are enabled, individual `producer` properties are ignored and all producers use the `spring.cloud.stream.kafka.binder.transaction.producer.*` properties.
-+
-Default `null` (no transactions)
-spring.cloud.stream.kafka.binder.transaction.producer.*::
-Global producer properties for producers in a transactional binder.
-See `spring.cloud.stream.kafka.binder.transaction.transactionIdPrefix` and <<kafka-producer-properties>> and the general producer properties supported by all binders.
-+
-Default: See individual producer properties.
-
-spring.cloud.stream.kafka.binder.headerMapperBeanName::
-The bean name of a `KafkaHeaderMapper` used for mapping `spring-messaging` headers to and from Kafka headers.
-Use this, for example, if you wish to customize the trusted packages in a `DefaultKafkaHeaderMapper` that uses JSON deserialization for the headers.
-+
-Default: none.
-
-[[kafka-consumer-properties]]
-==== Kafka Consumer Properties
-
-NOTE: To avoid repetition, Spring Cloud Stream supports setting values for all channels, in the format of `spring.cloud.stream.default.<property>=<value>`.
-
-
-The following properties are available for Kafka consumers only and
-must be prefixed with `spring.cloud.stream.kafka.bindings.<channelName>.consumer.`.
-
-admin.configuration::
-Since version 2.1.1, this property is deprecated in favor of `topic.properties`, and support for it will be removed in a future version.
-
-admin.replicas-assignment::
-Since version 2.1.1, this property is deprecated in favor of `topic.replicas-assignment`, and support for it will be removed in a future version.
-
-admin.replication-factor::
-Since version 2.1.1, this property is deprecated in favor of `topic.replication-factor`, and support for it will be removed in a future version.
-
-autoRebalanceEnabled::
-When `true`, topic partitions is automatically rebalanced between the members of a consumer group.
-When `false`, each consumer is assigned a fixed set of partitions based on `spring.cloud.stream.instanceCount` and `spring.cloud.stream.instanceIndex`.
-This requires both the `spring.cloud.stream.instanceCount` and `spring.cloud.stream.instanceIndex` properties to be set appropriately on each launched instance.
-The value of the `spring.cloud.stream.instanceCount` property must typically be greater than 1 in this case.
-+
-Default: `true`.
-ackEachRecord::
-When `autoCommitOffset` is `true`, this setting dictates whether to commit the offset after each record is processed.
-By default, offsets are committed after all records in the batch of records returned by `consumer.poll()` have been processed.
-The number of records returned by a poll can be controlled with the `max.poll.records` Kafka property, which is set through the consumer `configuration` property.
-Setting this to `true` may cause a degradation in performance, but doing so reduces the likelihood of redelivered records when a failure occurs.
-Also, see the binder `requiredAcks` property, which also affects the performance of committing offsets.
-+
-Default: `false`.
-autoCommitOffset::
-Whether to autocommit offsets when a message has been processed.
-If set to `false`, a header with the key `kafka_acknowledgment` of the type `org.springframework.kafka.support.Acknowledgment` header is present in the inbound message.
-Applications may use this header for acknowledging messages.
-See the examples section for details.
-When this property is set to `false`, Kafka binder sets the ack mode to `org.springframework.kafka.listener.AbstractMessageListenerContainer.AckMode.MANUAL` and the application is responsible for acknowledging records.
-Also see `ackEachRecord`.
-+
-Default: `true`.
-autoCommitOnError::
-Effective only if `autoCommitOffset` is set to `true`.
-If set to `false`, it suppresses auto-commits for messages that result in errors and commits only for successful messages. It allows a stream to automatically replay from the last successfully processed message, in case of persistent failures.
-If set to `true`, it always auto-commits (if auto-commit is enabled).
-If not set (the default), it effectively has the same value as `enableDlq`, auto-committing erroneous messages if they are sent to a DLQ and not committing them otherwise.
-+
-Default: not set.
-resetOffsets::
-Whether to reset offsets on the consumer to the value provided by startOffset.
-Must be false if a `KafkaRebalanceListener` is provided; see <<rebalance-listener>>.
-+
-Default: `false`.
-startOffset::
-The starting offset for new groups.
-Allowed values: `earliest` and `latest`.
-If the consumer group is set explicitly for the consumer 'binding' (through `spring.cloud.stream.bindings.<channelName>.group`), 'startOffset' is set to `earliest`. Otherwise, it is set to `latest` for the `anonymous` consumer group.
-Also see `resetOffsets` (earlier in this list).
-+
-Default: null (equivalent to `earliest`).
-enableDlq::
-When set to true, it enables DLQ behavior for the consumer.
-By default, messages that result in errors are forwarded to a topic named `error.<destination>.<group>`.
-The DLQ topic name can be configurable by setting the `dlqName` property.
-This provides an alternative option to the more common Kafka replay scenario for the case when the number of errors is relatively small and replaying the entire original topic may be too cumbersome.
-See <<kafka-dlq-processing>> processing for more information.
-Starting with version 2.0, messages sent to the DLQ topic are enhanced with the following headers: `x-original-topic`, `x-exception-message`, and `x-exception-stacktrace` as `byte[]`.
-**Not allowed when `destinationIsPattern` is `true`.**
-+
-Default: `false`.
-configuration::
-Map with a key/value pair containing generic Kafka consumer properties.
-In addition to having Kafka consumer properties, other configuration properties can be passed here.
-For example some properties needed by the application such as `spring.cloud.stream.kafka.bindings.input.consumer.configuration.foo=bar`.
-+
-Default: Empty map.
-dlqName::
-The name of the DLQ topic to receive the error messages.
-+
-Default: null (If not specified, messages that result in errors are forwarded to a topic named `error.<destination>.<group>`).
-dlqProducerProperties::
-Using this, DLQ-specific producer properties can be set.
-All the properties available through kafka producer properties can be set through this property.
-+
-Default: Default Kafka producer properties.
-standardHeaders::
-Indicates which standard headers are populated by the inbound channel adapter.
-Allowed values: `none`, `id`, `timestamp`, or `both`.
-Useful if using native deserialization and the first component to receive a message needs an `id` (such as an aggregator that is configured to use a JDBC message store).
-+
-Default: `none`
-converterBeanName::
-The name of a bean that implements `RecordMessageConverter`. Used in the inbound channel adapter to replace the default `MessagingMessageConverter`.
-+
-Default: `null`
-idleEventInterval::
-The interval, in milliseconds, between events indicating that no messages have recently been received.
-Use an `ApplicationListener<ListenerContainerIdleEvent>` to receive these events.
-See <<pause-resume>> for a usage example.
-+
-Default: `30000`
-destinationIsPattern::
-When true, the destination is treated as a regular expression `Pattern` used to match topic names by the broker.
-When true, topics are not provisioned, and `enableDlq` is not allowed, because the binder does not know the topic names during the provisioning phase.
-Note, the time taken to detect new topics that match the pattern is controlled by the consumer property `metadata.max.age.ms`, which (at the time of writing) defaults to 300,000ms (5 minutes).
-This can be configured using the `configuration` property above.
-+
-Default: `false`
-topic.properties::
-A `Map` of Kafka topic properties used when provisioning new topics -- for example, `spring.cloud.stream.kafka.bindings.input.consumer.topic.properties.message.format.version=0.9.0.0`
-+
-Default: none.
-topic.replicas-assignment::
-A Map<Integer, List<Integer>> of replica assignments, with the key being the partition and the value being the assignments.
-Used when provisioning new topics.
-See the `NewTopic` Javadocs in the `kafka-clients` jar.
-+
-Default: none.
-topic.replication-factor::
-The replication factor to use when provisioning topics. Overrides the binder-wide setting.
-Ignored if `replicas-assignments` is present.
-+
-Default: none (the binder-wide default of 1 is used).
-
-[[kafka-producer-properties]]
-==== Kafka Producer Properties
-
-NOTE: To avoid repetition, Spring Cloud Stream supports setting values for all channels, in the format of `spring.cloud.stream.default.<property>=<value>`.
-
-
-The following properties are available for Kafka producers only and
-must be prefixed with `spring.cloud.stream.kafka.bindings.<channelName>.producer.`.
-
-admin.configuration::
-Since version 2.1.1, this property is deprecated in favor of `topic.properties`, and support for it will be removed in a future version.
-
-admin.replicas-assignment::
-Since version 2.1.1, this property is deprecated in favor of `topic.replicas-assignment`, and support for it will be removed in a future version.
-
-admin.replication-factor::
-Since version 2.1.1, this property is deprecated in favor of `topic.replication-factor`, and support for it will be removed in a future version.
-
-bufferSize::
-Upper limit, in bytes, of how much data the Kafka producer attempts to batch before sending.
-+
-Default: `16384`.
-sync::
-Whether the producer is synchronous.
-+
-Default: `false`.
-batchTimeout::
-How long the producer waits to allow more messages to accumulate in the same batch before sending the messages.
-(Normally, the producer does not wait at all and simply sends all the messages that accumulated while the previous send was in progress.) A non-zero value may increase throughput at the expense of latency.
-+
-Default: `0`.
-messageKeyExpression::
-A SpEL expression evaluated against the outgoing message used to populate the key of the produced Kafka message -- for example, `headers['myKey']`.
-The payload cannot be used because, by the time this expression is evaluated, the payload is already in the form of a `byte[]`.
-+
-Default: `none`.
-headerPatterns::
-A comma-delimited list of simple patterns to match Spring messaging headers to be mapped to the Kafka `Headers` in the `ProducerRecord`.
-Patterns can begin or end with the wildcard character (asterisk).
-Patterns can be negated by prefixing with `!`.
-Matching stops after the first match (positive or negative).
-For example `!ask,as*` will pass `ash` but not `ask`.
-`id` and `timestamp` are never mapped.
-+
-Default: `*` (all headers - except the `id` and `timestamp`)
-configuration::
-Map with a key/value pair containing generic Kafka producer properties.
-+
-Default: Empty map.
-topic.properties::
-A `Map` of Kafka topic properties used when provisioning new topics -- for example, `spring.cloud.stream.kafka.bindings.output.producer.topic.properties.message.format.version=0.9.0.0`
-+
-topic.replicas-assignment::
-A Map<Integer, List<Integer>> of replica assignments, with the key being the partition and the value being the assignments.
-Used when provisioning new topics.
-See the `NewTopic` Javadocs in the `kafka-clients` jar.
-+
-Default: none.
-topic.replication-factor::
-The replication factor to use when provisioning topics. Overrides the binder-wide setting.
-Ignored if `replicas-assignments` is present.
-+
-Default: none (the binder-wide default of 1 is used).
-
-
-NOTE: The Kafka binder uses the `partitionCount` setting of the producer as a hint to create a topic with the given partition count (in conjunction with the `minPartitionCount`, the maximum of the two being the value being used).
-Exercise caution when configuring both `minPartitionCount` for a binder and `partitionCount` for an application, as the larger value is used.
-If a topic already exists with a smaller partition count and `autoAddPartitions` is disabled (the default), the binder fails to start.
-If a topic already exists with a smaller partition count and `autoAddPartitions` is enabled, new partitions are added.
-If a topic already exists with a larger number of partitions than the maximum of (`minPartitionCount` or `partitionCount`), the existing partition count is used.
-
-compression::
-Set the `compression.type` producer property.
-Supported values are `none`, `gzip`, `snappy` and `lz4`.
-If you override the `kafka-clients` jar to 2.1.0 (or later), as discussed in the https://docs.spring.io/spring-kafka/docs/2.2.x/reference/html/deps-for-21x.html[Spring for Apache Kafka documentation], and wish to use `zstd` compression, use `spring.cloud.stream.kafka.bindings.<binding-name>.producer.configuration.compression.type=zstd`.
-+
-Default: `none`.
-
-==== Usage examples
-
-In this section, we show the use of the preceding properties for specific scenarios.
-
-===== Example: Setting `autoCommitOffset` to `false` and Relying on Manual Acking
-
-This example illustrates how one may manually acknowledge offsets in a consumer application.
-
-This example requires that `spring.cloud.stream.kafka.bindings.input.consumer.autoCommitOffset` be set to `false`.
-Use the corresponding input channel name for your example.
-
-[source]
-----
-@SpringBootApplication
-@EnableBinding(Sink.class)
-public class ManuallyAcknowdledgingConsumer {
-
- public static void main(String[] args) {
-     SpringApplication.run(ManuallyAcknowdledgingConsumer.class, args);
- }
-
- @StreamListener(Sink.INPUT)
- public void process(Message<?> message) {
-     Acknowledgment acknowledgment = message.getHeaders().get(KafkaHeaders.ACKNOWLEDGMENT, Acknowledgment.class);
-     if (acknowledgment != null) {
-         System.out.println("Acknowledgment provided");
-         acknowledgment.acknowledge();
-     }
- }
-}
-----
-
-===== Example: Security Configuration
-
-Apache Kafka 0.9 supports secure connections between client and brokers.
-To take advantage of this feature, follow the guidelines in the https://kafka.apache.org/090/documentation.html#security_configclients[Apache Kafka Documentation] as well as the Kafka 0.9 https://docs.confluent.io/2.0.0/kafka/security.html[security guidelines from the Confluent documentation].
-Use the `spring.cloud.stream.kafka.binder.configuration` option to set security properties for all clients created by the binder.
-
-For example, to set `security.protocol` to `SASL_SSL`, set the following property:
-
-[source]
-----
-spring.cloud.stream.kafka.binder.configuration.security.protocol=SASL_SSL
-----
-
-All the other security properties can be set in a similar manner.
-
-When using Kerberos, follow the instructions in the https://kafka.apache.org/090/documentation.html#security_sasl_clientconfig[reference documentation] for creating and referencing the JAAS configuration.
-
-Spring Cloud Stream supports passing JAAS configuration information to the application by using a JAAS configuration file and using Spring Boot properties.
-
-====== Using JAAS Configuration Files
-
-The JAAS and (optionally) krb5 file locations can be set for Spring Cloud Stream applications by using system properties.
-The following example shows how to launch a Spring Cloud Stream application with SASL and Kerberos by using a JAAS configuration file:
-
-[source,bash]
-----
- java -Djava.security.auth.login.config=/path.to/kafka_client_jaas.conf -jar log.jar \
-   --spring.cloud.stream.kafka.binder.brokers=secure.server:9092 \
-   --spring.cloud.stream.bindings.input.destination=stream.ticktock \
-   --spring.cloud.stream.kafka.binder.configuration.security.protocol=SASL_PLAINTEXT
-----
-
-====== Using Spring Boot Properties
-
-As an alternative to having a JAAS configuration file, Spring Cloud Stream provides a mechanism for setting up the JAAS configuration for Spring Cloud Stream applications by using Spring Boot properties.
-
-The following properties can be used to configure the login context of the Kafka client:
-
-spring.cloud.stream.kafka.binder.jaas.loginModule::
-The login module name. Not necessary to be set in normal cases.
-+
-Default: `com.sun.security.auth.module.Krb5LoginModule`.
-spring.cloud.stream.kafka.binder.jaas.controlFlag::
-The control flag of the login module.
-+
-Default: `required`.
-spring.cloud.stream.kafka.binder.jaas.options::
-Map with a key/value pair containing the login module options.
-+
-Default: Empty map.
-
-The following example shows how to launch a Spring Cloud Stream application with SASL and Kerberos by using Spring Boot configuration properties:
-
-[source,bash]
-----
- java --spring.cloud.stream.kafka.binder.brokers=secure.server:9092 \
-   --spring.cloud.stream.bindings.input.destination=stream.ticktock \
-   --spring.cloud.stream.kafka.binder.autoCreateTopics=false \
-   --spring.cloud.stream.kafka.binder.configuration.security.protocol=SASL_PLAINTEXT \
-   --spring.cloud.stream.kafka.binder.jaas.options.useKeyTab=true \
-   --spring.cloud.stream.kafka.binder.jaas.options.storeKey=true \
-   --spring.cloud.stream.kafka.binder.jaas.options.keyTab=/etc/security/keytabs/kafka_client.keytab \
-   --spring.cloud.stream.kafka.binder.jaas.options.principal=kafka-client-1@EXAMPLE.COM
-----
-
-The preceding example represents the equivalent of the following JAAS file:
-
-[source]
-----
-KafkaClient {
-    com.sun.security.auth.module.Krb5LoginModule required
-    useKeyTab=true
-    storeKey=true
-    keyTab="/etc/security/keytabs/kafka_client.keytab"
-    principal="kafka-client-1@EXAMPLE.COM";
-};
-----
-
-If the topics required already exist on the broker or will be created by an administrator, autocreation can be turned off and only client JAAS properties need to be sent.
-
-NOTE: Do not mix JAAS configuration files and Spring Boot properties in the same application.
-If the `-Djava.security.auth.login.config` system property is already present, Spring Cloud Stream ignores the Spring Boot properties.
-
-NOTE: Be careful when using the `autoCreateTopics` and `autoAddPartitions` with Kerberos.
-Usually, applications may use principals that do not have administrative rights in Kafka and Zookeeper.
-Consequently, relying on Spring Cloud Stream to create/modify topics may fail.
-In secure environments, we strongly recommend creating topics and managing ACLs administratively by using Kafka tooling.
-
-[[pause-resume]]
-===== Example: Pausing and Resuming the Consumer
-
-If you wish to suspend consumption but not cause a partition rebalance, you can pause and resume the consumer.
-This is facilitated by adding the `Consumer` as a parameter to your `@StreamListener`.
-To resume, you need an `ApplicationListener` for `ListenerContainerIdleEvent` instances.
-The frequency at which events are published is controlled by the `idleEventInterval` property.
-Since the consumer is not thread-safe, you must call these methods on the calling thread.
-
-The following simple application shows how to pause and resume:
-
-[source, java]
-----
-@SpringBootApplication
-@EnableBinding(Sink.class)
-public class Application {
-
-	public static void main(String[] args) {
-		SpringApplication.run(Application.class, args);
-	}
-
-	@StreamListener(Sink.INPUT)
-	public void in(String in, @Header(KafkaHeaders.CONSUMER) Consumer<?, ?> consumer) {
-		System.out.println(in);
-		consumer.pause(Collections.singleton(new TopicPartition("myTopic", 0)));
-	}
-
-	@Bean
-	public ApplicationListener<ListenerContainerIdleEvent> idleListener() {
-		return event -> {
-			System.out.println(event);
-			if (event.getConsumer().paused().size() > 0) {
-				event.getConsumer().resume(event.getConsumer().paused());
-			}
-		};
-	}
-
-}
-----
-
-[[kafka-error-channels]]
-=== Error Channels
-
-Starting with version 1.3, the binder unconditionally sends exceptions to an error channel for each consumer destination and can also be configured to send async producer send failures to an error channel.
-See <<spring-cloud-stream-overview-error-handling>> for more information.
-
-The payload of the `ErrorMessage` for a send failure is a `KafkaSendFailureException` with properties:
-
-* `failedMessage`: The Spring Messaging `Message<?>` that failed to be sent.
-* `record`: The raw `ProducerRecord` that was created from the `failedMessage`
-
-There is no automatic handling of producer exceptions (such as sending to a <<kafka-dlq-processing, Dead-Letter queue>>).
-You can consume these exceptions with your own Spring Integration flow.
-
-[[kafka-metrics]]
-=== Kafka Metrics
-
-Kafka binder module exposes the following metrics:
-
-`spring.cloud.stream.binder.kafka.offset`: This metric indicates how many messages have not been yet consumed from a given binder's topic by a given consumer group.
-The metrics provided are based on the Mircometer metrics library. The metric contains the consumer group information, topic and the actual lag in committed offset from the latest offset on the topic.
-This metric is particularly useful for providing auto-scaling feedback to a PaaS platform.
-
-[[kafka-tombstones]]
-=== Tombstone Records (null record values)
-
-When using compacted topics, a record with a `null` value (also called a tombstone record) represents the deletion of a key.
-To receive such messages in a `@StreamListener` method, the parameter must be marked as not required to receive a `null` value argument.
-
-====
-[source, java]
-----
-@StreamListener(Sink.INPUT)
-public void in(@Header(KafkaHeaders.RECEIVED_MESSAGE_KEY) byte[] key,
-               @Payload(required = false) Customer customer) {
-    // customer is null if a tombstone record
-    ...
-}
-----
-====
-
-[[rebalance-listener]]
-=== Using a KafkaRebalanceListener
-
-Applications may wish to seek topics/partitions to arbitrary offsets when the partitions are initially assigned, or perform other operations on the consumer.
-Starting with version 2.1, if you provide a single `KafkaRebalanceListener` bean in the application context, it will be wired into all Kafka consumer bindings.
-
-====
-[source, java]
-----
-public interface KafkaBindingRebalanceListener {
-
-	/**
-	 * Invoked by the container before any pending offsets are committed.
-	 * @param bindingName the name of the binding.
-	 * @param consumer the consumer.
-	 * @param partitions the partitions.
-	 */
-	default void onPartitionsRevokedBeforeCommit(String bindingName, Consumer<?, ?> consumer,
-			Collection<TopicPartition> partitions) {
-
-	}
-
-	/**
-	 * Invoked by the container after any pending offsets are committed.
-	 * @param bindingName the name of the binding.
-	 * @param consumer the consumer.
-	 * @param partitions the partitions.
-	 */
-	default void onPartitionsRevokedAfterCommit(String bindingName, Consumer<?, ?> consumer, Collection<TopicPartition> partitions) {
-
-	}
-
-	/**
-	 * Invoked when partitions are initially assigned or after a rebalance.
-	 * Applications might only want to perform seek operations on an initial assignment.
-	 * @param bindingName the name of the binding.
-	 * @param consumer the consumer.
-	 * @param partitions the partitions.
-	 * @param initial true if this is the initial assignment.
-	 */
-	default void onPartitionsAssigned(String bindingName, Consumer<?, ?> consumer, Collection<TopicPartition> partitions,
-			boolean initial) {
-
-	}
-
-}
-----
-====
-
-You cannot set the `resetOffsets` consumer property to `true` when you provide a rebalance listener.
-
-= Appendices
-[appendix]
-[[building]]
-== Building
-
-:jdkversion: 1.7
-
-=== Basic Compile and Test
-
-To build the source you will need to install JDK {jdkversion}.
-
-The build uses the Maven wrapper so you don't have to install a specific
-version of Maven. To enable the tests, you should have Kafka server 0.9 or above running
-before building. See below for more information on running the servers.
-
-The main build command is
-
-----
-$ ./mvnw clean install
-----
-
-You can also add '-DskipTests' if you like, to avoid running the tests.
-
-NOTE: You can also install Maven (>=3.3.3) yourself and run the `mvn` command
-in place of `./mvnw` in the examples below. If you do that you also
-might need to add `-P spring` if your local Maven settings do not
-contain repository declarations for spring pre-release artifacts.
-
-NOTE: Be aware that you might need to increase the amount of memory
-available to Maven by setting a `MAVEN_OPTS` environment variable with
-a value like `-Xmx512m -XX:MaxPermSize=128m`. We try to cover this in
-the `.mvn` configuration, so if you find you have to do it to make a
-build succeed, please raise a ticket to get the settings added to
-source control.
-
-
-The projects that require middleware generally include a
-`docker-compose.yml`, so consider using
-https://compose.docker.io/[Docker Compose] to run the middeware servers
-in Docker containers.
-
-=== Documentation
-
-There is a "full" profile that will generate documentation.
-
-=== Working with the code
-If you don't have an IDE preference we would recommend that you use
-https://www.springsource.com/developer/sts[Spring Tools Suite] or
-https://eclipse.org[Eclipse] when working with the code. We use the
-https://eclipse.org/m2e/[m2eclipe] eclipse plugin for maven support. Other IDEs and tools
-should also work without issue.
-
-==== Importing into eclipse with m2eclipse
-We recommend the https://eclipse.org/m2e/[m2eclipe] eclipse plugin when working with
-eclipse. If you don't already have m2eclipse installed it is available from the "eclipse
-marketplace".
-
-Unfortunately m2e does not yet support Maven 3.3, so once the projects
-are imported into Eclipse you will also need to tell m2eclipse to use
-the `.settings.xml` file for the projects.  If you do not do this you
-may see many different errors related to the POMs in the
-projects.  Open your Eclipse preferences, expand the Maven
-preferences, and select User Settings.  In the User Settings field
-click Browse and navigate to the Spring Cloud project you imported
-selecting the `.settings.xml` file in that project.  Click Apply and
-then OK to save the preference changes.
-
-NOTE: Alternatively you can copy the repository settings from https://github.com/spring-cloud/spring-cloud-build/blob/master/.settings.xml[`.settings.xml`] into your own `~/.m2/settings.xml`.
-
-==== Importing into eclipse without m2eclipse
-If you prefer not to use m2eclipse you can generate eclipse project metadata using the
-following command:
-
-[indent=0]
-----
-	$ ./mvnw eclipse:eclipse
-----
-
-The generated eclipse projects can be imported by selecting `import existing projects`
-from the `file` menu.
-[[contributing]
-== Contributing
-
-Spring Cloud is released under the non-restrictive Apache 2.0 license,
-and follows a very standard Github development process, using Github
-tracker for issues and merging pull requests into master. If you want
-to contribute even something trivial please do not hesitate, but
-follow the guidelines below.
-
-=== Sign the Contributor License Agreement
-Before we accept a non-trivial patch or pull request we will need you to sign the
-https://support.springsource.com/spring_committer_signup[contributor's agreement].
-Signing the contributor's agreement does not grant anyone commit rights to the main
-repository, but it does mean that we can accept your contributions, and you will get an
-author credit if we do.  Active contributors might be asked to join the core team, and
-given the ability to merge pull requests.
-
-=== Code Conventions and Housekeeping
-None of these is essential for a pull request, but they will all help.  They can also be
-added after the original pull request but before a merge.
-
-* Use the Spring Framework code format conventions. If you use Eclipse
-  you can import formatter settings using the
-  `eclipse-code-formatter.xml` file from the
-  https://github.com/spring-cloud/build/tree/master/eclipse-coding-conventions.xml[Spring
-  Cloud Build] project. If using IntelliJ, you can use the
-  https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
-  Plugin] to import the same file.
-* Make sure all new `.java` files to have a simple Javadoc class comment with at least an
-  `@author` tag identifying you, and preferably at least a paragraph on what the class is
-  for.
-* Add the ASF license header comment to all new `.java` files (copy from existing files
-  in the project)
-* Add yourself as an `@author` to the .java files that you modify substantially (more
-  than cosmetic changes).
-* Add some Javadocs and, if you change the namespace, some XSD doc elements.
-* A few unit tests would help a lot as well -- someone has to do it.
-* If no-one else is using your branch, please rebase it against the current master (or
-  other target branch in the main project).
-* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
-  if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
-  message (where XXXX is the issue number).
-
-// ======================================================================================
+Spring Cloud Stream Binder for Apache Kafka

docs/pom.xml

@@ -1,328 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>spring-cloud-stream-binder-kafka-docs</artifactId>
-	<parent>
-		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-stream-binder-kafka-parent</artifactId>
-		<version>2.2.0.RC1</version>
-	</parent>
-	<packaging>pom</packaging>
-	<name>spring-cloud-stream-binder-kafka-docs</name>
-	<description>Spring Cloud Stream Kafka Binder Docs</description>
-	<properties>
-		<docs.main>spring-cloud-stream-binder-kafka</docs.main>
-		<main.basedir>${basedir}/..</main.basedir>
-		<spring-doc-resources.version>0.1.1.RELEASE</spring-doc-resources.version>
-		<spring-asciidoctor-extensions.version>0.1.0.RELEASE
-		</spring-asciidoctor-extensions.version>
-		<asciidoctorj-pdf.version>1.5.0-alpha.16</asciidoctorj-pdf.version>
-	</properties>
-	<profiles>
-		<profile>
-			<id>docs</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId>
-						<version>${maven-dependency-plugin.version}</version>
-						<inherited>false</inherited>
-						<executions>
-							<execution>
-								<id>unpack-docs</id>
-								<phase>generate-resources</phase>
-								<goals>
-									<goal>unpack</goal>
-								</goals>
-								<configuration>
-									<artifactItems>
-										<artifactItem>
-											<groupId>org.springframework.cloud
-											</groupId>
-											<artifactId>spring-cloud-build-docs
-											</artifactId>
-											<version>${spring-cloud-build.version}
-											</version>
-											<classifier>sources</classifier>
-											<type>jar</type>
-											<overWrite>false</overWrite>
-											<outputDirectory>${docs.resources.dir}
-											</outputDirectory>
-										</artifactItem>
-									</artifactItems>
-								</configuration>
-							</execution>
-							<execution>
-								<id>unpack-docs-resources</id>
-								<phase>generate-resources</phase>
-								<goals>
-									<goal>unpack</goal>
-								</goals>
-								<configuration>
-									<artifactItems>
-										<artifactItem>
-											<groupId>io.spring.docresources</groupId>
-											<artifactId>spring-doc-resources</artifactId>
-											<version>${spring-doc-resources.version}</version>
-											<type>zip</type>
-											<overWrite>true</overWrite>
-											<outputDirectory>${project.build.directory}/refdocs/</outputDirectory>
-										</artifactItem>
-									</artifactItems>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-resources-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>copy-asciidoc-resources</id>
-								<phase>generate-resources</phase>
-								<goals>
-									<goal>copy-resources</goal>
-								</goals>
-								<configuration>
-									<outputDirectory>${project.build.directory}/refdocs/</outputDirectory>
-									<resources>
-										<resource>
-											<directory>src/main/asciidoc</directory>
-											<filtering>false</filtering>
-											<excludes>
-												<exclude>ghpages.sh</exclude>
-											</excludes>
-										</resource>
-									</resources>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-
-					<plugin>
-						<groupId>org.asciidoctor</groupId>
-						<artifactId>asciidoctor-maven-plugin</artifactId>
-						<version>${asciidoctor-maven-plugin.version}</version>
-						<inherited>false</inherited>
-						<dependencies>
-							<dependency>
-								<groupId>io.spring.asciidoctor</groupId>
-								<artifactId>spring-asciidoctor-extensions</artifactId>
-								<version>${spring-asciidoctor-extensions.version}</version>
-							</dependency>
-							<dependency>
-								<groupId>org.asciidoctor</groupId>
-								<artifactId>asciidoctorj-pdf</artifactId>
-								<version>${asciidoctorj-pdf.version}</version>
-							</dependency>
-						</dependencies>
-						<configuration>
-							<sourceDirectory>${project.build.directory}/refdocs/</sourceDirectory>
-							<sourceDocumentName>${docs.main}.adoc</sourceDocumentName>
-							<attributes>
-            						<spring-cloud-stream-version>${project.version}</spring-cloud-stream-version>
-<!--             						<docs-url>https://cloud.spring.io/</docs-url> -->
-<!--             						<docs-version></docs-version> -->
-            						<docs-version>${project.version}/</docs-version>
-            						<docs-url>https://cloud.spring.io/spring-cloud-static/</docs-url>
-        					</attributes>
-						</configuration>
-						<executions>
-							<execution>
-								<id>generate-html-documentation</id>
-								<phase>prepare-package</phase>
-								<goals>
-									<goal>process-asciidoc</goal>
-								</goals>
-								<configuration>
-									<backend>html5</backend>
-									<sourceHighlighter>highlight.js</sourceHighlighter>
-									<doctype>book</doctype>
-									<attributes>
-										// these attributes are required to use the doc resources
-										<docinfo>shared</docinfo>
-										<stylesdir>css/</stylesdir>
-										<stylesheet>spring.css</stylesheet>
-										<linkcss>true</linkcss>
-										<icons>font</icons>
-										<highlightjsdir>js/highlight</highlightjsdir>
-										<highlightjs-theme>atom-one-dark-reasonable</highlightjs-theme>
-										<allow-uri-read>true</allow-uri-read>
-										<nofooter />
-										<toc>left</toc>
-										<toc-levels>4</toc-levels>
-										<spring-cloud-version>${project.version}</spring-cloud-version>
-										<sectlinks>true</sectlinks>
-									</attributes>
-									<outputFile>${docs.main}.html</outputFile>
-								</configuration>
-							</execution>
-							<execution>
-								<id>generate-docbook</id>
-								<phase>none</phase>
-								<goals>
-									<goal>process-asciidoc</goal>
-								</goals>
-							</execution>
-							<execution>
-								<id>generate-index</id>
-								<phase>none</phase>
-								<goals>
-									<goal>process-asciidoc</goal>
-								</goals>
-							</execution>
-
-						</executions>
-					</plugin>
-
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<version>${maven-antrun-plugin.version}</version>
-						<dependencies>
-							<dependency>
-								<groupId>ant-contrib</groupId>
-								<artifactId>ant-contrib</artifactId>
-								<version>1.0b3</version>
-								<exclusions>
-									<exclusion>
-										<groupId>ant</groupId>
-										<artifactId>ant</artifactId>
-									</exclusion>
-								</exclusions>
-							</dependency>
-							<dependency>
-								<groupId>org.apache.ant</groupId>
-								<artifactId>ant-nodeps</artifactId>
-								<version>1.8.1</version>
-							</dependency>
-							<dependency>
-								<groupId>org.tigris.antelope</groupId>
-								<artifactId>antelopetasks</artifactId>
-								<version>3.2.10</version>
-							</dependency>
-							<dependency>
-								<groupId>org.jruby</groupId>
-								<artifactId>jruby-complete</artifactId>
-								<version>1.7.17</version>
-							</dependency>
-							<dependency>
-								<groupId>org.asciidoctor</groupId>
-								<artifactId>asciidoctorj</artifactId>
-								<version>1.5.8</version>
-							</dependency>
-						</dependencies>
-						<executions>
-							<execution>
-								<id>readme</id>
-								<phase>process-resources</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<target>
-										<java classname="org.jruby.Main" failonerror="yes">
-											<arg
-												value="${docs.resources.dir}/ruby/generate_readme.sh" />
-											<arg value="-o" />
-											<arg value="${main.basedir}/README.adoc" />
-										</java>
-									</target>
-								</configuration>
-							</execution>
-							<execution>
-								<id>assert-no-unresolved-links</id>
-								<phase>prepare-package</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<target>
-										<fileset id="unresolved.file"
-											dir="${basedir}/target/generated-docs/" includes="**/*.html">
-											<contains text="Unresolved" />
-										</fileset>
-										<fail message="[Unresolved] Found...failing">
-											<condition>
-												<resourcecount when="greater" count="0"
-													refid="unresolved.file" />
-											</condition>
-										</fail>
-									</target>
-								</configuration>
-							</execution>
-							<execution>
-								<id>setup-maven-properties</id>
-								<phase>validate</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<exportAntProperties>true</exportAntProperties>
-									<target>
-										<taskdef
-											resource="net/sf/antcontrib/antcontrib.properties" />
-										<taskdef name="stringutil"
-											classname="ise.antelope.tasks.StringUtilTask" />
-										<var name="version-type" value="${project.version}" />
-										<propertyregex property="version-type"
-											override="true" input="${version-type}" regexp=".*\.(.*)"
-											replace="\1" />
-										<propertyregex property="version-type"
-											override="true" input="${version-type}" regexp="(M)\d+"
-											replace="MILESTONE" />
-										<propertyregex property="version-type"
-											override="true" input="${version-type}" regexp="(RC)\d+"
-											replace="MILESTONE" />
-										<propertyregex property="version-type"
-											override="true" input="${version-type}" regexp="BUILD-(.*)"
-											replace="SNAPSHOT" />
-										<stringutil string="${version-type}"
-											property="spring-cloud-repo">
-											<lowercase />
-										</stringutil>
-										<var name="github-tag" value="v${project.version}" />
-										<propertyregex property="github-tag"
-											override="true" input="${github-tag}" regexp=".*SNAPSHOT"
-											replace="master" />
-									</target>
-								</configuration>
-							</execution>
-							<execution>
-								<id>copy-css</id>
-								<phase>none</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-							</execution>
-							<execution>
-								<id>generate-documentation-index</id>
-								<phase>none</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-							</execution>
-							<execution>
-								<id>copy-generated-html</id>
-								<phase>none</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-							</execution>
-
-						</executions>
-					</plugin>
-
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>build-helper-maven-plugin</artifactId>
-						<inherited>false</inherited>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>

docs/src/main/asciidoc/README.adoc

@@ -1,22 +0,0 @@
-:jdkversion: 1.8
-:github-tag: master
-:github-repo: spring-cloud/spring-cloud-stream-binder-kafka
-
-:github-raw: https://raw.githubusercontent.com/{github-repo}/{github-tag}
-:github-code: https://github.com/{github-repo}/tree/{github-tag}
-
-image::https://circleci.com/gh/spring-cloud/spring-cloud-stream-binder-kafka.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-stream-binder-kafka"]
-image::https://codecov.io/gh/spring-cloud/spring-cloud-stream-binder-kafka/branch/{github-tag}/graph/badge.svg["codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-stream-binder-kafka"]
-image::https://badges.gitter.im/spring-cloud/spring-cloud-stream-binder-kafka.svg[Gitter, link="https://gitter.im/spring-cloud/spring-cloud-stream-binder-kafka?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"]
-
-// ======================================================================================
-
-//= Overview
-include::overview.adoc[]
-
-= Appendices
-[appendix]
-include::building.adoc[]
-include::contributing.adoc[]
-
-// ======================================================================================

docs/src/main/asciidoc/ghpages.sh

@@ -1,330 +0,0 @@
-#!/bin/bash -x
-
-set -e
-
-# Set default props like MAVEN_PATH, ROOT_FOLDER etc.
-function set_default_props() {
-    # The script should be executed from the root folder
-    ROOT_FOLDER=`pwd`
-    echo "Current folder is ${ROOT_FOLDER}"
-
-    if [[ ! -e "${ROOT_FOLDER}/.git" ]]; then
-        echo "You're not in the root folder of the project!"
-        exit 1
-    fi
-
-    # Prop that will let commit the changes
-    COMMIT_CHANGES="no"
-    MAVEN_PATH=${MAVEN_PATH:-}
-    echo "Path to Maven is [${MAVEN_PATH}]"
-    REPO_NAME=${PWD##*/}
-    echo "Repo name is [${REPO_NAME}]"
-    SPRING_CLOUD_STATIC_REPO=${SPRING_CLOUD_STATIC_REPO:-git@github.com:spring-cloud/spring-cloud-static.git}
-    echo "Spring Cloud Static repo is [${SPRING_CLOUD_STATIC_REPO}"
-}
-
-# Check if gh-pages exists and docs have been built
-function check_if_anything_to_sync() {
-    git remote set-url --push origin `git config remote.origin.url | sed -e 's/^git:/https:/'`
-
-    if ! (git remote set-branches --add origin gh-pages && git fetch -q); then
-        echo "No gh-pages, so not syncing"
-        exit 0
-    fi
-
-    if ! [ -d docs/target/generated-docs ] && ! [ "${BUILD}" == "yes" ]; then
-        echo "No gh-pages sources in docs/target/generated-docs, so not syncing"
-        exit 0
-    fi
-}
-
-function retrieve_current_branch() {
-    # Code getting the name of the current branch. For master we want to publish as we did until now
-    # https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch
-    # If there is a branch already passed will reuse it - otherwise will try to find it
-    CURRENT_BRANCH=${BRANCH}
-    if [[ -z "${CURRENT_BRANCH}" ]] ; then
-      CURRENT_BRANCH=$(git symbolic-ref -q HEAD)
-      CURRENT_BRANCH=${CURRENT_BRANCH##refs/heads/}
-      CURRENT_BRANCH=${CURRENT_BRANCH:-HEAD}
-    fi
-    echo "Current branch is [${CURRENT_BRANCH}]"
-    git checkout ${CURRENT_BRANCH} || echo "Failed to check the branch... continuing with the script"
-}
-
-# Switches to the provided value of the release version. We always prefix it with `v`
-function switch_to_tag() {
-    git checkout v${VERSION}
-}
-
-# Build the docs if switch is on
-function build_docs_if_applicable() {
-    if [[ "${BUILD}" == "yes" ]] ; then
-        ./mvnw clean install -P docs -pl docs -DskipTests
-    fi
-}
-
-# Get the name of the `docs.main` property
-# Get whitelisted branches - assumes that a `docs` module is available under `docs` profile
-function retrieve_doc_properties() {
-    MAIN_ADOC_VALUE=$("${MAVEN_PATH}"mvn -q \
-        -Dexec.executable="echo" \
-        -Dexec.args='${docs.main}' \
-        --non-recursive \
-        org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
-    echo "Extracted 'main.adoc' from Maven build [${MAIN_ADOC_VALUE}]"
-
-
-    WHITELIST_PROPERTY=${WHITELIST_PROPERTY:-"docs.whitelisted.branches"}
-    WHITELISTED_BRANCHES_VALUE=$("${MAVEN_PATH}"mvn -q \
-        -Dexec.executable="echo" \
-        -Dexec.args="\${${WHITELIST_PROPERTY}}" \
-        org.codehaus.mojo:exec-maven-plugin:1.3.1:exec \
-        -P docs \
-        -pl docs)
-    echo "Extracted '${WHITELIST_PROPERTY}' from Maven build [${WHITELISTED_BRANCHES_VALUE}]"
-}
-
-# Stash any outstanding changes
-function stash_changes() {
-    git diff-index --quiet HEAD && dirty=$? || (echo "Failed to check if the current repo is dirty. Assuming that it is." && dirty="1")
-    if [ "$dirty" != "0" ]; then git stash; fi
-}
-
-# Switch to gh-pages branch to sync it with current branch
-function add_docs_from_target() {
-    local DESTINATION_REPO_FOLDER
-    if [[ -z "${DESTINATION}" && -z "${CLONE}" ]] ; then
-        DESTINATION_REPO_FOLDER=${ROOT_FOLDER}
-    elif [[ "${CLONE}" == "yes" ]]; then
-        mkdir -p ${ROOT_FOLDER}/target
-        local clonedStatic=${ROOT_FOLDER}/target/spring-cloud-static
-        if [[ ! -e "${clonedStatic}/.git" ]]; then
-            echo "Cloning Spring Cloud Static to target"
-            git clone ${SPRING_CLOUD_STATIC_REPO} ${clonedStatic} && git checkout gh-pages
-        else
-            echo "Spring Cloud Static already cloned - will pull changes"
-            cd ${clonedStatic} && git checkout gh-pages && git pull origin gh-pages
-        fi
-        DESTINATION_REPO_FOLDER=${clonedStatic}/${REPO_NAME}
-        mkdir -p ${DESTINATION_REPO_FOLDER}
-    else
-        if [[ ! -e "${DESTINATION}/.git" ]]; then
-            echo "[${DESTINATION}] is not a git repository"
-            exit 1
-        fi
-        DESTINATION_REPO_FOLDER=${DESTINATION}/${REPO_NAME}
-        mkdir -p ${DESTINATION_REPO_FOLDER}
-        echo "Destination was provided [${DESTINATION}]"
-    fi
-    cd ${DESTINATION_REPO_FOLDER}
-    git checkout gh-pages
-    git pull origin gh-pages
-
-    # Add git branches
-    ###################################################################
-    if [[ -z "${VERSION}" ]] ; then
-        copy_docs_for_current_version
-    else
-        copy_docs_for_provided_version
-    fi
-    commit_changes_if_applicable
-}
-
-
-# Copies the docs by using the retrieved properties from Maven build
-function copy_docs_for_current_version() {
-    if [[ "${CURRENT_BRANCH}" == "master" ]] ; then
-        echo -e "Current branch is master - will copy the current docs only to the root folder"
-        for f in docs/target/generated-docs/*; do
-            file=${f#docs/target/generated-docs/*}
-            if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
-                # Not ignored...
-                cp -rf $f ${ROOT_FOLDER}/
-                git add -A ${ROOT_FOLDER}/$file
-            fi
-        done
-        COMMIT_CHANGES="yes"
-    else
-        echo -e "Current branch is [${CURRENT_BRANCH}]"
-        # https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin
-        if [[ ",${WHITELISTED_BRANCHES_VALUE}," = *",${CURRENT_BRANCH},"* ]] ; then
-            mkdir -p ${ROOT_FOLDER}/${CURRENT_BRANCH}
-            echo -e "Branch [${CURRENT_BRANCH}] is whitelisted! Will copy the current docs to the [${CURRENT_BRANCH}] folder"
-            for f in docs/target/generated-docs/*; do
-                file=${f#docs/target/generated-docs/*}
-                if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
-                    # Not ignored...
-                    # We want users to access 2.0.0.BUILD-SNAPSHOT/ instead of 1.0.0.RELEASE/spring-cloud.sleuth.html
-                    if [[ "${file}" == "${MAIN_ADOC_VALUE}.html" ]] ; then
-                        # We don't want to copy the spring-cloud-sleuth.html
-                        # we want it to be converted to index.html
-                        cp -rf $f ${ROOT_FOLDER}/${CURRENT_BRANCH}/index.html
-                        git add -A ${ROOT_FOLDER}/${CURRENT_BRANCH}/index.html
-                    else
-                        cp -rf $f ${ROOT_FOLDER}/${CURRENT_BRANCH}
-                        git add -A ${ROOT_FOLDER}/${CURRENT_BRANCH}/$file
-                    fi
-                fi
-            done
-            COMMIT_CHANGES="yes"
-        else
-            echo -e "Branch [${CURRENT_BRANCH}] is not on the white list! Check out the Maven [${WHITELIST_PROPERTY}] property in
-             [docs] module available under [docs] profile. Won't commit any changes to gh-pages for this branch."
-        fi
-    fi
-}
-
-# Copies the docs by using the explicitly provided version
-function copy_docs_for_provided_version() {
-    local FOLDER=${DESTINATION_REPO_FOLDER}/${VERSION}
-    mkdir -p ${FOLDER}
-    echo -e "Current tag is [v${VERSION}] Will copy the current docs to the [${FOLDER}] folder"
-    for f in ${ROOT_FOLDER}/docs/target/generated-docs/*; do
-        file=${f#${ROOT_FOLDER}/docs/target/generated-docs/*}
-        copy_docs_for_branch ${file} ${FOLDER}
-    done
-    COMMIT_CHANGES="yes"
-    CURRENT_BRANCH="v${VERSION}"
-}
-
-# Copies the docs from target to the provided destination
-# Params:
-# $1 - file from target
-# $2 - destination to which copy the files
-function copy_docs_for_branch() {
-    local file=$1
-    local destination=$2
-    if ! git ls-files -i -o --exclude-standard --directory | grep -q ^${file}$; then
-        # Not ignored...
-        # We want users to access 2.0.0.BUILD-SNAPSHOT/ instead of 1.0.0.RELEASE/spring-cloud.sleuth.html
-        if [[ ("${file}" == "${MAIN_ADOC_VALUE}.html") || ("${file}" == "${REPO_NAME}.html") ]] ; then
-            # We don't want to copy the spring-cloud-sleuth.html
-            # we want it to be converted to index.html
-            cp -rf $f ${destination}/index.html
-            git add -A ${destination}/index.html
-        else
-            cp -rf $f ${destination}
-            git add -A ${destination}/$file
-        fi
-    fi
-}
-
-function commit_changes_if_applicable() {
-    if [[ "${COMMIT_CHANGES}" == "yes" ]] ; then
-        COMMIT_SUCCESSFUL="no"
-        git commit -a -m "Sync docs from ${CURRENT_BRANCH} to gh-pages" && COMMIT_SUCCESSFUL="yes" || echo "Failed to commit changes"
-
-        # Uncomment the following push if you want to auto push to
-        # the gh-pages branch whenever you commit to master locally.
-        # This is a little extreme. Use with care!
-        ###################################################################
-        if [[ "${COMMIT_SUCCESSFUL}" == "yes" ]] ; then
-            git push origin gh-pages
-        fi
-    fi
-}
-
-# Switch back to the previous branch and exit block
-function checkout_previous_branch() {
-    # If -version was provided we need to come back to root project
-    cd ${ROOT_FOLDER}
-    git checkout ${CURRENT_BRANCH} || echo "Failed to check the branch... continuing with the script"
-    if [ "$dirty" != "0" ]; then git stash pop; fi
-    exit 0
-}
-
-# Assert if properties have been properly passed
-function assert_properties() {
-echo "VERSION [${VERSION}], DESTINATION [${DESTINATION}], CLONE [${CLONE}]"
-if [[ "${VERSION}" != "" && (-z "${DESTINATION}" && -z "${CLONE}") ]] ; then echo "Version was set but destination / clone was not!"; exit 1;fi
-if [[ ("${DESTINATION}" != "" && "${CLONE}" != "") && -z "${VERSION}" ]] ; then echo "Destination / clone was set but version was not!"; exit 1;fi
-if [[ "${DESTINATION}" != "" && "${CLONE}" == "yes" ]] ; then echo "Destination and clone was set. Pick one!"; exit 1;fi
-}
-
-# Prints the usage
-function print_usage() {
-cat <<EOF
-The idea of this script is to update gh-pages branch with the generated docs. Without any options
-the script will work in the following manner:
-
-- if there's no gh-pages / target for docs module then the script ends
-- for master branch the generated docs are copied to the root of gh-pages branch
-- for any other branch (if that branch is whitelisted) a subfolder with branch name is created
-    and docs are copied there
-- if the version switch is passed (-v) then a tag with (v) prefix will be retrieved and a folder
-    with that version number will be created in the gh-pages branch. WARNING! No whitelist verification will take place
-- if the destination switch is passed (-d) then the script will check if the provided dir is a git repo and then will
-    switch to gh-pages of that repo and copy the generated docs to `docs/<project-name>/<version>`
-- if the destination switch is passed (-d) then the script will check if the provided dir is a git repo and then will
-    switch to gh-pages of that repo and copy the generated docs to `docs/<project-name>/<version>`
-
-USAGE:
-
-You can use the following options:
-
--v|--version        - the script will apply the whole procedure for a particular library version
--d|--destination    - the root of destination folder where the docs should be copied. You have to use the full path.
-                        E.g. point to spring-cloud-static folder. Can't be used with (-c)
--b|--build          - will run the standard build process after checking out the branch
--c|--clone          - will automatically clone the spring-cloud-static repo instead of providing the destination.
-                        Obviously can't be used with (-d)
-
-EOF
-}
-
-
-# ==========================================
-#    ____   ____ _____  _____ _____ _______
-#  / ____|/ ____|  __ \|_   _|  __ \__   __|
-# | (___ | |    | |__) | | | | |__) | | |
-#  \___ \| |    |  _  /  | | |  ___/  | |
-#  ____) | |____| | \ \ _| |_| |      | |
-# |_____/ \_____|_|  \_\_____|_|      |_|
-#
-# ==========================================
-
-while [[ $# > 0 ]]
-do
-key="$1"
-case ${key} in
-    -v|--version)
-    VERSION="$2"
-    shift # past argument
-    ;;
-    -d|--destination)
-    DESTINATION="$2"
-    shift # past argument
-    ;;
-    -b|--build)
-    BUILD="yes"
-    ;;
-    -c|--clone)
-    CLONE="yes"
-    ;;
-    -h|--help)
-    print_usage
-    exit 0
-    ;;
-    *)
-    echo "Invalid option: [$1]"
-    print_usage
-    exit 1
-    ;;
-esac
-shift # past argument or value
-done
-
-assert_properties
-set_default_props
-check_if_anything_to_sync
-if [[ -z "${VERSION}" ]] ; then
-    retrieve_current_branch
-else
-    switch_to_tag
-fi
-build_docs_if_applicable
-retrieve_doc_properties
-stash_changes
-add_docs_from_target
-checkout_previous_branch

docs/src/main/asciidoc/kafka-streams.adoc

@@ -1,724 +0,0 @@
-== Kafka Streams Binder
-
-
-=== Usage
-
-For using the Kafka Streams binder, you just need to add it to your Spring Cloud Stream application, using the following
-Maven coordinates:
-
-[source,xml]
-----
-<dependency>
-  <groupId>org.springframework.cloud</groupId>
-  <artifactId>spring-cloud-stream-binder-kafka-streams</artifactId>
-</dependency>
-----
-
-
-=== Overview
-
-Spring Cloud Stream's Apache Kafka support also includes a binder implementation designed explicitly for Apache Kafka
-Streams binding. With this native integration, a Spring Cloud Stream "processor" application can directly use the
-https://kafka.apache.org/documentation/streams/developer-guide[Apache Kafka Streams] APIs in the core business logic.
-
-Kafka Streams binder implementation builds on the foundation provided by the https://docs.spring.io/spring-kafka/reference/html/_reference.html#kafka-streams[Kafka Streams in Spring Kafka]
-project.
-
-Kafka Streams binder provides binding capabilities for the three major types in Kafka Streams - KStream, KTable and GlobalKTable.
-
-As part of this native integration, the high-level https://docs.confluent.io/current/streams/developer-guide/dsl-api.html[Streams DSL]
-provided by the Kafka Streams API is available for use in the business logic.
-
-An early version of the https://docs.confluent.io/current/streams/developer-guide/processor-api.html[Processor API]
-support is available as well.
-
-As noted early-on, Kafka Streams support in Spring Cloud Stream is strictly only available for use in the Processor model.
-A model in which the messages read from an inbound topic, business processing can be applied, and the transformed messages
-can be written to an outbound topic. It can also be used in Processor applications with a no-outbound destination.
-
-==== Streams DSL
-
-This application consumes data from a Kafka topic (e.g., `words`), computes word count for each unique word in a 5 seconds
-time window, and the computed results are sent to a downstream topic (e.g., `counts`) for further processing.
-
-[source]
-----
-@SpringBootApplication
-@EnableBinding(KStreamProcessor.class)
-public class WordCountProcessorApplication {
-
-	@StreamListener("input")
-	@SendTo("output")
-	public KStream<?, WordCount> process(KStream<?, String> input) {
-		return input
-                .flatMapValues(value -> Arrays.asList(value.toLowerCase().split("\\W+")))
-                .groupBy((key, value) -> value)
-                .windowedBy(TimeWindows.of(5000))
-                .count(Materialized.as("WordCounts-multi"))
-                .toStream()
-                .map((key, value) -> new KeyValue<>(null, new WordCount(key.key(), value, new Date(key.window().start()), new Date(key.window().end()))));
-    }
-
-	public static void main(String[] args) {
-		SpringApplication.run(WordCountProcessorApplication.class, args);
-	}
-----
-
-Once built as a uber-jar (e.g., `wordcount-processor.jar`), you can run the above example like the following.
-
-[source]
-----
-java -jar wordcount-processor.jar  --spring.cloud.stream.bindings.input.destination=words --spring.cloud.stream.bindings.output.destination=counts
-----
-
-This application will consume messages from the Kafka topic `words` and the computed results are published to an output
-topic `counts`.
-
-Spring Cloud Stream will ensure that the messages from both the incoming and outgoing topics are automatically bound as
-KStream objects. As a developer, you can exclusively focus on the business aspects of the code, i.e. writing the logic
-required in the processor. Setting up the Streams DSL specific configuration required by the Kafka Streams infrastructure
-is automatically handled by the framework.
-
-=== Configuration Options
-
-This section contains the configuration options used by the Kafka Streams binder.
-
-For common configuration options and properties pertaining to binder, refer to the <<binding-properties,core documentation>>.
-
-==== Kafka Streams Properties
-
-The following properties are available at the binder level and must be prefixed with `spring.cloud.stream.kafka.streams.binder.`
-
-configuration::
-  Map with a key/value pair containing properties pertaining to Apache Kafka Streams API.
-  This property must be prefixed with `spring.cloud.stream.kafka.streams.binder.`.
- Following are some examples of using this property.
-
-[source]
-----
-spring.cloud.stream.kafka.streams.binder.configuration.default.key.serde=org.apache.kafka.common.serialization.Serdes$StringSerde
-spring.cloud.stream.kafka.streams.binder.configuration.default.value.serde=org.apache.kafka.common.serialization.Serdes$StringSerde
-spring.cloud.stream.kafka.streams.binder.configuration.commit.interval.ms=1000
-----
-
-For more information about all the properties that may go into streams configuration, see StreamsConfig JavaDocs in
-Apache Kafka Streams docs.
-
-brokers::
- Broker URL
-+
-Default: `localhost`
-zkNodes::
- Zookeeper URL
-+
-Default: `localhost`
-serdeError::
- Deserialization error handler type.
- Possible values are - `logAndContinue`, `logAndFail` or `sendToDlq`
-+
-Default: `logAndFail`
-applicationId::
- Convenient way to set the application.id for the Kafka Streams application globally at the binder level.
- If the application contains multiple `StreamListener` methods, then application.id should be set at the binding level per input binding.
-+
-Default: `none`
-
-The following properties are _only_ available for Kafka Streams producers and must be prefixed with `spring.cloud.stream.kafka.streams.bindings.<binding name>.producer.`
-For convenience, if there multiple output bindings and they all require a common value, that can be configured by using the prefix `spring.cloud.stream.kafka.streams.default.producer.`.
-
-keySerde::
-  key serde to use
-+
-Default: `none`.
-valueSerde::
-  value serde to use
-+
-Default: `none`.
-useNativeEncoding::
-  flag to enable native encoding
-+
-Default: `false`.
-
-The following properties are available for Kafka Streams consumers and must be prefixed with `spring.cloud.stream.kafka.streams.bindings.<binding-name>.consumer.`
-For convenience, if there are multiple input bindings and they all require a common value, that can be configured by using the prefix `spring.cloud.stream.kafka.streams.default.consumer.`.
-
-applicationId::
- Setting application.id per input binding.
-+
-Default: `none`
-keySerde::
-  key serde to use
-+
-Default: `none`.
-valueSerde::
-  value serde to use
-+
-Default: `none`.
-materializedAs::
-  state store to materialize when using incoming KTable types
-+
-Default: `none`.
-useNativeDecoding::
-  flag to enable native decoding
-+
-Default: `false`.
-dlqName::
-  DLQ topic name.
-+
-Default: `none`.
-startOffset::
-  Offset to start from if there is no committed offset to consume from.
-  This is mostly used when the consumer is consuming from a topic for the first time. Kafka Streams uses `earliest` as the default strategy and
-  the binder uses the same default. This can be overridden to `latest` using this property.
-+
-Default: `earliest`.
-
-Note: Using `resetOffsets` on the consumer does not have any effect on Kafka Streams binder.
-Unlike the message channel based binder, Kafka Streams binder does not seek to beginning or end on demand.
-
-==== TimeWindow properties:
-
-Windowing is an important concept in stream processing applications. Following properties are available to configure
-time-window computations.
-
-spring.cloud.stream.kafka.streams.timeWindow.length::
-  When this property is given, you can autowire a `TimeWindows` bean into the application.
-  The value is expressed in milliseconds.
-+
-Default: `none`.
-spring.cloud.stream.kafka.streams.timeWindow.advanceBy::
-  Value is given in milliseconds.
-+
-Default: `none`.
-
-=== Multiple Input Bindings
-
-For use cases that requires multiple incoming KStream objects or a combination of KStream and KTable objects, the Kafka
-Streams binder provides multiple bindings support.
-
-Let's see it in action.
-
-==== Multiple Input Bindings as a Sink
-
-[source]
-----
-@EnableBinding(KStreamKTableBinding.class)
-.....
-.....
-@StreamListener
-public void process(@Input("inputStream") KStream<String, PlayEvent> playEvents,
-                    @Input("inputTable") KTable<Long, Song> songTable) {
-                    ....
-                    ....
-}
-
-interface KStreamKTableBinding {
-
-    @Input("inputStream")
-    KStream<?, ?> inputStream();
-
-    @Input("inputTable")
-    KTable<?, ?> inputTable();
-}
-
-----
-
-In the above example, the application is written as a sink, i.e. there are no output bindings and the application has to
-decide concerning downstream processing. When you write applications in this style, you might want to send the information
-downstream or store them in a state store (See below for Queryable State Stores).
-
-In the case of incoming KTable, if you want to materialize the computations to a state store, you have to express it
-through the following property.
-
-[source]
-----
-spring.cloud.stream.kafka.streams.bindings.inputTable.consumer.materializedAs: all-songs
-----
-
-The above example shows the use of KTable as an input binding.
-The binder also supports input bindings for GlobalKTable.
-GlobalKTable binding is useful when you have to ensure that all instances of your application has access to the data updates from the topic.
-KTable and GlobalKTable bindings are only available on the input.
-Binder supports both input and output bindings for KStream.
-
-=== Multiple Input Bindings as a Processor
-
-[source]
-----
-@EnableBinding(KStreamKTableBinding.class)
-....
-....
-
-@StreamListener
-@SendTo("output")
-public KStream<String, Long> process(@Input("input") KStream<String, Long> userClicksStream,
-                                     @Input("inputTable") KTable<String, String> userRegionsTable) {
-....
-....
-}
-
-interface KStreamKTableBinding extends KafkaStreamsProcessor {
-
-    @Input("inputX")
-    KTable<?, ?> inputTable();
-}
-
-----
-
-=== Multiple Output Bindings (aka Branching)
-
-Kafka Streams allow outbound data to be split into multiple topics based on some predicates. The Kafka Streams binder provides
-support for this feature without compromising the programming model exposed through `StreamListener` in the end user application.
-
-You can write the application in the usual way as demonstrated above in the word count example. However, when using the
-branching feature, you are required to do a few things. First, you need to make sure that your return type is `KStream[]`
-instead of a regular `KStream`. Second, you need to use the `SendTo` annotation containing the output bindings in the order
-(see example below). For each of these output bindings, you need to configure destination, content-type etc., complying with
-the standard Spring Cloud Stream expectations.
-
-Here is an example:
-
-[source]
-----
-@EnableBinding(KStreamProcessorWithBranches.class)
-@EnableAutoConfiguration
-public static class WordCountProcessorApplication {
-
-    @Autowired
-    private TimeWindows timeWindows;
-
-    @StreamListener("input")
-    @SendTo({"output1","output2","output3})
-    public KStream<?, WordCount>[] process(KStream<Object, String> input) {
-
-			Predicate<Object, WordCount> isEnglish = (k, v) -> v.word.equals("english");
-			Predicate<Object, WordCount> isFrench =  (k, v) -> v.word.equals("french");
-			Predicate<Object, WordCount> isSpanish = (k, v) -> v.word.equals("spanish");
-
-			return input
-					.flatMapValues(value -> Arrays.asList(value.toLowerCase().split("\\W+")))
-					.groupBy((key, value) -> value)
-					.windowedBy(timeWindows)
-					.count(Materialized.as("WordCounts-1"))
-					.toStream()
-					.map((key, value) -> new KeyValue<>(null, new WordCount(key.key(), value, new Date(key.window().start()), new Date(key.window().end()))))
-					.branch(isEnglish, isFrench, isSpanish);
-    }
-
-    interface KStreamProcessorWithBranches {
-
-    		@Input("input")
-    		KStream<?, ?> input();
-
-    		@Output("output1")
-    		KStream<?, ?> output1();
-
-    		@Output("output2")
-    		KStream<?, ?> output2();
-
-    		@Output("output3")
-    		KStream<?, ?> output3();
-    	}
-}
-----
-
-Properties:
-
-[source]
-----
-spring.cloud.stream.bindings.output1.contentType: application/json
-spring.cloud.stream.bindings.output2.contentType: application/json
-spring.cloud.stream.bindings.output3.contentType: application/json
-spring.cloud.stream.kafka.streams.binder.configuration.commit.interval.ms: 1000
-spring.cloud.stream.kafka.streams.binder.configuration:
-  default.key.serde: org.apache.kafka.common.serialization.Serdes$StringSerde
-  default.value.serde: org.apache.kafka.common.serialization.Serdes$StringSerde
-spring.cloud.stream.bindings.output1:
-  destination: foo
-  producer:
-    headerMode: raw
-spring.cloud.stream.bindings.output2:
-  destination: bar
-  producer:
-    headerMode: raw
-spring.cloud.stream.bindings.output3:
-  destination: fox
-  producer:
-    headerMode: raw
-spring.cloud.stream.bindings.input:
-  destination: words
-  consumer:
-    headerMode: raw
-----
-
-=== Record Value Conversion
-
-Kafka Streams binder can marshal producer/consumer values based on a content type and the converters provided out of the box in Spring Cloud Stream.
-
-It is typical for Kafka Streams applications to provide `Serde` classes.
-Therefore, it may be more natural to rely on the SerDe facilities provided by the Apache Kafka Streams library itself for data conversion on inbound and outbound
-rather than rely on the content-type conversions offered by the binder.
-On the other hand, you might be already familiar with the content-type conversion patterns provided by Spring Cloud Stream and
-would like to continue using that for inbound and outbound conversions.
-
-Both the options are supported in the Kafka Streams binder implementation. See below for more details.
-
-===== Outbound serialization
-
-If native encoding is disabled (which is the default), then the framework will convert the message using the contentType
-set by the user (otherwise, the default `application/json` will be applied). It will ignore any SerDe set on the outbound
-in this case for outbound serialization.
-
-Here is the property to set the contentType on the outbound.
-
-[source]
-----
-spring.cloud.stream.bindings.output.contentType: application/json
-----
-
-Here is the property to enable native encoding.
-
-[source]
-----
-spring.cloud.stream.bindings.output.nativeEncoding: true
-----
-
-If native encoding is enabled on the output binding (user has to enable it as above explicitly), then the framework will
-skip any form of automatic message conversion on the outbound. In that case, it will switch to the Serde set by the user.
-The `valueSerde` property set on the actual output binding will be used. Here is an example.
-
-[source]
-----
-spring.cloud.stream.kafka.streams.bindings.output.producer.valueSerde: org.apache.kafka.common.serialization.Serdes$StringSerde
-----
-If this property is not set, then it will use the "default" SerDe: `spring.cloud.stream.kafka.streams.binder.configuration.default.value.serde`.
-
-It is worth to mention that Kafka Streams binder does not serialize the keys on outbound - it simply relies on Kafka itself.
-Therefore, you either have to specify the `keySerde` property on the binding or it will default to the application-wide common
-`keySerde`.
-
-Binding level key serde:
-
-[source]
-----
-spring.cloud.stream.kafka.streams.bindings.output.producer.keySerde
-----
-
-Common Key serde:
-
-[source]
-----
-spring.cloud.stream.kafka.streams.binder.configuration.default.key.serde
-----
-
-If branching is used, then you need to use multiple output bindings. For example,
-
-[source]
-----
-interface KStreamProcessorWithBranches {
-
-    		@Input("input")
-    		KStream<?, ?> input();
-
-    		@Output("output1")
-    		KStream<?, ?> output1();
-
-    		@Output("output2")
-    		KStream<?, ?> output2();
-
-    		@Output("output3")
-    		KStream<?, ?> output3();
-    	}
-----
-
-If `nativeEncoding` is set, then you can set different SerDe's on individual output bindings as below.
-
-[source]
-----
-spring.cloud.stream.kafka.streams.bindings.output1.producer.valueSerde=IntegerSerde
-spring.cloud.stream.kafka.streams.bindings.output2.producer.valueSerde=StringSerde
-spring.cloud.stream.kafka.streams.bindings.output3.producer.valueSerde=JsonSerde
-----
-
-Then if you have `SendTo` like this, @SendTo({"output1", "output2", "output3"}), the `KStream[]` from the branches are
-applied with proper SerDe objects as defined above. If you are not enabling `nativeEncoding`, you can then set different
-contentType values on the output bindings as below. In that case, the framework will use the appropriate message converter
-to convert the messages before sending to Kafka.
-
-[source]
-----
-spring.cloud.stream.bindings.output1.contentType: application/json
-spring.cloud.stream.bindings.output2.contentType: application/java-serialzied-object
-spring.cloud.stream.bindings.output3.contentType: application/octet-stream
-----
-
-===== Inbound Deserialization
-
-Similar rules apply to data deserialization on the inbound.
-
-If native decoding is disabled (which is the default), then the framework will convert the message using the contentType
-set by the user (otherwise, the default `application/json` will be applied). It will ignore any SerDe set on the inbound
-in this case for inbound deserialization.
-
-Here is the property to set the contentType on the inbound.
-
-[source]
-----
-spring.cloud.stream.bindings.input.contentType: application/json
-----
-
-Here is the property to enable native decoding.
-
-[source]
-----
-spring.cloud.stream.bindings.input.nativeDecoding: true
-----
-
-If native decoding is enabled on the input binding (user has to enable it as above explicitly), then the framework will
-skip doing any message conversion on the inbound. In that case, it will switch to the SerDe set by the user. The `valueSerde`
-property set on the actual output binding will be used. Here is an example.
-
-[source]
-----
-spring.cloud.stream.kafka.streams.bindings.input.consumer.valueSerde: org.apache.kafka.common.serialization.Serdes$StringSerde
-----
-
-If this property is not set, it will use the default SerDe: `spring.cloud.stream.kafka.streams.binder.configuration.default.value.serde`.
-
-It is worth to mention that Kafka Streams binder does not deserialize the keys on inbound - it simply relies on Kafka itself.
-Therefore, you either have to specify the `keySerde` property on the binding or it will default to the application-wide common
-`keySerde`.
-
-Binding level key serde:
-
-[source]
-----
-spring.cloud.stream.kafka.streams.bindings.input.consumer.keySerde
-----
-
-Common Key serde:
-
-[source]
-----
-spring.cloud.stream.kafka.streams.binder.configuration.default.key.serde
-----
-
-As in the case of KStream branching on the outbound, the benefit of setting value SerDe per binding is that if you have
-multiple input bindings (multiple KStreams object) and they all require separate value SerDe's, then you can configure
-them individually. If you use the common configuration approach, then this feature won't be applicable.
-
-=== Error Handling
-
-Apache Kafka Streams provide the capability for natively handling exceptions from deserialization errors.
-For details on this support, please see https://cwiki.apache.org/confluence/display/KAFKA/KIP-161%3A+streams+deserialization+exception+handlers[this]
-Out of the box, Apache Kafka Streams provide two kinds of deserialization exception handlers - `logAndContinue` and `logAndFail`.
-As the name indicates, the former will log the error and continue processing the next records and the latter will log the
-error and fail. `LogAndFail` is the default deserialization exception handler.
-
-=== Handling Deserialization Exceptions
-
-Kafka Streams binder supports a selection of exception handlers through the following properties.
-
-[source]
-----
-spring.cloud.stream.kafka.streams.binder.serdeError: logAndContinue
-----
-
-In addition to the above two deserialization exception handlers, the binder also provides a third one for sending the erroneous
-records (poison pills) to a DLQ topic. Here is how you enable this DLQ exception handler.
-
-[source]
-----
-spring.cloud.stream.kafka.streams.binder.serdeError: sendToDlq
-----
-When the above property is set, all the deserialization error records are automatically sent to the DLQ topic.
-
-[source]
-----
-spring.cloud.stream.kafka.streams.bindings.input.consumer.dlqName: foo-dlq
-----
-
-If this is set, then the error records are sent to the topic `foo-dlq`. If this is not set, then it will create a DLQ
-topic with the name `error.<input-topic-name>.<group-name>`.
-
-A couple of things to keep in mind when using the exception handling feature in Kafka Streams binder.
-
-* The property `spring.cloud.stream.kafka.streams.binder.serdeError` is applicable for the entire application. This implies
-that if there are multiple `StreamListener` methods in the same application, this property is applied to all of them.
-* The exception handling for deserialization works consistently with native deserialization and framework provided message
-conversion.
-
-==== Handling Non-Deserialization Exceptions
-
-For general error handling in Kafka Streams binder, it is up to the end user applications to handle application level errors.
-As a side effect of providing a DLQ for deserialization exception handlers, Kafka Streams binder provides a way to get
-access to the DLQ sending bean directly from your application.
-Once you get access to that bean, you can programmatically send any exception records from your application to the DLQ.
-
-It continues to remain hard to robust error handling using the high-level DSL; Kafka Streams doesn't natively support error
-handling yet.
-
-However, when you use the low-level Processor API in your application, there are options to control this behavior. See
-below.
-
-[source]
-----
-@Autowired
-private SendToDlqAndContinue dlqHandler;
-
-@StreamListener("input")
-@SendTo("output")
-public KStream<?, WordCount> process(KStream<Object, String> input) {
-
-    input.process(() -> new Processor() {
-    			ProcessorContext context;
-
-    			@Override
-    			public void init(ProcessorContext context) {
-    				this.context = context;
-    			}
-
-    			@Override
-    			public void process(Object o, Object o2) {
-
-    			    try {
-    			        .....
-    			        .....
-    			    }
-    			    catch(Exception e) {
-    			        //explicitly provide the kafka topic corresponding to the input binding as the first argument.
-                        //DLQ handler will correctly map to the dlq topic from the actual incoming destination.
-                        dlqHandler.sendToDlq("topic-name", (byte[]) o1, (byte[]) o2, context.partition());
-    			    }
-    			}
-
-    			.....
-    			.....
-    });
-}
-----
-
-=== State Store
-
-State store is created automatically by Kafka Streams when the DSL is used.
-When processor API is used, you need to register a state store manually. In order to do so, you can use `KafkaStreamsStateStore` annotation.
-You can specify the name and type of the store, flags to control log and disabling cache, etc.
-Once the store is created by the binder during the bootstrapping phase, you can access this state store through the processor API.
-Below are some primitives for doing this.
-
-Creating a state store:
-[source]
-----
-@KafkaStreamsStateStore(name="mystate", type= KafkaStreamsStateStoreProperties.StoreType.WINDOW, lengthMs=300000)
-public void process(KStream<Object, Product> input) {
-    ...
-}
-----
-
-Accessing the state store:
-[source]
-----
-Processor<Object, Product>() {
-
-    WindowStore<Object, String> state;
-
-    @Override
-    public void init(ProcessorContext processorContext) {
-        state = (WindowStore)processorContext.getStateStore("mystate");
-    }
-    ...
-}
-----
-
-=== Interactive Queries
-
-As part of the public Kafka Streams binder API, we expose a class called `InteractiveQueryService`.
-You can access this as a Spring bean in your application. An easy way to get access to this bean from your application is to "autowire" the bean.
-
-[source]
-----
-@Autowired
-private InteractiveQueryService interactiveQueryService;
-----
-
-Once you gain access to this bean, then you can query for the particular state-store that you are interested. See below.
-
-[source]
-----
-ReadOnlyKeyValueStore<Object, Object> keyValueStore =
-						interactiveQueryService.getQueryableStoreType("my-store", QueryableStoreTypes.keyValueStore());
-----
-
-If there are multiple instances of the kafka streams application running, then before you can query them interactively, you need to identify which application instance hosts the key.
-`InteractiveQueryService` API provides methods for identifying the host information.
-
-In order for this to work, you must configure the property `application.server` as below:
-
-[source]
-----
-spring.cloud.stream.kafka.streams.binder.configuration.application.server: <server>:<port>
-----
-
-Here are some code snippets:
-
-[source]
-----
-org.apache.kafka.streams.state.HostInfo hostInfo = interactiveQueryService.getHostInfo("store-name",
-						key, keySerializer);
-
-if (interactiveQueryService.getCurrentHostInfo().equals(hostInfo)) {
-
-    //query from the store that is locally available
-}
-else {
-    //query from the remote host
-}
-----
-
-=== Accessing the underlying KafkaStreams object
-
-`StreamBuilderFactoryBean` from spring-kafka that is responsible for constructing the `KafkaStreams` object can be accessed programmatically.
-Each `StreamBuilderFactoryBean` is registered as `stream-builder` and appended with the `StreamListener` method name.
-If your `StreamListener` method is named as `process` for example, the stream builder bean is named as `stream-builder-process`.
-Since this is a factory bean, it should be accessed by prepending an ampersand (`&`) when accessing it programmatically.
-Following is an example and it assumes the `StreamListener` method is named as `process`
-
-[source]
-----
-StreamsBuilderFactoryBean streamsBuilderFactoryBean = context.getBean("&stream-builder-process", StreamsBuilderFactoryBean.class);
-			KafkaStreams kafkaStreams = streamsBuilderFactoryBean.getKafkaStreams();
-----
-
-=== State Cleanup
-
-By default, the `Kafkastreams.cleanup()` method is called when the binding is stopped.
-See https://docs.spring.io/spring-kafka/reference/html/_reference.html#_configuration[the Spring Kafka documentation].
-To modify this behavior simply add a single `CleanupConfig` `@Bean` (configured to clean up on start, stop, or neither) to the application context; the bean will be detected and wired into the factory bean.
-
-=== Health Indicator
-
-The health indicator requires the dependency `spring-boot-starter-actuator`. For maven use:
-[source,xml]
-----
-<dependency>
-  <groupId>org.springframework.boot</groupId>
-  <artifactId>spring-boot-starter-actuator</artifactId>
-</dependency>
-----
-
-Spring Cloud Stream Binder Kafka Streams provides a health indicator to check the state of the underlying Kafka threads.
-Spring Cloud Stream defines a property `management.health.binders.enabled` to enable the health indicator. See the
-https://docs.spring.io/spring-cloud-stream/docs/current/reference/htmlsingle/#_health_indicator[Spring Cloud Stream documentation].
-
-The health indicator provides the following details for each Kafka threads:
-
-* Thread name
-* Thread state:  `CREATED`, `RUNNING`, `PARTITIONS_REVOKED`, `PARTITIONS_ASSIGNED`, `PENDING_SHUTDOWN` or `DEAD`
-* Active tasks: task ID and partitions
-* Standby tasks: task ID and partitions
-
-By default, only the global status is visible (`UP` or `DOWN`). To show the details, the property `management.endpoint.health.show-details` must be set to `ALWAYS` or `WHEN_AUTHORIZED`.
-For more details about the health information, see the
-https://docs.spring.io/spring-boot/docs/current/reference/html/production-ready-endpoints.html#production-ready-health[Spring Boot Actuator documentation].
-
-NOTE: The status of the health indicator is `UP` if all the Kafka threads registered are in the `RUNNING` state.

docs/src/main/asciidoc/overview.adoc

@@ -1,595 +0,0 @@
-[partintro]
---
-This guide describes the Apache Kafka implementation of the Spring Cloud Stream Binder.
-It contains information about its design, usage, and configuration options, as well as information on how the Stream Cloud Stream concepts map onto Apache Kafka specific constructs.
-In addition, this guide explains the Kafka Streams binding capabilities of Spring Cloud Stream.
---
-
-== Apache Kafka Binder
-
-=== Usage
-
-To use Apache Kafka binder, you need to add `spring-cloud-stream-binder-kafka` as a dependency to your Spring Cloud Stream application, as shown in the following example for Maven:
-
-[source,xml]
-----
-<dependency>
-  <groupId>org.springframework.cloud</groupId>
-  <artifactId>spring-cloud-stream-binder-kafka</artifactId>
-</dependency>
-----
-
-Alternatively, you can also use the Spring Cloud Stream Kafka Starter, as shown inn the following example for Maven:
-
-[source,xml]
-----
-<dependency>
-  <groupId>org.springframework.cloud</groupId>
-  <artifactId>spring-cloud-starter-stream-kafka</artifactId>
-</dependency>
-----
-
-=== Overview
-
-The following image shows a simplified diagram of how the Apache Kafka binder operates:
-
-.Kafka Binder
-image::{github-raw}/docs/src/main/asciidoc/images/kafka-binder.png[width=300,scaledwidth="50%"]
-
-The Apache Kafka Binder implementation maps each destination to an Apache Kafka topic.
-The consumer group maps directly to the same Apache Kafka concept.
-Partitioning also maps directly to Apache Kafka partitions as well.
-
-The binder currently uses the Apache Kafka `kafka-clients` 1.0.0 jar and is designed to be used with a broker of at least that version.
-This client can communicate with older brokers (see the Kafka documentation), but certain features may not be available.
-For example, with versions earlier than 0.11.x.x, native headers are not supported.
-Also, 0.11.x.x does not support the `autoAddPartitions` property.
-
-=== Configuration Options
-
-This section contains the configuration options used by the Apache Kafka binder.
-
-For common configuration options and properties pertaining to binder, see the <<binding-properties,core documentation>>.
-
-==== Kafka Binder Properties
-
-spring.cloud.stream.kafka.binder.brokers::
-A list of brokers to which the Kafka binder connects.
-+
-Default: `localhost`.
-spring.cloud.stream.kafka.binder.defaultBrokerPort::
-`brokers` allows hosts specified with or without port information (for example, `host1,host2:port2`).
-This sets the default port when no port is configured in the broker list.
-+
-Default: `9092`.
-spring.cloud.stream.kafka.binder.configuration::
-Key/Value map of client properties (both producers and consumer) passed to all clients created by the binder.
-Due to the fact that these properties are used by both producers and consumers, usage should be restricted to common properties -- for example, security settings.
-Unknown Kafka producer or consumer properties provided through this configuration are filtered out and not allowed to propagate.
-Properties here supersede any properties set in boot.
-+
-Default: Empty map.
-spring.cloud.stream.kafka.binder.consumerProperties::
-Key/Value map of arbitrary Kafka client consumer properties.
-In addition to support known Kafka consumer properties, unknown consumer properties are allowed here as well.
-Properties here supersede any properties set in boot and in the `configuration` property above.
-+
-Default: Empty map.
-spring.cloud.stream.kafka.binder.headers::
-The list of custom headers that are transported by the binder.
-Only required when communicating with older applications (<= 1.3.x) with a `kafka-clients` version < 0.11.0.0. Newer versions support headers natively.
-+
-Default: empty.
-spring.cloud.stream.kafka.binder.healthTimeout::
-The time to wait to get partition information, in seconds.
-Health reports as down if this timer expires.
-+
-Default: 10.
-spring.cloud.stream.kafka.binder.requiredAcks::
-The number of required acks on the broker.
-See the Kafka documentation for the producer `acks` property.
-+
-Default: `1`.
-spring.cloud.stream.kafka.binder.minPartitionCount::
-Effective only if `autoCreateTopics` or `autoAddPartitions` is set.
-The global minimum number of partitions that the binder configures on topics on which it produces or consumes data.
-It can be superseded by the `partitionCount` setting of the producer or by the value of `instanceCount * concurrency` settings of the producer (if either is larger).
-+
-Default: `1`.
-spring.cloud.stream.kafka.binder.producerProperties::
-Key/Value map of arbitrary Kafka client producer properties.
-In addition to support known Kafka producer properties, unknown producer properties are allowed here as well.
-Properties here supersede any properties set in boot and in the `configuration` property above.
-+
-Default: Empty map.
-spring.cloud.stream.kafka.binder.replicationFactor::
-The replication factor of auto-created topics if `autoCreateTopics` is active.
-Can be overridden on each binding.
-+
-Default: `1`.
-spring.cloud.stream.kafka.binder.autoCreateTopics::
-If set to `true`, the binder creates new topics automatically.
-If set to `false`, the binder relies on the topics being already configured.
-In the latter case, if the topics do not exist, the binder fails to start.
-+
-NOTE: This setting is independent of the `auto.create.topics.enable` setting of the broker and does not influence it.
-If the server is set to auto-create topics, they may be created as part of the metadata retrieval request, with default broker settings.
-+
-Default: `true`.
-spring.cloud.stream.kafka.binder.autoAddPartitions::
-If set to `true`, the binder creates new partitions if required.
-If set to `false`, the binder relies on the partition size of the topic being already configured.
-If the partition count of the target topic is smaller than the expected value, the binder fails to start.
-+
-Default: `false`.
-spring.cloud.stream.kafka.binder.transaction.transactionIdPrefix::
-Enables transactions in the binder. See `transaction.id` in the Kafka documentation and https://docs.spring.io/spring-kafka/reference/html/_reference.html#transactions[Transactions] in the `spring-kafka` documentation.
-When transactions are enabled, individual `producer` properties are ignored and all producers use the `spring.cloud.stream.kafka.binder.transaction.producer.*` properties.
-+
-Default `null` (no transactions)
-spring.cloud.stream.kafka.binder.transaction.producer.*::
-Global producer properties for producers in a transactional binder.
-See `spring.cloud.stream.kafka.binder.transaction.transactionIdPrefix` and <<kafka-producer-properties>> and the general producer properties supported by all binders.
-+
-Default: See individual producer properties.
-
-spring.cloud.stream.kafka.binder.headerMapperBeanName::
-The bean name of a `KafkaHeaderMapper` used for mapping `spring-messaging` headers to and from Kafka headers.
-Use this, for example, if you wish to customize the trusted packages in a `DefaultKafkaHeaderMapper` that uses JSON deserialization for the headers.
-+
-Default: none.
-
-[[kafka-consumer-properties]]
-==== Kafka Consumer Properties
-
-NOTE: To avoid repetition, Spring Cloud Stream supports setting values for all channels, in the format of `spring.cloud.stream.default.<property>=<value>`.
-
-
-The following properties are available for Kafka consumers only and
-must be prefixed with `spring.cloud.stream.kafka.bindings.<channelName>.consumer.`.
-
-admin.configuration::
-Since version 2.1.1, this property is deprecated in favor of `topic.properties`, and support for it will be removed in a future version.
-
-admin.replicas-assignment::
-Since version 2.1.1, this property is deprecated in favor of `topic.replicas-assignment`, and support for it will be removed in a future version.
-
-admin.replication-factor::
-Since version 2.1.1, this property is deprecated in favor of `topic.replication-factor`, and support for it will be removed in a future version.
-
-autoRebalanceEnabled::
-When `true`, topic partitions is automatically rebalanced between the members of a consumer group.
-When `false`, each consumer is assigned a fixed set of partitions based on `spring.cloud.stream.instanceCount` and `spring.cloud.stream.instanceIndex`.
-This requires both the `spring.cloud.stream.instanceCount` and `spring.cloud.stream.instanceIndex` properties to be set appropriately on each launched instance.
-The value of the `spring.cloud.stream.instanceCount` property must typically be greater than 1 in this case.
-+
-Default: `true`.
-ackEachRecord::
-When `autoCommitOffset` is `true`, this setting dictates whether to commit the offset after each record is processed.
-By default, offsets are committed after all records in the batch of records returned by `consumer.poll()` have been processed.
-The number of records returned by a poll can be controlled with the `max.poll.records` Kafka property, which is set through the consumer `configuration` property.
-Setting this to `true` may cause a degradation in performance, but doing so reduces the likelihood of redelivered records when a failure occurs.
-Also, see the binder `requiredAcks` property, which also affects the performance of committing offsets.
-+
-Default: `false`.
-autoCommitOffset::
-Whether to autocommit offsets when a message has been processed.
-If set to `false`, a header with the key `kafka_acknowledgment` of the type `org.springframework.kafka.support.Acknowledgment` header is present in the inbound message.
-Applications may use this header for acknowledging messages.
-See the examples section for details.
-When this property is set to `false`, Kafka binder sets the ack mode to `org.springframework.kafka.listener.AbstractMessageListenerContainer.AckMode.MANUAL` and the application is responsible for acknowledging records.
-Also see `ackEachRecord`.
-+
-Default: `true`.
-autoCommitOnError::
-Effective only if `autoCommitOffset` is set to `true`.
-If set to `false`, it suppresses auto-commits for messages that result in errors and commits only for successful messages. It allows a stream to automatically replay from the last successfully processed message, in case of persistent failures.
-If set to `true`, it always auto-commits (if auto-commit is enabled).
-If not set (the default), it effectively has the same value as `enableDlq`, auto-committing erroneous messages if they are sent to a DLQ and not committing them otherwise.
-+
-Default: not set.
-resetOffsets::
-Whether to reset offsets on the consumer to the value provided by startOffset.
-Must be false if a `KafkaRebalanceListener` is provided; see <<rebalance-listener>>.
-+
-Default: `false`.
-startOffset::
-The starting offset for new groups.
-Allowed values: `earliest` and `latest`.
-If the consumer group is set explicitly for the consumer 'binding' (through `spring.cloud.stream.bindings.<channelName>.group`), 'startOffset' is set to `earliest`. Otherwise, it is set to `latest` for the `anonymous` consumer group.
-Also see `resetOffsets` (earlier in this list).
-+
-Default: null (equivalent to `earliest`).
-enableDlq::
-When set to true, it enables DLQ behavior for the consumer.
-By default, messages that result in errors are forwarded to a topic named `error.<destination>.<group>`.
-The DLQ topic name can be configurable by setting the `dlqName` property.
-This provides an alternative option to the more common Kafka replay scenario for the case when the number of errors is relatively small and replaying the entire original topic may be too cumbersome.
-See <<kafka-dlq-processing>> processing for more information.
-Starting with version 2.0, messages sent to the DLQ topic are enhanced with the following headers: `x-original-topic`, `x-exception-message`, and `x-exception-stacktrace` as `byte[]`.
-**Not allowed when `destinationIsPattern` is `true`.**
-+
-Default: `false`.
-configuration::
-Map with a key/value pair containing generic Kafka consumer properties.
-In addition to having Kafka consumer properties, other configuration properties can be passed here.
-For example some properties needed by the application such as `spring.cloud.stream.kafka.bindings.input.consumer.configuration.foo=bar`.
-+
-Default: Empty map.
-dlqName::
-The name of the DLQ topic to receive the error messages.
-+
-Default: null (If not specified, messages that result in errors are forwarded to a topic named `error.<destination>.<group>`).
-dlqProducerProperties::
-Using this, DLQ-specific producer properties can be set.
-All the properties available through kafka producer properties can be set through this property.
-+
-Default: Default Kafka producer properties.
-standardHeaders::
-Indicates which standard headers are populated by the inbound channel adapter.
-Allowed values: `none`, `id`, `timestamp`, or `both`.
-Useful if using native deserialization and the first component to receive a message needs an `id` (such as an aggregator that is configured to use a JDBC message store).
-+
-Default: `none`
-converterBeanName::
-The name of a bean that implements `RecordMessageConverter`. Used in the inbound channel adapter to replace the default `MessagingMessageConverter`.
-+
-Default: `null`
-idleEventInterval::
-The interval, in milliseconds, between events indicating that no messages have recently been received.
-Use an `ApplicationListener<ListenerContainerIdleEvent>` to receive these events.
-See <<pause-resume>> for a usage example.
-+
-Default: `30000`
-destinationIsPattern::
-When true, the destination is treated as a regular expression `Pattern` used to match topic names by the broker.
-When true, topics are not provisioned, and `enableDlq` is not allowed, because the binder does not know the topic names during the provisioning phase.
-Note, the time taken to detect new topics that match the pattern is controlled by the consumer property `metadata.max.age.ms`, which (at the time of writing) defaults to 300,000ms (5 minutes).
-This can be configured using the `configuration` property above.
-+
-Default: `false`
-topic.properties::
-A `Map` of Kafka topic properties used when provisioning new topics -- for example, `spring.cloud.stream.kafka.bindings.input.consumer.topic.properties.message.format.version=0.9.0.0`
-+
-Default: none.
-topic.replicas-assignment::
-A Map<Integer, List<Integer>> of replica assignments, with the key being the partition and the value being the assignments.
-Used when provisioning new topics.
-See the `NewTopic` Javadocs in the `kafka-clients` jar.
-+
-Default: none.
-topic.replication-factor::
-The replication factor to use when provisioning topics. Overrides the binder-wide setting.
-Ignored if `replicas-assignments` is present.
-+
-Default: none (the binder-wide default of 1 is used).
-
-[[kafka-producer-properties]]
-==== Kafka Producer Properties
-
-NOTE: To avoid repetition, Spring Cloud Stream supports setting values for all channels, in the format of `spring.cloud.stream.default.<property>=<value>`.
-
-
-The following properties are available for Kafka producers only and
-must be prefixed with `spring.cloud.stream.kafka.bindings.<channelName>.producer.`.
-
-admin.configuration::
-Since version 2.1.1, this property is deprecated in favor of `topic.properties`, and support for it will be removed in a future version.
-
-admin.replicas-assignment::
-Since version 2.1.1, this property is deprecated in favor of `topic.replicas-assignment`, and support for it will be removed in a future version.
-
-admin.replication-factor::
-Since version 2.1.1, this property is deprecated in favor of `topic.replication-factor`, and support for it will be removed in a future version.
-
-bufferSize::
-Upper limit, in bytes, of how much data the Kafka producer attempts to batch before sending.
-+
-Default: `16384`.
-sync::
-Whether the producer is synchronous.
-+
-Default: `false`.
-batchTimeout::
-How long the producer waits to allow more messages to accumulate in the same batch before sending the messages.
-(Normally, the producer does not wait at all and simply sends all the messages that accumulated while the previous send was in progress.) A non-zero value may increase throughput at the expense of latency.
-+
-Default: `0`.
-messageKeyExpression::
-A SpEL expression evaluated against the outgoing message used to populate the key of the produced Kafka message -- for example, `headers['myKey']`.
-The payload cannot be used because, by the time this expression is evaluated, the payload is already in the form of a `byte[]`.
-+
-Default: `none`.
-headerPatterns::
-A comma-delimited list of simple patterns to match Spring messaging headers to be mapped to the Kafka `Headers` in the `ProducerRecord`.
-Patterns can begin or end with the wildcard character (asterisk).
-Patterns can be negated by prefixing with `!`.
-Matching stops after the first match (positive or negative).
-For example `!ask,as*` will pass `ash` but not `ask`.
-`id` and `timestamp` are never mapped.
-+
-Default: `*` (all headers - except the `id` and `timestamp`)
-configuration::
-Map with a key/value pair containing generic Kafka producer properties.
-+
-Default: Empty map.
-topic.properties::
-A `Map` of Kafka topic properties used when provisioning new topics -- for example, `spring.cloud.stream.kafka.bindings.output.producer.topic.properties.message.format.version=0.9.0.0`
-+
-topic.replicas-assignment::
-A Map<Integer, List<Integer>> of replica assignments, with the key being the partition and the value being the assignments.
-Used when provisioning new topics.
-See the `NewTopic` Javadocs in the `kafka-clients` jar.
-+
-Default: none.
-topic.replication-factor::
-The replication factor to use when provisioning topics. Overrides the binder-wide setting.
-Ignored if `replicas-assignments` is present.
-+
-Default: none (the binder-wide default of 1 is used).
-
-
-NOTE: The Kafka binder uses the `partitionCount` setting of the producer as a hint to create a topic with the given partition count (in conjunction with the `minPartitionCount`, the maximum of the two being the value being used).
-Exercise caution when configuring both `minPartitionCount` for a binder and `partitionCount` for an application, as the larger value is used.
-If a topic already exists with a smaller partition count and `autoAddPartitions` is disabled (the default), the binder fails to start.
-If a topic already exists with a smaller partition count and `autoAddPartitions` is enabled, new partitions are added.
-If a topic already exists with a larger number of partitions than the maximum of (`minPartitionCount` or `partitionCount`), the existing partition count is used.
-
-compression::
-Set the `compression.type` producer property.
-Supported values are `none`, `gzip`, `snappy` and `lz4`.
-If you override the `kafka-clients` jar to 2.1.0 (or later), as discussed in the https://docs.spring.io/spring-kafka/docs/2.2.x/reference/html/deps-for-21x.html[Spring for Apache Kafka documentation], and wish to use `zstd` compression, use `spring.cloud.stream.kafka.bindings.<binding-name>.producer.configuration.compression.type=zstd`.
-+
-Default: `none`.
-
-==== Usage examples
-
-In this section, we show the use of the preceding properties for specific scenarios.
-
-===== Example: Setting `autoCommitOffset` to `false` and Relying on Manual Acking
-
-This example illustrates how one may manually acknowledge offsets in a consumer application.
-
-This example requires that `spring.cloud.stream.kafka.bindings.input.consumer.autoCommitOffset` be set to `false`.
-Use the corresponding input channel name for your example.
-
-[source]
-----
-@SpringBootApplication
-@EnableBinding(Sink.class)
-public class ManuallyAcknowdledgingConsumer {
-
- public static void main(String[] args) {
-     SpringApplication.run(ManuallyAcknowdledgingConsumer.class, args);
- }
-
- @StreamListener(Sink.INPUT)
- public void process(Message<?> message) {
-     Acknowledgment acknowledgment = message.getHeaders().get(KafkaHeaders.ACKNOWLEDGMENT, Acknowledgment.class);
-     if (acknowledgment != null) {
-         System.out.println("Acknowledgment provided");
-         acknowledgment.acknowledge();
-     }
- }
-}
-----
-
-===== Example: Security Configuration
-
-Apache Kafka 0.9 supports secure connections between client and brokers.
-To take advantage of this feature, follow the guidelines in the https://kafka.apache.org/090/documentation.html#security_configclients[Apache Kafka Documentation] as well as the Kafka 0.9 https://docs.confluent.io/2.0.0/kafka/security.html[security guidelines from the Confluent documentation].
-Use the `spring.cloud.stream.kafka.binder.configuration` option to set security properties for all clients created by the binder.
-
-For example, to set `security.protocol` to `SASL_SSL`, set the following property:
-
-[source]
-----
-spring.cloud.stream.kafka.binder.configuration.security.protocol=SASL_SSL
-----
-
-All the other security properties can be set in a similar manner.
-
-When using Kerberos, follow the instructions in the https://kafka.apache.org/090/documentation.html#security_sasl_clientconfig[reference documentation] for creating and referencing the JAAS configuration.
-
-Spring Cloud Stream supports passing JAAS configuration information to the application by using a JAAS configuration file and using Spring Boot properties.
-
-====== Using JAAS Configuration Files
-
-The JAAS and (optionally) krb5 file locations can be set for Spring Cloud Stream applications by using system properties.
-The following example shows how to launch a Spring Cloud Stream application with SASL and Kerberos by using a JAAS configuration file:
-
-[source,bash]
-----
- java -Djava.security.auth.login.config=/path.to/kafka_client_jaas.conf -jar log.jar \
-   --spring.cloud.stream.kafka.binder.brokers=secure.server:9092 \
-   --spring.cloud.stream.bindings.input.destination=stream.ticktock \
-   --spring.cloud.stream.kafka.binder.configuration.security.protocol=SASL_PLAINTEXT
-----
-
-====== Using Spring Boot Properties
-
-As an alternative to having a JAAS configuration file, Spring Cloud Stream provides a mechanism for setting up the JAAS configuration for Spring Cloud Stream applications by using Spring Boot properties.
-
-The following properties can be used to configure the login context of the Kafka client:
-
-spring.cloud.stream.kafka.binder.jaas.loginModule::
-The login module name. Not necessary to be set in normal cases.
-+
-Default: `com.sun.security.auth.module.Krb5LoginModule`.
-spring.cloud.stream.kafka.binder.jaas.controlFlag::
-The control flag of the login module.
-+
-Default: `required`.
-spring.cloud.stream.kafka.binder.jaas.options::
-Map with a key/value pair containing the login module options.
-+
-Default: Empty map.
-
-The following example shows how to launch a Spring Cloud Stream application with SASL and Kerberos by using Spring Boot configuration properties:
-
-[source,bash]
-----
- java --spring.cloud.stream.kafka.binder.brokers=secure.server:9092 \
-   --spring.cloud.stream.bindings.input.destination=stream.ticktock \
-   --spring.cloud.stream.kafka.binder.autoCreateTopics=false \
-   --spring.cloud.stream.kafka.binder.configuration.security.protocol=SASL_PLAINTEXT \
-   --spring.cloud.stream.kafka.binder.jaas.options.useKeyTab=true \
-   --spring.cloud.stream.kafka.binder.jaas.options.storeKey=true \
-   --spring.cloud.stream.kafka.binder.jaas.options.keyTab=/etc/security/keytabs/kafka_client.keytab \
-   --spring.cloud.stream.kafka.binder.jaas.options.principal=kafka-client-1@EXAMPLE.COM
-----
-
-The preceding example represents the equivalent of the following JAAS file:
-
-[source]
-----
-KafkaClient {
-    com.sun.security.auth.module.Krb5LoginModule required
-    useKeyTab=true
-    storeKey=true
-    keyTab="/etc/security/keytabs/kafka_client.keytab"
-    principal="kafka-client-1@EXAMPLE.COM";
-};
-----
-
-If the topics required already exist on the broker or will be created by an administrator, autocreation can be turned off and only client JAAS properties need to be sent.
-
-NOTE: Do not mix JAAS configuration files and Spring Boot properties in the same application.
-If the `-Djava.security.auth.login.config` system property is already present, Spring Cloud Stream ignores the Spring Boot properties.
-
-NOTE: Be careful when using the `autoCreateTopics` and `autoAddPartitions` with Kerberos.
-Usually, applications may use principals that do not have administrative rights in Kafka and Zookeeper.
-Consequently, relying on Spring Cloud Stream to create/modify topics may fail.
-In secure environments, we strongly recommend creating topics and managing ACLs administratively by using Kafka tooling.
-
-[[pause-resume]]
-===== Example: Pausing and Resuming the Consumer
-
-If you wish to suspend consumption but not cause a partition rebalance, you can pause and resume the consumer.
-This is facilitated by adding the `Consumer` as a parameter to your `@StreamListener`.
-To resume, you need an `ApplicationListener` for `ListenerContainerIdleEvent` instances.
-The frequency at which events are published is controlled by the `idleEventInterval` property.
-Since the consumer is not thread-safe, you must call these methods on the calling thread.
-
-The following simple application shows how to pause and resume:
-
-[source, java]
-----
-@SpringBootApplication
-@EnableBinding(Sink.class)
-public class Application {
-
-	public static void main(String[] args) {
-		SpringApplication.run(Application.class, args);
-	}
-
-	@StreamListener(Sink.INPUT)
-	public void in(String in, @Header(KafkaHeaders.CONSUMER) Consumer<?, ?> consumer) {
-		System.out.println(in);
-		consumer.pause(Collections.singleton(new TopicPartition("myTopic", 0)));
-	}
-
-	@Bean
-	public ApplicationListener<ListenerContainerIdleEvent> idleListener() {
-		return event -> {
-			System.out.println(event);
-			if (event.getConsumer().paused().size() > 0) {
-				event.getConsumer().resume(event.getConsumer().paused());
-			}
-		};
-	}
-
-}
-----
-
-[[kafka-error-channels]]
-=== Error Channels
-
-Starting with version 1.3, the binder unconditionally sends exceptions to an error channel for each consumer destination and can also be configured to send async producer send failures to an error channel.
-See <<spring-cloud-stream-overview-error-handling>> for more information.
-
-The payload of the `ErrorMessage` for a send failure is a `KafkaSendFailureException` with properties:
-
-* `failedMessage`: The Spring Messaging `Message<?>` that failed to be sent.
-* `record`: The raw `ProducerRecord` that was created from the `failedMessage`
-
-There is no automatic handling of producer exceptions (such as sending to a <<kafka-dlq-processing, Dead-Letter queue>>).
-You can consume these exceptions with your own Spring Integration flow.
-
-[[kafka-metrics]]
-=== Kafka Metrics
-
-Kafka binder module exposes the following metrics:
-
-`spring.cloud.stream.binder.kafka.offset`: This metric indicates how many messages have not been yet consumed from a given binder's topic by a given consumer group.
-The metrics provided are based on the Mircometer metrics library. The metric contains the consumer group information, topic and the actual lag in committed offset from the latest offset on the topic.
-This metric is particularly useful for providing auto-scaling feedback to a PaaS platform.
-
-[[kafka-tombstones]]
-=== Tombstone Records (null record values)
-
-When using compacted topics, a record with a `null` value (also called a tombstone record) represents the deletion of a key.
-To receive such messages in a `@StreamListener` method, the parameter must be marked as not required to receive a `null` value argument.
-
-====
-[source, java]
-----
-@StreamListener(Sink.INPUT)
-public void in(@Header(KafkaHeaders.RECEIVED_MESSAGE_KEY) byte[] key,
-               @Payload(required = false) Customer customer) {
-    // customer is null if a tombstone record
-    ...
-}
-----
-====
-
-[[rebalance-listener]]
-=== Using a KafkaRebalanceListener
-
-Applications may wish to seek topics/partitions to arbitrary offsets when the partitions are initially assigned, or perform other operations on the consumer.
-Starting with version 2.1, if you provide a single `KafkaRebalanceListener` bean in the application context, it will be wired into all Kafka consumer bindings.
-
-====
-[source, java]
-----
-public interface KafkaBindingRebalanceListener {
-
-	/**
-	 * Invoked by the container before any pending offsets are committed.
-	 * @param bindingName the name of the binding.
-	 * @param consumer the consumer.
-	 * @param partitions the partitions.
-	 */
-	default void onPartitionsRevokedBeforeCommit(String bindingName, Consumer<?, ?> consumer,
-			Collection<TopicPartition> partitions) {
-
-	}
-
-	/**
-	 * Invoked by the container after any pending offsets are committed.
-	 * @param bindingName the name of the binding.
-	 * @param consumer the consumer.
-	 * @param partitions the partitions.
-	 */
-	default void onPartitionsRevokedAfterCommit(String bindingName, Consumer<?, ?> consumer, Collection<TopicPartition> partitions) {
-
-	}
-
-	/**
-	 * Invoked when partitions are initially assigned or after a rebalance.
-	 * Applications might only want to perform seek operations on an initial assignment.
-	 * @param bindingName the name of the binding.
-	 * @param consumer the consumer.
-	 * @param partitions the partitions.
-	 * @param initial true if this is the initial assignment.
-	 */
-	default void onPartitionsAssigned(String bindingName, Consumer<?, ?> consumer, Collection<TopicPartition> partitions,
-			boolean initial) {
-
-	}
-
-}
-----
-====
-
-You cannot set the `resetOffsets` consumer property to `true` when you provide a rebalance listener.

docs/src/main/asciidoc/partitions.adoc

@@ -1,103 +0,0 @@
-=== Partitioning with the Kafka Binder
-
-Apache Kafka supports topic partitioning natively.
-
-Sometimes it is advantageous to send data to specific partitions -- for example, when you want to strictly order message processing (all messages for a particular customer should go to the same partition).
-
-The following example shows how to configure the producer and consumer side:
-
-[source, java]
-----
-@SpringBootApplication
-@EnableBinding(Source.class)
-public class KafkaPartitionProducerApplication {
-
-    private static final Random RANDOM = new Random(System.currentTimeMillis());
-
-    private static final String[] data = new String[] {
-            "foo1", "bar1", "qux1",
-            "foo2", "bar2", "qux2",
-            "foo3", "bar3", "qux3",
-            "foo4", "bar4", "qux4",
-            };
-
-    public static void main(String[] args) {
-        new SpringApplicationBuilder(KafkaPartitionProducerApplication.class)
-            .web(false)
-            .run(args);
-    }
-
-    @InboundChannelAdapter(channel = Source.OUTPUT, poller = @Poller(fixedRate = "5000"))
-    public Message<?> generate() {
-        String value = data[RANDOM.nextInt(data.length)];
-        System.out.println("Sending: " + value);
-        return MessageBuilder.withPayload(value)
-                .setHeader("partitionKey", value)
-                .build();
-    }
-
-}
-----
-
-.application.yml
-[source, yaml]
-----
-spring:
-  cloud:
-    stream:
-      bindings:
-        output:
-          destination: partitioned.topic
-          producer:
-            partition-key-expression: headers['partitionKey']
-            partition-count: 12
-----
-
-IMPORTANT: The topic must be provisioned to have enough partitions to achieve the desired concurrency for all consumer groups.
-The above configuration supports up to 12 consumer instances (6 if their `concurrency` is 2, 4 if their concurrency is 3, and so on).
-It is generally best to "`over-provision`" the partitions to allow for future increases in consumers or concurrency.
-
-NOTE: The preceding configuration uses the default partitioning (`key.hashCode() % partitionCount`).
-This may or may not provide a suitably balanced algorithm, depending on the key values.
-You can override this default by using the `partitionSelectorExpression` or `partitionSelectorClass` properties.
-
-Since partitions are natively handled by Kafka, no special configuration is needed on the consumer side.
-Kafka allocates partitions across the instances.
-
-The following Spring Boot application listens to a Kafka stream and prints (to the console) the partition ID to which each message goes:
-
-[source, java]
-----
-@SpringBootApplication
-@EnableBinding(Sink.class)
-public class KafkaPartitionConsumerApplication {
-
-    public static void main(String[] args) {
-        new SpringApplicationBuilder(KafkaPartitionConsumerApplication.class)
-            .web(false)
-            .run(args);
-    }
-
-    @StreamListener(Sink.INPUT)
-    public void listen(@Payload String in, @Header(KafkaHeaders.RECEIVED_PARTITION_ID) int partition) {
-        System.out.println(in + " received from partition " + partition);
-    }
-
-}
-----
-
-.application.yml
-[source, yaml]
-----
-spring:
-  cloud:
-    stream:
-      bindings:
-        input:
-          destination: partitioned.topic
-          group: myGroup
-----
-
-You can add instances as needed.
-Kafka rebalances the partition allocations.
-If the instance count (or `instance count * concurrency`) exceeds the number of partitions, some consumers are idle.

docs/src/main/asciidoc/spring-cloud-stream-binder-kafka-aggregate.adoc

@@ -1,3 +0,0 @@
-include::overview.adoc[leveloffset=+1]
-include::dlq.adoc[leveloffset=+1]
-include::partitions.adoc[leveloffset=+1]

docs/src/main/asciidoc/spring-cloud-stream-binder-kafka.adoc

@@ -1,55 +0,0 @@
-:github-tag: master
-:github-repo: spring-cloud/spring-cloud-stream-binder-kafka
-:github-raw: https://raw.githubusercontent.com/{github-repo}/{github-tag}
-:github-code: https://github.com/{github-repo}/tree/{github-tag}
-:toc: left
-:toclevels: 8
-:nofooter:
-:sectlinks: true
-
-
-[[spring-cloud-stream-binder-kafka-reference]]
-= Spring Cloud Stream Kafka Binder Reference Guide
-Sabby Anandan, Marius Bogoevici, Eric Bottard, Mark Fisher, Ilayaperumal Gopinathan, Gunnar Hillert, Mark Pollack, Patrick Peralta, Glenn Renfro, Thomas Risberg, Dave Syer, David Turanski, Janne Valkealahti, Benjamin Klein, Henryk Konsek, Gary Russell, Arnaud Jardiné, Soby Chacko
-:doctype: book
-:toc:
-:toclevels: 4
-:source-highlighter: prettify
-:numbered:
-:icons: font
-:hide-uri-scheme:
-:spring-cloud-stream-binder-kafka-repo: snapshot
-:github-tag: master
-:spring-cloud-stream-binder-kafka-docs-version: current
-:spring-cloud-stream-binder-kafka-docs: https://docs.spring.io/spring-cloud-stream-binder-kafka/docs/{spring-cloud-stream-binder-kafka-docs-version}/reference
-:spring-cloud-stream-binder-kafka-docs-current: https://docs.spring.io/spring-cloud-stream-binder-kafka/docs/current-SNAPSHOT/reference/html/
-:github-repo: spring-cloud/spring-cloud-stream-binder-kafka
-:github-raw: https://raw.github.com/{github-repo}/{github-tag}
-:github-code: https://github.com/{github-repo}/tree/{github-tag}
-:github-wiki: https://github.com/{github-repo}/wiki
-:github-master-code: https://github.com/{github-repo}/tree/master
-:sc-ext: java
-// ======================================================================================
-
-
-*{spring-cloud-stream-version}*
-
-[#index-link]
-{docs-url}spring-cloud-stream/{docs-version}home.html
-
-= Reference Guide
-include::overview.adoc[]
-
-include::dlq.adoc[]
-
-include::partitions.adoc[]
-
-include::kafka-streams.adoc[]
-
-= Appendices
-[appendix]
-include::building.adoc[]
-
-include::contributing.adoc[]
-
-// ======================================================================================

docs/src/main/ruby/generate_readme.sh

@@ -1,37 +0,0 @@
-#!/usr/bin/env ruby
-
-base_dir = File.join(File.dirname(__FILE__),'../../..')
-src_dir = File.join(base_dir, "/src/main/asciidoc")
-require 'asciidoctor'
-require 'optparse'
-
-options = {}
-file = "#{src_dir}/README.adoc"
-
-OptionParser.new do |o|
-  o.on('-o OUTPUT_FILE', 'Output file (default is stdout)') { |file| options[:to_file] = file unless file=='-' }
-  o.on('-h', '--help') { puts o; exit }
-  o.parse!
-end
-
-file = ARGV[0] if ARGV.length>0
-
-# Copied from https://github.com/asciidoctor/asciidoctor-extensions-lab/blob/master/scripts/asciidoc-coalescer.rb
-doc = Asciidoctor.load_file file, safe: :unsafe, header_only: true, attributes: options[:attributes]
-header_attr_names = (doc.instance_variable_get :@attributes_modified).to_a
-header_attr_names.each {|k| doc.attributes[%(#{k}!)] = '' unless doc.attr? k }
-attrs = doc.attributes
-attrs['allow-uri-read'] = true
-puts attrs
-
-out = "// Do not edit this file (e.g. go instead to src/main/asciidoc)\n\n"
-doc = Asciidoctor.load_file file, safe: :unsafe, parse: false, attributes: attrs
-out << doc.reader.read
-
-unless options[:to_file]
-  puts out
-else
-  File.open(options[:to_file],'w+') do |file|
-    file.write(out)
-  end
-end

mvnw

@@ -8,7 +8,7 @@
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
 #
-#    https://www.apache.org/licenses/LICENSE-2.0
+#    http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
@@ -54,16 +54,38 @@ case "`uname`" in
   CYGWIN*) cygwin=true ;;
   MINGW*) mingw=true;;
   Darwin*) darwin=true
-    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
-    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
-    if [ -z "$JAVA_HOME" ]; then
-      if [ -x "/usr/libexec/java_home" ]; then
-        export JAVA_HOME="`/usr/libexec/java_home`"
-      else
-        export JAVA_HOME="/Library/Java/Home"
-      fi
-    fi
-    ;;
+           #
+           # Look for the Apple JDKs first to preserve the existing behaviour, and then look
+           # for the new JDKs provided by Oracle.
+           #
+           if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then
+             #
+             # Apple JDKs
+             #
+             export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
+           fi
+
+           if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then
+             #
+             # Apple JDKs
+             #
+             export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
+           fi
+
+           if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then
+             #
+             # Oracle JDKs
+             #
+             export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
+           fi
+
+           if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then
+             #
+             # Apple JDKs
+             #
+             export JAVA_HOME=`/usr/libexec/java_home`
+           fi
+           ;;
 esac
 
 if [ -z "$JAVA_HOME" ] ; then
@@ -108,7 +130,7 @@ if $cygwin ; then
     CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
 fi
 
-# For Mingw, ensure paths are in UNIX format before anything is touched
+# For Migwn, ensure paths are in UNIX format before anything is touched
 if $mingw ; then
   [ -n "$M2_HOME" ] &&
     M2_HOME="`(cd "$M2_HOME"; pwd)`"
@@ -162,28 +184,27 @@ fi
 
 CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
 
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+fi
+
 # traverses directory structure from process work directory to filesystem root
 # first directory with .mvn subdirectory is considered project base directory
 find_maven_basedir() {
-
-  if [ -z "$1" ]
-  then
-    echo "Path not specified to find_maven_basedir"
-    return 1
-  fi
-
-  basedir="$1"
-  wdir="$1"
+  local basedir=$(pwd)
+  local wdir=$(pwd)
   while [ "$wdir" != '/' ] ; do
     if [ -d "$wdir"/.mvn ] ; then
       basedir=$wdir
       break
     fi
-    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
-    if [ -d "${wdir}" ]; then
-      wdir=`cd "$wdir/.."; pwd`
-    fi
-    # end of workaround
+    wdir=$(cd "$wdir/.."; pwd)
   done
   echo "${basedir}"
 }
@@ -195,92 +216,30 @@ concat_lines() {
   fi
 }
 
-BASE_DIR=`find_maven_basedir "$(pwd)"`
-if [ -z "$BASE_DIR" ]; then
-  exit 1;
-fi
-
-##########################################################################################
-# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-# This allows using the maven wrapper in projects that prohibit checking in binary data.
-##########################################################################################
-if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Found .mvn/wrapper/maven-wrapper.jar"
-    fi
-else
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
-    fi
-    jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
-    while IFS="=" read key value; do
-      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
-      esac
-    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Downloading from: $jarUrl"
-    fi
-    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
-
-    if command -v wget > /dev/null; then
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Found wget ... using wget"
-        fi
-        wget "$jarUrl" -O "$wrapperJarPath"
-    elif command -v curl > /dev/null; then
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Found curl ... using curl"
-        fi
-        curl -o "$wrapperJarPath" "$jarUrl"
-    else
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Falling back to using Java to download"
-        fi
-        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
-        if [ -e "$javaClass" ]; then
-            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
-                if [ "$MVNW_VERBOSE" = true ]; then
-                  echo " - Compiling MavenWrapperDownloader.java ..."
-                fi
-                # Compiling the Java class
-                ("$JAVA_HOME/bin/javac" "$javaClass")
-            fi
-            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
-                # Running the downloader
-                if [ "$MVNW_VERBOSE" = true ]; then
-                  echo " - Running MavenWrapperDownloader.java ..."
-                fi
-                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
-            fi
-        fi
-    fi
-fi
-##########################################################################################
-# End of extension
-##########################################################################################
-
-export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
-if [ "$MVNW_VERBOSE" = true ]; then
-  echo $MAVEN_PROJECTBASEDIR
-fi
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
 MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --path --windows "$M2_HOME"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
-  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
-    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
-fi
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
 
 WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
+echo "Running version check"
+VERSION=$( sed '\!<parent!,\!</parent!d' `dirname $0`/pom.xml | grep '<version' | head -1 | sed -e 's/.*<version>//' -e 's!</version>.*$!!' )
+echo "The found version is [${VERSION}]"
+
+if echo $VERSION | egrep -q 'M|RC'; then
+    echo Activating \"milestone\" profile for version=\"$VERSION\"
+    echo $MAVEN_ARGS | grep -q milestone || MAVEN_ARGS="$MAVEN_ARGS -Pmilestone"
+else
+    echo Deactivating \"milestone\" profile for version=\"$VERSION\"
+    echo $MAVEN_ARGS | grep -q milestone && MAVEN_ARGS=$(echo $MAVEN_ARGS | sed -e 's/-Pmilestone//')
+fi
+
 exec "$JAVACMD" \
   $MAVEN_OPTS \
   -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
   "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
+  ${WRAPPER_LAUNCHER} ${MAVEN_ARGS} "$@"

mvnw.cmd

@@ -1,161 +1,145 @@
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements.  See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership.  The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License.  You may obtain a copy of the License at
-@REM
-@REM    https://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied.  See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
-
-@REM ----------------------------------------------------------------------------
-@REM Maven2 Start Up Batch script
-@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
-@REM
-@REM Optional ENV vars
-@REM M2_HOME - location of maven2's installed home dir
-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-@REM     e.g. to debug Maven itself, use
-@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-@REM ----------------------------------------------------------------------------
-
-@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
-@echo off
-@REM set title of command window
-title %0
-@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
-@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
-
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
-@REM Execute a user defined script before this one
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
-@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
-:skipRcPre
-
-@setlocal
-
-set ERROR_CODE=0
-
-@REM To isolate internal variables from possible post scripts, we use another setlocal
-@setlocal
-
-@REM ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo Error: JAVA_HOME not found in your environment. >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-:OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto init
-
-echo.
-echo Error: JAVA_HOME is set to an invalid directory. >&2
-echo JAVA_HOME = "%JAVA_HOME%" >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-@REM ==== END VALIDATION ====
-
-:init
-
-@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
-@REM Fallback to current working directory if not found.
-
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
-:findBaseDir
-IF EXIST "%WDIR%"\.mvn goto baseDirFound
-cd ..
-IF "%WDIR%"=="%CD%" goto baseDirNotFound
-set WDIR=%CD%
-goto findBaseDir
-
-:baseDirFound
-set MAVEN_PROJECTBASEDIR=%WDIR%
-cd "%EXEC_DIR%"
-goto endDetectBaseDir
-
-:baseDirNotFound
-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
-cd "%EXEC_DIR%"
-
-:endDetectBaseDir
-
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
-
-@setlocal EnableExtensions EnableDelayedExpansion
-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
-
-:endReadAdditionalConfig
-
-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
-set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
-FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
-	IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B 
-)
-
-@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
-if exist %WRAPPER_JAR% (
-    echo Found %WRAPPER_JAR%
-) else (
-    echo Couldn't find %WRAPPER_JAR%, downloading it ...
-	echo Downloading from: %DOWNLOAD_URL%
-    powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"
-    echo Finished downloading %WRAPPER_JAR%
-)
-@REM End of extension
-
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
-if ERRORLEVEL 1 goto error
-goto end
-
-:error
-set ERROR_CODE=1
-
-:end
-@endlocal & set ERROR_CODE=%ERROR_CODE%
-
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
-@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
-:skipRcPost
-
-@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%" == "on" pause
-
-if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
-
-exit /B %ERROR_CODE%
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+set MAVEN_CMD_LINE_ARGS=%*
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+
+set WRAPPER_JAR="".\.mvn\wrapper\maven-wrapper.jar""
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%

pom.xml

@@ -1,43 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>spring-cloud-stream-binder-kafka-parent</artifactId>
-	<version>2.2.0.RC1</version>
+	<artifactId>spring-cloud-stream-binder-kafka11-parent</artifactId>
+	<version>1.3.0.RELEASE</version>
 	<packaging>pom</packaging>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.1.4.RELEASE</version>
+		<version>1.3.5.RELEASE</version>
 		<relativePath />
 	</parent>
 	<properties>
-		<java.version>1.8</java.version>
-		<spring-kafka.version>2.2.2.RELEASE</spring-kafka.version>
-		<spring-integration-kafka.version>3.1.0.RELEASE</spring-integration-kafka.version>
-		<kafka.version>2.0.0</kafka.version>
-		<spring-cloud-stream.version>2.2.0.RC1</spring-cloud-stream.version>
-		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
-		<maven-checkstyle-plugin.failsOnViolation>true</maven-checkstyle-plugin.failsOnViolation>
-		<maven-checkstyle-plugin.includeTestSourceDirectory>true</maven-checkstyle-plugin.includeTestSourceDirectory>
+		<java.version>1.7</java.version>
+		<kafka.version>0.11.0.0</kafka.version>
+		<spring-kafka.version>1.3.0.RELEASE</spring-kafka.version>
+		<spring-integration-kafka.version>2.3.0.RELEASE</spring-integration-kafka.version>
+		<spring-cloud-stream.version>1.3.0.RELEASE</spring-cloud-stream.version>
+		<spring-cloud-build.version>1.3.5.RELEASE</spring-cloud-build.version>
 	</properties>
 	<modules>
-		<module>spring-cloud-stream-binder-kafka</module>
-		<module>spring-cloud-starter-stream-kafka</module>
-		<module>spring-cloud-stream-binder-kafka-core</module>
-		<module>spring-cloud-stream-binder-kafka-streams</module>
-		<module>docs</module>
+		<module>spring-cloud-stream-binder-kafka11</module>
+		<module>spring-cloud-starter-stream-kafka11</module>
+		<module>spring-cloud-stream-binder-kafka11-docs</module>
+		<module>spring-cloud-stream-binder-kafka-0.11-test</module>
+		<module>spring-cloud-stream-binder-kafka11-core</module>
+		<module>spring-cloud-stream-binder-kstream11</module>
     </modules>
 
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream-binder-kafka-core</artifactId>
+				<artifactId>spring-cloud-stream-binder-kafka11-core</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream-binder-kafka</artifactId>
+				<artifactId>spring-cloud-stream-binder-kafka11</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
@@ -45,56 +44,14 @@
 				<artifactId>spring-cloud-stream</artifactId>
 				<version>${spring-cloud-stream.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.apache.kafka</groupId>
-				<artifactId>kafka-clients</artifactId>
-				<version>${kafka.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.kafka</groupId>
-				<artifactId>kafka-clients</artifactId>
-				<version>${kafka.version}</version>
-				<classifier>test</classifier>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.kafka</groupId>
-				<artifactId>spring-kafka</artifactId>
-				<version>${spring-kafka.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.integration</groupId>
-				<artifactId>spring-integration-kafka</artifactId>
-				<version>${spring-integration-kafka.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream-binder-test</artifactId>
+				<artifactId>spring-cloud-stream-codec</artifactId>
 				<version>${spring-cloud-stream.version}</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.kafka</groupId>
-				<artifactId>spring-kafka-test</artifactId>
-				<scope>test</scope>
-				<version>${spring-kafka.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.kafka</groupId>
-				<artifactId>kafka-streams</artifactId>
-				<version>${kafka.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>org.slf4j</groupId>
-						<artifactId>slf4j-log4j12</artifactId>
-					</exclusion>
-				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.kafka</groupId>
 				<artifactId>kafka_2.11</artifactId>
-				<classifier>test</classifier>
-				<scope>test</scope>
 				<version>${kafka.version}</version>
 				<exclusions>
 					<exclusion>
@@ -111,12 +68,56 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.kafka</groupId>
+				<artifactId>kafka-clients</artifactId>
+				<version>${kafka.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.kafka</groupId>
+				<artifactId>spring-kafka</artifactId>
+				<version>${spring-kafka.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.integration</groupId>
+				<artifactId>spring-integration-kafka</artifactId>
+				<version>${spring-integration-kafka.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.apache.avro</groupId>
+						<artifactId>avro-compiler</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream-schema</artifactId>
+				<artifactId>spring-cloud-stream-binder-test</artifactId>
 				<version>${spring-cloud-stream.version}</version>
 				<scope>test</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.kafka</groupId>
+				<artifactId>spring-kafka-test</artifactId>
+				<scope>test</scope>
+				<version>${spring-kafka.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.kafka</groupId>
+				<artifactId>kafka_2.11</artifactId>
+				<classifier>test</classifier>
+				<version>${kafka.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.kafka</groupId>
+				<artifactId>kafka-streams</artifactId>
+				<version>${kafka.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.slf4j</groupId>
+						<artifactId>slf4j-log4j12</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
@@ -128,6 +129,18 @@
 					<artifactId>maven-antrun-plugin</artifactId>
 					<version>1.7</version>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-checkstyle-plugin</artifactId>
+					<version>2.17</version>
+					<dependencies>
+						<dependency>
+							<groupId>com.puppycrawl.tools</groupId>
+							<artifactId>checkstyle</artifactId>
+							<version>7.1</version>
+						</dependency>
+					</dependencies>
+				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
@@ -148,6 +161,29 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
+				<dependencies>
+					<dependency>
+						<groupId>org.springframework.cloud</groupId>
+						<artifactId>spring-cloud-build-tools</artifactId>
+						<version>${spring-cloud-build.version}</version>
+					</dependency>
+				</dependencies>
+				<executions>
+					<execution>
+						<id>checkstyle-validation</id>
+						<phase>validate</phase>
+						<configuration>
+							<configLocation>checkstyle.xml</configLocation>
+							<encoding>UTF-8</encoding>
+							<consoleOutput>true</consoleOutput>
+							<failsOnError>true</failsOnError>
+							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+						</configuration>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 	</build>
@@ -159,7 +195,7 @@
 				<repository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>https://repo.spring.io/libs-snapshot-local</url>
+					<url>http://repo.spring.io/libs-snapshot-local</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -170,7 +206,7 @@
 				<repository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
+					<url>http://repo.spring.io/libs-milestone-local</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -178,7 +214,7 @@
 				<repository>
 					<id>spring-releases</id>
 					<name>Spring Releases</name>
-					<url>https://repo.spring.io/release</url>
+					<url>http://repo.spring.io/release</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -188,7 +224,7 @@
 				<pluginRepository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>https://repo.spring.io/libs-snapshot-local</url>
+					<url>http://repo.spring.io/libs-snapshot-local</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -199,7 +235,7 @@
 				<pluginRepository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
+					<url>http://repo.spring.io/libs-milestone-local</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -207,7 +243,7 @@
 				<pluginRepository>
 					<id>spring-releases</id>
 					<name>Spring Releases</name>
-					<url>https://repo.spring.io/libs-release-local</url>
+					<url>http://repo.spring.io/libs-release-local</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -215,12 +251,4 @@
 			</pluginRepositories>
 		</profile>
 	</profiles>
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</reporting>
 </project>

spring-cloud-starter-stream-kafka11/pom.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-stream-binder-kafka-parent</artifactId>
-		<version>2.2.0.RC1</version>
+		<artifactId>spring-cloud-stream-binder-kafka11-parent</artifactId>
+		<version>1.3.0.RELEASE</version>
 	</parent>
-	<artifactId>spring-cloud-starter-stream-kafka</artifactId>
-	<description>Spring Cloud Starter Stream Kafka</description>
-	<url>https://projects.spring.io/spring-cloud</url>
+	<artifactId>spring-cloud-starter-stream-kafka11</artifactId>
+	<description>Spring Cloud Starter Stream Kafka for the 0.11.x.x client</description>
+	<url>http://projects.spring.io/spring-cloud</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
-		<url>https://www.spring.io</url>
+		<url>http://www.spring.io</url>
 	</organization>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>

spring-cloud-stream-binder-kafka-0.11-test/pom.xml

@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-stream-binder-kafka11-parent</artifactId>
+        <version>1.3.0.RELEASE</version>
+    </parent>
+    <artifactId>spring-cloud-stream-binder-kafka-0.11-test</artifactId>
+    <description>Spring Cloud Stream Kafka Binder 0.11 Tests</description>
+    <url>http://projects.spring.io/spring-cloud</url>
+    <organization>
+        <name>Pivotal Software, Inc.</name>
+        <url>http://www.spring.io</url>
+    </organization>
+    <properties>
+        <main.basedir>${basedir}/../..</main.basedir>
+        <kafka.version>0.11.0.0</kafka.version>
+        <spring-kafka.version>1.3.0.RELEASE</spring-kafka.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-stream-binder-kafka11-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-stream-binder-kafka11</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.kafka</groupId>
+            <artifactId>spring-kafka</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka_2.11</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka-clients</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.kafka</groupId>
+            <artifactId>spring-kafka-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.integration</groupId>
+            <artifactId>spring-integration-kafka</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-stream-binder-kafka11</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-stream-binder-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-stream-schema</artifactId>
+            <version>${spring-cloud-stream.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.confluent</groupId>
+            <artifactId>kafka-avro-serializer</artifactId>
+            <version>3.2.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.confluent</groupId>
+            <artifactId>kafka-schema-registry</artifactId>
+            <version>3.2.2</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <repositories>
+        <repository>
+            <id>confluent</id>
+            <url>http://packages.confluent.io/maven/</url>
+        </repository>
+    </repositories>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.0.2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

spring-cloud-stream-binder-kafka-0.11-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka10TestBinder.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2015-2018 the original author or authors.
+ * Copyright 2015-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,6 +17,8 @@
 package org.springframework.cloud.stream.binder.kafka;
 
 import org.springframework.cloud.stream.binder.ExtendedConsumerProperties;
+import org.springframework.cloud.stream.binder.kafka.admin.AdminUtilsOperation;
+import org.springframework.cloud.stream.binder.kafka.admin.Kafka10AdminUtilsOperation;
 import org.springframework.cloud.stream.binder.kafka.properties.KafkaBinderConfigurationProperties;
 import org.springframework.cloud.stream.binder.kafka.properties.KafkaConsumerProperties;
 import org.springframework.cloud.stream.binder.kafka.provisioning.KafkaTopicProvisioner;
@@ -29,44 +31,46 @@ import org.springframework.kafka.support.ProducerListener;
 
 /**
  * Test support class for {@link KafkaMessageChannelBinder}.
- *
  * @author Eric Bottard
  * @author Marius Bogoevici
  * @author David Turanski
  * @author Gary Russell
  * @author Soby Chacko
  */
-public class KafkaTestBinder extends AbstractKafkaTestBinder {
+public class Kafka10TestBinder extends AbstractKafkaTestBinder {
 
 	@SuppressWarnings({ "rawtypes", "unchecked" })
-	KafkaTestBinder(KafkaBinderConfigurationProperties binderConfiguration,
-			KafkaTopicProvisioner kafkaTopicProvisioner) {
+	public Kafka10TestBinder(KafkaBinderConfigurationProperties binderConfiguration) {
 		try {
-			KafkaMessageChannelBinder binder = new KafkaMessageChannelBinder(
-					binderConfiguration, kafkaTopicProvisioner) {
+			AdminUtilsOperation adminUtilsOperation = new Kafka10AdminUtilsOperation();
+			KafkaTopicProvisioner provisioningProvider =
+					new KafkaTopicProvisioner(binderConfiguration, adminUtilsOperation);
+			provisioningProvider.afterPropertiesSet();
+
+			KafkaMessageChannelBinder binder = new KafkaMessageChannelBinder(binderConfiguration,
+					provisioningProvider) {
 
 				/*
-				 * Some tests use multiple instance indexes for the same topic; we need to
-				 * make the error infrastructure beans unique.
+				 * Some tests use multiple instance indexes for the same topic; we need to make
+				 * the error infrastructure beans unique.
 				 */
 				@Override
-				protected String errorsBaseName(ConsumerDestination destination,
-						String group,
+				protected String errorsBaseName(ConsumerDestination destination, String group,
 						ExtendedConsumerProperties<KafkaConsumerProperties> consumerProperties) {
-					return super.errorsBaseName(destination, group, consumerProperties)
-							+ "-" + consumerProperties.getInstanceIndex();
+					return super.errorsBaseName(destination, group, consumerProperties) + "-"
+							+ consumerProperties.getInstanceIndex();
 				}
 
 			};
 
+			binder.setCodec(AbstractKafkaTestBinder.getCodec());
 			ProducerListener producerListener = new LoggingProducerListener();
 			binder.setProducerListener(producerListener);
-			AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
-					Config.class);
+			AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Config.class);
 			setApplicationContext(context);
 			binder.setApplicationContext(context);
 			binder.afterPropertiesSet();
-			this.setPollableConsumerBinder(binder);
+			this.setBinder(binder);
 		}
 		catch (Exception e) {
 			throw new RuntimeException(e);

spring-cloud-stream-binder-kafka-0.11-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka_0_11_BinderTests.java

@@ -0,0 +1,296 @@
+/*
+ * Copyright 2014-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.stream.binder.kafka;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.UUID;
+
+import io.confluent.kafka.schemaregistry.rest.SchemaRegistryConfig;
+import io.confluent.kafka.schemaregistry.rest.SchemaRegistryRestApplication;
+
+import kafka.utils.ZKStringSerializer$;
+import kafka.utils.ZkUtils;
+
+import org.I0Itec.zkclient.ZkClient;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.common.serialization.ByteArrayDeserializer;
+import org.apache.kafka.common.serialization.Deserializer;
+import org.assertj.core.api.Assertions;
+import org.eclipse.jetty.server.Server;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
+
+import org.springframework.cloud.stream.binder.Binder;
+import org.springframework.cloud.stream.binder.BinderHeaders;
+import org.springframework.cloud.stream.binder.Binding;
+import org.springframework.cloud.stream.binder.ExtendedConsumerProperties;
+import org.springframework.cloud.stream.binder.ExtendedProducerProperties;
+import org.springframework.cloud.stream.binder.Spy;
+import org.springframework.cloud.stream.binder.kafka.admin.Kafka10AdminUtilsOperation;
+import org.springframework.cloud.stream.binder.kafka.properties.KafkaBinderConfigurationProperties;
+import org.springframework.cloud.stream.binder.kafka.properties.KafkaConsumerProperties;
+import org.springframework.cloud.stream.binder.kafka.properties.KafkaProducerProperties;
+import org.springframework.cloud.stream.config.BindingProperties;
+import org.springframework.integration.channel.DirectChannel;
+import org.springframework.integration.channel.QueueChannel;
+import org.springframework.kafka.core.ConsumerFactory;
+import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
+import org.springframework.kafka.support.KafkaHeaders;
+import org.springframework.kafka.test.core.BrokerAddress;
+import org.springframework.kafka.test.rule.KafkaEmbedded;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.MessageHeaders;
+import org.springframework.messaging.SubscribableChannel;
+import org.springframework.messaging.support.MessageBuilder;
+import org.springframework.util.MimeType;
+import org.springframework.util.MimeTypeUtils;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Integration tests for the {@link KafkaMessageChannelBinder}.
+ *
+ * This test specifically tests for the 0.11.x.x version of Kafka.
+ *
+ * @author Eric Bottard
+ * @author Marius Bogoevici
+ * @author Mark Fisher
+ * @author Ilayaperumal Gopinathan
+ */
+public class Kafka_0_11_BinderTests extends KafkaBinderTests {
+
+	private final String CLASS_UNDER_TEST_NAME = KafkaMessageChannelBinder.class.getSimpleName();
+
+	@ClassRule
+	public static KafkaEmbedded embeddedKafka = new KafkaEmbedded(1, true, 10);
+
+	private Kafka10TestBinder binder;
+
+	private final Kafka10AdminUtilsOperation adminUtilsOperation = new Kafka10AdminUtilsOperation();
+
+	@Override
+	protected void binderBindUnbindLatency() throws InterruptedException {
+		Thread.sleep(500);
+	}
+
+	@Override
+	protected Kafka10TestBinder getBinder() {
+		if (binder == null) {
+			KafkaBinderConfigurationProperties binderConfiguration = createConfigurationProperties();
+			binder = new Kafka10TestBinder(binderConfiguration);
+		}
+		return binder;
+	}
+
+	@Override
+	protected KafkaBinderConfigurationProperties createConfigurationProperties() {
+		KafkaBinderConfigurationProperties binderConfiguration = new KafkaBinderConfigurationProperties();
+		BrokerAddress[] brokerAddresses = embeddedKafka.getBrokerAddresses();
+		List<String> bAddresses = new ArrayList<>();
+		for (BrokerAddress bAddress : brokerAddresses) {
+			bAddresses.add(bAddress.toString());
+		}
+		String[] foo = new String[bAddresses.size()];
+		binderConfiguration.setBrokers(bAddresses.toArray(foo));
+		binderConfiguration.setZkNodes(embeddedKafka.getZookeeperConnectionString());
+		return binderConfiguration;
+	}
+
+	@Override
+	protected int partitionSize(String topic) {
+		return consumerFactory().createConsumer().partitionsFor(topic).size();
+	}
+
+	@Override
+	protected ZkUtils getZkUtils(KafkaBinderConfigurationProperties kafkaBinderConfigurationProperties) {
+		final ZkClient zkClient = new ZkClient(kafkaBinderConfigurationProperties.getZkConnectionString(),
+				kafkaBinderConfigurationProperties.getZkSessionTimeout(), kafkaBinderConfigurationProperties.getZkConnectionTimeout(),
+				ZKStringSerializer$.MODULE$);
+
+		return new ZkUtils(zkClient, null, false);
+	}
+
+	@Override
+	protected void invokeCreateTopic(ZkUtils zkUtils, String topic, int partitions, int replicationFactor, Properties topicConfig) {
+		adminUtilsOperation.invokeCreateTopic(zkUtils, topic, partitions, replicationFactor, new Properties());
+	}
+
+	@Override
+	protected int invokePartitionSize(String topic, ZkUtils zkUtils) {
+		return adminUtilsOperation.partitionSize(topic, zkUtils);
+	}
+
+	@Override
+	public String getKafkaOffsetHeaderKey() {
+		return KafkaHeaders.OFFSET;
+	}
+
+	@Override
+	protected Binder getBinder(KafkaBinderConfigurationProperties kafkaBinderConfigurationProperties) {
+		return new Kafka10TestBinder(kafkaBinderConfigurationProperties);
+	}
+
+	@Before
+	public void init() {
+		String multiplier = System.getenv("KAFKA_TIMEOUT_MULTIPLIER");
+		if (multiplier != null) {
+			timeoutMultiplier = Double.parseDouble(multiplier);
+		}
+	}
+
+	@Override
+	protected boolean usesExplicitRouting() {
+		return false;
+	}
+
+	@Override
+	protected String getClassUnderTestName() {
+		return CLASS_UNDER_TEST_NAME;
+	}
+
+	@Override
+	public Spy spyOn(final String name) {
+		throw new UnsupportedOperationException("'spyOn' is not used by Kafka tests");
+	}
+
+
+	private ConsumerFactory<byte[], byte[]> consumerFactory() {
+		Map<String, Object> props = new HashMap<>();
+		KafkaBinderConfigurationProperties configurationProperties = createConfigurationProperties();
+		props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, configurationProperties.getKafkaConnectionString());
+		props.put(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, false);
+		props.put(ConsumerConfig.GROUP_ID_CONFIG, "TEST-CONSUMER-GROUP");
+		Deserializer<byte[]> valueDecoder = new ByteArrayDeserializer();
+		Deserializer<byte[]> keyDecoder = new ByteArrayDeserializer();
+
+		return new DefaultKafkaConsumerFactory<>(props, keyDecoder, valueDecoder);
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@Test
+	public void testTrustedPackages() throws Exception {
+		Binder binder = getBinder();
+
+		BindingProperties producerBindingProperties = createProducerBindingProperties(createProducerProperties());
+		DirectChannel moduleOutputChannel = createBindableChannel("output", producerBindingProperties);
+		QueueChannel moduleInputChannel = new QueueChannel();
+		Binding<MessageChannel> producerBinding = binder.bindProducer("bar.0", moduleOutputChannel,
+				producerBindingProperties.getProducer());
+		ExtendedConsumerProperties<KafkaConsumerProperties> consumerProperties = createConsumerProperties();
+		consumerProperties.getExtension().setTrustedPackages(new String[]{"org.springframework.util"});
+		Binding<MessageChannel> consumerBinding = binder.bindConsumer("bar.0",
+				"testSendAndReceiveNoOriginalContentType", moduleInputChannel, consumerProperties);
+		binderBindUnbindLatency();
+
+		Message<?> message = org.springframework.integration.support.MessageBuilder.withPayload("foo")
+			.setHeader(MessageHeaders.CONTENT_TYPE, MimeTypeUtils.TEXT_PLAIN).setHeader("foo", MimeTypeUtils.TEXT_PLAIN)
+			.build();
+
+		moduleOutputChannel.send(message);
+		Message<?> inbound = receive(moduleInputChannel);
+		Assertions.assertThat(inbound).isNotNull();
+		Assertions.assertThat(inbound.getPayload()).isEqualTo("foo");
+		Assertions.assertThat(inbound.getHeaders().get(BinderHeaders.BINDER_ORIGINAL_CONTENT_TYPE)).isNull();
+		Assertions.assertThat(inbound.getHeaders().get(MessageHeaders.CONTENT_TYPE))
+				.isEqualTo(MimeTypeUtils.TEXT_PLAIN_VALUE);
+		Assertions.assertThat(inbound.getHeaders().get("foo")).isInstanceOf(MimeType.class);
+		MimeType actual = (MimeType) inbound.getHeaders().get("foo");
+		Assertions.assertThat(actual).isEqualTo(MimeTypeUtils.TEXT_PLAIN);
+		producerBinding.unbind();
+		consumerBinding.unbind();
+	}
+
+	class Foo{}
+
+	@Test
+	@SuppressWarnings("unchecked")
+	public void testCustomAvroSerialization() throws Exception {
+		KafkaBinderConfigurationProperties configurationProperties = createConfigurationProperties();
+		final ZkClient zkClient = new ZkClient(configurationProperties.getZkConnectionString(),
+				configurationProperties.getZkSessionTimeout(), configurationProperties.getZkConnectionTimeout(),
+				ZKStringSerializer$.MODULE$);
+		final ZkUtils zkUtils = new ZkUtils(zkClient, null, false);
+		Map<String, Object> schemaRegistryProps = new HashMap<>();
+		schemaRegistryProps.put("kafkastore.connection.url", configurationProperties.getZkConnectionString());
+		schemaRegistryProps.put("listeners", "http://0.0.0.0:8082");
+		schemaRegistryProps.put("port", "8082");
+		schemaRegistryProps.put("kafkastore.topic", "_schemas");
+		SchemaRegistryConfig config = new SchemaRegistryConfig(schemaRegistryProps);
+		SchemaRegistryRestApplication app = new SchemaRegistryRestApplication(config);
+		Server server = app.createServer();
+		server.start();
+		long endTime = System.currentTimeMillis() + 5000;
+		while(true) {
+			if (server.isRunning()) {
+				break;
+			}
+			else if (System.currentTimeMillis() > endTime) {
+				Assertions.fail("Kafka Schema Registry Server failed to start");
+			}
+		}
+		User1 firstOutboundFoo = new User1();
+		String userName1 = "foo-name" + UUID.randomUUID().toString();
+		String favColor1 = "foo-color" + UUID.randomUUID().toString();
+		firstOutboundFoo.setName(userName1);
+		firstOutboundFoo.setFavoriteColor(favColor1);
+		Message<?> message = MessageBuilder.withPayload(firstOutboundFoo).build();
+		SubscribableChannel moduleOutputChannel = new DirectChannel();
+		String testTopicName = "existing" + System.currentTimeMillis();
+		invokeCreateTopic(zkUtils, testTopicName, 6, 1, new Properties());
+		configurationProperties.setAutoAddPartitions(true);
+		Binder binder = getBinder(configurationProperties);
+		QueueChannel moduleInputChannel = new QueueChannel();
+		ExtendedProducerProperties<KafkaProducerProperties> producerProperties = createProducerProperties();
+		producerProperties.getExtension().getConfiguration().put("value.serializer", "io.confluent.kafka.serializers.KafkaAvroSerializer");
+		producerProperties.getExtension().getConfiguration().put("schema.registry.url", "http://localhost:8082");
+		producerProperties.setUseNativeEncoding(true);
+		Binding<MessageChannel> producerBinding = binder.bindProducer(testTopicName, moduleOutputChannel, producerProperties);
+		ExtendedConsumerProperties<KafkaConsumerProperties> consumerProperties = createConsumerProperties();
+		consumerProperties.getExtension().setAutoRebalanceEnabled(false);
+		consumerProperties.getExtension().getConfiguration().put("value.deserializer", "io.confluent.kafka.serializers.KafkaAvroDeserializer");
+		consumerProperties.getExtension().getConfiguration().put("schema.registry.url", "http://localhost:8082");
+		Binding<MessageChannel> consumerBinding = binder.bindConsumer(testTopicName, "test", moduleInputChannel, consumerProperties);
+		// Let the consumer actually bind to the producer before sending a msg
+		binderBindUnbindLatency();
+		moduleOutputChannel.send(message);
+		Message<?> inbound = receive(moduleInputChannel);
+		Assertions.assertThat(inbound).isNotNull();
+		assertTrue(message.getPayload() instanceof User1);
+		User1 receivedUser = (User1) message.getPayload();
+		Assertions.assertThat(receivedUser.getName()).isEqualTo(userName1);
+		Assertions.assertThat(receivedUser.getFavoriteColor()).isEqualTo(favColor1);
+		producerBinding.unbind();
+		consumerBinding.unbind();
+	}
+
+	@Override
+	public void testSendAndReceiveWithExplicitConsumerGroupWithRawMode() {
+		// raw mode no longer needed
+	}
+
+	@Override
+	public void testSendAndReceiveWithRawModeAndStringPayload() {
+		// raw mode no longer needed
+	}
+
+}

spring-cloud-stream-binder-kafka-0.11-test/src/test/java/org/springframework/cloud/stream/binder/kafka/User1.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.stream.binder.kafka;
+
+import java.io.IOException;
+
+import org.apache.avro.Schema;
+import org.apache.avro.reflect.Nullable;
+import org.apache.avro.specific.SpecificRecordBase;
+
+import org.springframework.core.io.ClassPathResource;
+
+/**
+ * @author Marius Bogoevici
+ * @author Ilayaperumal Gopinathan
+ */
+public class User1 extends SpecificRecordBase {
+
+	@Nullable
+	private String name;
+
+	@Nullable
+	private String favoriteColor;
+
+	public String getName() {
+		return this.name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getFavoriteColor() {
+		return this.favoriteColor;
+	}
+
+	public void setFavoriteColor(String favoriteColor) {
+		this.favoriteColor = favoriteColor;
+	}
+
+	@Override
+	public Schema getSchema() {
+		try {
+			return new Schema.Parser().parse(new ClassPathResource("schemas/users_v1.schema").getInputStream());
+		}
+		catch (IOException e) {
+			throw new IllegalStateException(e);
+		}
+	}
+
+	@Override
+	public Object get(int i) {
+		if (i == 0) {
+			return getName().toString();
+		}
+		if (i == 1) {
+			return getFavoriteColor().toString();
+		}
+		return null;
+	}
+
+	@Override
+	public void put(int i, Object o) {
+		if (i == 0) {
+			setName((String) o);
+		}
+		if (i == 1) {
+			setFavoriteColor((String) o);
+		}
+	}
+}

spring-cloud-stream-binder-kafka-core/.settings/org.eclipse.jdt.ui.prefs

@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;com;org;org.springframework;ch.qos;\#;
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99

spring-cloud-stream-binder-kafka-core/pom.xml

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-stream-binder-kafka-parent</artifactId>
-		<version>2.2.0.RC1</version>
-	</parent>
-	<artifactId>spring-cloud-stream-binder-kafka-core</artifactId>
-	<description>Spring Cloud Stream Kafka Binder Core</description>
-	<url>https://projects.spring.io/spring-cloud</url>
-	<organization>
-		<name>Pivotal Software, Inc.</name>
-		<url>https://www.spring.io</url>
-	</organization>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-kafka</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-configuration-processor</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.kafka</groupId>
-			<artifactId>spring-kafka-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-binder-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-</project>

spring-cloud-stream-binder-kafka-core/src/main/java/org/springframework/cloud/stream/binder/kafka/properties/KafkaAdminProperties.java

@@ -1,39 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.properties;
-
-import java.util.Map;
-
-/**
- * Properties for configuring topics.
- *
- * @author Gary Russell
- * @since 2.0
- * @deprecated in favor of {@link KafkaTopicProperties}
- */
-@Deprecated
-public class KafkaAdminProperties extends KafkaTopicProperties {
-
-	public Map<String, String> getConfiguration() {
-		return getProperties();
-	}
-
-	public void setConfiguration(Map<String, String> configuration) {
-		setProperties(configuration);
-	}
-
-}

spring-cloud-stream-binder-kafka-core/src/main/java/org/springframework/cloud/stream/binder/kafka/properties/KafkaBinderConfigurationProperties.java

@@ -1,827 +0,0 @@
-/*
- * Copyright 2015-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.properties;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.producer.ProducerConfig;
-
-import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
-import org.springframework.cloud.stream.binder.HeaderMode;
-import org.springframework.cloud.stream.binder.ProducerProperties;
-import org.springframework.cloud.stream.binder.kafka.properties.KafkaProducerProperties.CompressionType;
-import org.springframework.expression.Expression;
-import org.springframework.util.Assert;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
-
-/**
- * Configuration properties for the Kafka binder. The properties in this class are
- * prefixed with <b>spring.cloud.stream.kafka.binder</b>.
- *
- * @author David Turanski
- * @author Ilayaperumal Gopinathan
- * @author Marius Bogoevici
- * @author Soby Chacko
- * @author Gary Russell
- * @author Rafal Zukowski
- * @author Aldo Sinanaj
- */
-@ConfigurationProperties(prefix = "spring.cloud.stream.kafka.binder")
-public class KafkaBinderConfigurationProperties {
-
-	private static final String DEFAULT_KAFKA_CONNECTION_STRING = "localhost:9092";
-
-	private final Log logger = LogFactory.getLog(getClass());
-
-	private final Transaction transaction = new Transaction();
-
-	private final KafkaProperties kafkaProperties;
-
-	private String[] zkNodes = new String[] { "localhost" };
-
-	/**
-	 * Arbitrary kafka properties that apply to both producers and consumers.
-	 */
-	private Map<String, String> configuration = new HashMap<>();
-
-	/**
-	 * Arbitrary kafka consumer properties.
-	 */
-	private Map<String, String> consumerProperties = new HashMap<>();
-
-	/**
-	 * Arbitrary kafka producer properties.
-	 */
-	private Map<String, String> producerProperties = new HashMap<>();
-
-	private String defaultZkPort = "2181";
-
-	private String[] brokers = new String[] { "localhost" };
-
-	private String defaultBrokerPort = "9092";
-
-	private String[] headers = new String[] {};
-
-	private int offsetUpdateTimeWindow = 10000;
-
-	private int offsetUpdateCount;
-
-	private int offsetUpdateShutdownTimeout = 2000;
-
-	private int maxWait = 100;
-
-	private boolean autoCreateTopics = true;
-
-	private boolean autoAddPartitions;
-
-	private int socketBufferSize = 2097152;
-
-	/**
-	 * ZK session timeout in milliseconds.
-	 */
-	private int zkSessionTimeout = 10000;
-
-	/**
-	 * ZK Connection timeout in milliseconds.
-	 */
-	private int zkConnectionTimeout = 10000;
-
-	private String requiredAcks = "1";
-
-	private short replicationFactor = 1;
-
-	private int fetchSize = 1024 * 1024;
-
-	private int minPartitionCount = 1;
-
-	private int queueSize = 8192;
-
-	/**
-	 * Time to wait to get partition information in seconds; default 60.
-	 */
-	private int healthTimeout = 60;
-
-	private JaasLoginModuleConfiguration jaas;
-
-	/**
-	 * The bean name of a custom header mapper to use instead of a
-	 * {@link org.springframework.kafka.support.DefaultKafkaHeaderMapper}.
-	 */
-	private String headerMapperBeanName;
-
-	public KafkaBinderConfigurationProperties(KafkaProperties kafkaProperties) {
-		Assert.notNull(kafkaProperties, "'kafkaProperties' cannot be null");
-		this.kafkaProperties = kafkaProperties;
-	}
-
-	public KafkaProperties getKafkaProperties() {
-		return this.kafkaProperties;
-	}
-
-	public Transaction getTransaction() {
-		return this.transaction;
-	}
-
-	/**
-	 * No longer used.
-	 * @return the connection String
-	 * @deprecated connection to zookeeper is no longer necessary
-	 */
-	@DeprecatedConfigurationProperty(reason = "Not used since 2.0")
-	@Deprecated
-	public String getZkConnectionString() {
-		return toConnectionString(this.zkNodes, this.defaultZkPort);
-	}
-
-	public String getKafkaConnectionString() {
-		return toConnectionString(this.brokers, this.defaultBrokerPort);
-	}
-
-	public String getDefaultKafkaConnectionString() {
-		return DEFAULT_KAFKA_CONNECTION_STRING;
-	}
-
-	public String[] getHeaders() {
-		return this.headers;
-	}
-
-	/**
-	 * No longer used.
-	 * @return the window.
-	 * @deprecated No longer used by the binder
-	 */
-	@Deprecated
-	@DeprecatedConfigurationProperty(reason = "Not used since 2.0")
-	public int getOffsetUpdateTimeWindow() {
-		return this.offsetUpdateTimeWindow;
-	}
-
-	/**
-	 * No longer used.
-	 * @return the count.
-	 * @deprecated No longer used by the binder
-	 */
-	@Deprecated
-	@DeprecatedConfigurationProperty(reason = "Not used since 2.0")
-	public int getOffsetUpdateCount() {
-		return this.offsetUpdateCount;
-	}
-
-	/**
-	 * No longer used.
-	 * @return the timeout.
-	 * @deprecated No longer used by the binder
-	 */
-	@Deprecated
-	@DeprecatedConfigurationProperty(reason = "Not used since 2.0")
-	public int getOffsetUpdateShutdownTimeout() {
-		return this.offsetUpdateShutdownTimeout;
-	}
-
-	/**
-	 * Zookeeper nodes.
-	 * @return the nodes.
-	 * @deprecated connection to zookeeper is no longer necessary
-	 */
-	@Deprecated
-	@DeprecatedConfigurationProperty(reason = "No longer necessary since 2.0")
-	public String[] getZkNodes() {
-		return this.zkNodes;
-	}
-
-	/**
-	 * Zookeeper nodes.
-	 * @param zkNodes the nodes.
-	 * @deprecated connection to zookeeper is no longer necessary
-	 */
-	@Deprecated
-	@DeprecatedConfigurationProperty(reason = "No longer necessary since 2.0")
-	public void setZkNodes(String... zkNodes) {
-		this.zkNodes = zkNodes;
-	}
-
-	/**
-	 * Zookeeper port.
-	 * @param defaultZkPort the port.
-	 * @deprecated connection to zookeeper is no longer necessary
-	 */
-	@Deprecated
-	@DeprecatedConfigurationProperty(reason = "No longer necessary since 2.0")
-	public void setDefaultZkPort(String defaultZkPort) {
-		this.defaultZkPort = defaultZkPort;
-	}
-
-	public String[] getBrokers() {
-		return this.brokers;
-	}
-
-	public void setBrokers(String... brokers) {
-		this.brokers = brokers;
-	}
-
-	public void setDefaultBrokerPort(String defaultBrokerPort) {
-		this.defaultBrokerPort = defaultBrokerPort;
-	}
-
-	public void setHeaders(String... headers) {
-		this.headers = headers;
-	}
-
-	/**
-	 * No longer used.
-	 * @param offsetUpdateTimeWindow the window.
-	 * @deprecated No longer used by the binder
-	 */
-	@Deprecated
-	@DeprecatedConfigurationProperty(reason = "Not used since 2.0")
-	public void setOffsetUpdateTimeWindow(int offsetUpdateTimeWindow) {
-		this.offsetUpdateTimeWindow = offsetUpdateTimeWindow;
-	}
-
-	/**
-	 * No longer used.
-	 * @param offsetUpdateCount the count.
-	 * @deprecated No longer used by the binder
-	 */
-	@Deprecated
-	@DeprecatedConfigurationProperty(reason = "Not used since 2.0")
-	public void setOffsetUpdateCount(int offsetUpdateCount) {
-		this.offsetUpdateCount = offsetUpdateCount;
-	}
-
-	/**
-	 * No longer used.
-	 * @param offsetUpdateShutdownTimeout the timeout.
-	 * @deprecated No longer used by the binder
-	 */
-	@Deprecated
-	@DeprecatedConfigurationProperty(reason = "Not used since 2.0")
-	public void setOffsetUpdateShutdownTimeout(int offsetUpdateShutdownTimeout) {
-		this.offsetUpdateShutdownTimeout = offsetUpdateShutdownTimeout;
-	}
-
-	/**
-	 * Zookeeper session timeout.
-	 * @return the timeout.
-	 * @deprecated connection to zookeeper is no longer necessary
-	 */
-	@Deprecated
-	@DeprecatedConfigurationProperty(reason = "No longer necessary since 2.0")
-	public int getZkSessionTimeout() {
-		return this.zkSessionTimeout;
-	}
-
-	/**
-	 * Zookeeper session timeout.
-	 * @param zkSessionTimeout the timout
-	 * @deprecated connection to zookeeper is no longer necessary
-	 */
-	@Deprecated
-	@DeprecatedConfigurationProperty(reason = "No longer necessary since 2.0")
-	public void setZkSessionTimeout(int zkSessionTimeout) {
-		this.zkSessionTimeout = zkSessionTimeout;
-	}
-
-	/**
-	 * Zookeeper connection timeout.
-	 * @return the timout.
-	 * @deprecated connection to zookeeper is no longer necessary
-	 */
-	@Deprecated
-	@DeprecatedConfigurationProperty(reason = "No longer necessary since 2.0")
-	public int getZkConnectionTimeout() {
-		return this.zkConnectionTimeout;
-	}
-
-	/**
-	 * Zookeeper connection timeout.
-	 * @param zkConnectionTimeout the timeout.
-	 * @deprecated connection to zookeeper is no longer necessary
-	 */
-	@Deprecated
-	@DeprecatedConfigurationProperty(reason = "No longer necessary since 2.0")
-	public void setZkConnectionTimeout(int zkConnectionTimeout) {
-		this.zkConnectionTimeout = zkConnectionTimeout;
-	}
-
-	/**
-	 * Converts an array of host values to a comma-separated String. It will append the
-	 * default port value, if not already specified.
-	 * @param hosts host string
-	 * @param defaultPort port
-	 * @return formatted connection string
-	 */
-	private String toConnectionString(String[] hosts, String defaultPort) {
-		String[] fullyFormattedHosts = new String[hosts.length];
-		for (int i = 0; i < hosts.length; i++) {
-			if (hosts[i].contains(":") || StringUtils.isEmpty(defaultPort)) {
-				fullyFormattedHosts[i] = hosts[i];
-			}
-			else {
-				fullyFormattedHosts[i] = hosts[i] + ":" + defaultPort;
-			}
-		}
-		return StringUtils.arrayToCommaDelimitedString(fullyFormattedHosts);
-	}
-
-	/**
-	 * No longer used.
-	 * @return the wait.
-	 * @deprecated No longer used by the binder
-	 */
-	@Deprecated
-	@DeprecatedConfigurationProperty(reason = "Not used since 2.0")
-	public int getMaxWait() {
-		return this.maxWait;
-	}
-
-	/**
-	 * No longer user.
-	 * @param maxWait the wait.
-	 * @deprecated No longer used by the binder
-	 */
-	@Deprecated
-	@DeprecatedConfigurationProperty(reason = "Not used since 2.0")
-	public void setMaxWait(int maxWait) {
-		this.maxWait = maxWait;
-	}
-
-	public String getRequiredAcks() {
-		return this.requiredAcks;
-	}
-
-	public void setRequiredAcks(String requiredAcks) {
-		this.requiredAcks = requiredAcks;
-	}
-
-	public short getReplicationFactor() {
-		return this.replicationFactor;
-	}
-
-	public void setReplicationFactor(short replicationFactor) {
-		this.replicationFactor = replicationFactor;
-	}
-
-	/**
-	 * No longer used.
-	 * @return the size.
-	 * @deprecated No longer used by the binder
-	 */
-	@Deprecated
-	@DeprecatedConfigurationProperty(reason = "Not used since 2.0")
-	public int getFetchSize() {
-		return this.fetchSize;
-	}
-
-	/**
-	 * No longer used.
-	 * @param fetchSize the size.
-	 * @deprecated No longer used by the binder
-	 */
-	@Deprecated
-	@DeprecatedConfigurationProperty(reason = "Not used since 2.0")
-	public void setFetchSize(int fetchSize) {
-		this.fetchSize = fetchSize;
-	}
-
-	public int getMinPartitionCount() {
-		return this.minPartitionCount;
-	}
-
-	public void setMinPartitionCount(int minPartitionCount) {
-		this.minPartitionCount = minPartitionCount;
-	}
-
-	public int getHealthTimeout() {
-		return this.healthTimeout;
-	}
-
-	public void setHealthTimeout(int healthTimeout) {
-		this.healthTimeout = healthTimeout;
-	}
-
-	/**
-	 * No longer used.
-	 * @return the queue size.
-	 * @deprecated No longer used by the binder
-	 */
-	@Deprecated
-	@DeprecatedConfigurationProperty(reason = "Not used since 2.0")
-	public int getQueueSize() {
-		return this.queueSize;
-	}
-
-	/**
-	 * No longer used.
-	 * @param queueSize the queue size.
-	 * @deprecated No longer used by the binder
-	 */
-	@Deprecated
-	@DeprecatedConfigurationProperty(reason = "Not used since 2.0")
-	public void setQueueSize(int queueSize) {
-		this.queueSize = queueSize;
-	}
-
-	public boolean isAutoCreateTopics() {
-		return this.autoCreateTopics;
-	}
-
-	public void setAutoCreateTopics(boolean autoCreateTopics) {
-		this.autoCreateTopics = autoCreateTopics;
-	}
-
-	public boolean isAutoAddPartitions() {
-		return this.autoAddPartitions;
-	}
-
-	public void setAutoAddPartitions(boolean autoAddPartitions) {
-		this.autoAddPartitions = autoAddPartitions;
-	}
-
-	/**
-	 * No longer used; set properties such as this via {@link #getConfiguration()
-	 * configuration}.
-	 * @return the size.
-	 * @deprecated No longer used by the binder
-	 */
-	@Deprecated
-	@DeprecatedConfigurationProperty(reason = "Not used since 2.0, set properties such as this via 'configuration'")
-	public int getSocketBufferSize() {
-		return this.socketBufferSize;
-	}
-
-	/**
-	 * No longer used; set properties such as this via {@link #getConfiguration()
-	 * configuration}.
-	 * @param socketBufferSize the size.
-	 * @deprecated No longer used by the binder
-	 */
-	@Deprecated
-	@DeprecatedConfigurationProperty(reason = "Not used since 2.0, set properties such as this via 'configuration'")
-	public void setSocketBufferSize(int socketBufferSize) {
-		this.socketBufferSize = socketBufferSize;
-	}
-
-	public Map<String, String> getConfiguration() {
-		return this.configuration;
-	}
-
-	public void setConfiguration(Map<String, String> configuration) {
-		this.configuration = configuration;
-	}
-
-	public Map<String, String> getConsumerProperties() {
-		return this.consumerProperties;
-	}
-
-	public void setConsumerProperties(Map<String, String> consumerProperties) {
-		Assert.notNull(consumerProperties, "'consumerProperties' cannot be null");
-		this.consumerProperties = consumerProperties;
-	}
-
-	public Map<String, String> getProducerProperties() {
-		return this.producerProperties;
-	}
-
-	public void setProducerProperties(Map<String, String> producerProperties) {
-		Assert.notNull(producerProperties, "'producerProperties' cannot be null");
-		this.producerProperties = producerProperties;
-	}
-
-	/**
-	 * Merge boot consumer properties, general properties from
-	 * {@link #setConfiguration(Map)} that apply to consumers, properties from
-	 * {@link #setConsumerProperties(Map)}, in that order.
-	 * @return the merged properties.
-	 */
-	public Map<String, Object> mergedConsumerConfiguration() {
-		Map<String, Object> consumerConfiguration = new HashMap<>();
-		consumerConfiguration.putAll(this.kafkaProperties.buildConsumerProperties());
-		// Copy configured binder properties that apply to consumers
-		for (Map.Entry<String, String> configurationEntry : this.configuration
-				.entrySet()) {
-			if (ConsumerConfig.configNames().contains(configurationEntry.getKey())) {
-				consumerConfiguration.put(configurationEntry.getKey(),
-						configurationEntry.getValue());
-			}
-		}
-		consumerConfiguration.putAll(this.consumerProperties);
-		filterStreamManagedConfiguration(consumerConfiguration);
-		// Override Spring Boot bootstrap server setting if left to default with the value
-		// configured in the binder
-		return getConfigurationWithBootstrapServer(consumerConfiguration,
-				ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG);
-	}
-
-	/**
-	 * Merge boot producer properties, general properties from
-	 * {@link #setConfiguration(Map)} that apply to producers, properties from
-	 * {@link #setProducerProperties(Map)}, in that order.
-	 * @return the merged properties.
-	 */
-	public Map<String, Object> mergedProducerConfiguration() {
-		Map<String, Object> producerConfiguration = new HashMap<>();
-		producerConfiguration.putAll(this.kafkaProperties.buildProducerProperties());
-		// Copy configured binder properties that apply to producers
-		for (Map.Entry<String, String> configurationEntry : this.configuration
-				.entrySet()) {
-			if (ProducerConfig.configNames().contains(configurationEntry.getKey())) {
-				producerConfiguration.put(configurationEntry.getKey(),
-						configurationEntry.getValue());
-			}
-		}
-		producerConfiguration.putAll(this.producerProperties);
-		// Override Spring Boot bootstrap server setting if left to default with the value
-		// configured in the binder
-		return getConfigurationWithBootstrapServer(producerConfiguration,
-				ProducerConfig.BOOTSTRAP_SERVERS_CONFIG);
-	}
-
-	private void filterStreamManagedConfiguration(Map<String, Object> configuration) {
-		if (configuration.containsKey(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG)
-				&& configuration.get(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG).equals(true)) {
-			logger.warn(constructIgnoredConfigMessage(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG) +
-					ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG + "=true is not supported by the Kafka binder");
-			configuration.remove(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG);
-		}
-		if (configuration.containsKey(ConsumerConfig.GROUP_ID_CONFIG)) {
-			logger.warn(constructIgnoredConfigMessage(ConsumerConfig.GROUP_ID_CONFIG) +
-					"Use spring.cloud.stream.default.group or spring.cloud.stream.binding.<name>.group to specify " +
-					"the group instead of " + ConsumerConfig.GROUP_ID_CONFIG);
-			configuration.remove(ConsumerConfig.GROUP_ID_CONFIG);
-		}
-	}
-
-	private String constructIgnoredConfigMessage(String config) {
-		return String.format("Ignoring provided value(s) for '%s'. ", config);
-	}
-
-	private Map<String, Object> getConfigurationWithBootstrapServer(
-			Map<String, Object> configuration, String bootstrapServersConfig) {
-		if (ObjectUtils.isEmpty(configuration.get(bootstrapServersConfig))) {
-			configuration.put(bootstrapServersConfig, getKafkaConnectionString());
-		}
-		else {
-			Object boostrapServersConfig = configuration.get(bootstrapServersConfig);
-			if (boostrapServersConfig instanceof List) {
-				@SuppressWarnings("unchecked")
-				List<String> bootStrapServers = (List<String>) configuration
-						.get(bootstrapServersConfig);
-				if (bootStrapServers.size() == 1
-						&& bootStrapServers.get(0).equals("localhost:9092")) {
-					configuration.put(bootstrapServersConfig, getKafkaConnectionString());
-				}
-			}
-		}
-		return Collections.unmodifiableMap(configuration);
-	}
-
-	public JaasLoginModuleConfiguration getJaas() {
-		return this.jaas;
-	}
-
-	public void setJaas(JaasLoginModuleConfiguration jaas) {
-		this.jaas = jaas;
-	}
-
-	public String getHeaderMapperBeanName() {
-		return this.headerMapperBeanName;
-	}
-
-	public void setHeaderMapperBeanName(String headerMapperBeanName) {
-		this.headerMapperBeanName = headerMapperBeanName;
-	}
-
-	/**
-	 * Domain class that models transaction capabilities in Kafka.
-	 */
-	public static class Transaction {
-
-		private final CombinedProducerProperties producer = new CombinedProducerProperties();
-
-		private String transactionIdPrefix;
-
-		public String getTransactionIdPrefix() {
-			return this.transactionIdPrefix;
-		}
-
-		public void setTransactionIdPrefix(String transactionIdPrefix) {
-			this.transactionIdPrefix = transactionIdPrefix;
-		}
-
-		public CombinedProducerProperties getProducer() {
-			return this.producer;
-		}
-
-	}
-
-	/**
-	 * An combination of {@link ProducerProperties} and {@link KafkaProducerProperties} so
-	 * that common and kafka-specific properties can be set for the transactional
-	 * producer.
-	 *
-	 * @since 2.1
-	 */
-	public static class CombinedProducerProperties {
-
-		private final ProducerProperties producerProperties = new ProducerProperties();
-
-		private final KafkaProducerProperties kafkaProducerProperties = new KafkaProducerProperties();
-
-		public Expression getPartitionKeyExpression() {
-			return this.producerProperties.getPartitionKeyExpression();
-		}
-
-		public void setPartitionKeyExpression(Expression partitionKeyExpression) {
-			this.producerProperties.setPartitionKeyExpression(partitionKeyExpression);
-		}
-
-		public boolean isPartitioned() {
-			return this.producerProperties.isPartitioned();
-		}
-
-		public Expression getPartitionSelectorExpression() {
-			return this.producerProperties.getPartitionSelectorExpression();
-		}
-
-		public void setPartitionSelectorExpression(
-				Expression partitionSelectorExpression) {
-			this.producerProperties
-					.setPartitionSelectorExpression(partitionSelectorExpression);
-		}
-
-		public @Min(value = 1, message = "Partition count should be greater than zero.") int getPartitionCount() {
-			return this.producerProperties.getPartitionCount();
-		}
-
-		public void setPartitionCount(int partitionCount) {
-			this.producerProperties.setPartitionCount(partitionCount);
-		}
-
-		public String[] getRequiredGroups() {
-			return this.producerProperties.getRequiredGroups();
-		}
-
-		public void setRequiredGroups(String... requiredGroups) {
-			this.producerProperties.setRequiredGroups(requiredGroups);
-		}
-
-		public @AssertTrue(message = "Partition key expression and partition key extractor class properties "
-				+ "are mutually exclusive.") boolean isValidPartitionKeyProperty() {
-			return this.producerProperties.isValidPartitionKeyProperty();
-		}
-
-		public @AssertTrue(message = "Partition selector class and partition selector expression "
-				+ "properties are mutually exclusive.") boolean isValidPartitionSelectorProperty() {
-			return this.producerProperties.isValidPartitionSelectorProperty();
-		}
-
-		public HeaderMode getHeaderMode() {
-			return this.producerProperties.getHeaderMode();
-		}
-
-		public void setHeaderMode(HeaderMode headerMode) {
-			this.producerProperties.setHeaderMode(headerMode);
-		}
-
-		public boolean isUseNativeEncoding() {
-			return this.producerProperties.isUseNativeEncoding();
-		}
-
-		public void setUseNativeEncoding(boolean useNativeEncoding) {
-			this.producerProperties.setUseNativeEncoding(useNativeEncoding);
-		}
-
-		public boolean isErrorChannelEnabled() {
-			return this.producerProperties.isErrorChannelEnabled();
-		}
-
-		public void setErrorChannelEnabled(boolean errorChannelEnabled) {
-			this.producerProperties.setErrorChannelEnabled(errorChannelEnabled);
-		}
-
-		public String getPartitionKeyExtractorName() {
-			return this.producerProperties.getPartitionKeyExtractorName();
-		}
-
-		public void setPartitionKeyExtractorName(String partitionKeyExtractorName) {
-			this.producerProperties
-					.setPartitionKeyExtractorName(partitionKeyExtractorName);
-		}
-
-		public String getPartitionSelectorName() {
-			return this.producerProperties.getPartitionSelectorName();
-		}
-
-		public void setPartitionSelectorName(String partitionSelectorName) {
-			this.producerProperties.setPartitionSelectorName(partitionSelectorName);
-		}
-
-		public int getBufferSize() {
-			return this.kafkaProducerProperties.getBufferSize();
-		}
-
-		public void setBufferSize(int bufferSize) {
-			this.kafkaProducerProperties.setBufferSize(bufferSize);
-		}
-
-		public @NotNull CompressionType getCompressionType() {
-			return this.kafkaProducerProperties.getCompressionType();
-		}
-
-		public void setCompressionType(CompressionType compressionType) {
-			this.kafkaProducerProperties.setCompressionType(compressionType);
-		}
-
-		public boolean isSync() {
-			return this.kafkaProducerProperties.isSync();
-		}
-
-		public void setSync(boolean sync) {
-			this.kafkaProducerProperties.setSync(sync);
-		}
-
-		public int getBatchTimeout() {
-			return this.kafkaProducerProperties.getBatchTimeout();
-		}
-
-		public void setBatchTimeout(int batchTimeout) {
-			this.kafkaProducerProperties.setBatchTimeout(batchTimeout);
-		}
-
-		public Expression getMessageKeyExpression() {
-			return this.kafkaProducerProperties.getMessageKeyExpression();
-		}
-
-		public void setMessageKeyExpression(Expression messageKeyExpression) {
-			this.kafkaProducerProperties.setMessageKeyExpression(messageKeyExpression);
-		}
-
-		public String[] getHeaderPatterns() {
-			return this.kafkaProducerProperties.getHeaderPatterns();
-		}
-
-		public void setHeaderPatterns(String[] headerPatterns) {
-			this.kafkaProducerProperties.setHeaderPatterns(headerPatterns);
-		}
-
-		public Map<String, String> getConfiguration() {
-			return this.kafkaProducerProperties.getConfiguration();
-		}
-
-		public void setConfiguration(Map<String, String> configuration) {
-			this.kafkaProducerProperties.setConfiguration(configuration);
-		}
-
-		@SuppressWarnings("deprecation")
-		public KafkaAdminProperties getAdmin() {
-			return this.kafkaProducerProperties.getAdmin();
-		}
-
-		@SuppressWarnings("deprecation")
-		public void setAdmin(KafkaAdminProperties admin) {
-			this.kafkaProducerProperties.setAdmin(admin);
-		}
-
-		public KafkaTopicProperties getTopic() {
-			return this.kafkaProducerProperties.getTopic();
-		}
-
-		public void setTopic(KafkaTopicProperties topic) {
-			this.kafkaProducerProperties.setTopic(topic);
-		}
-
-		public KafkaProducerProperties getExtension() {
-			return this.kafkaProducerProperties;
-		}
-
-	}
-
-}

spring-cloud-stream-binder-kafka-core/src/main/java/org/springframework/cloud/stream/binder/kafka/properties/KafkaConsumerProperties.java

@@ -1,294 +0,0 @@
-/*
- * Copyright 2016-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.properties;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
-
-/**
- * Extended consumer properties for Kafka binder.
- *
- * @author Marius Bogoevici
- * @author Ilayaperumal Gopinathan
- * @author Soby Chacko
- * @author Gary Russell
- * @author Aldo Sinanaj
- *
- * <p>
- * Thanks to Laszlo Szabo for providing the initial patch for generic property support.
- * </p>
- */
-public class KafkaConsumerProperties {
-
-	/**
-	 * Enumeration for starting consumer offset.
-	 */
-	public enum StartOffset {
-
-		/**
-		 * Starting from earliest offset.
-		 */
-		earliest(-2L),
-		/**
-		 * Starting from latest offset.
-		 */
-		latest(-1L);
-
-		private final long referencePoint;
-
-		StartOffset(long referencePoint) {
-			this.referencePoint = referencePoint;
-		}
-
-		public long getReferencePoint() {
-			return this.referencePoint;
-		}
-
-	}
-
-	/**
-	 * Standard headers for the message.
-	 */
-	public enum StandardHeaders {
-
-		/**
-		 * No headers.
-		 */
-		none,
-		/**
-		 * Message header representing ID.
-		 */
-		id,
-		/**
-		 * Message header representing timestamp.
-		 */
-		timestamp,
-		/**
-		 * Indicating both ID and timestamp headers.
-		 */
-		both
-
-	}
-
-	private boolean ackEachRecord;
-
-	private boolean autoRebalanceEnabled = true;
-
-	private boolean autoCommitOffset = true;
-
-	private Boolean autoCommitOnError;
-
-	private StartOffset startOffset;
-
-	private boolean resetOffsets;
-
-	private boolean enableDlq;
-
-	private String dlqName;
-
-	private KafkaProducerProperties dlqProducerProperties = new KafkaProducerProperties();
-
-	private int recoveryInterval = 5000;
-
-	private String[] trustedPackages;
-
-	private StandardHeaders standardHeaders = StandardHeaders.none;
-
-	private String converterBeanName;
-
-	private long idleEventInterval = 30_000;
-
-	private boolean destinationIsPattern;
-
-	private Map<String, String> configuration = new HashMap<>();
-
-	private KafkaTopicProperties topic = new KafkaTopicProperties();
-
-	public boolean isAckEachRecord() {
-		return this.ackEachRecord;
-	}
-
-	public void setAckEachRecord(boolean ackEachRecord) {
-		this.ackEachRecord = ackEachRecord;
-	}
-
-	public boolean isAutoCommitOffset() {
-		return this.autoCommitOffset;
-	}
-
-	public void setAutoCommitOffset(boolean autoCommitOffset) {
-		this.autoCommitOffset = autoCommitOffset;
-	}
-
-	public StartOffset getStartOffset() {
-		return this.startOffset;
-	}
-
-	public void setStartOffset(StartOffset startOffset) {
-		this.startOffset = startOffset;
-	}
-
-	public boolean isResetOffsets() {
-		return this.resetOffsets;
-	}
-
-	public void setResetOffsets(boolean resetOffsets) {
-		this.resetOffsets = resetOffsets;
-	}
-
-	public boolean isEnableDlq() {
-		return this.enableDlq;
-	}
-
-	public void setEnableDlq(boolean enableDlq) {
-		this.enableDlq = enableDlq;
-	}
-
-	public Boolean getAutoCommitOnError() {
-		return this.autoCommitOnError;
-	}
-
-	public void setAutoCommitOnError(Boolean autoCommitOnError) {
-		this.autoCommitOnError = autoCommitOnError;
-	}
-
-	/**
-	 * No longer used.
-	 * @return the interval.
-	 * @deprecated No longer used by the binder
-	 */
-	@Deprecated
-	public int getRecoveryInterval() {
-		return this.recoveryInterval;
-	}
-
-	/**
-	 * No longer used.
-	 * @param recoveryInterval the interval.
-	 * @deprecated No longer needed by the binder
-	 */
-	@Deprecated
-	public void setRecoveryInterval(int recoveryInterval) {
-		this.recoveryInterval = recoveryInterval;
-	}
-
-	public boolean isAutoRebalanceEnabled() {
-		return this.autoRebalanceEnabled;
-	}
-
-	public void setAutoRebalanceEnabled(boolean autoRebalanceEnabled) {
-		this.autoRebalanceEnabled = autoRebalanceEnabled;
-	}
-
-	public Map<String, String> getConfiguration() {
-		return this.configuration;
-	}
-
-	public void setConfiguration(Map<String, String> configuration) {
-		this.configuration = configuration;
-	}
-
-	public String getDlqName() {
-		return this.dlqName;
-	}
-
-	public void setDlqName(String dlqName) {
-		this.dlqName = dlqName;
-	}
-
-	public String[] getTrustedPackages() {
-		return this.trustedPackages;
-	}
-
-	public void setTrustedPackages(String[] trustedPackages) {
-		this.trustedPackages = trustedPackages;
-	}
-
-	public KafkaProducerProperties getDlqProducerProperties() {
-		return this.dlqProducerProperties;
-	}
-
-	public void setDlqProducerProperties(KafkaProducerProperties dlqProducerProperties) {
-		this.dlqProducerProperties = dlqProducerProperties;
-	}
-
-	public StandardHeaders getStandardHeaders() {
-		return this.standardHeaders;
-	}
-
-	public void setStandardHeaders(StandardHeaders standardHeaders) {
-		this.standardHeaders = standardHeaders;
-	}
-
-	public String getConverterBeanName() {
-		return this.converterBeanName;
-	}
-
-	public void setConverterBeanName(String converterBeanName) {
-		this.converterBeanName = converterBeanName;
-	}
-
-	public long getIdleEventInterval() {
-		return this.idleEventInterval;
-	}
-
-	public void setIdleEventInterval(long idleEventInterval) {
-		this.idleEventInterval = idleEventInterval;
-	}
-
-	public boolean isDestinationIsPattern() {
-		return this.destinationIsPattern;
-	}
-
-	public void setDestinationIsPattern(boolean destinationIsPattern) {
-		this.destinationIsPattern = destinationIsPattern;
-	}
-
-	/**
-	 * No longer used; get properties such as this via {@link #getTopic()}.
-	 * @return Kafka admin properties
-	 * @deprecated No longer used
-	 */
-	@Deprecated
-	@DeprecatedConfigurationProperty(reason = "Not used since 2.1.1, set properties such as this via 'topic'")
-	@SuppressWarnings("deprecation")
-	public KafkaAdminProperties getAdmin() {
-		// Temporary workaround to copy the topic properties to the admin one.
-		final KafkaAdminProperties kafkaAdminProperties = new KafkaAdminProperties();
-		kafkaAdminProperties.setReplicationFactor(this.topic.getReplicationFactor());
-		kafkaAdminProperties.setReplicasAssignments(this.topic.getReplicasAssignments());
-		kafkaAdminProperties.setConfiguration(this.topic.getProperties());
-		return kafkaAdminProperties;
-	}
-
-	@Deprecated
-	@SuppressWarnings("deprecation")
-	public void setAdmin(KafkaAdminProperties admin) {
-		this.topic = admin;
-	}
-
-	public KafkaTopicProperties getTopic() {
-		return this.topic;
-	}
-
-	public void setTopic(KafkaTopicProperties topic) {
-		this.topic = topic;
-	}
-
-}

spring-cloud-stream-binder-kafka-core/src/main/java/org/springframework/cloud/stream/binder/kafka/properties/KafkaExtendedBindingProperties.java

@@ -1,55 +0,0 @@
-/*
- * Copyright 2016-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.properties;
-
-import java.util.Map;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cloud.stream.binder.AbstractExtendedBindingProperties;
-import org.springframework.cloud.stream.binder.BinderSpecificPropertiesProvider;
-
-/**
- * Kafka specific extended binding properties class that extends from
- * {@link AbstractExtendedBindingProperties}.
- *
- * @author Marius Bogoevici
- * @author Gary Russell
- * @author Soby Chacko
- * @author Oleg Zhurakousky
- */
-@ConfigurationProperties("spring.cloud.stream.kafka")
-public class KafkaExtendedBindingProperties extends
-		AbstractExtendedBindingProperties<KafkaConsumerProperties, KafkaProducerProperties, KafkaBindingProperties> {
-
-	private static final String DEFAULTS_PREFIX = "spring.cloud.stream.kafka.default";
-
-	@Override
-	public String getDefaultsPrefix() {
-		return DEFAULTS_PREFIX;
-	}
-
-	@Override
-	public Map<String, KafkaBindingProperties> getBindings() {
-		return this.doGetBindings();
-	}
-
-	@Override
-	public Class<? extends BinderSpecificPropertiesProvider> getExtendedPropertiesEntryClass() {
-		return KafkaBindingProperties.class;
-	}
-
-}

spring-cloud-stream-binder-kafka-core/src/main/java/org/springframework/cloud/stream/binder/kafka/properties/KafkaTopicProperties.java

@@ -1,62 +0,0 @@
-/*
- * Copyright 2019-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.properties;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Properties for configuring topics.
- *
- * @author Aldo Sinanaj
- * @since 2.2
- *
- */
-public class KafkaTopicProperties {
-
-	private Short replicationFactor;
-
-	private Map<Integer, List<Integer>> replicasAssignments = new HashMap<>();
-
-	private Map<String, String> properties = new HashMap<>();
-
-	public Short getReplicationFactor() {
-		return replicationFactor;
-	}
-
-	public void setReplicationFactor(Short replicationFactor) {
-		this.replicationFactor = replicationFactor;
-	}
-
-	public Map<Integer, List<Integer>> getReplicasAssignments() {
-		return replicasAssignments;
-	}
-
-	public void setReplicasAssignments(Map<Integer, List<Integer>> replicasAssignments) {
-		this.replicasAssignments = replicasAssignments;
-	}
-
-	public Map<String, String> getProperties() {
-		return properties;
-	}
-
-	public void setProperties(Map<String, String> properties) {
-		this.properties = properties;
-	}
-
-}

spring-cloud-stream-binder-kafka-core/src/main/java/org/springframework/cloud/stream/binder/kafka/provisioning/KafkaTopicProvisioner.java

@@ -1,580 +0,0 @@
-/*
- * Copyright 2014-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.provisioning;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.kafka.clients.CommonClientConfigs;
-import org.apache.kafka.clients.admin.AdminClient;
-import org.apache.kafka.clients.admin.AdminClientConfig;
-import org.apache.kafka.clients.admin.CreatePartitionsResult;
-import org.apache.kafka.clients.admin.CreateTopicsResult;
-import org.apache.kafka.clients.admin.DescribeTopicsResult;
-import org.apache.kafka.clients.admin.ListTopicsResult;
-import org.apache.kafka.clients.admin.NewPartitions;
-import org.apache.kafka.clients.admin.NewTopic;
-import org.apache.kafka.clients.admin.TopicDescription;
-import org.apache.kafka.common.KafkaFuture;
-import org.apache.kafka.common.PartitionInfo;
-import org.apache.kafka.common.errors.TopicExistsException;
-import org.apache.kafka.common.errors.UnknownTopicOrPartitionException;
-
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
-import org.springframework.cloud.stream.binder.BinderException;
-import org.springframework.cloud.stream.binder.ExtendedConsumerProperties;
-import org.springframework.cloud.stream.binder.ExtendedProducerProperties;
-import org.springframework.cloud.stream.binder.kafka.properties.KafkaBinderConfigurationProperties;
-import org.springframework.cloud.stream.binder.kafka.properties.KafkaConsumerProperties;
-import org.springframework.cloud.stream.binder.kafka.properties.KafkaProducerProperties;
-import org.springframework.cloud.stream.binder.kafka.properties.KafkaTopicProperties;
-import org.springframework.cloud.stream.binder.kafka.utils.KafkaTopicUtils;
-import org.springframework.cloud.stream.provisioning.ConsumerDestination;
-import org.springframework.cloud.stream.provisioning.ProducerDestination;
-import org.springframework.cloud.stream.provisioning.ProvisioningException;
-import org.springframework.cloud.stream.provisioning.ProvisioningProvider;
-import org.springframework.retry.RetryOperations;
-import org.springframework.retry.backoff.ExponentialBackOffPolicy;
-import org.springframework.retry.policy.SimpleRetryPolicy;
-import org.springframework.retry.support.RetryTemplate;
-import org.springframework.util.Assert;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
-
-/**
- * Kafka implementation for {@link ProvisioningProvider}.
- *
- * @author Soby Chacko
- * @author Gary Russell
- * @author Ilayaperumal Gopinathan
- * @author Simon Flandergan
- * @author Oleg Zhurakousky
- * @author Aldo Sinanaj
- */
-public class KafkaTopicProvisioner implements
-		// @checkstyle:off
-		ProvisioningProvider<ExtendedConsumerProperties<KafkaConsumerProperties>, ExtendedProducerProperties<KafkaProducerProperties>>,
-		// @checkstyle:on
-		InitializingBean {
-
-	private static final int DEFAULT_OPERATION_TIMEOUT = 30;
-
-	private final Log logger = LogFactory.getLog(getClass());
-
-	private final KafkaBinderConfigurationProperties configurationProperties;
-
-	private final int operationTimeout = DEFAULT_OPERATION_TIMEOUT;
-
-	private final Map<String, Object> adminClientProperties;
-
-	private RetryOperations metadataRetryOperations;
-
-	public KafkaTopicProvisioner(
-			KafkaBinderConfigurationProperties kafkaBinderConfigurationProperties,
-			KafkaProperties kafkaProperties) {
-		Assert.isTrue(kafkaProperties != null, "KafkaProperties cannot be null");
-		this.adminClientProperties = kafkaProperties.buildAdminProperties();
-		this.configurationProperties = kafkaBinderConfigurationProperties;
-		normalalizeBootPropsWithBinder(this.adminClientProperties, kafkaProperties,
-				kafkaBinderConfigurationProperties);
-	}
-
-	/**
-	 * Mutator for metadata retry operations.
-	 * @param metadataRetryOperations the retry configuration
-	 */
-	public void setMetadataRetryOperations(RetryOperations metadataRetryOperations) {
-		this.metadataRetryOperations = metadataRetryOperations;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		if (this.metadataRetryOperations == null) {
-			RetryTemplate retryTemplate = new RetryTemplate();
-
-			SimpleRetryPolicy simpleRetryPolicy = new SimpleRetryPolicy();
-			simpleRetryPolicy.setMaxAttempts(10);
-			retryTemplate.setRetryPolicy(simpleRetryPolicy);
-
-			ExponentialBackOffPolicy backOffPolicy = new ExponentialBackOffPolicy();
-			backOffPolicy.setInitialInterval(100);
-			backOffPolicy.setMultiplier(2);
-			backOffPolicy.setMaxInterval(1000);
-			retryTemplate.setBackOffPolicy(backOffPolicy);
-			this.metadataRetryOperations = retryTemplate;
-		}
-	}
-
-	@Override
-	public ProducerDestination provisionProducerDestination(final String name,
-			ExtendedProducerProperties<KafkaProducerProperties> properties) {
-
-		if (this.logger.isInfoEnabled()) {
-			this.logger.info("Using kafka topic for outbound: " + name);
-		}
-		KafkaTopicUtils.validateTopicName(name);
-		try (AdminClient adminClient = AdminClient.create(this.adminClientProperties)) {
-			createTopic(adminClient, name, properties.getPartitionCount(), false,
-					properties.getExtension().getTopic());
-			int partitions = 0;
-			if (this.configurationProperties.isAutoCreateTopics()) {
-				DescribeTopicsResult describeTopicsResult = adminClient
-						.describeTopics(Collections.singletonList(name));
-				KafkaFuture<Map<String, TopicDescription>> all = describeTopicsResult
-						.all();
-
-				Map<String, TopicDescription> topicDescriptions = null;
-				try {
-					topicDescriptions = all.get(this.operationTimeout, TimeUnit.SECONDS);
-				}
-				catch (Exception ex) {
-					throw new ProvisioningException(
-							"Problems encountered with partitions finding", ex);
-				}
-				TopicDescription topicDescription = topicDescriptions.get(name);
-				partitions = topicDescription.partitions().size();
-			}
-			return new KafkaProducerDestination(name, partitions);
-		}
-	}
-
-	@Override
-	public ConsumerDestination provisionConsumerDestination(final String name,
-			final String group,
-			ExtendedConsumerProperties<KafkaConsumerProperties> properties) {
-		if (!properties.isMultiplex()) {
-			return doProvisionConsumerDestination(name, group, properties);
-		}
-		else {
-			String[] destinations = StringUtils.commaDelimitedListToStringArray(name);
-			for (String destination : destinations) {
-				doProvisionConsumerDestination(destination.trim(), group, properties);
-			}
-			return new KafkaConsumerDestination(name);
-		}
-	}
-
-	private ConsumerDestination doProvisionConsumerDestination(final String name,
-			final String group,
-			ExtendedConsumerProperties<KafkaConsumerProperties> properties) {
-
-		if (properties.getExtension().isDestinationIsPattern()) {
-			Assert.isTrue(!properties.getExtension().isEnableDlq(),
-					"enableDLQ is not allowed when listening to topic patterns");
-			if (this.logger.isDebugEnabled()) {
-				this.logger.debug("Listening to a topic pattern - " + name
-						+ " - no provisioning performed");
-			}
-			return new KafkaConsumerDestination(name);
-		}
-		KafkaTopicUtils.validateTopicName(name);
-		boolean anonymous = !StringUtils.hasText(group);
-		Assert.isTrue(!anonymous || !properties.getExtension().isEnableDlq(),
-				"DLQ support is not available for anonymous subscriptions");
-		if (properties.getInstanceCount() == 0) {
-			throw new IllegalArgumentException("Instance count cannot be zero");
-		}
-		int partitionCount = properties.getInstanceCount() * properties.getConcurrency();
-		ConsumerDestination consumerDestination = new KafkaConsumerDestination(name);
-		try (AdminClient adminClient = createAdminClient()) {
-			createTopic(adminClient, name, partitionCount,
-					properties.getExtension().isAutoRebalanceEnabled(),
-					properties.getExtension().getTopic());
-			if (this.configurationProperties.isAutoCreateTopics()) {
-				DescribeTopicsResult describeTopicsResult = adminClient
-						.describeTopics(Collections.singletonList(name));
-				KafkaFuture<Map<String, TopicDescription>> all = describeTopicsResult
-						.all();
-				try {
-					Map<String, TopicDescription> topicDescriptions = all
-							.get(this.operationTimeout, TimeUnit.SECONDS);
-					TopicDescription topicDescription = topicDescriptions.get(name);
-					int partitions = topicDescription.partitions().size();
-					consumerDestination = createDlqIfNeedBe(adminClient, name, group,
-							properties, anonymous, partitions);
-					if (consumerDestination == null) {
-						consumerDestination = new KafkaConsumerDestination(name,
-								partitions);
-					}
-				}
-				catch (Exception ex) {
-					throw new ProvisioningException("provisioning exception", ex);
-				}
-			}
-		}
-		return consumerDestination;
-	}
-
-	AdminClient createAdminClient() {
-		return AdminClient.create(this.adminClientProperties);
-	}
-
-	/**
-	 * In general, binder properties supersede boot kafka properties. The one exception is
-	 * the bootstrap servers. In that case, we should only override the boot properties if
-	 * (there is a binder property AND it is a non-default value) OR (if there is no boot
-	 * property); this is needed because the binder property never returns a null value.
-	 * @param adminProps the admin properties to normalize.
-	 * @param bootProps the boot kafka properties.
-	 * @param binderProps the binder kafka properties.
-	 */
-	private void normalalizeBootPropsWithBinder(Map<String, Object> adminProps,
-			KafkaProperties bootProps, KafkaBinderConfigurationProperties binderProps) {
-		// First deal with the outlier
-		String kafkaConnectionString = binderProps.getKafkaConnectionString();
-		if (ObjectUtils
-				.isEmpty(adminProps.get(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG))
-				|| !kafkaConnectionString
-						.equals(binderProps.getDefaultKafkaConnectionString())) {
-			adminProps.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG,
-					kafkaConnectionString);
-		}
-		// Now override any boot values with binder values
-		Map<String, String> binderProperties = binderProps.getConfiguration();
-		Set<String> adminConfigNames = AdminClientConfig.configNames();
-		binderProperties.forEach((key, value) -> {
-			if (key.equals(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG)) {
-				throw new IllegalStateException(
-						"Set binder bootstrap servers via the 'brokers' property, not 'configuration'");
-			}
-			if (adminConfigNames.contains(key)) {
-				Object replaced = adminProps.put(key, value);
-				if (replaced != null && this.logger.isDebugEnabled()) {
-					this.logger.debug("Overrode boot property: [" + key + "], from: ["
-							+ replaced + "] to: [" + value + "]");
-				}
-			}
-		});
-	}
-
-	private ConsumerDestination createDlqIfNeedBe(AdminClient adminClient, String name,
-			String group, ExtendedConsumerProperties<KafkaConsumerProperties> properties,
-			boolean anonymous, int partitions) {
-		if (properties.getExtension().isEnableDlq() && !anonymous) {
-			String dlqTopic = StringUtils.hasText(properties.getExtension().getDlqName())
-					? properties.getExtension().getDlqName()
-					: "error." + name + "." + group;
-			try {
-				createTopicAndPartitions(adminClient, dlqTopic, partitions,
-						properties.getExtension().isAutoRebalanceEnabled(),
-						properties.getExtension().getTopic());
-			}
-			catch (Throwable throwable) {
-				if (throwable instanceof Error) {
-					throw (Error) throwable;
-				}
-				else {
-					throw new ProvisioningException("provisioning exception", throwable);
-				}
-			}
-			return new KafkaConsumerDestination(name, partitions, dlqTopic);
-		}
-		return null;
-	}
-
-	private void createTopic(AdminClient adminClient, String name, int partitionCount,
-			boolean tolerateLowerPartitionsOnBroker, KafkaTopicProperties properties) {
-		try {
-			createTopicIfNecessary(adminClient, name, partitionCount,
-					tolerateLowerPartitionsOnBroker, properties);
-		}
-		// TODO: Remove catching Throwable. See this thread:
-		// TODO:
-		// https://github.com/spring-cloud/spring-cloud-stream-binder-kafka/pull/514#discussion_r241075940
-		catch (Throwable throwable) {
-			if (throwable instanceof Error) {
-				throw (Error) throwable;
-			}
-			else {
-				// TODO:
-				// https://github.com/spring-cloud/spring-cloud-stream-binder-kafka/pull/514#discussion_r241075940
-				throw new ProvisioningException("Provisioning exception", throwable);
-			}
-		}
-	}
-
-	private void createTopicIfNecessary(AdminClient adminClient, final String topicName,
-			final int partitionCount, boolean tolerateLowerPartitionsOnBroker,
-			KafkaTopicProperties properties) throws Throwable {
-
-		if (this.configurationProperties.isAutoCreateTopics()) {
-			createTopicAndPartitions(adminClient, topicName, partitionCount,
-					tolerateLowerPartitionsOnBroker, properties);
-		}
-		else {
-			this.logger.info("Auto creation of topics is disabled.");
-		}
-	}
-
-	/**
-	 * Creates a Kafka topic if needed, or try to increase its partition count to the
-	 * desired number.
-	 * @param adminClient kafka admin client
-	 * @param topicName topic name
-	 * @param partitionCount partition count
-	 * @param tolerateLowerPartitionsOnBroker whether lower partitions count on broker is
-	 * tolerated ot not
-	 * @param topicProperties kafka topic properties
-	 * @throws Throwable from topic creation
-	 */
-	private void createTopicAndPartitions(AdminClient adminClient, final String topicName,
-			final int partitionCount, boolean tolerateLowerPartitionsOnBroker,
-			KafkaTopicProperties topicProperties) throws Throwable {
-
-		ListTopicsResult listTopicsResult = adminClient.listTopics();
-		KafkaFuture<Set<String>> namesFutures = listTopicsResult.names();
-
-		Set<String> names = namesFutures.get(this.operationTimeout, TimeUnit.SECONDS);
-		if (names.contains(topicName)) {
-			// only consider minPartitionCount for resizing if autoAddPartitions is true
-			int effectivePartitionCount = this.configurationProperties
-					.isAutoAddPartitions()
-							? Math.max(
-									this.configurationProperties.getMinPartitionCount(),
-									partitionCount)
-							: partitionCount;
-			DescribeTopicsResult describeTopicsResult = adminClient
-					.describeTopics(Collections.singletonList(topicName));
-			KafkaFuture<Map<String, TopicDescription>> topicDescriptionsFuture = describeTopicsResult
-					.all();
-			Map<String, TopicDescription> topicDescriptions = topicDescriptionsFuture
-					.get(this.operationTimeout, TimeUnit.SECONDS);
-			TopicDescription topicDescription = topicDescriptions.get(topicName);
-			int partitionSize = topicDescription.partitions().size();
-			if (partitionSize < effectivePartitionCount) {
-				if (this.configurationProperties.isAutoAddPartitions()) {
-					CreatePartitionsResult partitions = adminClient
-							.createPartitions(Collections.singletonMap(topicName,
-									NewPartitions.increaseTo(effectivePartitionCount)));
-					partitions.all().get(this.operationTimeout, TimeUnit.SECONDS);
-				}
-				else if (tolerateLowerPartitionsOnBroker) {
-					this.logger.warn("The number of expected partitions was: "
-							+ partitionCount + ", but " + partitionSize
-							+ (partitionSize > 1 ? " have " : " has ")
-							+ "been found instead." + "There will be "
-							+ (effectivePartitionCount - partitionSize)
-							+ " idle consumers");
-				}
-				else {
-					throw new ProvisioningException(
-							"The number of expected partitions was: " + partitionCount
-									+ ", but " + partitionSize
-									+ (partitionSize > 1 ? " have " : " has ")
-									+ "been found instead."
-									+ "Consider either increasing the partition count of the topic or enabling "
-									+ "`autoAddPartitions`");
-				}
-			}
-		}
-		else {
-			// always consider minPartitionCount for topic creation
-			final int effectivePartitionCount = Math.max(
-					this.configurationProperties.getMinPartitionCount(), partitionCount);
-			this.metadataRetryOperations.execute((context) -> {
-
-				NewTopic newTopic;
-				Map<Integer, List<Integer>> replicasAssignments = topicProperties
-						.getReplicasAssignments();
-				if (replicasAssignments != null && replicasAssignments.size() > 0) {
-					newTopic = new NewTopic(topicName,
-							topicProperties.getReplicasAssignments());
-				}
-				else {
-					newTopic = new NewTopic(topicName, effectivePartitionCount,
-							topicProperties.getReplicationFactor() != null
-									? topicProperties.getReplicationFactor()
-									: this.configurationProperties
-											.getReplicationFactor());
-				}
-				if (topicProperties.getProperties().size() > 0) {
-					newTopic.configs(topicProperties.getProperties());
-				}
-				CreateTopicsResult createTopicsResult = adminClient
-						.createTopics(Collections.singletonList(newTopic));
-				try {
-					createTopicsResult.all().get(this.operationTimeout, TimeUnit.SECONDS);
-				}
-				catch (Exception ex) {
-					if (ex instanceof ExecutionException) {
-						if (ex.getCause() instanceof TopicExistsException) {
-							if (this.logger.isWarnEnabled()) {
-								this.logger.warn("Attempt to create topic: " + topicName
-										+ ". Topic already exists.");
-							}
-						}
-						else {
-							this.logger.error("Failed to create topics", ex.getCause());
-							throw ex.getCause();
-						}
-					}
-					else {
-						this.logger.error("Failed to create topics", ex.getCause());
-						throw ex.getCause();
-					}
-				}
-				return null;
-			});
-		}
-	}
-
-	public Collection<PartitionInfo> getPartitionsForTopic(final int partitionCount,
-			final boolean tolerateLowerPartitionsOnBroker,
-			final Callable<Collection<PartitionInfo>> callable, final String topicName) {
-		try {
-			return this.metadataRetryOperations.execute((context) -> {
-				Collection<PartitionInfo> partitions = Collections.emptyList();
-
-				try {
-					// This call may return null or throw an exception.
-					partitions = callable.call();
-				}
-				catch (Exception ex) {
-					// The above call can potentially throw exceptions such as timeout. If
-					// we can determine
-					// that the exception was due to an unknown topic on the broker, just
-					// simply rethrow that.
-					if (ex instanceof UnknownTopicOrPartitionException) {
-						throw ex;
-					}
-					this.logger.error("Failed to obtain partition information", ex);
-				}
-				// In some cases, the above partition query may not throw an UnknownTopic..Exception for various reasons.
-				// For that, we are forcing another query to ensure that the topic is present on the server.
-				if (CollectionUtils.isEmpty(partitions)) {
-					final AdminClient adminClient = AdminClient
-							.create(this.adminClientProperties);
-					final DescribeTopicsResult describeTopicsResult = adminClient
-							.describeTopics(Collections.singletonList(topicName));
-					try {
-						describeTopicsResult.all().get();
-					}
-					catch (ExecutionException ex) {
-						if (ex.getCause() instanceof UnknownTopicOrPartitionException) {
-							throw (UnknownTopicOrPartitionException) ex.getCause();
-						}
-						else {
-							logger.warn("No partitions have been retrieved for the topic "
-									+ "(" + topicName
-									+ "). This will affect the health check.");
-						}
-					}
-				}
-				// do a sanity check on the partition set
-				int partitionSize = CollectionUtils.isEmpty(partitions) ? 0 : partitions.size();
-				if (partitionSize < partitionCount) {
-					if (tolerateLowerPartitionsOnBroker) {
-						this.logger.warn("The number of expected partitions was: "
-								+ partitionCount + ", but " + partitionSize
-								+ (partitionSize > 1 ? " have " : " has ")
-								+ "been found instead." + "There will be "
-								+ (partitionCount - partitionSize) + " idle consumers");
-					}
-					else {
-						throw new IllegalStateException(
-								"The number of expected partitions was: " + partitionCount
-										+ ", but " + partitionSize
-										+ (partitionSize > 1 ? " have " : " has ")
-										+ "been found instead");
-					}
-				}
-				return partitions;
-			});
-		}
-		catch (Exception ex) {
-			this.logger.error("Cannot initialize Binder", ex);
-			throw new BinderException("Cannot initialize binder:", ex);
-		}
-	}
-
-	private static final class KafkaProducerDestination implements ProducerDestination {
-
-		private final String producerDestinationName;
-
-		private final int partitions;
-
-		KafkaProducerDestination(String destinationName, Integer partitions) {
-			this.producerDestinationName = destinationName;
-			this.partitions = partitions;
-		}
-
-		@Override
-		public String getName() {
-			return this.producerDestinationName;
-		}
-
-		@Override
-		public String getNameForPartition(int partition) {
-			return this.producerDestinationName;
-		}
-
-		@Override
-		public String toString() {
-			return "KafkaProducerDestination{" + "producerDestinationName='"
-					+ producerDestinationName + '\'' + ", partitions=" + partitions + '}';
-		}
-
-	}
-
-	private static final class KafkaConsumerDestination implements ConsumerDestination {
-
-		private final String consumerDestinationName;
-
-		private final int partitions;
-
-		private final String dlqName;
-
-		KafkaConsumerDestination(String consumerDestinationName) {
-			this(consumerDestinationName, 0, null);
-		}
-
-		KafkaConsumerDestination(String consumerDestinationName, int partitions) {
-			this(consumerDestinationName, partitions, null);
-		}
-
-		KafkaConsumerDestination(String consumerDestinationName, Integer partitions,
-				String dlqName) {
-			this.consumerDestinationName = consumerDestinationName;
-			this.partitions = partitions;
-			this.dlqName = dlqName;
-		}
-
-		@Override
-		public String getName() {
-			return this.consumerDestinationName;
-		}
-
-		@Override
-		public String toString() {
-			return "KafkaConsumerDestination{" + "consumerDestinationName='"
-					+ consumerDestinationName + '\'' + ", partitions=" + partitions
-					+ ", dlqName='" + dlqName + '\'' + '}';
-		}
-
-	}
-
-}

spring-cloud-stream-binder-kafka-core/src/test/java/org/springframework/cloud/stream/binder/kafka/properties/KafkaBinderConfigurationPropertiesTest.java

@@ -1,108 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.properties;
-
-import java.util.Collections;
-import java.util.Map;
-
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.junit.Test;
-
-import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class KafkaBinderConfigurationPropertiesTest {
-
-	@Test
-	public void mergedConsumerConfigurationFiltersGroupIdFromKafkaProperties() {
-		KafkaProperties kafkaProperties = new KafkaProperties();
-		kafkaProperties.getConsumer().setGroupId("group1");
-		KafkaBinderConfigurationProperties kafkaBinderConfigurationProperties =
-				new KafkaBinderConfigurationProperties(kafkaProperties);
-
-		Map<String, Object> mergedConsumerConfiguration =
-				kafkaBinderConfigurationProperties.mergedConsumerConfiguration();
-
-		assertThat(mergedConsumerConfiguration).doesNotContainKeys(ConsumerConfig.GROUP_ID_CONFIG);
-	}
-
-	@Test
-	public void mergedConsumerConfigurationFiltersEnableAutoCommitFromKafkaProperties() {
-		KafkaProperties kafkaProperties = new KafkaProperties();
-		kafkaProperties.getConsumer().setEnableAutoCommit(true);
-		KafkaBinderConfigurationProperties kafkaBinderConfigurationProperties =
-				new KafkaBinderConfigurationProperties(kafkaProperties);
-
-		Map<String, Object> mergedConsumerConfiguration =
-				kafkaBinderConfigurationProperties.mergedConsumerConfiguration();
-
-		assertThat(mergedConsumerConfiguration).doesNotContainKeys(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG);
-	}
-
-	@Test
-	public void mergedConsumerConfigurationFiltersGroupIdFromKafkaBinderConfigurationPropertiesConfiguration() {
-		KafkaProperties kafkaProperties = new KafkaProperties();
-		KafkaBinderConfigurationProperties kafkaBinderConfigurationProperties =
-				new KafkaBinderConfigurationProperties(kafkaProperties);
-		kafkaBinderConfigurationProperties
-				.setConfiguration(Collections.singletonMap(ConsumerConfig.GROUP_ID_CONFIG, "group1"));
-
-		Map<String, Object> mergedConsumerConfiguration = kafkaBinderConfigurationProperties.mergedConsumerConfiguration();
-
-		assertThat(mergedConsumerConfiguration).doesNotContainKeys(ConsumerConfig.GROUP_ID_CONFIG);
-	}
-
-	@Test
-	public void mergedConsumerConfigurationFiltersEnableAutoCommitFromKafkaBinderConfigurationPropertiesConfiguration() {
-		KafkaProperties kafkaProperties = new KafkaProperties();
-		KafkaBinderConfigurationProperties kafkaBinderConfigurationProperties =
-				new KafkaBinderConfigurationProperties(kafkaProperties);
-		kafkaBinderConfigurationProperties
-				.setConfiguration(Collections.singletonMap(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, "true"));
-
-		Map<String, Object> mergedConsumerConfiguration = kafkaBinderConfigurationProperties.mergedConsumerConfiguration();
-
-		assertThat(mergedConsumerConfiguration).doesNotContainKeys(ConsumerConfig.GROUP_ID_CONFIG);
-	}
-
-	@Test
-	public void mergedConsumerConfigurationFiltersGroupIdFromKafkaBinderConfigurationPropertiesConsumerProperties() {
-		KafkaProperties kafkaProperties = new KafkaProperties();
-		KafkaBinderConfigurationProperties kafkaBinderConfigurationProperties =
-				new KafkaBinderConfigurationProperties(kafkaProperties);
-		kafkaBinderConfigurationProperties
-				.setConsumerProperties(Collections.singletonMap(ConsumerConfig.GROUP_ID_CONFIG, "group1"));
-
-		Map<String, Object> mergedConsumerConfiguration = kafkaBinderConfigurationProperties.mergedConsumerConfiguration();
-
-		assertThat(mergedConsumerConfiguration).doesNotContainKeys(ConsumerConfig.GROUP_ID_CONFIG);
-	}
-
-	@Test
-	public void mergedConsumerConfigurationFiltersEnableAutoCommitFromKafkaBinderConfigurationPropertiesConsumerProps() {
-		KafkaProperties kafkaProperties = new KafkaProperties();
-		KafkaBinderConfigurationProperties kafkaBinderConfigurationProperties =
-				new KafkaBinderConfigurationProperties(kafkaProperties);
-		kafkaBinderConfigurationProperties
-				.setConsumerProperties(Collections.singletonMap(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, "true"));
-
-		Map<String, Object> mergedConsumerConfiguration = kafkaBinderConfigurationProperties.mergedConsumerConfiguration();
-
-		assertThat(mergedConsumerConfiguration).doesNotContainKeys(ConsumerConfig.GROUP_ID_CONFIG);
-	}
-}

spring-cloud-stream-binder-kafka-core/src/test/java/org/springframework/cloud/stream/binder/kafka/provisioning/KafkaTopicProvisionerTests.java

@@ -1,118 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.provisioning;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.kafka.clients.CommonClientConfigs;
-import org.apache.kafka.clients.admin.AdminClient;
-import org.apache.kafka.clients.admin.AdminClientConfig;
-import org.apache.kafka.common.config.SslConfigs;
-import org.apache.kafka.common.network.SslChannelBuilder;
-import org.junit.Test;
-
-import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
-import org.springframework.cloud.stream.binder.kafka.properties.KafkaBinderConfigurationProperties;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.kafka.test.utils.KafkaTestUtils;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-
-/**
- * @author Gary Russell
- * @since 2.0
- *
- */
-public class KafkaTopicProvisionerTests {
-
-	@SuppressWarnings("rawtypes")
-	@Test
-	public void bootPropertiesOverriddenExceptServers() throws Exception {
-		KafkaProperties bootConfig = new KafkaProperties();
-		bootConfig.getProperties().put(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG,
-				"PLAINTEXT");
-		bootConfig.setBootstrapServers(Collections.singletonList("localhost:1234"));
-		KafkaBinderConfigurationProperties binderConfig = new KafkaBinderConfigurationProperties(
-				bootConfig);
-		binderConfig.getConfiguration().put(AdminClientConfig.SECURITY_PROTOCOL_CONFIG,
-				"SSL");
-		ClassPathResource ts = new ClassPathResource("test.truststore.ks");
-		binderConfig.getConfiguration().put(SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG,
-				ts.getFile().getAbsolutePath());
-		binderConfig.setBrokers("localhost:9092");
-		KafkaTopicProvisioner provisioner = new KafkaTopicProvisioner(binderConfig,
-				bootConfig);
-		AdminClient adminClient = provisioner.createAdminClient();
-		assertThat(KafkaTestUtils.getPropertyValue(adminClient,
-				"client.selector.channelBuilder")).isInstanceOf(SslChannelBuilder.class);
-		Map configs = KafkaTestUtils.getPropertyValue(adminClient,
-				"client.selector.channelBuilder.configs", Map.class);
-		assertThat(
-				((List) configs.get(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG)).get(0))
-						.isEqualTo("localhost:1234");
-		adminClient.close();
-	}
-
-	@SuppressWarnings("rawtypes")
-	@Test
-	public void bootPropertiesOverriddenIncludingServers() throws Exception {
-		KafkaProperties bootConfig = new KafkaProperties();
-		bootConfig.getProperties().put(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG,
-				"PLAINTEXT");
-		bootConfig.setBootstrapServers(Collections.singletonList("localhost:9092"));
-		KafkaBinderConfigurationProperties binderConfig = new KafkaBinderConfigurationProperties(
-				bootConfig);
-		binderConfig.getConfiguration().put(AdminClientConfig.SECURITY_PROTOCOL_CONFIG,
-				"SSL");
-		ClassPathResource ts = new ClassPathResource("test.truststore.ks");
-		binderConfig.getConfiguration().put(SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG,
-				ts.getFile().getAbsolutePath());
-		binderConfig.setBrokers("localhost:1234");
-		KafkaTopicProvisioner provisioner = new KafkaTopicProvisioner(binderConfig,
-				bootConfig);
-		AdminClient adminClient = provisioner.createAdminClient();
-		assertThat(KafkaTestUtils.getPropertyValue(adminClient,
-				"client.selector.channelBuilder")).isInstanceOf(SslChannelBuilder.class);
-		Map configs = KafkaTestUtils.getPropertyValue(adminClient,
-				"client.selector.channelBuilder.configs", Map.class);
-		assertThat(
-				((List) configs.get(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG)).get(0))
-						.isEqualTo("localhost:1234");
-		adminClient.close();
-	}
-
-	@Test
-	public void brokersInvalid() throws Exception {
-		KafkaProperties bootConfig = new KafkaProperties();
-		KafkaBinderConfigurationProperties binderConfig = new KafkaBinderConfigurationProperties(
-				bootConfig);
-		binderConfig.getConfiguration().put(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG,
-				"localhost:1234");
-		try {
-			new KafkaTopicProvisioner(binderConfig, bootConfig);
-			fail("Expected illegal state");
-		}
-		catch (IllegalStateException e) {
-			assertThat(e.getMessage()).isEqualTo(
-					"Set binder bootstrap servers via the 'brokers' property, not 'configuration'");
-		}
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/pom.xml

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<artifactId>spring-cloud-stream-binder-kafka-streams</artifactId>
-	<packaging>jar</packaging>
-	<name>spring-cloud-stream-binder-kafka-streams</name>
-	<description>Kafka Streams Binder Implementation</description>
-
-	<parent>
-		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-stream-binder-kafka-parent</artifactId>
-		<version>2.2.0.RC1</version>
-	</parent>
-
-	<properties>
-		<avro.version>1.8.2</avro.version>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-binder-kafka-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-configuration-processor</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-autoconfigure</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.kafka</groupId>
-			<artifactId>kafka-streams</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.kafka</groupId>
-			<artifactId>spring-kafka</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.kafka</groupId>
-			<artifactId>spring-kafka-test</artifactId>
-		</dependency>
-		<!-- Added back since Kafka still depends on it, but it has been removed by Boot due to EOL -->
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.17</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-binder-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-autoconfigure-processor</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<!-- Following dependencies are needed to support Kafka 1.1.0 client-->
-		<dependency>
-			<groupId>org.apache.kafka</groupId>
-			<artifactId>kafka_2.11</artifactId>
-			<version>${kafka.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.kafka</groupId>
-			<artifactId>kafka_2.11</artifactId>
-			<version>${kafka.version}</version>
-			<classifier>test</classifier>
-			<scope>test</scope>
-		</dependency>
-		<!-- Following dependencies are only provided for testing and won't be packaged with the binder apps-->
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-schema</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.avro</groupId>
-			<artifactId>avro</artifactId>
-			<version>${avro.version}</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.avro</groupId>
-				<artifactId>avro-maven-plugin</artifactId>
-				<version>${avro.version}</version>
-				<executions>
-					<execution>
-						<phase>generate-test-sources</phase>
-						<goals>
-							<goal>schema</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.basedir}/target/generated-test-sources</outputDirectory>
-							<testOutputDirectory>${project.basedir}/target/generated-test-sources</testOutputDirectory>
-							<testSourceDirectory>${project.basedir}/src/test/resources/avro</testSourceDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/GlobalKTableBinder.java

@@ -1,121 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams;
-
-import java.util.Map;
-
-import org.apache.kafka.streams.kstream.GlobalKTable;
-
-import org.springframework.cloud.stream.binder.AbstractBinder;
-import org.springframework.cloud.stream.binder.BinderSpecificPropertiesProvider;
-import org.springframework.cloud.stream.binder.Binding;
-import org.springframework.cloud.stream.binder.DefaultBinding;
-import org.springframework.cloud.stream.binder.ExtendedConsumerProperties;
-import org.springframework.cloud.stream.binder.ExtendedProducerProperties;
-import org.springframework.cloud.stream.binder.ExtendedPropertiesBinder;
-import org.springframework.cloud.stream.binder.kafka.provisioning.KafkaTopicProvisioner;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsBinderConfigurationProperties;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsConsumerProperties;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsExtendedBindingProperties;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsProducerProperties;
-import org.springframework.util.StringUtils;
-
-/**
- * An {@link AbstractBinder} implementation for {@link GlobalKTable}.
- * <p>
- * Provides only consumer binding for the bound {@link GlobalKTable}. Output bindings are
- * not allowed on this binder.
- *
- * @author Soby Chacko
- * @since 2.1.0
- */
-public class GlobalKTableBinder extends
-		// @checkstyle:off
-		AbstractBinder<GlobalKTable<Object, Object>, ExtendedConsumerProperties<KafkaStreamsConsumerProperties>, ExtendedProducerProperties<KafkaStreamsProducerProperties>>
-		implements
-		ExtendedPropertiesBinder<GlobalKTable<Object, Object>, KafkaStreamsConsumerProperties, KafkaStreamsProducerProperties> {
-
-	// @checkstyle:on
-	private final KafkaStreamsBinderConfigurationProperties binderConfigurationProperties;
-
-	private final KafkaTopicProvisioner kafkaTopicProvisioner;
-
-	private final Map<String, KafkaStreamsDlqDispatch> kafkaStreamsDlqDispatchers;
-
-	// @checkstyle:off
-	private KafkaStreamsExtendedBindingProperties kafkaStreamsExtendedBindingProperties = new KafkaStreamsExtendedBindingProperties();
-
-	// @checkstyle:on
-
-	public GlobalKTableBinder(
-			KafkaStreamsBinderConfigurationProperties binderConfigurationProperties,
-			KafkaTopicProvisioner kafkaTopicProvisioner,
-			Map<String, KafkaStreamsDlqDispatch> kafkaStreamsDlqDispatchers) {
-		this.binderConfigurationProperties = binderConfigurationProperties;
-		this.kafkaTopicProvisioner = kafkaTopicProvisioner;
-		this.kafkaStreamsDlqDispatchers = kafkaStreamsDlqDispatchers;
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	protected Binding<GlobalKTable<Object, Object>> doBindConsumer(String name,
-			String group, GlobalKTable<Object, Object> inputTarget,
-			ExtendedConsumerProperties<KafkaStreamsConsumerProperties> properties) {
-		if (!StringUtils.hasText(group)) {
-			group = this.binderConfigurationProperties.getApplicationId();
-		}
-		KafkaStreamsBinderUtils.prepareConsumerBinding(name, group,
-				getApplicationContext(), this.kafkaTopicProvisioner,
-				this.binderConfigurationProperties, properties,
-				this.kafkaStreamsDlqDispatchers);
-		return new DefaultBinding<>(name, group, inputTarget, null);
-	}
-
-	@Override
-	protected Binding<GlobalKTable<Object, Object>> doBindProducer(String name,
-			GlobalKTable<Object, Object> outboundBindTarget,
-			ExtendedProducerProperties<KafkaStreamsProducerProperties> properties) {
-		throw new UnsupportedOperationException(
-				"No producer level binding is allowed for GlobalKTable");
-	}
-
-	@Override
-	public KafkaStreamsConsumerProperties getExtendedConsumerProperties(
-			String channelName) {
-		return this.kafkaStreamsExtendedBindingProperties
-				.getExtendedConsumerProperties(channelName);
-	}
-
-	@Override
-	public KafkaStreamsProducerProperties getExtendedProducerProperties(
-			String channelName) {
-		throw new UnsupportedOperationException(
-				"No producer binding is allowed and therefore no properties");
-	}
-
-	@Override
-	public String getDefaultsPrefix() {
-		return this.kafkaStreamsExtendedBindingProperties.getDefaultsPrefix();
-	}
-
-	@Override
-	public Class<? extends BinderSpecificPropertiesProvider> getExtendedPropertiesEntryClass() {
-		return this.kafkaStreamsExtendedBindingProperties
-				.getExtendedPropertiesEntryClass();
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/GlobalKTableBinderConfiguration.java

@@ -1,76 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams;
-
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
-import org.springframework.cloud.stream.binder.kafka.properties.KafkaBinderConfigurationProperties;
-import org.springframework.cloud.stream.binder.kafka.provisioning.KafkaTopicProvisioner;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsBinderConfigurationProperties;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Configuration for GlobalKTable binder.
- *
- * @author Soby Chacko
- * @since 2.1.0
- */
-@Configuration
-public class GlobalKTableBinderConfiguration {
-
-	@Bean
-	@ConditionalOnBean(name = "outerContext")
-	public static BeanFactoryPostProcessor outerContextBeanFactoryPostProcessor() {
-		return (beanFactory) -> {
-			// It is safe to call getBean("outerContext") here, because this bean is
-			// registered as first
-			// and as independent from the parent context.
-			ApplicationContext outerContext = (ApplicationContext) beanFactory
-					.getBean("outerContext");
-			beanFactory.registerSingleton(
-					KafkaStreamsBinderConfigurationProperties.class.getSimpleName(),
-					outerContext
-							.getBean(KafkaStreamsBinderConfigurationProperties.class));
-			beanFactory.registerSingleton(
-					KafkaStreamsBindingInformationCatalogue.class.getSimpleName(),
-					outerContext.getBean(KafkaStreamsBindingInformationCatalogue.class));
-		};
-	}
-
-	@Bean
-	public KafkaTopicProvisioner provisioningProvider(
-			KafkaBinderConfigurationProperties binderConfigurationProperties,
-			KafkaProperties kafkaProperties) {
-		return new KafkaTopicProvisioner(binderConfigurationProperties, kafkaProperties);
-	}
-
-	@Bean
-	public GlobalKTableBinder GlobalKTableBinder(
-			KafkaStreamsBinderConfigurationProperties binderConfigurationProperties,
-			KafkaTopicProvisioner kafkaTopicProvisioner,
-			@Qualifier("kafkaStreamsDlqDispatchers") Map<String, KafkaStreamsDlqDispatch> kafkaStreamsDlqDispatchers) {
-		return new GlobalKTableBinder(binderConfigurationProperties,
-				kafkaTopicProvisioner, kafkaStreamsDlqDispatchers);
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/GlobalKTableBoundElementFactory.java

@@ -1,115 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams;
-
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-import org.apache.kafka.streams.kstream.GlobalKTable;
-
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.cloud.stream.binder.ConsumerProperties;
-import org.springframework.cloud.stream.binding.AbstractBindingTargetFactory;
-import org.springframework.cloud.stream.config.BindingServiceProperties;
-import org.springframework.util.Assert;
-
-/**
- * {@link org.springframework.cloud.stream.binding.BindingTargetFactory} for
- * {@link GlobalKTable}
- *
- * Input bindings are only created as output bindings on GlobalKTable are not allowed.
- *
- * @author Soby Chacko
- * @since 2.1.0
- */
-public class GlobalKTableBoundElementFactory
-		extends AbstractBindingTargetFactory<GlobalKTable> {
-
-	private final BindingServiceProperties bindingServiceProperties;
-
-	GlobalKTableBoundElementFactory(BindingServiceProperties bindingServiceProperties) {
-		super(GlobalKTable.class);
-		this.bindingServiceProperties = bindingServiceProperties;
-	}
-
-	@Override
-	public GlobalKTable createInput(String name) {
-		ConsumerProperties consumerProperties = this.bindingServiceProperties
-				.getConsumerProperties(name);
-		// Always set multiplex to true in the kafka streams binder
-		consumerProperties.setMultiplex(true);
-
-		// @checkstyle:off
-		GlobalKTableBoundElementFactory.GlobalKTableWrapperHandler wrapper = new GlobalKTableBoundElementFactory.GlobalKTableWrapperHandler();
-		// @checkstyle:on
-		ProxyFactory proxyFactory = new ProxyFactory(
-				GlobalKTableBoundElementFactory.GlobalKTableWrapper.class,
-				GlobalKTable.class);
-		proxyFactory.addAdvice(wrapper);
-
-		return (GlobalKTable) proxyFactory.getProxy();
-	}
-
-	@Override
-	public GlobalKTable createOutput(String name) {
-		throw new UnsupportedOperationException(
-				"Outbound operations are not allowed on target type GlobalKTable");
-	}
-
-	/**
-	 * Wrapper for GlobalKTable proxy.
-	 */
-	public interface GlobalKTableWrapper {
-
-		void wrap(GlobalKTable<Object, Object> delegate);
-
-	}
-
-	private static class GlobalKTableWrapperHandler implements
-			GlobalKTableBoundElementFactory.GlobalKTableWrapper, MethodInterceptor {
-
-		private GlobalKTable<Object, Object> delegate;
-
-		public void wrap(GlobalKTable<Object, Object> delegate) {
-			Assert.notNull(delegate, "delegate cannot be null");
-			Assert.isNull(this.delegate, "delegate already set to " + this.delegate);
-			this.delegate = delegate;
-		}
-
-		@Override
-		public Object invoke(MethodInvocation methodInvocation) throws Throwable {
-			if (methodInvocation.getMethod().getDeclaringClass()
-					.equals(GlobalKTable.class)) {
-				Assert.notNull(this.delegate,
-						"Trying to prepareConsumerBinding " + methodInvocation.getMethod()
-								+ "  but no delegate has been set.");
-				return methodInvocation.getMethod().invoke(this.delegate,
-						methodInvocation.getArguments());
-			}
-			else if (methodInvocation.getMethod().getDeclaringClass()
-					.equals(GlobalKTableBoundElementFactory.GlobalKTableWrapper.class)) {
-				return methodInvocation.getMethod().invoke(this,
-						methodInvocation.getArguments());
-			}
-			else {
-				throw new IllegalStateException(
-						"Only GlobalKTable method invocations are permitted");
-			}
-		}
-
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/InteractiveQueryService.java

@@ -1,127 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams;
-
-import java.util.Map;
-import java.util.Optional;
-
-import org.apache.kafka.common.serialization.Serializer;
-import org.apache.kafka.streams.KafkaStreams;
-import org.apache.kafka.streams.errors.InvalidStateStoreException;
-import org.apache.kafka.streams.state.HostInfo;
-import org.apache.kafka.streams.state.QueryableStoreType;
-import org.apache.kafka.streams.state.StreamsMetadata;
-
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsBinderConfigurationProperties;
-import org.springframework.util.StringUtils;
-
-/**
- * Services pertinent to the interactive query capabilities of Kafka Streams. This class
- * provides services such as querying for a particular store, which instance is hosting a
- * particular store etc. This is part of the public API of the kafka streams binder and
- * the users can inject this service in their applications to make use of it.
- *
- * @author Soby Chacko
- * @author Renwei Han
- * @since 2.1.0
- */
-public class InteractiveQueryService {
-
-	private final KafkaStreamsRegistry kafkaStreamsRegistry;
-
-	private final KafkaStreamsBinderConfigurationProperties binderConfigurationProperties;
-
-	/**
-	 * Constructor for InteractiveQueryService.
-	 * @param kafkaStreamsRegistry holding {@link KafkaStreamsRegistry}
-	 * @param binderConfigurationProperties kafka Streams binder configuration properties
-	 */
-	public InteractiveQueryService(KafkaStreamsRegistry kafkaStreamsRegistry,
-			KafkaStreamsBinderConfigurationProperties binderConfigurationProperties) {
-		this.kafkaStreamsRegistry = kafkaStreamsRegistry;
-		this.binderConfigurationProperties = binderConfigurationProperties;
-	}
-
-	/**
-	 * Retrieve and return a queryable store by name created in the application.
-	 * @param storeName name of the queryable store
-	 * @param storeType type of the queryable store
-	 * @param <T> generic queryable store
-	 * @return queryable store.
-	 */
-	public <T> T getQueryableStore(String storeName, QueryableStoreType<T> storeType) {
-		for (KafkaStreams kafkaStream : this.kafkaStreamsRegistry.getKafkaStreams()) {
-			try {
-				T store = kafkaStream.store(storeName, storeType);
-				if (store != null) {
-					return store;
-				}
-			}
-			catch (InvalidStateStoreException ignored) {
-				// pass through
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Gets the current {@link HostInfo} that the calling kafka streams application is
-	 * running on.
-	 *
-	 * Note that the end user applications must provide `applicaiton.server` as a
-	 * configuration property when calling this method. If this is not available, then
-	 * null is returned.
-	 * @return the current {@link HostInfo}
-	 */
-	public HostInfo getCurrentHostInfo() {
-		Map<String, String> configuration = this.binderConfigurationProperties
-				.getConfiguration();
-		if (configuration.containsKey("application.server")) {
-
-			String applicationServer = configuration.get("application.server");
-			String[] splits = StringUtils.split(applicationServer, ":");
-
-			return new HostInfo(splits[0], Integer.valueOf(splits[1]));
-		}
-		return null;
-	}
-
-	/**
-	 * Gets the {@link HostInfo} where the provided store and key are hosted on. This may
-	 * not be the current host that is running the application. Kafka Streams will look
-	 * through all the consumer instances under the same application id and retrieves the
-	 * proper host.
-	 *
-	 * Note that the end user applications must provide `applicaiton.server` as a
-	 * configuration property for all the application instances when calling this method.
-	 * If this is not available, then null maybe returned.
-	 * @param <K> generic type for key
-	 * @param store store name
-	 * @param key key to look for
-	 * @param serializer {@link Serializer} for the key
-	 * @return the {@link HostInfo} where the key for the provided store is hosted
-	 * currently
-	 */
-	public <K> HostInfo getHostInfo(String store, K key, Serializer<K> serializer) {
-		StreamsMetadata streamsMetadata = this.kafkaStreamsRegistry.getKafkaStreams()
-				.stream()
-				.map((k) -> Optional.ofNullable(k.metadataForKey(store, key, serializer)))
-				.filter(Optional::isPresent).map(Optional::get).findFirst().orElse(null);
-		return streamsMetadata != null ? streamsMetadata.hostInfo() : null;
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KStreamBinder.java

@@ -1,179 +0,0 @@
-/*
- * Copyright 2017-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams;
-
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.kafka.common.serialization.Serde;
-import org.apache.kafka.streams.kstream.KStream;
-import org.apache.kafka.streams.kstream.Produced;
-
-import org.springframework.cloud.stream.binder.AbstractBinder;
-import org.springframework.cloud.stream.binder.BinderSpecificPropertiesProvider;
-import org.springframework.cloud.stream.binder.Binding;
-import org.springframework.cloud.stream.binder.DefaultBinding;
-import org.springframework.cloud.stream.binder.ExtendedConsumerProperties;
-import org.springframework.cloud.stream.binder.ExtendedProducerProperties;
-import org.springframework.cloud.stream.binder.ExtendedPropertiesBinder;
-import org.springframework.cloud.stream.binder.kafka.properties.KafkaProducerProperties;
-import org.springframework.cloud.stream.binder.kafka.provisioning.KafkaTopicProvisioner;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsBinderConfigurationProperties;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsConsumerProperties;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsExtendedBindingProperties;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsProducerProperties;
-import org.springframework.util.StringUtils;
-
-/**
- * {@link org.springframework.cloud.stream.binder.Binder} implementation for
- * {@link KStream}. This implemenation extends from the {@link AbstractBinder} directly.
- * <p>
- * Provides both producer and consumer bindings for the bound KStream.
- *
- * @author Marius Bogoevici
- * @author Soby Chacko
- */
-class KStreamBinder extends
-		// @checkstyle:off
-		AbstractBinder<KStream<Object, Object>, ExtendedConsumerProperties<KafkaStreamsConsumerProperties>, ExtendedProducerProperties<KafkaStreamsProducerProperties>>
-		implements
-		ExtendedPropertiesBinder<KStream<Object, Object>, KafkaStreamsConsumerProperties, KafkaStreamsProducerProperties> {
-
-	// @checkstyle:on
-
-	private static final Log LOG = LogFactory.getLog(KStreamBinder.class);
-
-	private final KafkaTopicProvisioner kafkaTopicProvisioner;
-
-	// @checkstyle:off
-	private KafkaStreamsExtendedBindingProperties kafkaStreamsExtendedBindingProperties = new KafkaStreamsExtendedBindingProperties();
-
-	// @checkstyle:on
-
-	private final KafkaStreamsBinderConfigurationProperties binderConfigurationProperties;
-
-	private final KafkaStreamsMessageConversionDelegate kafkaStreamsMessageConversionDelegate;
-
-	private final KafkaStreamsBindingInformationCatalogue kafkaStreamsBindingInformationCatalogue;
-
-	private final KeyValueSerdeResolver keyValueSerdeResolver;
-
-	private final Map<String, KafkaStreamsDlqDispatch> kafkaStreamsDlqDispatchers;
-
-	KStreamBinder(KafkaStreamsBinderConfigurationProperties binderConfigurationProperties,
-			KafkaTopicProvisioner kafkaTopicProvisioner,
-			KafkaStreamsMessageConversionDelegate kafkaStreamsMessageConversionDelegate,
-			KafkaStreamsBindingInformationCatalogue KafkaStreamsBindingInformationCatalogue,
-			KeyValueSerdeResolver keyValueSerdeResolver,
-			Map<String, KafkaStreamsDlqDispatch> kafkaStreamsDlqDispatchers) {
-		this.binderConfigurationProperties = binderConfigurationProperties;
-		this.kafkaTopicProvisioner = kafkaTopicProvisioner;
-		this.kafkaStreamsMessageConversionDelegate = kafkaStreamsMessageConversionDelegate;
-		this.kafkaStreamsBindingInformationCatalogue = KafkaStreamsBindingInformationCatalogue;
-		this.keyValueSerdeResolver = keyValueSerdeResolver;
-		this.kafkaStreamsDlqDispatchers = kafkaStreamsDlqDispatchers;
-	}
-
-	@Override
-	protected Binding<KStream<Object, Object>> doBindConsumer(String name, String group,
-			KStream<Object, Object> inputTarget,
-			// @checkstyle:off
-			ExtendedConsumerProperties<KafkaStreamsConsumerProperties> properties) {
-		// @checkstyle:on
-		this.kafkaStreamsBindingInformationCatalogue
-				.registerConsumerProperties(inputTarget, properties.getExtension());
-		if (!StringUtils.hasText(group)) {
-			group = this.binderConfigurationProperties.getApplicationId();
-		}
-		KafkaStreamsBinderUtils.prepareConsumerBinding(name, group,
-				getApplicationContext(), this.kafkaTopicProvisioner,
-				this.binderConfigurationProperties, properties,
-				this.kafkaStreamsDlqDispatchers);
-
-		return new DefaultBinding<>(name, group, inputTarget, null);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	protected Binding<KStream<Object, Object>> doBindProducer(String name,
-			KStream<Object, Object> outboundBindTarget,
-			// @checkstyle:off
-			ExtendedProducerProperties<KafkaStreamsProducerProperties> properties) {
-		// @checkstyle:on
-		ExtendedProducerProperties<KafkaProducerProperties> extendedProducerProperties = new ExtendedProducerProperties<>(
-				new KafkaProducerProperties());
-		this.kafkaTopicProvisioner.provisionProducerDestination(name,
-				extendedProducerProperties);
-		Serde<?> keySerde = this.keyValueSerdeResolver
-				.getOuboundKeySerde(properties.getExtension());
-		Serde<?> valueSerde = this.keyValueSerdeResolver.getOutboundValueSerde(properties,
-				properties.getExtension());
-		to(properties.isUseNativeEncoding(), name, outboundBindTarget,
-				(Serde<Object>) keySerde, (Serde<Object>) valueSerde);
-		return new DefaultBinding<>(name, null, outboundBindTarget, null);
-	}
-
-	@SuppressWarnings("unchecked")
-	private void to(boolean isNativeEncoding, String name,
-			KStream<Object, Object> outboundBindTarget, Serde<Object> keySerde,
-			Serde<Object> valueSerde) {
-		if (!isNativeEncoding) {
-			LOG.info("Native encoding is disabled for " + name
-					+ ". Outbound message conversion done by Spring Cloud Stream.");
-			this.kafkaStreamsMessageConversionDelegate
-					.serializeOnOutbound(outboundBindTarget)
-					.to(name, Produced.with(keySerde, valueSerde));
-		}
-		else {
-			LOG.info("Native encoding is enabled for " + name
-					+ ". Outbound serialization done at the broker.");
-			outboundBindTarget.to(name, Produced.with(keySerde, valueSerde));
-		}
-	}
-
-	@Override
-	public KafkaStreamsConsumerProperties getExtendedConsumerProperties(
-			String channelName) {
-		return this.kafkaStreamsExtendedBindingProperties
-				.getExtendedConsumerProperties(channelName);
-	}
-
-	@Override
-	public KafkaStreamsProducerProperties getExtendedProducerProperties(
-			String channelName) {
-		return this.kafkaStreamsExtendedBindingProperties
-				.getExtendedProducerProperties(channelName);
-	}
-
-	public void setKafkaStreamsExtendedBindingProperties(
-			KafkaStreamsExtendedBindingProperties kafkaStreamsExtendedBindingProperties) {
-		this.kafkaStreamsExtendedBindingProperties = kafkaStreamsExtendedBindingProperties;
-	}
-
-	@Override
-	public String getDefaultsPrefix() {
-		return this.kafkaStreamsExtendedBindingProperties.getDefaultsPrefix();
-	}
-
-	@Override
-	public Class<? extends BinderSpecificPropertiesProvider> getExtendedPropertiesEntryClass() {
-		return this.kafkaStreamsExtendedBindingProperties
-				.getExtendedPropertiesEntryClass();
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KStreamBinderConfiguration.java

@@ -1,100 +0,0 @@
-/*
- * Copyright 2017-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams;
-
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration;
-import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
-import org.springframework.cloud.stream.binder.kafka.provisioning.KafkaTopicProvisioner;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsBinderConfigurationProperties;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsExtendedBindingProperties;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-/**
- * Configuration for KStream binder.
- *
- * @author Marius Bogoevici
- * @author Gary Russell
- * @author Soby Chacko
- */
-@Configuration
-@Import({ KafkaAutoConfiguration.class,
-		KafkaStreamsBinderHealthIndicatorConfiguration.class })
-public class KStreamBinderConfiguration {
-
-	@Bean
-	public KafkaTopicProvisioner provisioningProvider(
-			KafkaStreamsBinderConfigurationProperties kafkaStreamsBinderConfigurationProperties,
-			KafkaProperties kafkaProperties) {
-		return new KafkaTopicProvisioner(kafkaStreamsBinderConfigurationProperties,
-				kafkaProperties);
-	}
-
-	@Bean
-	public KStreamBinder kStreamBinder(
-			KafkaStreamsBinderConfigurationProperties binderConfigurationProperties,
-			KafkaTopicProvisioner kafkaTopicProvisioner,
-			KafkaStreamsMessageConversionDelegate KafkaStreamsMessageConversionDelegate,
-			KafkaStreamsBindingInformationCatalogue KafkaStreamsBindingInformationCatalogue,
-			KeyValueSerdeResolver keyValueSerdeResolver,
-			KafkaStreamsExtendedBindingProperties kafkaStreamsExtendedBindingProperties,
-			@Qualifier("kafkaStreamsDlqDispatchers") Map<String, KafkaStreamsDlqDispatch> kafkaStreamsDlqDispatchers) {
-		KStreamBinder kStreamBinder = new KStreamBinder(binderConfigurationProperties,
-				kafkaTopicProvisioner, KafkaStreamsMessageConversionDelegate,
-				KafkaStreamsBindingInformationCatalogue, keyValueSerdeResolver,
-				kafkaStreamsDlqDispatchers);
-		kStreamBinder.setKafkaStreamsExtendedBindingProperties(
-				kafkaStreamsExtendedBindingProperties);
-		return kStreamBinder;
-	}
-
-	@Bean
-	@ConditionalOnBean(name = "outerContext")
-	public static BeanFactoryPostProcessor outerContextBeanFactoryPostProcessor() {
-		return beanFactory -> {
-
-			// It is safe to call getBean("outerContext") here, because this bean is
-			// registered as first
-			// and as independent from the parent context.
-			ApplicationContext outerContext = (ApplicationContext) beanFactory
-					.getBean("outerContext");
-			beanFactory.registerSingleton(
-					KafkaStreamsBinderConfigurationProperties.class.getSimpleName(),
-					outerContext
-							.getBean(KafkaStreamsBinderConfigurationProperties.class));
-			beanFactory.registerSingleton(
-					KafkaStreamsMessageConversionDelegate.class.getSimpleName(),
-					outerContext.getBean(KafkaStreamsMessageConversionDelegate.class));
-			beanFactory.registerSingleton(
-					KafkaStreamsBindingInformationCatalogue.class.getSimpleName(),
-					outerContext.getBean(KafkaStreamsBindingInformationCatalogue.class));
-			beanFactory.registerSingleton(KeyValueSerdeResolver.class.getSimpleName(),
-					outerContext.getBean(KeyValueSerdeResolver.class));
-			beanFactory.registerSingleton(
-					KafkaStreamsExtendedBindingProperties.class.getSimpleName(),
-					outerContext.getBean(KafkaStreamsExtendedBindingProperties.class));
-		};
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KStreamBoundElementFactory.java

@@ -1,126 +0,0 @@
-/*
- * Copyright 2017-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams;
-
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-import org.apache.kafka.streams.kstream.KStream;
-
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.cloud.stream.binder.ConsumerProperties;
-import org.springframework.cloud.stream.binding.AbstractBindingTargetFactory;
-import org.springframework.cloud.stream.config.BindingProperties;
-import org.springframework.cloud.stream.config.BindingServiceProperties;
-import org.springframework.util.Assert;
-
-/**
- * {@link org.springframework.cloud.stream.binding.BindingTargetFactory}
- * for{@link KStream}.
- *
- * The implementation creates proxies for both input and output binding. The actual target
- * will be created downstream through further binding process.
- *
- * @author Marius Bogoevici
- * @author Soby Chacko
- */
-class KStreamBoundElementFactory extends AbstractBindingTargetFactory<KStream> {
-
-	private final BindingServiceProperties bindingServiceProperties;
-
-	private final KafkaStreamsBindingInformationCatalogue kafkaStreamsBindingInformationCatalogue;
-
-	KStreamBoundElementFactory(BindingServiceProperties bindingServiceProperties,
-			KafkaStreamsBindingInformationCatalogue KafkaStreamsBindingInformationCatalogue) {
-		super(KStream.class);
-		this.bindingServiceProperties = bindingServiceProperties;
-		this.kafkaStreamsBindingInformationCatalogue = KafkaStreamsBindingInformationCatalogue;
-	}
-
-	@Override
-	public KStream createInput(String name) {
-		ConsumerProperties consumerProperties = this.bindingServiceProperties
-				.getConsumerProperties(name);
-		// Always set multiplex to true in the kafka streams binder
-		consumerProperties.setMultiplex(true);
-		return createProxyForKStream(name);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public KStream createOutput(final String name) {
-		return createProxyForKStream(name);
-	}
-
-	private KStream createProxyForKStream(String name) {
-		KStreamWrapperHandler wrapper = new KStreamWrapperHandler();
-		ProxyFactory proxyFactory = new ProxyFactory(KStreamWrapper.class, KStream.class);
-		proxyFactory.addAdvice(wrapper);
-
-		KStream proxy = (KStream) proxyFactory.getProxy();
-
-		// Add the binding properties to the catalogue for later retrieval during further
-		// binding steps downstream.
-		BindingProperties bindingProperties = this.bindingServiceProperties
-				.getBindingProperties(name);
-		this.kafkaStreamsBindingInformationCatalogue.registerBindingProperties(proxy,
-				bindingProperties);
-		return proxy;
-	}
-
-	/**
-	 * Wrapper object for KStream proxy.
-	 */
-	public interface KStreamWrapper {
-
-		void wrap(KStream<Object, Object> delegate);
-
-	}
-
-	private static class KStreamWrapperHandler
-			implements KStreamWrapper, MethodInterceptor {
-
-		private KStream<Object, Object> delegate;
-
-		public void wrap(KStream<Object, Object> delegate) {
-			Assert.notNull(delegate, "delegate cannot be null");
-			Assert.isNull(this.delegate, "delegate already set to " + this.delegate);
-			this.delegate = delegate;
-		}
-
-		@Override
-		public Object invoke(MethodInvocation methodInvocation) throws Throwable {
-			if (methodInvocation.getMethod().getDeclaringClass().equals(KStream.class)) {
-				Assert.notNull(this.delegate,
-						"Trying to prepareConsumerBinding " + methodInvocation.getMethod()
-								+ "  but no delegate has been set.");
-				return methodInvocation.getMethod().invoke(this.delegate,
-						methodInvocation.getArguments());
-			}
-			else if (methodInvocation.getMethod().getDeclaringClass()
-					.equals(KStreamWrapper.class)) {
-				return methodInvocation.getMethod().invoke(this,
-						methodInvocation.getArguments());
-			}
-			else {
-				throw new IllegalStateException(
-						"Only KStream method invocations are permitted");
-			}
-		}
-
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KTableBinder.java

@@ -1,125 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams;
-
-import java.util.Map;
-
-import org.apache.kafka.streams.kstream.KTable;
-
-import org.springframework.cloud.stream.binder.AbstractBinder;
-import org.springframework.cloud.stream.binder.BinderSpecificPropertiesProvider;
-import org.springframework.cloud.stream.binder.Binding;
-import org.springframework.cloud.stream.binder.DefaultBinding;
-import org.springframework.cloud.stream.binder.ExtendedConsumerProperties;
-import org.springframework.cloud.stream.binder.ExtendedProducerProperties;
-import org.springframework.cloud.stream.binder.ExtendedPropertiesBinder;
-import org.springframework.cloud.stream.binder.kafka.provisioning.KafkaTopicProvisioner;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsBinderConfigurationProperties;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsConsumerProperties;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsExtendedBindingProperties;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsProducerProperties;
-import org.springframework.util.StringUtils;
-
-/**
- * {@link org.springframework.cloud.stream.binder.Binder} implementation for
- * {@link KTable}. This implemenation extends from the {@link AbstractBinder} directly.
- *
- * Provides only consumer binding for the bound KTable as output bindings are not allowed
- * on it.
- *
- * @author Soby Chacko
- */
-class KTableBinder extends
-		// @checkstyle:off
-		AbstractBinder<KTable<Object, Object>, ExtendedConsumerProperties<KafkaStreamsConsumerProperties>, ExtendedProducerProperties<KafkaStreamsProducerProperties>>
-		implements
-		ExtendedPropertiesBinder<KTable<Object, Object>, KafkaStreamsConsumerProperties, KafkaStreamsProducerProperties> {
-
-	// @checkstyle:on
-
-	private final KafkaStreamsBinderConfigurationProperties binderConfigurationProperties;
-
-	private final KafkaTopicProvisioner kafkaTopicProvisioner;
-
-	private Map<String, KafkaStreamsDlqDispatch> kafkaStreamsDlqDispatchers;
-
-	// @checkstyle:off
-	private KafkaStreamsExtendedBindingProperties kafkaStreamsExtendedBindingProperties = new KafkaStreamsExtendedBindingProperties();
-
-	// @checkstyle:on
-
-	KTableBinder(KafkaStreamsBinderConfigurationProperties binderConfigurationProperties,
-			KafkaTopicProvisioner kafkaTopicProvisioner,
-			Map<String, KafkaStreamsDlqDispatch> kafkaStreamsDlqDispatchers) {
-		this.binderConfigurationProperties = binderConfigurationProperties;
-		this.kafkaTopicProvisioner = kafkaTopicProvisioner;
-		this.kafkaStreamsDlqDispatchers = kafkaStreamsDlqDispatchers;
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	protected Binding<KTable<Object, Object>> doBindConsumer(String name, String group,
-			KTable<Object, Object> inputTarget,
-			// @checkstyle:off
-			ExtendedConsumerProperties<KafkaStreamsConsumerProperties> properties) {
-		// @checkstyle:on
-		if (!StringUtils.hasText(group)) {
-			group = this.binderConfigurationProperties.getApplicationId();
-		}
-		KafkaStreamsBinderUtils.prepareConsumerBinding(name, group,
-				getApplicationContext(), this.kafkaTopicProvisioner,
-				this.binderConfigurationProperties, properties,
-				this.kafkaStreamsDlqDispatchers);
-		return new DefaultBinding<>(name, group, inputTarget, null);
-	}
-
-	@Override
-	protected Binding<KTable<Object, Object>> doBindProducer(String name,
-			KTable<Object, Object> outboundBindTarget,
-			// @checkstyle:off
-			ExtendedProducerProperties<KafkaStreamsProducerProperties> properties) {
-		// @checkstyle:on
-		throw new UnsupportedOperationException(
-				"No producer level binding is allowed for KTable");
-	}
-
-	@Override
-	public KafkaStreamsConsumerProperties getExtendedConsumerProperties(
-			String channelName) {
-		return this.kafkaStreamsExtendedBindingProperties
-				.getExtendedConsumerProperties(channelName);
-	}
-
-	@Override
-	public KafkaStreamsProducerProperties getExtendedProducerProperties(
-			String channelName) {
-		return this.kafkaStreamsExtendedBindingProperties
-				.getExtendedProducerProperties(channelName);
-	}
-
-	@Override
-	public String getDefaultsPrefix() {
-		return this.kafkaStreamsExtendedBindingProperties.getDefaultsPrefix();
-	}
-
-	@Override
-	public Class<? extends BinderSpecificPropertiesProvider> getExtendedPropertiesEntryClass() {
-		return this.kafkaStreamsExtendedBindingProperties
-				.getExtendedPropertiesEntryClass();
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KTableBinderConfiguration.java

@@ -1,77 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams;
-
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
-import org.springframework.cloud.stream.binder.kafka.properties.KafkaBinderConfigurationProperties;
-import org.springframework.cloud.stream.binder.kafka.provisioning.KafkaTopicProvisioner;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsBinderConfigurationProperties;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Configuration for KTable binder.
- *
- * @author Soby Chacko
- */
-@SuppressWarnings("ALL")
-@Configuration
-public class KTableBinderConfiguration {
-
-	@Bean
-	@ConditionalOnBean(name = "outerContext")
-	public static BeanFactoryPostProcessor outerContextBeanFactoryPostProcessor() {
-		return (beanFactory) -> {
-			// It is safe to call getBean("outerContext") here, because this bean is
-			// registered as first
-			// and as independent from the parent context.
-			ApplicationContext outerContext = (ApplicationContext) beanFactory
-					.getBean("outerContext");
-			beanFactory.registerSingleton(
-					KafkaStreamsBinderConfigurationProperties.class.getSimpleName(),
-					outerContext
-							.getBean(KafkaStreamsBinderConfigurationProperties.class));
-			beanFactory.registerSingleton(
-					KafkaStreamsBindingInformationCatalogue.class.getSimpleName(),
-					outerContext.getBean(KafkaStreamsBindingInformationCatalogue.class));
-		};
-	}
-
-	@Bean
-	public KafkaTopicProvisioner provisioningProvider(
-			KafkaBinderConfigurationProperties binderConfigurationProperties,
-			KafkaProperties kafkaProperties) {
-		return new KafkaTopicProvisioner(binderConfigurationProperties, kafkaProperties);
-	}
-
-	@Bean
-	public KTableBinder kTableBinder(
-			KafkaStreamsBinderConfigurationProperties binderConfigurationProperties,
-			KafkaTopicProvisioner kafkaTopicProvisioner,
-			@Qualifier("kafkaStreamsDlqDispatchers") Map<String, KafkaStreamsDlqDispatch> kafkaStreamsDlqDispatchers) {
-		KTableBinder kStreamBinder = new KTableBinder(binderConfigurationProperties,
-				kafkaTopicProvisioner, kafkaStreamsDlqDispatchers);
-		return kStreamBinder;
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KTableBoundElementFactory.java

@@ -1,110 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams;
-
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-import org.apache.kafka.streams.kstream.KTable;
-
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.cloud.stream.binder.ConsumerProperties;
-import org.springframework.cloud.stream.binding.AbstractBindingTargetFactory;
-import org.springframework.cloud.stream.config.BindingServiceProperties;
-import org.springframework.util.Assert;
-
-/**
- * {@link org.springframework.cloud.stream.binding.BindingTargetFactory} for
- * {@link KTable}
- *
- * Input bindings are only created as output bindings on KTable are not allowed.
- *
- * @author Soby Chacko
- */
-class KTableBoundElementFactory extends AbstractBindingTargetFactory<KTable> {
-
-	private final BindingServiceProperties bindingServiceProperties;
-
-	KTableBoundElementFactory(BindingServiceProperties bindingServiceProperties) {
-		super(KTable.class);
-		this.bindingServiceProperties = bindingServiceProperties;
-	}
-
-	@Override
-	public KTable createInput(String name) {
-		ConsumerProperties consumerProperties = this.bindingServiceProperties
-				.getConsumerProperties(name);
-		// Always set multiplex to true in the kafka streams binder
-		consumerProperties.setMultiplex(true);
-
-		KTableBoundElementFactory.KTableWrapperHandler wrapper = new KTableBoundElementFactory.KTableWrapperHandler();
-		ProxyFactory proxyFactory = new ProxyFactory(
-				KTableBoundElementFactory.KTableWrapper.class, KTable.class);
-		proxyFactory.addAdvice(wrapper);
-
-		return (KTable) proxyFactory.getProxy();
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public KTable createOutput(final String name) {
-		throw new UnsupportedOperationException(
-				"Outbound operations are not allowed on target type KTable");
-	}
-
-	/**
-	 * Wrapper for KTable proxy.
-	 */
-	public interface KTableWrapper {
-
-		void wrap(KTable<Object, Object> delegate);
-
-	}
-
-	private static class KTableWrapperHandler
-			implements KTableBoundElementFactory.KTableWrapper, MethodInterceptor {
-
-		private KTable<Object, Object> delegate;
-
-		public void wrap(KTable<Object, Object> delegate) {
-			Assert.notNull(delegate, "delegate cannot be null");
-			Assert.isNull(this.delegate, "delegate already set to " + this.delegate);
-			this.delegate = delegate;
-		}
-
-		@Override
-		public Object invoke(MethodInvocation methodInvocation) throws Throwable {
-			if (methodInvocation.getMethod().getDeclaringClass().equals(KTable.class)) {
-				Assert.notNull(this.delegate,
-						"Trying to prepareConsumerBinding " + methodInvocation.getMethod()
-								+ "  but no delegate has been set.");
-				return methodInvocation.getMethod().invoke(this.delegate,
-						methodInvocation.getArguments());
-			}
-			else if (methodInvocation.getMethod().getDeclaringClass()
-					.equals(KTableBoundElementFactory.KTableWrapper.class)) {
-				return methodInvocation.getMethod().invoke(this,
-						methodInvocation.getArguments());
-			}
-			else {
-				throw new IllegalStateException(
-						"Only KTable method invocations are permitted");
-			}
-		}
-
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBinderHealthIndicator.java

@@ -1,81 +0,0 @@
-/*
- * Copyright 2019-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.apache.kafka.streams.KafkaStreams;
-import org.apache.kafka.streams.processor.TaskMetadata;
-import org.apache.kafka.streams.processor.ThreadMetadata;
-
-import org.springframework.boot.actuate.health.AbstractHealthIndicator;
-import org.springframework.boot.actuate.health.Health;
-import org.springframework.boot.actuate.health.Status;
-
-/**
- * Health indicator for Kafka Streams.
- *
- * @author Arnaud Jardiné
- */
-class KafkaStreamsBinderHealthIndicator extends AbstractHealthIndicator {
-
-	private final KafkaStreamsRegistry kafkaStreamsRegistry;
-
-	KafkaStreamsBinderHealthIndicator(KafkaStreamsRegistry kafkaStreamsRegistry) {
-		super("Kafka-streams health check failed");
-		this.kafkaStreamsRegistry = kafkaStreamsRegistry;
-	}
-
-	@Override
-	protected void doHealthCheck(Health.Builder builder) throws Exception {
-		boolean up = true;
-		for (KafkaStreams kStream : kafkaStreamsRegistry.getKafkaStreams()) {
-			up &= kStream.state().isRunning();
-			builder.withDetails(buildDetails(kStream));
-		}
-		builder.status(up ? Status.UP : Status.DOWN);
-	}
-
-	private static Map<String, Object> buildDetails(KafkaStreams kStreams) {
-		final Map<String, Object> details = new HashMap<>();
-		if (kStreams.state().isRunning()) {
-			for (ThreadMetadata metadata : kStreams.localThreadsMetadata()) {
-				details.put("threadName", metadata.threadName());
-				details.put("threadState", metadata.threadState());
-				details.put("activeTasks", taskDetails(metadata.activeTasks()));
-				details.put("standbyTasks", taskDetails(metadata.standbyTasks()));
-			}
-		}
-		return details;
-	}
-
-	private static Map<String, Object> taskDetails(Set<TaskMetadata> taskMetadata) {
-		final Map<String, Object> details = new HashMap<>();
-		for (TaskMetadata metadata : taskMetadata) {
-			details.put("taskId", metadata.taskId());
-			details.put("partitions",
-					metadata.topicPartitions().stream().map(
-							p -> "partition=" + p.partition() + ", topic=" + p.topic())
-							.collect(Collectors.toList()));
-		}
-		return details;
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBinderHealthIndicatorConfiguration.java

@@ -1,42 +0,0 @@
-/*
- * Copyright 2019-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams;
-
-import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Configuration class for Kafka-streams binder health indicator beans.
- *
- * @author Arnaud Jardiné
- */
-@Configuration
-@ConditionalOnClass(name = "org.springframework.boot.actuate.health.HealthIndicator")
-@ConditionalOnEnabledHealthIndicator("binders")
-class KafkaStreamsBinderHealthIndicatorConfiguration {
-
-	@Bean
-	@ConditionalOnBean(KafkaStreamsRegistry.class)
-	KafkaStreamsBinderHealthIndicator kafkaStreamsBinderHealthIndicator(
-			KafkaStreamsRegistry kafkaStreamsRegistry) {
-		return new KafkaStreamsBinderHealthIndicator(kafkaStreamsRegistry);
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBinderSupportAutoConfiguration.java

@@ -1,342 +0,0 @@
-/*
- * Copyright 2017-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.stream.Collectors;
-
-import org.apache.kafka.common.serialization.Serdes;
-import org.apache.kafka.streams.StreamsConfig;
-import org.apache.kafka.streams.errors.LogAndContinueExceptionHandler;
-import org.apache.kafka.streams.errors.LogAndFailExceptionHandler;
-
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.function.context.FunctionCatalog;
-import org.springframework.cloud.stream.binder.BinderConfiguration;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsBinderConfigurationProperties;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsExtendedBindingProperties;
-import org.springframework.cloud.stream.binder.kafka.streams.serde.CompositeNonNativeSerde;
-import org.springframework.cloud.stream.binding.BindableProxyFactory;
-import org.springframework.cloud.stream.binding.BindingService;
-import org.springframework.cloud.stream.binding.StreamListenerResultAdapter;
-import org.springframework.cloud.stream.config.BinderProperties;
-import org.springframework.cloud.stream.config.BindingServiceConfiguration;
-import org.springframework.cloud.stream.config.BindingServiceProperties;
-import org.springframework.cloud.stream.converter.CompositeMessageConverterFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.Environment;
-import org.springframework.core.env.MapPropertySource;
-import org.springframework.kafka.config.KafkaStreamsConfiguration;
-import org.springframework.kafka.core.CleanupConfig;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
-
-/**
- * Kafka Streams binder configuration.
- *
- * @author Marius Bogoevici
- * @author Soby Chacko
- * @author Gary Russell
- */
-@EnableConfigurationProperties(KafkaStreamsExtendedBindingProperties.class)
-@ConditionalOnBean(BindingService.class)
-@AutoConfigureAfter(BindingServiceConfiguration.class)
-public class KafkaStreamsBinderSupportAutoConfiguration {
-
-	private static final String KSTREAM_BINDER_TYPE = "kstream";
-
-	private static final String KTABLE_BINDER_TYPE = "ktable";
-
-	private static final String GLOBALKTABLE_BINDER_TYPE = "globalktable";
-
-	@Bean
-	@ConfigurationProperties(prefix = "spring.cloud.stream.kafka.streams.binder")
-	public KafkaStreamsBinderConfigurationProperties binderConfigurationProperties(
-			KafkaProperties kafkaProperties, ConfigurableEnvironment environment,
-			BindingServiceProperties properties) {
-		final Map<String, BinderConfiguration> binderConfigurations = getBinderConfigurations(
-				properties);
-		for (Map.Entry<String, BinderConfiguration> entry : binderConfigurations
-				.entrySet()) {
-			final BinderConfiguration binderConfiguration = entry.getValue();
-			final String binderType = binderConfiguration.getBinderType();
-			if (binderType != null && (binderType.equals(KSTREAM_BINDER_TYPE)
-					|| binderType.equals(KTABLE_BINDER_TYPE)
-					|| binderType.equals(GLOBALKTABLE_BINDER_TYPE))) {
-				Map<String, Object> binderProperties = new HashMap<>();
-				this.flatten(null, binderConfiguration.getProperties(), binderProperties);
-				environment.getPropertySources().addFirst(
-						new MapPropertySource("kafkaStreamsBinderEnv", binderProperties));
-			}
-		}
-		return new KafkaStreamsBinderConfigurationProperties(kafkaProperties);
-	}
-
-	// TODO: Lifted from core - good candidate for exposing as a utility method in core.
-	private static Map<String, BinderConfiguration> getBinderConfigurations(
-			BindingServiceProperties properties) {
-
-		Map<String, BinderConfiguration> binderConfigurations = new HashMap<>();
-		Map<String, BinderProperties> declaredBinders = properties.getBinders();
-
-		for (Map.Entry<String, BinderProperties> binderEntry : declaredBinders
-				.entrySet()) {
-			BinderProperties binderProperties = binderEntry.getValue();
-			binderConfigurations.put(binderEntry.getKey(),
-					new BinderConfiguration(binderProperties.getType(),
-							binderProperties.getEnvironment(),
-							binderProperties.isInheritEnvironment(),
-							binderProperties.isDefaultCandidate()));
-		}
-		return binderConfigurations;
-	}
-
-	// TODO: Lifted from core - good candidate for exposing as a utility method in core.
-	@SuppressWarnings("unchecked")
-	private void flatten(String propertyName, Object value,
-			Map<String, Object> flattenedProperties) {
-		if (value instanceof Map) {
-			((Map<Object, Object>) value).forEach((k, v) -> flatten(
-					(propertyName != null ? propertyName + "." : "") + k, v,
-					flattenedProperties));
-		}
-		else {
-			flattenedProperties.put(propertyName, value.toString());
-		}
-	}
-
-	@Bean
-	public KafkaStreamsConfiguration kafkaStreamsConfiguration(
-			KafkaStreamsBinderConfigurationProperties properties,
-			Environment environment) {
-		KafkaProperties kafkaProperties = properties.getKafkaProperties();
-		Map<String, Object> streamsProperties = kafkaProperties.buildStreamsProperties();
-		if (kafkaProperties.getStreams().getApplicationId() == null) {
-			String applicationName = environment.getProperty("spring.application.name");
-			if (applicationName != null) {
-				streamsProperties.put(StreamsConfig.APPLICATION_ID_CONFIG,
-						applicationName);
-			}
-		}
-		return new KafkaStreamsConfiguration(streamsProperties);
-	}
-
-	@Bean("streamConfigGlobalProperties")
-	public Map<String, Object> streamConfigGlobalProperties(
-			KafkaStreamsBinderConfigurationProperties configProperties,
-			KafkaStreamsConfiguration kafkaStreamsConfiguration) {
-
-		Properties properties = kafkaStreamsConfiguration.asProperties();
-		// Override Spring Boot bootstrap server setting if left to default with the value
-		// configured in the binder
-		if (ObjectUtils.isEmpty(properties.get(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG))) {
-			properties.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG,
-					configProperties.getKafkaConnectionString());
-		}
-		else {
-			Object bootstrapServerConfig = properties
-					.get(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG);
-			if (bootstrapServerConfig instanceof String) {
-				@SuppressWarnings("unchecked")
-				String bootStrapServers = (String) properties
-						.get(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG);
-				if (bootStrapServers.equals("localhost:9092")) {
-					properties.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG,
-							configProperties.getKafkaConnectionString());
-				}
-			}
-		}
-
-		String binderProvidedApplicationId = configProperties.getApplicationId();
-		if (StringUtils.hasText(binderProvidedApplicationId)) {
-			properties.put(StreamsConfig.APPLICATION_ID_CONFIG,
-					binderProvidedApplicationId);
-		}
-
-		properties.put(StreamsConfig.DEFAULT_KEY_SERDE_CLASS_CONFIG,
-				Serdes.ByteArraySerde.class.getName());
-		properties.put(StreamsConfig.DEFAULT_VALUE_SERDE_CLASS_CONFIG,
-				Serdes.ByteArraySerde.class.getName());
-
-		if (configProperties
-				.getSerdeError() == KafkaStreamsBinderConfigurationProperties.SerdeError.logAndContinue) {
-			properties.put(
-					StreamsConfig.DEFAULT_DESERIALIZATION_EXCEPTION_HANDLER_CLASS_CONFIG,
-					LogAndContinueExceptionHandler.class.getName());
-		}
-		else if (configProperties
-				.getSerdeError() == KafkaStreamsBinderConfigurationProperties.SerdeError.logAndFail) {
-			properties.put(
-					StreamsConfig.DEFAULT_DESERIALIZATION_EXCEPTION_HANDLER_CLASS_CONFIG,
-					LogAndFailExceptionHandler.class.getName());
-		}
-		else if (configProperties
-				.getSerdeError() == KafkaStreamsBinderConfigurationProperties.SerdeError.sendToDlq) {
-			properties.put(
-					StreamsConfig.DEFAULT_DESERIALIZATION_EXCEPTION_HANDLER_CLASS_CONFIG,
-					SendToDlqAndContinue.class.getName());
-		}
-
-		if (!ObjectUtils.isEmpty(configProperties.getConfiguration())) {
-			properties.putAll(configProperties.getConfiguration());
-		}
-		return properties.entrySet().stream().collect(
-				Collectors.toMap((e) -> String.valueOf(e.getKey()), Map.Entry::getValue));
-	}
-
-	@Bean
-	public KStreamStreamListenerResultAdapter kstreamStreamListenerResultAdapter() {
-		return new KStreamStreamListenerResultAdapter();
-	}
-
-	@Bean
-	public KStreamStreamListenerParameterAdapter kstreamStreamListenerParameterAdapter(
-			KafkaStreamsMessageConversionDelegate kstreamBoundMessageConversionDelegate,
-			KafkaStreamsBindingInformationCatalogue KafkaStreamsBindingInformationCatalogue) {
-		return new KStreamStreamListenerParameterAdapter(
-				kstreamBoundMessageConversionDelegate,
-				KafkaStreamsBindingInformationCatalogue);
-	}
-
-	@Bean
-	public KafkaStreamsStreamListenerSetupMethodOrchestrator kafkaStreamsStreamListenerSetupMethodOrchestrator(
-			BindingServiceProperties bindingServiceProperties,
-			KafkaStreamsExtendedBindingProperties kafkaStreamsExtendedBindingProperties,
-			KeyValueSerdeResolver keyValueSerdeResolver,
-			KafkaStreamsBindingInformationCatalogue kafkaStreamsBindingInformationCatalogue,
-			KStreamStreamListenerParameterAdapter kafkaStreamListenerParameterAdapter,
-			Collection<StreamListenerResultAdapter> streamListenerResultAdapters,
-			ObjectProvider<CleanupConfig> cleanupConfig) {
-		return new KafkaStreamsStreamListenerSetupMethodOrchestrator(
-				bindingServiceProperties, kafkaStreamsExtendedBindingProperties,
-				keyValueSerdeResolver, kafkaStreamsBindingInformationCatalogue,
-				kafkaStreamListenerParameterAdapter, streamListenerResultAdapters,
-				cleanupConfig.getIfUnique());
-	}
-
-	@Bean
-//	@ConditionalOnProperty("spring.cloud.stream.kafka.streams.function.definition")
-	@ConditionalOnProperty("spring.cloud.stream.function.definition")
-	public KafkaStreamsFunctionProcessor kafkaStreamsFunctionProcessor(BindingServiceProperties bindingServiceProperties,
-																	KafkaStreamsExtendedBindingProperties kafkaStreamsExtendedBindingProperties,
-																	KeyValueSerdeResolver keyValueSerdeResolver,
-																	KafkaStreamsBindingInformationCatalogue kafkaStreamsBindingInformationCatalogue,
-																	KafkaStreamsMessageConversionDelegate kafkaStreamsMessageConversionDelegate,
-																	ObjectProvider<CleanupConfig> cleanupConfig,
-																	FunctionCatalog functionCatalog, BindableProxyFactory bindableProxyFactory) {
-		return new KafkaStreamsFunctionProcessor(bindingServiceProperties, kafkaStreamsExtendedBindingProperties,
-				keyValueSerdeResolver, kafkaStreamsBindingInformationCatalogue, kafkaStreamsMessageConversionDelegate,
-				cleanupConfig.getIfUnique(), functionCatalog, bindableProxyFactory);
-	}
-
-	@Bean
-	public KafkaStreamsMessageConversionDelegate messageConversionDelegate(
-																		CompositeMessageConverterFactory compositeMessageConverterFactory,
-																		SendToDlqAndContinue sendToDlqAndContinue,
-																		KafkaStreamsBindingInformationCatalogue KafkaStreamsBindingInformationCatalogue,
-																		KafkaStreamsBinderConfigurationProperties binderConfigurationProperties) {
-		return new KafkaStreamsMessageConversionDelegate(compositeMessageConverterFactory, sendToDlqAndContinue,
-				KafkaStreamsBindingInformationCatalogue, binderConfigurationProperties);
-	}
-
-	@Bean
-	public CompositeNonNativeSerde compositeNonNativeSerde(
-			CompositeMessageConverterFactory compositeMessageConverterFactory) {
-		return new CompositeNonNativeSerde(compositeMessageConverterFactory);
-	}
-
-	@Bean
-	public KStreamBoundElementFactory kStreamBoundElementFactory(
-			BindingServiceProperties bindingServiceProperties,
-			KafkaStreamsBindingInformationCatalogue KafkaStreamsBindingInformationCatalogue) {
-		return new KStreamBoundElementFactory(bindingServiceProperties,
-				KafkaStreamsBindingInformationCatalogue);
-	}
-
-	@Bean
-	public KTableBoundElementFactory kTableBoundElementFactory(
-			BindingServiceProperties bindingServiceProperties) {
-		return new KTableBoundElementFactory(bindingServiceProperties);
-	}
-
-	@Bean
-	public GlobalKTableBoundElementFactory globalKTableBoundElementFactory(
-			BindingServiceProperties properties) {
-		return new GlobalKTableBoundElementFactory(properties);
-	}
-
-	@Bean
-	public SendToDlqAndContinue sendToDlqAndContinue() {
-		return new SendToDlqAndContinue();
-	}
-
-	@Bean
-	public KafkaStreamsBindingInformationCatalogue kafkaStreamsBindingInformationCatalogue() {
-		return new KafkaStreamsBindingInformationCatalogue();
-	}
-
-	@Bean
-	@SuppressWarnings("unchecked")
-	public KeyValueSerdeResolver keyValueSerdeResolver(
-			@Qualifier("streamConfigGlobalProperties") Object streamConfigGlobalProperties,
-			KafkaStreamsBinderConfigurationProperties properties) {
-		return new KeyValueSerdeResolver(
-				(Map<String, Object>) streamConfigGlobalProperties, properties);
-	}
-
-	@Bean
-	public QueryableStoreRegistry queryableStoreTypeRegistry(
-			KafkaStreamsRegistry kafkaStreamsRegistry) {
-		return new QueryableStoreRegistry(kafkaStreamsRegistry);
-	}
-
-	@Bean
-	public InteractiveQueryService interactiveQueryServices(
-			KafkaStreamsRegistry kafkaStreamsRegistry,
-			KafkaStreamsBinderConfigurationProperties properties) {
-		return new InteractiveQueryService(kafkaStreamsRegistry, properties);
-	}
-
-	@Bean
-	public KafkaStreamsRegistry kafkaStreamsRegistry() {
-		return new KafkaStreamsRegistry();
-	}
-
-	@Bean
-	public StreamsBuilderFactoryManager streamsBuilderFactoryManager(
-			KafkaStreamsBindingInformationCatalogue catalogue,
-			KafkaStreamsRegistry kafkaStreamsRegistry) {
-		return new StreamsBuilderFactoryManager(catalogue, kafkaStreamsRegistry);
-	}
-
-	@Bean("kafkaStreamsDlqDispatchers")
-	public Map<String, KafkaStreamsDlqDispatch> dlqDispatchers() {
-		return new HashMap<>();
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBinderUtils.java

@@ -1,86 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams;
-
-import java.util.Map;
-
-import org.springframework.cloud.stream.binder.ExtendedConsumerProperties;
-import org.springframework.cloud.stream.binder.kafka.properties.KafkaConsumerProperties;
-import org.springframework.cloud.stream.binder.kafka.provisioning.KafkaTopicProvisioner;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsBinderConfigurationProperties;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsConsumerProperties;
-import org.springframework.context.ApplicationContext;
-import org.springframework.util.StringUtils;
-
-/**
- * Common methods used by various Kafka Streams types across the binders.
- *
- * @author Soby Chacko
- */
-final class KafkaStreamsBinderUtils {
-
-	private KafkaStreamsBinderUtils() {
-
-	}
-
-	static void prepareConsumerBinding(String name, String group,
-			ApplicationContext context, KafkaTopicProvisioner kafkaTopicProvisioner,
-			KafkaStreamsBinderConfigurationProperties binderConfigurationProperties,
-			ExtendedConsumerProperties<KafkaStreamsConsumerProperties> properties,
-			Map<String, KafkaStreamsDlqDispatch> kafkaStreamsDlqDispatchers) {
-		ExtendedConsumerProperties<KafkaConsumerProperties> extendedConsumerProperties = new ExtendedConsumerProperties<>(
-				properties.getExtension());
-		if (binderConfigurationProperties
-				.getSerdeError() == KafkaStreamsBinderConfigurationProperties.SerdeError.sendToDlq) {
-			extendedConsumerProperties.getExtension().setEnableDlq(true);
-		}
-
-		String[] inputTopics = StringUtils.commaDelimitedListToStringArray(name);
-		for (String inputTopic : inputTopics) {
-			kafkaTopicProvisioner.provisionConsumerDestination(inputTopic, group,
-					extendedConsumerProperties);
-		}
-
-		if (extendedConsumerProperties.getExtension().isEnableDlq()) {
-			KafkaStreamsDlqDispatch kafkaStreamsDlqDispatch = !StringUtils
-					.isEmpty(extendedConsumerProperties.getExtension().getDlqName())
-							? new KafkaStreamsDlqDispatch(
-									extendedConsumerProperties.getExtension()
-											.getDlqName(),
-									binderConfigurationProperties,
-									extendedConsumerProperties.getExtension())
-							: null;
-			for (String inputTopic : inputTopics) {
-				if (StringUtils.isEmpty(
-						extendedConsumerProperties.getExtension().getDlqName())) {
-					String dlqName = "error." + inputTopic + "." + group;
-					kafkaStreamsDlqDispatch = new KafkaStreamsDlqDispatch(dlqName,
-							binderConfigurationProperties,
-							extendedConsumerProperties.getExtension());
-				}
-
-				SendToDlqAndContinue sendToDlqAndContinue = context
-						.getBean(SendToDlqAndContinue.class);
-				sendToDlqAndContinue.addKStreamDlqDispatch(inputTopic,
-						kafkaStreamsDlqDispatch);
-
-				kafkaStreamsDlqDispatchers.put(inputTopic, kafkaStreamsDlqDispatch);
-			}
-		}
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBindingInformationCatalogue.java

@@ -1,125 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams;
-
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.kafka.streams.StreamsConfig;
-import org.apache.kafka.streams.kstream.KStream;
-
-import org.springframework.cloud.stream.binder.ConsumerProperties;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsConsumerProperties;
-import org.springframework.cloud.stream.config.BindingProperties;
-import org.springframework.kafka.config.StreamsBuilderFactoryBean;
-
-/**
- * A catalogue that provides binding information for Kafka Streams target types such as
- * KStream. It also keeps a catalogue for the underlying {@link StreamsBuilderFactoryBean}
- * and {@link StreamsConfig} associated with various
- * {@link org.springframework.cloud.stream.annotation.StreamListener} methods in the
- * {@link org.springframework.context.ApplicationContext}.
- *
- * @author Soby Chacko
- */
-class KafkaStreamsBindingInformationCatalogue {
-
-	private final Map<KStream<?, ?>, BindingProperties> bindingProperties = new ConcurrentHashMap<>();
-
-	private final Map<KStream<?, ?>, KafkaStreamsConsumerProperties> consumerProperties = new ConcurrentHashMap<>();
-
-	private final Set<StreamsBuilderFactoryBean> streamsBuilderFactoryBeans = new HashSet<>();
-
-	/**
-	 * For a given bounded {@link KStream}, retrieve it's corresponding destination on the
-	 * broker.
-	 * @param bindingTarget binding target for KStream
-	 * @return destination topic on Kafka
-	 */
-	String getDestination(KStream<?, ?> bindingTarget) {
-		BindingProperties bindingProperties = this.bindingProperties.get(bindingTarget);
-		return bindingProperties.getDestination();
-	}
-
-	/**
-	 * Is native decoding is enabled on this {@link KStream}.
-	 * @param bindingTarget binding target for KStream
-	 * @return true if native decoding is enabled, fasle otherwise.
-	 */
-	boolean isUseNativeDecoding(KStream<?, ?> bindingTarget) {
-		BindingProperties bindingProperties = this.bindingProperties.get(bindingTarget);
-		if (bindingProperties.getConsumer() == null) {
-			bindingProperties.setConsumer(new ConsumerProperties());
-		}
-		return bindingProperties.getConsumer().isUseNativeDecoding();
-	}
-
-	/**
-	 * Is DLQ enabled for this {@link KStream}.
-	 * @param bindingTarget binding target for KStream
-	 * @return true if DLQ is enabled, false otherwise.
-	 */
-	boolean isDlqEnabled(KStream<?, ?> bindingTarget) {
-		return this.consumerProperties.get(bindingTarget).isEnableDlq();
-	}
-
-	/**
-	 * Retrieve the content type associated with a given {@link KStream}.
-	 * @param bindingTarget binding target for KStream
-	 * @return content Type associated.
-	 */
-	String getContentType(KStream<?, ?> bindingTarget) {
-		BindingProperties bindingProperties = this.bindingProperties.get(bindingTarget);
-		return bindingProperties.getContentType();
-	}
-
-	/**
-	 * Register a cache for bounded KStream -> {@link BindingProperties}.
-	 * @param bindingTarget binding target for KStream
-	 * @param bindingProperties {@link BindingProperties} for this KStream
-	 */
-	void registerBindingProperties(KStream<?, ?> bindingTarget,
-			BindingProperties bindingProperties) {
-		this.bindingProperties.put(bindingTarget, bindingProperties);
-	}
-
-	/**
-	 * Register a cache for bounded KStream -> {@link KafkaStreamsConsumerProperties}.
-	 * @param bindingTarget binding target for KStream
-	 * @param kafkaStreamsConsumerProperties consumer properties for this KStream
-	 */
-	void registerConsumerProperties(KStream<?, ?> bindingTarget,
-			KafkaStreamsConsumerProperties kafkaStreamsConsumerProperties) {
-		this.consumerProperties.put(bindingTarget, kafkaStreamsConsumerProperties);
-	}
-
-	/**
-	 * Adds a mapping for KStream -> {@link StreamsBuilderFactoryBean}.
-	 * @param streamsBuilderFactoryBean provides the {@link StreamsBuilderFactoryBean}
-	 * mapped to the KStream
-	 */
-	void addStreamBuilderFactory(StreamsBuilderFactoryBean streamsBuilderFactoryBean) {
-		this.streamsBuilderFactoryBeans.add(streamsBuilderFactoryBean);
-	}
-
-	Set<StreamsBuilderFactoryBean> getStreamsBuilderFactoryBeans() {
-		return this.streamsBuilderFactoryBeans;
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsDlqDispatch.java

@@ -1,152 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.kafka.clients.producer.ProducerConfig;
-import org.apache.kafka.clients.producer.ProducerRecord;
-import org.apache.kafka.common.serialization.ByteArraySerializer;
-
-import org.springframework.cloud.stream.binder.ExtendedProducerProperties;
-import org.springframework.cloud.stream.binder.kafka.properties.KafkaBinderConfigurationProperties;
-import org.springframework.cloud.stream.binder.kafka.properties.KafkaConsumerProperties;
-import org.springframework.cloud.stream.binder.kafka.properties.KafkaProducerProperties;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.core.ProducerFactory;
-import org.springframework.kafka.support.SendResult;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.concurrent.ListenableFuture;
-import org.springframework.util.concurrent.ListenableFutureCallback;
-
-/**
- * Send records in error to a DLQ.
- *
- * @author Soby Chacko
- * @author Rafal Zukowski
- * @author Gary Russell
- */
-class KafkaStreamsDlqDispatch {
-
-	private final Log logger = LogFactory.getLog(getClass());
-
-	private final KafkaTemplate<byte[], byte[]> kafkaTemplate;
-
-	private final String dlqName;
-
-	KafkaStreamsDlqDispatch(String dlqName,
-			KafkaBinderConfigurationProperties kafkaBinderConfigurationProperties,
-			KafkaConsumerProperties kafkaConsumerProperties) {
-		ProducerFactory<byte[], byte[]> producerFactory = getProducerFactory(
-				new ExtendedProducerProperties<>(
-						kafkaConsumerProperties.getDlqProducerProperties()),
-				kafkaBinderConfigurationProperties);
-
-		this.kafkaTemplate = new KafkaTemplate<>(producerFactory);
-		this.dlqName = dlqName;
-	}
-
-	@SuppressWarnings("unchecked")
-	public void sendToDlq(byte[] key, byte[] value, int partittion) {
-		ProducerRecord<byte[], byte[]> producerRecord = new ProducerRecord<>(this.dlqName,
-				partittion, key, value, null);
-
-		StringBuilder sb = new StringBuilder().append(" a message with key='")
-				.append(toDisplayString(ObjectUtils.nullSafeToString(key))).append("'")
-				.append(" and payload='")
-				.append(toDisplayString(ObjectUtils.nullSafeToString(value))).append("'")
-				.append(" received from ").append(partittion);
-		ListenableFuture<SendResult<byte[], byte[]>> sentDlq = null;
-		try {
-			sentDlq = this.kafkaTemplate.send(producerRecord);
-			sentDlq.addCallback(
-					new ListenableFutureCallback<SendResult<byte[], byte[]>>() {
-
-						@Override
-						public void onFailure(Throwable ex) {
-							KafkaStreamsDlqDispatch.this.logger
-									.error("Error sending to DLQ " + sb.toString(), ex);
-						}
-
-						@Override
-						public void onSuccess(SendResult<byte[], byte[]> result) {
-							if (KafkaStreamsDlqDispatch.this.logger.isDebugEnabled()) {
-								KafkaStreamsDlqDispatch.this.logger
-										.debug("Sent to DLQ " + sb.toString());
-							}
-						}
-					});
-		}
-		catch (Exception ex) {
-			if (sentDlq == null) {
-				KafkaStreamsDlqDispatch.this.logger
-						.error("Error sending to DLQ " + sb.toString(), ex);
-			}
-		}
-	}
-
-	private DefaultKafkaProducerFactory<byte[], byte[]> getProducerFactory(
-			ExtendedProducerProperties<KafkaProducerProperties> producerProperties,
-			KafkaBinderConfigurationProperties configurationProperties) {
-		Map<String, Object> props = new HashMap<>();
-		props.put(ProducerConfig.RETRIES_CONFIG, 0);
-		props.put(ProducerConfig.BUFFER_MEMORY_CONFIG, 33554432);
-		props.put(ProducerConfig.ACKS_CONFIG, configurationProperties.getRequiredAcks());
-		Map<String, Object> mergedConfig = configurationProperties
-				.mergedProducerConfiguration();
-		if (!ObjectUtils.isEmpty(mergedConfig)) {
-			props.putAll(mergedConfig);
-		}
-		if (ObjectUtils.isEmpty(props.get(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG))) {
-			props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG,
-					configurationProperties.getKafkaConnectionString());
-		}
-		if (ObjectUtils.isEmpty(props.get(ProducerConfig.BATCH_SIZE_CONFIG))) {
-			props.put(ProducerConfig.BATCH_SIZE_CONFIG,
-					String.valueOf(producerProperties.getExtension().getBufferSize()));
-		}
-		if (ObjectUtils.isEmpty(props.get(ProducerConfig.LINGER_MS_CONFIG))) {
-			props.put(ProducerConfig.LINGER_MS_CONFIG,
-					String.valueOf(producerProperties.getExtension().getBatchTimeout()));
-		}
-		if (ObjectUtils.isEmpty(props.get(ProducerConfig.COMPRESSION_TYPE_CONFIG))) {
-			props.put(ProducerConfig.COMPRESSION_TYPE_CONFIG,
-					producerProperties.getExtension().getCompressionType().toString());
-		}
-		if (!ObjectUtils.isEmpty(producerProperties.getExtension().getConfiguration())) {
-			props.putAll(producerProperties.getExtension().getConfiguration());
-		}
-		// Always send as byte[] on dlq (the same byte[] that the consumer received)
-		props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, ByteArraySerializer.class);
-		props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,
-				ByteArraySerializer.class);
-
-		return new DefaultKafkaProducerFactory<>(props);
-	}
-
-	private String toDisplayString(String original) {
-		if (original.length() <= 50) {
-			return original;
-		}
-		return original.substring(0, 50) + "...";
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsFunctionProcessor.java

@@ -1,466 +0,0 @@
-/*
- * Copyright 2019-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.kafka.common.serialization.Serde;
-import org.apache.kafka.common.utils.Bytes;
-import org.apache.kafka.streams.StreamsBuilder;
-import org.apache.kafka.streams.StreamsConfig;
-import org.apache.kafka.streams.Topology;
-import org.apache.kafka.streams.kstream.Consumed;
-import org.apache.kafka.streams.kstream.GlobalKTable;
-import org.apache.kafka.streams.kstream.KStream;
-import org.apache.kafka.streams.kstream.KTable;
-import org.apache.kafka.streams.kstream.Materialized;
-import org.apache.kafka.streams.state.KeyValueStore;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanInitializationException;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.cloud.function.context.FunctionCatalog;
-import org.springframework.cloud.function.core.FluxedFunction;
-import org.springframework.cloud.stream.binder.ConsumerProperties;
-import org.springframework.cloud.stream.binder.kafka.properties.KafkaConsumerProperties;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsConsumerProperties;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsExtendedBindingProperties;
-import org.springframework.cloud.stream.binding.BindableProxyFactory;
-import org.springframework.cloud.stream.binding.StreamListenerErrorMessages;
-import org.springframework.cloud.stream.config.BindingProperties;
-import org.springframework.cloud.stream.config.BindingServiceProperties;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.core.ResolvableType;
-import org.springframework.kafka.config.KafkaStreamsConfiguration;
-import org.springframework.kafka.config.StreamsBuilderFactoryBean;
-import org.springframework.kafka.core.CleanupConfig;
-import org.springframework.messaging.MessageHeaders;
-import org.springframework.messaging.support.MessageBuilder;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-/**
- * @author Soby Chacko
- */
-public class KafkaStreamsFunctionProcessor implements ApplicationContextAware {
-
-	private static final Log LOG = LogFactory.getLog(KafkaStreamsFunctionProcessor.class);
-
-	private final BindingServiceProperties bindingServiceProperties;
-	private final Map<String, StreamsBuilderFactoryBean> methodStreamsBuilderFactoryBeanMap = new HashMap<>();
-	private final KafkaStreamsExtendedBindingProperties kafkaStreamsExtendedBindingProperties;
-	private final KeyValueSerdeResolver keyValueSerdeResolver;
-	private final KafkaStreamsBindingInformationCatalogue kafkaStreamsBindingInformationCatalogue;
-	private final KafkaStreamsMessageConversionDelegate kafkaStreamsMessageConversionDelegate;
-	private final CleanupConfig cleanupConfig;
-	private final FunctionCatalog functionCatalog;
-	private final BindableProxyFactory bindableProxyFactory;
-
-	private ConfigurableApplicationContext applicationContext;
-
-
-	public KafkaStreamsFunctionProcessor(BindingServiceProperties bindingServiceProperties,
-										KafkaStreamsExtendedBindingProperties kafkaStreamsExtendedBindingProperties,
-										KeyValueSerdeResolver keyValueSerdeResolver,
-										KafkaStreamsBindingInformationCatalogue kafkaStreamsBindingInformationCatalogue,
-										KafkaStreamsMessageConversionDelegate kafkaStreamsMessageConversionDelegate,
-										CleanupConfig cleanupConfig,
-										FunctionCatalog functionCatalog,
-										BindableProxyFactory bindableProxyFactory) {
-		this.bindingServiceProperties = bindingServiceProperties;
-		this.kafkaStreamsExtendedBindingProperties = kafkaStreamsExtendedBindingProperties;
-		this.keyValueSerdeResolver = keyValueSerdeResolver;
-		this.kafkaStreamsBindingInformationCatalogue = kafkaStreamsBindingInformationCatalogue;
-		this.kafkaStreamsMessageConversionDelegate = kafkaStreamsMessageConversionDelegate;
-		this.cleanupConfig = cleanupConfig;
-		this.functionCatalog = functionCatalog;
-		this.bindableProxyFactory = bindableProxyFactory;
-	}
-
-	private Map<String, ResolvableType> buildTypeMap(ResolvableType resolvableType) {
-		final Set<String> inputs = new TreeSet<>(this.bindableProxyFactory.getInputs());
-
-		Map<String, ResolvableType> map = new LinkedHashMap<>();
-		final Iterator<String> iterator = inputs.iterator();
-
-		if (iterator.hasNext()) {
-			map.put(iterator.next(), resolvableType.getGeneric(0));
-			ResolvableType generic = resolvableType.getGeneric(1);
-
-			while (iterator.hasNext() && generic != null) {
-				if (generic.getRawClass() != null &&
-						(generic.getRawClass().equals(Function.class) ||
-								generic.getRawClass().equals(Consumer.class))) {
-					map.put(iterator.next(), generic.getGeneric(0));
-				}
-				generic = generic.getGeneric(1);
-			}
-		}
-
-		return map;
-	}
-
-	@SuppressWarnings("unchecked")
-	public void orchestrateStreamListenerSetupMethod(ResolvableType resolvableType, String functionName) {
-		final Set<String> outputs = new TreeSet<>(this.bindableProxyFactory.getOutputs());
-
-		String[] methodAnnotatedOutboundNames = new String[outputs.size()];
-		int j = 0;
-		for (String output : outputs) {
-			methodAnnotatedOutboundNames[j++] = output;
-		}
-
-		final Map<String, ResolvableType> stringResolvableTypeMap = buildTypeMap(resolvableType);
-		Object[] adaptedInboundArguments = adaptAndRetrieveInboundArguments(stringResolvableTypeMap, "foobar");
-		try {
-			if (resolvableType.getRawClass() != null && resolvableType.getRawClass().equals(Consumer.class)) {
-				Consumer<Object> consumer = functionCatalog.lookup(Consumer.class, functionName);
-				consumer.accept(adaptedInboundArguments[0]);
-			}
-			else {
-
-				Function<Object, Object> function = functionCatalog.lookup(Function.class, functionName);
-				Object target = null;
-				if (function instanceof FluxedFunction) {
-					target = ((FluxedFunction) function).getTarget();
-				}
-				function = (Function) target;
-				Object result = function.apply(adaptedInboundArguments[0]);
-				int i = 1;
-				while (result instanceof Function || result instanceof Consumer) {
-					if (result instanceof Function) {
-						result = ((Function) result).apply(adaptedInboundArguments[i]);
-					}
-					else {
-						((Consumer) result).accept(adaptedInboundArguments[i]);
-						result = null;
-					}
-					i++;
-				}
-				if (result != null) {
-					if (result.getClass().isArray()) {
-						Assert.isTrue(methodAnnotatedOutboundNames.length == ((Object[]) result).length,
-								"Result does not match with the number of declared outbounds");
-					}
-					else {
-						Assert.isTrue(methodAnnotatedOutboundNames.length == 1,
-								"Result does not match with the number of declared outbounds");
-					}
-					if (result.getClass().isArray()) {
-						Object[] outboundKStreams = (Object[]) result;
-						int k = 0;
-						for (Object outboundKStream : outboundKStreams) {
-							Object targetBean = this.applicationContext.getBean(methodAnnotatedOutboundNames[k++]);
-
-							KStreamBoundElementFactory.KStreamWrapper
-									boundElement = (KStreamBoundElementFactory.KStreamWrapper) targetBean;
-							boundElement.wrap((KStream) outboundKStream);
-						}
-					}
-					else {
-						Object targetBean = this.applicationContext.getBean(methodAnnotatedOutboundNames[0]);
-
-						KStreamBoundElementFactory.KStreamWrapper
-								boundElement = (KStreamBoundElementFactory.KStreamWrapper) targetBean;
-						boundElement.wrap((KStream) result);
-					}
-				}
-			}
-		}
-		catch (Exception ex) {
-			throw new BeanInitializationException("Cannot setup StreamListener for foobar", ex);
-		}
-	}
-
-	@SuppressWarnings({"unchecked"})
-	private Object[] adaptAndRetrieveInboundArguments(Map<String, ResolvableType> stringResolvableTypeMap,
-													String functionName) {
-		Object[] arguments = new Object[stringResolvableTypeMap.size()];
-		int i = 0;
-		for (String input : stringResolvableTypeMap.keySet()) {
-			Class<?> parameterType = stringResolvableTypeMap.get(input).getRawClass();
-
-			if (input != null) {
-				Assert.isInstanceOf(String.class, input, "Annotation value must be a String");
-				Object targetBean = applicationContext.getBean(input);
-				BindingProperties bindingProperties = this.bindingServiceProperties.getBindingProperties(input);
-				enableNativeDecodingForKTableAlways(parameterType, bindingProperties);
-				//Retrieve the StreamsConfig created for this method if available.
-				//Otherwise, create the StreamsBuilderFactory and get the underlying config.
-				if (!this.methodStreamsBuilderFactoryBeanMap.containsKey(functionName)) {
-					buildStreamsBuilderAndRetrieveConfig(functionName, applicationContext, input);
-				}
-				try {
-					StreamsBuilderFactoryBean streamsBuilderFactoryBean =
-							this.methodStreamsBuilderFactoryBeanMap.get(functionName);
-					StreamsBuilder streamsBuilder = streamsBuilderFactoryBean.getObject();
-					KafkaStreamsConsumerProperties extendedConsumerProperties =
-							this.kafkaStreamsExtendedBindingProperties.getExtendedConsumerProperties(input);
-					//get state store spec
-					//KafkaStreamsStateStoreProperties spec = buildStateStoreSpec(method);
-					Serde<?> keySerde = this.keyValueSerdeResolver.getInboundKeySerde(extendedConsumerProperties);
-					Serde<?> valueSerde = this.keyValueSerdeResolver.getInboundValueSerde(
-							bindingProperties.getConsumer(), extendedConsumerProperties);
-
-					final KafkaConsumerProperties.StartOffset startOffset = extendedConsumerProperties.getStartOffset();
-					Topology.AutoOffsetReset autoOffsetReset = null;
-					if (startOffset != null) {
-						switch (startOffset) {
-							case earliest:
-								autoOffsetReset = Topology.AutoOffsetReset.EARLIEST;
-								break;
-							case latest:
-								autoOffsetReset = Topology.AutoOffsetReset.LATEST;
-								break;
-							default:
-								break;
-						}
-					}
-					if (extendedConsumerProperties.isResetOffsets()) {
-						LOG.warn("Detected resetOffsets configured on binding " + input + ". "
-								+ "Setting resetOffsets in Kafka Streams binder does not have any effect.");
-					}
-
-					if (parameterType.isAssignableFrom(KStream.class)) {
-						KStream<?, ?> stream = getkStream(input, bindingProperties,
-								streamsBuilder, keySerde, valueSerde, autoOffsetReset);
-						KStreamBoundElementFactory.KStreamWrapper kStreamWrapper =
-								(KStreamBoundElementFactory.KStreamWrapper) targetBean;
-						//wrap the proxy created during the initial target type binding with real object (KStream)
-						kStreamWrapper.wrap((KStream<Object, Object>) stream);
-						this.kafkaStreamsBindingInformationCatalogue.addStreamBuilderFactory(streamsBuilderFactoryBean);
-
-						if (KStream.class.isAssignableFrom(stringResolvableTypeMap.get(input).getRawClass())) {
-							final Class<?> valueClass =
-									(stringResolvableTypeMap.get(input).getGeneric(1).getRawClass() != null)
-									? (stringResolvableTypeMap.get(input).getGeneric(1).getRawClass()) : Object.class;
-							if (this.kafkaStreamsBindingInformationCatalogue.isUseNativeDecoding(
-									(KStream) kStreamWrapper)) {
-								arguments[i] = stream;
-							}
-							else {
-								arguments[i] = this.kafkaStreamsMessageConversionDelegate.deserializeOnInbound(
-										valueClass, stream);
-							}
-						}
-
-						if (arguments[i] == null) {
-							arguments[i] = stream;
-						}
-						Assert.notNull(arguments[i], "problems..");
-					}
-					else if (parameterType.isAssignableFrom(KTable.class)) {
-						String materializedAs = extendedConsumerProperties.getMaterializedAs();
-						String bindingDestination = this.bindingServiceProperties.getBindingDestination(input);
-						KTable<?, ?> table = getKTable(streamsBuilder, keySerde, valueSerde, materializedAs,
-								bindingDestination, autoOffsetReset);
-						KTableBoundElementFactory.KTableWrapper kTableWrapper =
-								(KTableBoundElementFactory.KTableWrapper) targetBean;
-						//wrap the proxy created during the initial target type binding with real object (KTable)
-						kTableWrapper.wrap((KTable<Object, Object>) table);
-						this.kafkaStreamsBindingInformationCatalogue.addStreamBuilderFactory(streamsBuilderFactoryBean);
-						arguments[i] = table;
-					}
-					else if (parameterType.isAssignableFrom(GlobalKTable.class)) {
-						String materializedAs = extendedConsumerProperties.getMaterializedAs();
-						String bindingDestination = this.bindingServiceProperties.getBindingDestination(input);
-						GlobalKTable<?, ?> table = getGlobalKTable(streamsBuilder, keySerde, valueSerde, materializedAs,
-								bindingDestination, autoOffsetReset);
-						GlobalKTableBoundElementFactory.GlobalKTableWrapper globalKTableWrapper =
-								(GlobalKTableBoundElementFactory.GlobalKTableWrapper) targetBean;
-						//wrap the proxy created during the initial target type binding with real object (KTable)
-						globalKTableWrapper.wrap((GlobalKTable<Object, Object>) table);
-						this.kafkaStreamsBindingInformationCatalogue.addStreamBuilderFactory(streamsBuilderFactoryBean);
-						arguments[i] = table;
-					}
-					i++;
-				}
-				catch (Exception ex) {
-					throw new IllegalStateException(ex);
-				}
-			}
-			else {
-				throw new IllegalStateException(StreamListenerErrorMessages.INVALID_DECLARATIVE_METHOD_PARAMETERS);
-			}
-		}
-		return arguments;
-	}
-
-	private GlobalKTable<?, ?> getGlobalKTable(StreamsBuilder streamsBuilder,
-											Serde<?> keySerde, Serde<?> valueSerde, String materializedAs,
-											String bindingDestination, Topology.AutoOffsetReset autoOffsetReset) {
-		return materializedAs != null ?
-				materializedAsGlobalKTable(streamsBuilder, bindingDestination, materializedAs,
-						keySerde, valueSerde, autoOffsetReset) :
-				streamsBuilder.globalTable(bindingDestination,
-						Consumed.with(keySerde, valueSerde).withOffsetResetPolicy(autoOffsetReset));
-	}
-
-	private KTable<?, ?> getKTable(StreamsBuilder streamsBuilder, Serde<?> keySerde, Serde<?> valueSerde,
-								String materializedAs,
-								String bindingDestination, Topology.AutoOffsetReset autoOffsetReset) {
-		return materializedAs != null ?
-				materializedAs(streamsBuilder, bindingDestination, materializedAs, keySerde, valueSerde,
-						autoOffsetReset) :
-				streamsBuilder.table(bindingDestination,
-						Consumed.with(keySerde, valueSerde).withOffsetResetPolicy(autoOffsetReset));
-	}
-
-	private <K, V> KTable<K, V> materializedAs(StreamsBuilder streamsBuilder, String destination,
-											String storeName, Serde<K> k, Serde<V> v,
-											Topology.AutoOffsetReset autoOffsetReset) {
-		return streamsBuilder.table(this.bindingServiceProperties.getBindingDestination(destination),
-				Consumed.with(k, v).withOffsetResetPolicy(autoOffsetReset),
-				getMaterialized(storeName, k, v));
-	}
-
-	private <K, V> GlobalKTable<K, V> materializedAsGlobalKTable(StreamsBuilder streamsBuilder,
-																String destination, String storeName,
-																Serde<K> k, Serde<V> v,
-																Topology.AutoOffsetReset autoOffsetReset) {
-		return streamsBuilder.globalTable(this.bindingServiceProperties.getBindingDestination(destination),
-				Consumed.with(k, v).withOffsetResetPolicy(autoOffsetReset),
-				getMaterialized(storeName, k, v));
-	}
-
-	private <K, V> Materialized<K, V, KeyValueStore<Bytes, byte[]>> getMaterialized(String storeName,
-																					Serde<K> k, Serde<V> v) {
-		return Materialized.<K, V, KeyValueStore<Bytes, byte[]>>as(storeName)
-				.withKeySerde(k)
-				.withValueSerde(v);
-	}
-
-	private KStream<?, ?> getkStream(String inboundName,
-									BindingProperties bindingProperties,
-									StreamsBuilder streamsBuilder,
-									Serde<?> keySerde, Serde<?> valueSerde, Topology.AutoOffsetReset autoOffsetReset) {
-		String[] bindingTargets = StringUtils
-				.commaDelimitedListToStringArray(this.bindingServiceProperties.getBindingDestination(inboundName));
-
-		KStream<?, ?> stream =
-				streamsBuilder.stream(Arrays.asList(bindingTargets),
-						Consumed.with(keySerde, valueSerde)
-								.withOffsetResetPolicy(autoOffsetReset));
-		final boolean nativeDecoding = this.bindingServiceProperties.getConsumerProperties(inboundName)
-				.isUseNativeDecoding();
-		if (nativeDecoding) {
-			LOG.info("Native decoding is enabled for " + inboundName + ". " +
-					"Inbound deserialization done at the broker.");
-		}
-		else {
-			LOG.info("Native decoding is disabled for " + inboundName + ". " +
-					"Inbound message conversion done by Spring Cloud Stream.");
-		}
-
-		stream = stream.mapValues((value) -> {
-			Object returnValue;
-			String contentType = bindingProperties.getContentType();
-			if (value != null && !StringUtils.isEmpty(contentType) && !nativeDecoding) {
-				returnValue = MessageBuilder.withPayload(value)
-						.setHeader(MessageHeaders.CONTENT_TYPE, contentType).build();
-			}
-			else {
-				returnValue = value;
-			}
-			return returnValue;
-		});
-		return stream;
-	}
-
-	private void enableNativeDecodingForKTableAlways(Class<?> parameterType, BindingProperties bindingProperties) {
-		if (parameterType.isAssignableFrom(KTable.class) || parameterType.isAssignableFrom(GlobalKTable.class)) {
-			if (bindingProperties.getConsumer() == null) {
-				bindingProperties.setConsumer(new ConsumerProperties());
-			}
-			//No framework level message conversion provided for KTable/GlobalKTable, its done by the broker.
-			bindingProperties.getConsumer().setUseNativeDecoding(true);
-		}
-	}
-
-	@SuppressWarnings({"unchecked"})
-	private void buildStreamsBuilderAndRetrieveConfig(String functionName, ApplicationContext applicationContext,
-													String inboundName) {
-		ConfigurableListableBeanFactory beanFactory = this.applicationContext.getBeanFactory();
-
-		Map<String, Object> streamConfigGlobalProperties = applicationContext.getBean("streamConfigGlobalProperties",
-				Map.class);
-
-		KafkaStreamsConsumerProperties extendedConsumerProperties = this.kafkaStreamsExtendedBindingProperties
-				.getExtendedConsumerProperties(inboundName);
-		streamConfigGlobalProperties.putAll(extendedConsumerProperties.getConfiguration());
-
-		String applicationId = extendedConsumerProperties.getApplicationId();
-		//override application.id if set at the individual binding level.
-		if (StringUtils.hasText(applicationId)) {
-			streamConfigGlobalProperties.put(StreamsConfig.APPLICATION_ID_CONFIG, applicationId);
-		}
-
-		int concurrency = this.bindingServiceProperties.getConsumerProperties(inboundName).getConcurrency();
-		// override concurrency if set at the individual binding level.
-		if (concurrency > 1) {
-			streamConfigGlobalProperties.put(StreamsConfig.NUM_STREAM_THREADS_CONFIG, concurrency);
-		}
-
-		Map<String, KafkaStreamsDlqDispatch> kafkaStreamsDlqDispatchers = applicationContext.getBean(
-				"kafkaStreamsDlqDispatchers", Map.class);
-
-		KafkaStreamsConfiguration kafkaStreamsConfiguration =
-				new KafkaStreamsConfiguration(streamConfigGlobalProperties) {
-			@Override
-			public Properties asProperties() {
-				Properties properties = super.asProperties();
-				properties.put(SendToDlqAndContinue.KAFKA_STREAMS_DLQ_DISPATCHERS, kafkaStreamsDlqDispatchers);
-				return properties;
-			}
-		};
-
-		StreamsBuilderFactoryBean streamsBuilder = this.cleanupConfig == null
-				? new StreamsBuilderFactoryBean(kafkaStreamsConfiguration)
-				: new StreamsBuilderFactoryBean(kafkaStreamsConfiguration, this.cleanupConfig);
-		streamsBuilder.setAutoStartup(false);
-		BeanDefinition streamsBuilderBeanDefinition =
-				BeanDefinitionBuilder.genericBeanDefinition(
-						(Class<StreamsBuilderFactoryBean>) streamsBuilder.getClass(), () -> streamsBuilder)
-						.getRawBeanDefinition();
-		((BeanDefinitionRegistry) beanFactory).registerBeanDefinition("stream-builder-" +
-				functionName, streamsBuilderBeanDefinition);
-		StreamsBuilderFactoryBean streamsBuilderX = applicationContext.getBean("&stream-builder-" +
-				functionName, StreamsBuilderFactoryBean.class);
-		this.methodStreamsBuilderFactoryBeanMap.put(functionName, streamsBuilderX);
-	}
-
-	@Override
-	public final void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-		this.applicationContext = (ConfigurableApplicationContext) applicationContext;
-	}
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsMessageConversionDelegate.java

@@ -1,288 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.kafka.common.header.Header;
-import org.apache.kafka.common.header.Headers;
-import org.apache.kafka.streams.KeyValue;
-import org.apache.kafka.streams.kstream.KStream;
-import org.apache.kafka.streams.processor.Processor;
-import org.apache.kafka.streams.processor.ProcessorContext;
-
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsBinderConfigurationProperties;
-import org.springframework.cloud.stream.converter.CompositeMessageConverterFactory;
-import org.springframework.messaging.Message;
-import org.springframework.messaging.MessageHeaders;
-import org.springframework.messaging.converter.MessageConverter;
-import org.springframework.messaging.support.MessageBuilder;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-/**
- * Delegate for handling all framework level message conversions inbound and outbound on
- * {@link KStream}. If native encoding is not enabled, then serialization will be
- * performed on outbound messages based on a contentType. Similarly, if native decoding is
- * not enabled, deserialization will be performed on inbound messages based on a
- * contentType. Based on the contentType, a {@link MessageConverter} will be resolved.
- *
- * @author Soby Chacko
- */
-public class KafkaStreamsMessageConversionDelegate {
-
-	private static final Log LOG = LogFactory
-			.getLog(KafkaStreamsMessageConversionDelegate.class);
-
-	private static final ThreadLocal<KeyValue<Object, Object>> keyValueThreadLocal = new ThreadLocal<>();
-
-	private final CompositeMessageConverterFactory compositeMessageConverterFactory;
-
-	private final SendToDlqAndContinue sendToDlqAndContinue;
-
-	private final KafkaStreamsBindingInformationCatalogue kstreamBindingInformationCatalogue;
-
-	private final KafkaStreamsBinderConfigurationProperties kstreamBinderConfigurationProperties;
-
-	KafkaStreamsMessageConversionDelegate(
-			CompositeMessageConverterFactory compositeMessageConverterFactory,
-			SendToDlqAndContinue sendToDlqAndContinue,
-			KafkaStreamsBindingInformationCatalogue kstreamBindingInformationCatalogue,
-			KafkaStreamsBinderConfigurationProperties kstreamBinderConfigurationProperties) {
-		this.compositeMessageConverterFactory = compositeMessageConverterFactory;
-		this.sendToDlqAndContinue = sendToDlqAndContinue;
-		this.kstreamBindingInformationCatalogue = kstreamBindingInformationCatalogue;
-		this.kstreamBinderConfigurationProperties = kstreamBinderConfigurationProperties;
-	}
-
-	/**
-	 * Serialize {@link KStream} records on outbound based on contentType.
-	 * @param outboundBindTarget outbound KStream target
-	 * @return serialized KStream
-	 */
-	@SuppressWarnings("rawtypes")
-	public KStream serializeOnOutbound(KStream<?, ?> outboundBindTarget) {
-		String contentType = this.kstreamBindingInformationCatalogue
-				.getContentType(outboundBindTarget);
-		MessageConverter messageConverter = this.compositeMessageConverterFactory
-				.getMessageConverterForAllRegistered();
-
-		return outboundBindTarget.mapValues((v) -> {
-			Message<?> message = v instanceof Message<?> ? (Message<?>) v
-					: MessageBuilder.withPayload(v).build();
-			Map<String, Object> headers = new HashMap<>(message.getHeaders());
-			if (!StringUtils.isEmpty(contentType)) {
-				headers.put(MessageHeaders.CONTENT_TYPE, contentType);
-			}
-			MessageHeaders messageHeaders = new MessageHeaders(headers);
-			return messageConverter.toMessage(message.getPayload(), messageHeaders)
-					.getPayload();
-		});
-	}
-
-	/**
-	 * Deserialize incoming {@link KStream} based on content type.
-	 * @param valueClass on KStream value
-	 * @param bindingTarget inbound KStream target
-	 * @return deserialized KStream
-	 */
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	public KStream deserializeOnInbound(Class<?> valueClass,
-			KStream<?, ?> bindingTarget) {
-		MessageConverter messageConverter = this.compositeMessageConverterFactory
-				.getMessageConverterForAllRegistered();
-		final PerRecordContentTypeHolder perRecordContentTypeHolder = new PerRecordContentTypeHolder();
-
-		resolvePerRecordContentType(bindingTarget, perRecordContentTypeHolder);
-
-		// Deserialize using a branching strategy
-		KStream<?, ?>[] branch = bindingTarget.branch(
-				// First filter where the message is converted and return true if
-				// everything went well, return false otherwise.
-				(o, o2) -> {
-					boolean isValidRecord = false;
-
-					try {
-						// if the record is a tombstone, ignore and exit from processing
-						// further.
-						if (o2 != null) {
-							if (o2 instanceof Message || o2 instanceof String
-									|| o2 instanceof byte[]) {
-								Message<?> m1 = null;
-								if (o2 instanceof Message) {
-									m1 = perRecordContentTypeHolder.contentType != null
-											? MessageBuilder.fromMessage((Message<?>) o2)
-													.setHeader(
-															MessageHeaders.CONTENT_TYPE,
-															perRecordContentTypeHolder.contentType)
-													.build()
-											: (Message<?>) o2;
-								}
-								else {
-									m1 = perRecordContentTypeHolder.contentType != null
-											? MessageBuilder.withPayload(o2).setHeader(
-													MessageHeaders.CONTENT_TYPE,
-													perRecordContentTypeHolder.contentType)
-													.build()
-											: MessageBuilder.withPayload(o2).build();
-								}
-								convertAndSetMessage(o, valueClass, messageConverter, m1);
-							}
-							else {
-								keyValueThreadLocal.set(new KeyValue<>(o, o2));
-							}
-							isValidRecord = true;
-						}
-						else {
-							LOG.info(
-									"Received a tombstone record. This will be skipped from further processing.");
-						}
-					}
-					catch (Exception e) {
-						LOG.warn(
-								"Deserialization has failed. This will be skipped from further processing.",
-								e);
-						// pass through
-					}
-					return isValidRecord;
-				},
-				// second filter that catches any messages for which an exception thrown
-				// in the first filter above.
-				(k, v) -> true);
-		// process errors from the second filter in the branch above.
-		processErrorFromDeserialization(bindingTarget, branch[1]);
-
-		// first branch above is the branch where the messages are converted, let it go
-		// through further processing.
-		return branch[0].mapValues((o2) -> {
-			Object objectValue = keyValueThreadLocal.get().value;
-			keyValueThreadLocal.remove();
-			return objectValue;
-		});
-	}
-
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	private void resolvePerRecordContentType(KStream<?, ?> outboundBindTarget,
-			PerRecordContentTypeHolder perRecordContentTypeHolder) {
-		outboundBindTarget.process(() -> new Processor() {
-
-			ProcessorContext context;
-
-			@Override
-			public void init(ProcessorContext context) {
-				this.context = context;
-			}
-
-			@Override
-			public void process(Object key, Object value) {
-				final Headers headers = this.context.headers();
-				final Iterable<Header> contentTypes = headers
-						.headers(MessageHeaders.CONTENT_TYPE);
-				if (contentTypes != null && contentTypes.iterator().hasNext()) {
-					final String contentType = new String(
-							contentTypes.iterator().next().value());
-					// remove leading and trailing quotes
-					final String cleanContentType = StringUtils.replace(contentType, "\"",
-							"");
-					perRecordContentTypeHolder.setContentType(cleanContentType);
-				}
-			}
-
-			@Override
-			public void close() {
-
-			}
-		});
-	}
-
-	private void convertAndSetMessage(Object o, Class<?> valueClass,
-			MessageConverter messageConverter, Message<?> msg) {
-		Object result = valueClass.isAssignableFrom(msg.getPayload().getClass())
-				? msg.getPayload() : messageConverter.fromMessage(msg, valueClass);
-
-		Assert.notNull(result, "Failed to convert message " + msg);
-
-		keyValueThreadLocal.set(new KeyValue<>(o, result));
-	}
-
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	private void processErrorFromDeserialization(KStream<?, ?> bindingTarget,
-			KStream<?, ?> branch) {
-		branch.process(() -> new Processor() {
-			ProcessorContext context;
-
-			@Override
-			public void init(ProcessorContext context) {
-				this.context = context;
-			}
-
-			@Override
-			public void process(Object o, Object o2) {
-				// Only continue if the record was not a tombstone.
-				if (o2 != null) {
-					if (KafkaStreamsMessageConversionDelegate.this.kstreamBindingInformationCatalogue
-							.isDlqEnabled(bindingTarget)) {
-						String destination = this.context.topic();
-						if (o2 instanceof Message) {
-							Message message = (Message) o2;
-							KafkaStreamsMessageConversionDelegate.this.sendToDlqAndContinue
-									.sendToDlq(destination, (byte[]) o,
-											(byte[]) message.getPayload(),
-											this.context.partition());
-						}
-						else {
-							KafkaStreamsMessageConversionDelegate.this.sendToDlqAndContinue
-									.sendToDlq(destination, (byte[]) o, (byte[]) o2,
-											this.context.partition());
-						}
-					}
-					else if (KafkaStreamsMessageConversionDelegate.this.kstreamBinderConfigurationProperties
-							.getSerdeError() == KafkaStreamsBinderConfigurationProperties.SerdeError.logAndFail) {
-						throw new IllegalStateException("Inbound deserialization failed. "
-								+ "Stopping further processing of records.");
-					}
-					else if (KafkaStreamsMessageConversionDelegate.this.kstreamBinderConfigurationProperties
-							.getSerdeError() == KafkaStreamsBinderConfigurationProperties.SerdeError.logAndContinue) {
-						// quietly passing through. No action needed, this is similar to
-						// log and continue.
-						LOG.error(
-								"Inbound deserialization failed. Skipping this record and continuing.");
-					}
-				}
-			}
-
-			@Override
-			public void close() {
-
-			}
-		});
-	}
-
-	private static class PerRecordContentTypeHolder {
-
-		String contentType;
-
-		void setContentType(String contentType) {
-			this.contentType = contentType;
-		}
-
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsRegistry.java

@@ -1,46 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.kafka.streams.KafkaStreams;
-
-/**
- * An internal registry for holding {@KafkaStreams} objects maintained through
- * {@link StreamsBuilderFactoryManager}.
- *
- * @author Soby Chacko
- */
-class KafkaStreamsRegistry {
-
-	private final Set<KafkaStreams> kafkaStreams = new HashSet<>();
-
-	Set<KafkaStreams> getKafkaStreams() {
-		return this.kafkaStreams;
-	}
-
-	/**
-	 * Register the {@link KafkaStreams} object created in the application.
-	 * @param kafkaStreams {@link KafkaStreams} object created in the application
-	 */
-	void registerKafkaStreams(KafkaStreams kafkaStreams) {
-		this.kafkaStreams.add(kafkaStreams);
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsStreamListenerSetupMethodOrchestrator.java

@@ -1,687 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.kafka.common.serialization.Serde;
-import org.apache.kafka.common.utils.Bytes;
-import org.apache.kafka.streams.StreamsBuilder;
-import org.apache.kafka.streams.StreamsConfig;
-import org.apache.kafka.streams.Topology;
-import org.apache.kafka.streams.kstream.Consumed;
-import org.apache.kafka.streams.kstream.GlobalKTable;
-import org.apache.kafka.streams.kstream.KStream;
-import org.apache.kafka.streams.kstream.KTable;
-import org.apache.kafka.streams.kstream.Materialized;
-import org.apache.kafka.streams.state.KeyValueStore;
-import org.apache.kafka.streams.state.StoreBuilder;
-import org.apache.kafka.streams.state.Stores;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanInitializationException;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.cloud.stream.annotation.Input;
-import org.springframework.cloud.stream.annotation.StreamListener;
-import org.springframework.cloud.stream.binder.ConsumerProperties;
-import org.springframework.cloud.stream.binder.kafka.properties.KafkaConsumerProperties;
-import org.springframework.cloud.stream.binder.kafka.streams.annotations.KafkaStreamsStateStore;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsConsumerProperties;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsExtendedBindingProperties;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsStateStoreProperties;
-import org.springframework.cloud.stream.binding.StreamListenerErrorMessages;
-import org.springframework.cloud.stream.binding.StreamListenerParameterAdapter;
-import org.springframework.cloud.stream.binding.StreamListenerResultAdapter;
-import org.springframework.cloud.stream.binding.StreamListenerSetupMethodOrchestrator;
-import org.springframework.cloud.stream.config.BindingProperties;
-import org.springframework.cloud.stream.config.BindingServiceProperties;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.core.MethodParameter;
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.kafka.config.KafkaStreamsConfiguration;
-import org.springframework.kafka.config.StreamsBuilderFactoryBean;
-import org.springframework.kafka.core.CleanupConfig;
-import org.springframework.messaging.MessageHeaders;
-import org.springframework.messaging.handler.annotation.SendTo;
-import org.springframework.messaging.support.MessageBuilder;
-import org.springframework.util.Assert;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.ReflectionUtils;
-import org.springframework.util.StringUtils;
-
-/**
- * Kafka Streams specific implementation for {@link StreamListenerSetupMethodOrchestrator}
- * that overrides the default mechanisms for invoking StreamListener adapters.
- * <p>
- * The orchestration primarily focus on the following areas:
- * <p>
- * 1. Allow multiple KStream output bindings (KStream branching) by allowing more than one
- * output values on {@link SendTo} 2. Allow multiple inbound bindings for multiple KStream
- * and or KTable/GlobalKTable types. 3. Each StreamListener method that it orchestrates
- * gets its own {@link StreamsBuilderFactoryBean} and {@link StreamsConfig}
- *
- * @author Soby Chacko
- * @author Lei Chen
- * @author Gary Russell
- */
-class KafkaStreamsStreamListenerSetupMethodOrchestrator
-		implements StreamListenerSetupMethodOrchestrator, ApplicationContextAware {
-
-	private static final Log LOG = LogFactory
-			.getLog(KafkaStreamsStreamListenerSetupMethodOrchestrator.class);
-
-	private final StreamListenerParameterAdapter streamListenerParameterAdapter;
-
-	private final Collection<StreamListenerResultAdapter> streamListenerResultAdapters;
-
-	private final BindingServiceProperties bindingServiceProperties;
-
-	private final KafkaStreamsExtendedBindingProperties kafkaStreamsExtendedBindingProperties;
-
-	private final KeyValueSerdeResolver keyValueSerdeResolver;
-
-	private final KafkaStreamsBindingInformationCatalogue kafkaStreamsBindingInformationCatalogue;
-
-	private final Map<Method, StreamsBuilderFactoryBean> methodStreamsBuilderFactoryBeanMap = new HashMap<>();
-
-	private final Map<Method, List<String>> registeredStoresPerMethod = new HashMap<>();
-
-	private final CleanupConfig cleanupConfig;
-
-	private ConfigurableApplicationContext applicationContext;
-
-	KafkaStreamsStreamListenerSetupMethodOrchestrator(
-			BindingServiceProperties bindingServiceProperties,
-			KafkaStreamsExtendedBindingProperties extendedBindingProperties,
-			KeyValueSerdeResolver keyValueSerdeResolver,
-			KafkaStreamsBindingInformationCatalogue bindingInformationCatalogue,
-			StreamListenerParameterAdapter streamListenerParameterAdapter,
-			Collection<StreamListenerResultAdapter> listenerResultAdapters,
-			CleanupConfig cleanupConfig) {
-		this.bindingServiceProperties = bindingServiceProperties;
-		this.kafkaStreamsExtendedBindingProperties = extendedBindingProperties;
-		this.keyValueSerdeResolver = keyValueSerdeResolver;
-		this.kafkaStreamsBindingInformationCatalogue = bindingInformationCatalogue;
-		this.streamListenerParameterAdapter = streamListenerParameterAdapter;
-		this.streamListenerResultAdapters = listenerResultAdapters;
-		this.cleanupConfig = cleanupConfig;
-	}
-
-	@Override
-	public boolean supports(Method method) {
-		return methodParameterSupports(method) && (methodReturnTypeSuppports(method)
-				|| Void.TYPE.equals(method.getReturnType()));
-	}
-
-	private boolean methodReturnTypeSuppports(Method method) {
-		Class<?> returnType = method.getReturnType();
-		if (returnType.equals(KStream.class) || (returnType.isArray()
-				&& returnType.getComponentType().equals(KStream.class))) {
-			return true;
-		}
-		return false;
-	}
-
-	private boolean methodParameterSupports(Method method) {
-		boolean supports = false;
-		for (int i = 0; i < method.getParameterCount(); i++) {
-			MethodParameter methodParameter = MethodParameter.forExecutable(method, i);
-			Class<?> parameterType = methodParameter.getParameterType();
-			if (parameterType.equals(KStream.class) || parameterType.equals(KTable.class)
-					|| parameterType.equals(GlobalKTable.class)) {
-				supports = true;
-			}
-		}
-		return supports;
-	}
-
-	@Override
-	@SuppressWarnings({"rawtypes", "unchecked"})
-	public void orchestrateStreamListenerSetupMethod(StreamListener streamListener,
-													Method method, Object bean) {
-		String[] methodAnnotatedOutboundNames = getOutboundBindingTargetNames(method);
-		validateStreamListenerMethod(streamListener, method,
-				methodAnnotatedOutboundNames);
-		String methodAnnotatedInboundName = streamListener.value();
-		Object[] adaptedInboundArguments = adaptAndRetrieveInboundArguments(method,
-				methodAnnotatedInboundName, this.applicationContext,
-				this.streamListenerParameterAdapter);
-		try {
-			ReflectionUtils.makeAccessible(method);
-			if (Void.TYPE.equals(method.getReturnType())) {
-				method.invoke(bean, adaptedInboundArguments);
-			}
-			else {
-				Object result = method.invoke(bean, adaptedInboundArguments);
-
-				if (result.getClass().isArray()) {
-					Assert.isTrue(
-							methodAnnotatedOutboundNames.length == ((Object[]) result).length,
-							"Result does not match with the number of declared outbounds");
-				}
-				else {
-					Assert.isTrue(methodAnnotatedOutboundNames.length == 1,
-							"Result does not match with the number of declared outbounds");
-				}
-				if (result.getClass().isArray()) {
-					Object[] outboundKStreams = (Object[]) result;
-					int i = 0;
-					for (Object outboundKStream : outboundKStreams) {
-						Object targetBean = this.applicationContext
-								.getBean(methodAnnotatedOutboundNames[i++]);
-						for (StreamListenerResultAdapter streamListenerResultAdapter : this.streamListenerResultAdapters) {
-							if (streamListenerResultAdapter.supports(
-									outboundKStream.getClass(), targetBean.getClass())) {
-								streamListenerResultAdapter.adapt(outboundKStream,
-										targetBean);
-								break;
-							}
-						}
-					}
-				}
-				else {
-					Object targetBean = this.applicationContext
-							.getBean(methodAnnotatedOutboundNames[0]);
-					for (StreamListenerResultAdapter streamListenerResultAdapter : this.streamListenerResultAdapters) {
-						if (streamListenerResultAdapter.supports(result.getClass(),
-								targetBean.getClass())) {
-							streamListenerResultAdapter.adapt(result, targetBean);
-							break;
-						}
-					}
-				}
-			}
-		}
-		catch (Exception ex) {
-			throw new BeanInitializationException(
-					"Cannot setup StreamListener for " + method, ex);
-		}
-	}
-
-	@Override
-	@SuppressWarnings({"unchecked"})
-	public Object[] adaptAndRetrieveInboundArguments(Method method, String inboundName,
-													ApplicationContext applicationContext,
-													StreamListenerParameterAdapter... adapters) {
-		Object[] arguments = new Object[method.getParameterTypes().length];
-		for (int parameterIndex = 0; parameterIndex < arguments.length; parameterIndex++) {
-			MethodParameter methodParameter = MethodParameter.forExecutable(method,
-					parameterIndex);
-			Class<?> parameterType = methodParameter.getParameterType();
-			Object targetReferenceValue = null;
-			if (methodParameter.hasParameterAnnotation(Input.class)) {
-				targetReferenceValue = AnnotationUtils
-						.getValue(methodParameter.getParameterAnnotation(Input.class));
-				Input methodAnnotation = methodParameter
-						.getParameterAnnotation(Input.class);
-				inboundName = methodAnnotation.value();
-			}
-			else if (arguments.length == 1 && StringUtils.hasText(inboundName)) {
-				targetReferenceValue = inboundName;
-			}
-			if (targetReferenceValue != null) {
-				Assert.isInstanceOf(String.class, targetReferenceValue,
-						"Annotation value must be a String");
-				Object targetBean = applicationContext
-						.getBean((String) targetReferenceValue);
-				BindingProperties bindingProperties = this.bindingServiceProperties
-						.getBindingProperties(inboundName);
-				enableNativeDecodingForKTableAlways(parameterType, bindingProperties);
-				// Retrieve the StreamsConfig created for this method if available.
-				// Otherwise, create the StreamsBuilderFactory and get the underlying
-				// config.
-				if (!this.methodStreamsBuilderFactoryBeanMap.containsKey(method)) {
-					buildStreamsBuilderAndRetrieveConfig(method, applicationContext,
-							inboundName);
-				}
-				try {
-					StreamsBuilderFactoryBean streamsBuilderFactoryBean = this.methodStreamsBuilderFactoryBeanMap
-							.get(method);
-					StreamsBuilder streamsBuilder = streamsBuilderFactoryBean.getObject();
-					KafkaStreamsConsumerProperties extendedConsumerProperties = this.kafkaStreamsExtendedBindingProperties
-							.getExtendedConsumerProperties(inboundName);
-					// get state store spec
-					KafkaStreamsStateStoreProperties spec = buildStateStoreSpec(method);
-					Serde<?> keySerde = this.keyValueSerdeResolver
-							.getInboundKeySerde(extendedConsumerProperties);
-					Serde<?> valueSerde = this.keyValueSerdeResolver.getInboundValueSerde(
-							bindingProperties.getConsumer(), extendedConsumerProperties);
-
-					final KafkaConsumerProperties.StartOffset startOffset = extendedConsumerProperties
-							.getStartOffset();
-					Topology.AutoOffsetReset autoOffsetReset = null;
-					if (startOffset != null) {
-						switch (startOffset) {
-							case earliest:
-								autoOffsetReset = Topology.AutoOffsetReset.EARLIEST;
-								break;
-							case latest:
-								autoOffsetReset = Topology.AutoOffsetReset.LATEST;
-								break;
-							default:
-								break;
-						}
-					}
-					if (extendedConsumerProperties.isResetOffsets()) {
-						LOG.warn("Detected resetOffsets configured on binding "
-								+ inboundName + ". "
-								+ "Setting resetOffsets in Kafka Streams binder does not have any effect.");
-					}
-
-					if (parameterType.isAssignableFrom(KStream.class)) {
-						KStream<?, ?> stream = getkStream(inboundName, spec,
-								bindingProperties, streamsBuilder, keySerde, valueSerde,
-								autoOffsetReset);
-						KStreamBoundElementFactory.KStreamWrapper kStreamWrapper = (KStreamBoundElementFactory.KStreamWrapper) targetBean;
-						// wrap the proxy created during the initial target type binding
-						// with real object (KStream)
-						kStreamWrapper.wrap((KStream<Object, Object>) stream);
-						this.kafkaStreamsBindingInformationCatalogue
-								.addStreamBuilderFactory(streamsBuilderFactoryBean);
-						for (StreamListenerParameterAdapter streamListenerParameterAdapter : adapters) {
-							if (streamListenerParameterAdapter.supports(stream.getClass(),
-									methodParameter)) {
-								arguments[parameterIndex] = streamListenerParameterAdapter
-										.adapt(kStreamWrapper, methodParameter);
-								break;
-							}
-						}
-						if (arguments[parameterIndex] == null
-								&& parameterType.isAssignableFrom(stream.getClass())) {
-							arguments[parameterIndex] = stream;
-						}
-						Assert.notNull(arguments[parameterIndex],
-								"Cannot convert argument " + parameterIndex + " of "
-										+ method + "from " + stream.getClass() + " to "
-										+ parameterType);
-					}
-					else if (parameterType.isAssignableFrom(KTable.class)) {
-						String materializedAs = extendedConsumerProperties
-								.getMaterializedAs();
-						String bindingDestination = this.bindingServiceProperties
-								.getBindingDestination(inboundName);
-						KTable<?, ?> table = getKTable(streamsBuilder, keySerde,
-								valueSerde, materializedAs, bindingDestination,
-								autoOffsetReset);
-						KTableBoundElementFactory.KTableWrapper kTableWrapper = (KTableBoundElementFactory.KTableWrapper) targetBean;
-						// wrap the proxy created during the initial target type binding
-						// with real object (KTable)
-						kTableWrapper.wrap((KTable<Object, Object>) table);
-						this.kafkaStreamsBindingInformationCatalogue
-								.addStreamBuilderFactory(streamsBuilderFactoryBean);
-						arguments[parameterIndex] = table;
-					}
-					else if (parameterType.isAssignableFrom(GlobalKTable.class)) {
-						String materializedAs = extendedConsumerProperties
-								.getMaterializedAs();
-						String bindingDestination = this.bindingServiceProperties
-								.getBindingDestination(inboundName);
-						GlobalKTable<?, ?> table = getGlobalKTable(streamsBuilder,
-								keySerde, valueSerde, materializedAs, bindingDestination,
-								autoOffsetReset);
-						// @checkstyle:off
-						GlobalKTableBoundElementFactory.GlobalKTableWrapper globalKTableWrapper = (GlobalKTableBoundElementFactory.GlobalKTableWrapper) targetBean;
-						// @checkstyle:on
-						// wrap the proxy created during the initial target type binding
-						// with real object (KTable)
-						globalKTableWrapper.wrap((GlobalKTable<Object, Object>) table);
-						this.kafkaStreamsBindingInformationCatalogue
-								.addStreamBuilderFactory(streamsBuilderFactoryBean);
-						arguments[parameterIndex] = table;
-					}
-				}
-				catch (Exception ex) {
-					throw new IllegalStateException(ex);
-				}
-			}
-			else {
-				throw new IllegalStateException(
-						StreamListenerErrorMessages.INVALID_DECLARATIVE_METHOD_PARAMETERS);
-			}
-		}
-		return arguments;
-	}
-
-	private GlobalKTable<?, ?> getGlobalKTable(StreamsBuilder streamsBuilder,
-											Serde<?> keySerde, Serde<?> valueSerde, String materializedAs,
-											String bindingDestination, Topology.AutoOffsetReset autoOffsetReset) {
-		return materializedAs != null
-				? materializedAsGlobalKTable(streamsBuilder, bindingDestination,
-				materializedAs, keySerde, valueSerde, autoOffsetReset)
-				: streamsBuilder.globalTable(bindingDestination,
-				Consumed.with(keySerde, valueSerde)
-						.withOffsetResetPolicy(autoOffsetReset));
-	}
-
-	private KTable<?, ?> getKTable(StreamsBuilder streamsBuilder, Serde<?> keySerde,
-								Serde<?> valueSerde, String materializedAs, String bindingDestination,
-								Topology.AutoOffsetReset autoOffsetReset) {
-		return materializedAs != null
-				? materializedAs(streamsBuilder, bindingDestination, materializedAs,
-				keySerde, valueSerde, autoOffsetReset)
-				: streamsBuilder.table(bindingDestination,
-				Consumed.with(keySerde, valueSerde)
-						.withOffsetResetPolicy(autoOffsetReset));
-	}
-
-	private <K, V> KTable<K, V> materializedAs(StreamsBuilder streamsBuilder,
-											String destination, String storeName, Serde<K> k, Serde<V> v,
-											Topology.AutoOffsetReset autoOffsetReset) {
-		return streamsBuilder.table(
-				this.bindingServiceProperties.getBindingDestination(destination),
-				Consumed.with(k, v).withOffsetResetPolicy(autoOffsetReset),
-				getMaterialized(storeName, k, v));
-	}
-
-	private <K, V> GlobalKTable<K, V> materializedAsGlobalKTable(
-			StreamsBuilder streamsBuilder, String destination, String storeName,
-			Serde<K> k, Serde<V> v, Topology.AutoOffsetReset autoOffsetReset) {
-		return streamsBuilder.globalTable(
-				this.bindingServiceProperties.getBindingDestination(destination),
-				Consumed.with(k, v).withOffsetResetPolicy(autoOffsetReset),
-				getMaterialized(storeName, k, v));
-	}
-
-	private <K, V> Materialized<K, V, KeyValueStore<Bytes, byte[]>> getMaterialized(
-			String storeName, Serde<K> k, Serde<V> v) {
-		return Materialized.<K, V, KeyValueStore<Bytes, byte[]>>as(storeName)
-				.withKeySerde(k).withValueSerde(v);
-	}
-
-	private StoreBuilder buildStateStore(KafkaStreamsStateStoreProperties spec) {
-		try {
-
-			Serde<?> keySerde = this.keyValueSerdeResolver
-					.getStateStoreKeySerde(spec.getKeySerdeString());
-			Serde<?> valueSerde = this.keyValueSerdeResolver
-					.getStateStoreValueSerde(spec.getValueSerdeString());
-			StoreBuilder builder;
-			switch (spec.getType()) {
-				case KEYVALUE:
-					builder = Stores.keyValueStoreBuilder(
-							Stores.persistentKeyValueStore(spec.getName()), keySerde,
-							valueSerde);
-					break;
-				case WINDOW:
-					builder = Stores
-							.windowStoreBuilder(
-									Stores.persistentWindowStore(spec.getName(),
-											spec.getRetention(), 3, spec.getLength(), false),
-									keySerde, valueSerde);
-					break;
-				case SESSION:
-					builder = Stores.sessionStoreBuilder(Stores.persistentSessionStore(
-							spec.getName(), spec.getRetention()), keySerde, valueSerde);
-					break;
-				default:
-					throw new UnsupportedOperationException(
-							"state store type (" + spec.getType() + ") is not supported!");
-			}
-			if (spec.isCacheEnabled()) {
-				builder = builder.withCachingEnabled();
-			}
-			if (spec.isLoggingDisabled()) {
-				builder = builder.withLoggingDisabled();
-			}
-			return builder;
-		}
-		catch (Exception ex) {
-			LOG.error("failed to build state store exception : " + ex);
-			throw ex;
-		}
-	}
-
-	private KStream<?, ?> getkStream(String inboundName,
-									KafkaStreamsStateStoreProperties storeSpec,
-									BindingProperties bindingProperties, StreamsBuilder streamsBuilder,
-									Serde<?> keySerde, Serde<?> valueSerde,
-									Topology.AutoOffsetReset autoOffsetReset) {
-		if (storeSpec != null) {
-			StoreBuilder storeBuilder = buildStateStore(storeSpec);
-			streamsBuilder.addStateStore(storeBuilder);
-			if (LOG.isInfoEnabled()) {
-				LOG.info("state store " + storeBuilder.name() + " added to topology");
-			}
-		}
-		String[] bindingTargets = StringUtils.commaDelimitedListToStringArray(
-				this.bindingServiceProperties.getBindingDestination(inboundName));
-
-		KStream<?, ?> stream = streamsBuilder.stream(Arrays.asList(bindingTargets),
-				Consumed.with(keySerde, valueSerde)
-						.withOffsetResetPolicy(autoOffsetReset));
-		final boolean nativeDecoding = this.bindingServiceProperties
-				.getConsumerProperties(inboundName).isUseNativeDecoding();
-		if (nativeDecoding) {
-			LOG.info("Native decoding is enabled for " + inboundName
-					+ ". Inbound deserialization done at the broker.");
-		}
-		else {
-			LOG.info("Native decoding is disabled for " + inboundName
-					+ ". Inbound message conversion done by Spring Cloud Stream.");
-		}
-
-		stream = stream.mapValues((value) -> {
-			Object returnValue;
-			String contentType = bindingProperties.getContentType();
-			if (value != null && !StringUtils.isEmpty(contentType) && !nativeDecoding) {
-				returnValue = MessageBuilder.withPayload(value)
-						.setHeader(MessageHeaders.CONTENT_TYPE, contentType).build();
-			}
-			else {
-				returnValue = value;
-			}
-			return returnValue;
-		});
-		return stream;
-	}
-
-	private void enableNativeDecodingForKTableAlways(Class<?> parameterType,
-													BindingProperties bindingProperties) {
-		if (parameterType.isAssignableFrom(KTable.class)
-				|| parameterType.isAssignableFrom(GlobalKTable.class)) {
-			if (bindingProperties.getConsumer() == null) {
-				bindingProperties.setConsumer(new ConsumerProperties());
-			}
-			// No framework level message conversion provided for KTable/GlobalKTable, its
-			// done by the broker.
-			bindingProperties.getConsumer().setUseNativeDecoding(true);
-		}
-	}
-
-	@SuppressWarnings({"unchecked"})
-	private void buildStreamsBuilderAndRetrieveConfig(Method method,
-													ApplicationContext applicationContext, String inboundName) {
-		ConfigurableListableBeanFactory beanFactory = this.applicationContext
-				.getBeanFactory();
-
-		Map<String, Object> streamConfigGlobalProperties = applicationContext
-				.getBean("streamConfigGlobalProperties", Map.class);
-
-		KafkaStreamsConsumerProperties extendedConsumerProperties = this.kafkaStreamsExtendedBindingProperties
-				.getExtendedConsumerProperties(inboundName);
-		streamConfigGlobalProperties
-				.putAll(extendedConsumerProperties.getConfiguration());
-
-		String applicationId = extendedConsumerProperties.getApplicationId();
-		// override application.id if set at the individual binding level.
-		if (StringUtils.hasText(applicationId)) {
-			streamConfigGlobalProperties.put(StreamsConfig.APPLICATION_ID_CONFIG,
-					applicationId);
-		}
-
-		int concurrency = this.bindingServiceProperties.getConsumerProperties(inboundName)
-				.getConcurrency();
-		// override concurrency if set at the individual binding level.
-		if (concurrency > 1) {
-			streamConfigGlobalProperties.put(StreamsConfig.NUM_STREAM_THREADS_CONFIG,
-					concurrency);
-		}
-
-		Map<String, KafkaStreamsDlqDispatch> kafkaStreamsDlqDispatchers = applicationContext
-				.getBean("kafkaStreamsDlqDispatchers", Map.class);
-
-		KafkaStreamsConfiguration kafkaStreamsConfiguration = new KafkaStreamsConfiguration(
-				streamConfigGlobalProperties) {
-			@Override
-			public Properties asProperties() {
-				Properties properties = super.asProperties();
-				properties.put(SendToDlqAndContinue.KAFKA_STREAMS_DLQ_DISPATCHERS,
-						kafkaStreamsDlqDispatchers);
-				return properties;
-			}
-		};
-
-		StreamsBuilderFactoryBean streamsBuilder = this.cleanupConfig == null
-				? new StreamsBuilderFactoryBean(kafkaStreamsConfiguration)
-				: new StreamsBuilderFactoryBean(kafkaStreamsConfiguration,
-				this.cleanupConfig);
-		streamsBuilder.setAutoStartup(false);
-		BeanDefinition streamsBuilderBeanDefinition = BeanDefinitionBuilder
-				.genericBeanDefinition(
-						(Class<StreamsBuilderFactoryBean>) streamsBuilder.getClass(),
-						() -> streamsBuilder)
-				.getRawBeanDefinition();
-		final String beanNamePostFix = method.getDeclaringClass().getSimpleName() + "-" + method.getName();
-		((BeanDefinitionRegistry) beanFactory).registerBeanDefinition(
-				"stream-builder-" + beanNamePostFix, streamsBuilderBeanDefinition);
-		StreamsBuilderFactoryBean streamsBuilderX = applicationContext.getBean(
-				"&stream-builder-" + beanNamePostFix, StreamsBuilderFactoryBean.class);
-		this.methodStreamsBuilderFactoryBeanMap.put(method, streamsBuilderX);
-	}
-
-	@Override
-	public final void setApplicationContext(ApplicationContext applicationContext)
-			throws BeansException {
-		this.applicationContext = (ConfigurableApplicationContext) applicationContext;
-	}
-
-	private void validateStreamListenerMethod(StreamListener streamListener,
-											Method method, String[] methodAnnotatedOutboundNames) {
-		String methodAnnotatedInboundName = streamListener.value();
-		if (methodAnnotatedOutboundNames != null) {
-			for (String s : methodAnnotatedOutboundNames) {
-				if (StringUtils.hasText(s)) {
-					Assert.isTrue(isDeclarativeOutput(method, s),
-							"Method must be declarative");
-				}
-			}
-		}
-		if (StringUtils.hasText(methodAnnotatedInboundName)) {
-			int methodArgumentsLength = method.getParameterTypes().length;
-
-			for (int parameterIndex = 0; parameterIndex < methodArgumentsLength; parameterIndex++) {
-				MethodParameter methodParameter = MethodParameter.forExecutable(method,
-						parameterIndex);
-				Assert.isTrue(
-						isDeclarativeInput(methodAnnotatedInboundName, methodParameter),
-						"Method must be declarative");
-			}
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	private boolean isDeclarativeOutput(Method m, String targetBeanName) {
-		boolean declarative;
-		Class<?> returnType = m.getReturnType();
-		if (returnType.isArray()) {
-			Class<?> targetBeanClass = this.applicationContext.getType(targetBeanName);
-			declarative = this.streamListenerResultAdapters.stream()
-					.anyMatch((slpa) -> slpa.supports(returnType.getComponentType(),
-							targetBeanClass));
-			return declarative;
-		}
-		Class<?> targetBeanClass = this.applicationContext.getType(targetBeanName);
-		declarative = this.streamListenerResultAdapters.stream()
-				.anyMatch((slpa) -> slpa.supports(returnType, targetBeanClass));
-		return declarative;
-	}
-
-	@SuppressWarnings("unchecked")
-	private boolean isDeclarativeInput(String targetBeanName,
-									MethodParameter methodParameter) {
-		if (!methodParameter.getParameterType().isAssignableFrom(Object.class)
-				&& this.applicationContext.containsBean(targetBeanName)) {
-			Class<?> targetBeanClass = this.applicationContext.getType(targetBeanName);
-			if (targetBeanClass != null) {
-				boolean supports = KStream.class.isAssignableFrom(targetBeanClass)
-						&& KStream.class.isAssignableFrom(methodParameter.getParameterType());
-				if (!supports) {
-					supports = KTable.class.isAssignableFrom(targetBeanClass)
-							&& KTable.class.isAssignableFrom(methodParameter.getParameterType());
-					if (!supports) {
-						supports = GlobalKTable.class.isAssignableFrom(targetBeanClass)
-								&& GlobalKTable.class.isAssignableFrom(methodParameter.getParameterType());
-					}
-				}
-				return supports;
-			}
-		}
-		return false;
-	}
-
-	private static String[] getOutboundBindingTargetNames(Method method) {
-		SendTo sendTo = AnnotationUtils.findAnnotation(method, SendTo.class);
-		if (sendTo != null) {
-			Assert.isTrue(!ObjectUtils.isEmpty(sendTo.value()),
-					StreamListenerErrorMessages.ATLEAST_ONE_OUTPUT);
-			Assert.isTrue(sendTo.value().length >= 1,
-					"At least one outbound destination need to be provided.");
-			return sendTo.value();
-		}
-		return null;
-	}
-
-	@SuppressWarnings({"unchecked"})
-	private KafkaStreamsStateStoreProperties buildStateStoreSpec(Method method) {
-		if (!this.registeredStoresPerMethod.containsKey(method)) {
-			KafkaStreamsStateStore spec = AnnotationUtils.findAnnotation(method,
-					KafkaStreamsStateStore.class);
-			if (spec != null) {
-				Assert.isTrue(!ObjectUtils.isEmpty(spec.name()), "name cannot be empty");
-				Assert.isTrue(spec.name().length() >= 1, "name cannot be empty.");
-				this.registeredStoresPerMethod.put(method, new ArrayList<>());
-				this.registeredStoresPerMethod.get(method).add(spec.name());
-				KafkaStreamsStateStoreProperties props = new KafkaStreamsStateStoreProperties();
-				props.setName(spec.name());
-				props.setType(spec.type());
-				props.setLength(spec.lengthMs());
-				props.setKeySerdeString(spec.keySerde());
-				props.setRetention(spec.retentionMs());
-				props.setValueSerdeString(spec.valueSerde());
-				props.setCacheEnabled(spec.cache());
-				props.setLoggingDisabled(!spec.logging());
-				return props;
-			}
-		}
-		return null;
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KeyValueSerdeResolver.java

@@ -1,206 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams;
-
-import java.util.Map;
-
-import org.apache.kafka.common.serialization.Serde;
-import org.apache.kafka.common.serialization.Serdes;
-import org.apache.kafka.common.utils.Utils;
-
-import org.springframework.cloud.stream.binder.ConsumerProperties;
-import org.springframework.cloud.stream.binder.ProducerProperties;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsBinderConfigurationProperties;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsConsumerProperties;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsProducerProperties;
-import org.springframework.util.StringUtils;
-
-/**
- * Resolver for key and value Serde.
- *
- * On the inbound, if native decoding is enabled, then any deserialization on the value is
- * handled by Kafka. First, we look for any key/value Serde set on the binding itself, if
- * that is not available then look at the common Serde set at the global level. If that
- * fails, it falls back to byte[]. If native decoding is disabled, then the binder will do
- * the deserialization on value and ignore any Serde set for value and rely on the
- * contentType provided. Keys are always deserialized at the broker.
- *
- *
- * Same rules apply on the outbound. If native encoding is enabled, then value
- * serialization is done at the broker using any binder level Serde for value, if not
- * using common Serde, if not, then byte[]. If native encoding is disabled, then the
- * binder will do serialization using a contentType. Keys are always serialized by the
- * broker.
- *
- * For state store, use serdes class specified in
- * {@link org.springframework.cloud.stream.binder.kafka.streams.annotations.KafkaStreamsStateStore}
- * to create Serde accordingly.
- *
- * @author Soby Chacko
- * @author Lei Chen
- */
-class KeyValueSerdeResolver {
-
-	private final Map<String, Object> streamConfigGlobalProperties;
-
-	private final KafkaStreamsBinderConfigurationProperties binderConfigurationProperties;
-
-	KeyValueSerdeResolver(Map<String, Object> streamConfigGlobalProperties,
-			KafkaStreamsBinderConfigurationProperties binderConfigurationProperties) {
-		this.streamConfigGlobalProperties = streamConfigGlobalProperties;
-		this.binderConfigurationProperties = binderConfigurationProperties;
-	}
-
-	/**
-	 * Provide the {@link Serde} for inbound key.
-	 * @param extendedConsumerProperties binding level extended
-	 * {@link KafkaStreamsConsumerProperties}
-	 * @return configurd {@link Serde} for the inbound key.
-	 */
-	public Serde<?> getInboundKeySerde(
-			KafkaStreamsConsumerProperties extendedConsumerProperties) {
-		String keySerdeString = extendedConsumerProperties.getKeySerde();
-
-		return getKeySerde(keySerdeString);
-	}
-
-	/**
-	 * Provide the {@link Serde} for inbound value.
-	 * @param consumerProperties {@link ConsumerProperties} on binding
-	 * @param extendedConsumerProperties binding level extended
-	 * {@link KafkaStreamsConsumerProperties}
-	 * @return configurd {@link Serde} for the inbound value.
-	 */
-	public Serde<?> getInboundValueSerde(ConsumerProperties consumerProperties,
-			KafkaStreamsConsumerProperties extendedConsumerProperties) {
-		Serde<?> valueSerde;
-
-		String valueSerdeString = extendedConsumerProperties.getValueSerde();
-		try {
-			if (consumerProperties != null && consumerProperties.isUseNativeDecoding()) {
-				valueSerde = getValueSerde(valueSerdeString);
-			}
-			else {
-				valueSerde = Serdes.ByteArray();
-			}
-			valueSerde.configure(this.streamConfigGlobalProperties, false);
-		}
-		catch (ClassNotFoundException ex) {
-			throw new IllegalStateException("Serde class not found: ", ex);
-		}
-		return valueSerde;
-	}
-
-	/**
-	 * Provide the {@link Serde} for outbound key.
-	 * @param properties binding level extended {@link KafkaStreamsProducerProperties}
-	 * @return configurd {@link Serde} for the outbound key.
-	 */
-	public Serde<?> getOuboundKeySerde(KafkaStreamsProducerProperties properties) {
-		return getKeySerde(properties.getKeySerde());
-	}
-
-	/**
-	 * Provide the {@link Serde} for outbound value.
-	 * @param producerProperties {@link ProducerProperties} on binding
-	 * @param kafkaStreamsProducerProperties binding level extended
-	 * {@link KafkaStreamsProducerProperties}
-	 * @return configurd {@link Serde} for the outbound value.
-	 */
-	public Serde<?> getOutboundValueSerde(ProducerProperties producerProperties,
-			KafkaStreamsProducerProperties kafkaStreamsProducerProperties) {
-		Serde<?> valueSerde;
-		try {
-			if (producerProperties.isUseNativeEncoding()) {
-				valueSerde = getValueSerde(
-						kafkaStreamsProducerProperties.getValueSerde());
-			}
-			else {
-				valueSerde = Serdes.ByteArray();
-			}
-			valueSerde.configure(this.streamConfigGlobalProperties, false);
-		}
-		catch (ClassNotFoundException ex) {
-			throw new IllegalStateException("Serde class not found: ", ex);
-		}
-		return valueSerde;
-	}
-
-	/**
-	 * Provide the {@link Serde} for state store.
-	 * @param keySerdeString serde class used for key
-	 * @return {@link Serde} for the state store key.
-	 */
-	public Serde<?> getStateStoreKeySerde(String keySerdeString) {
-		return getKeySerde(keySerdeString);
-	}
-
-	/**
-	 * Provide the {@link Serde} for state store value.
-	 * @param valueSerdeString serde class used for value
-	 * @return {@link Serde} for the state store value.
-	 */
-	public Serde<?> getStateStoreValueSerde(String valueSerdeString) {
-		try {
-			return getValueSerde(valueSerdeString);
-		}
-		catch (ClassNotFoundException ex) {
-			throw new IllegalStateException("Serde class not found: ", ex);
-		}
-	}
-
-	private Serde<?> getKeySerde(String keySerdeString) {
-		Serde<?> keySerde;
-		try {
-			if (StringUtils.hasText(keySerdeString)) {
-				keySerde = Utils.newInstance(keySerdeString, Serde.class);
-			}
-			else {
-				keySerde = this.binderConfigurationProperties.getConfiguration()
-						.containsKey("default.key.serde")
-								? Utils.newInstance(this.binderConfigurationProperties
-										.getConfiguration().get("default.key.serde"),
-										Serde.class)
-								: Serdes.ByteArray();
-			}
-			keySerde.configure(this.streamConfigGlobalProperties, true);
-
-		}
-		catch (ClassNotFoundException ex) {
-			throw new IllegalStateException("Serde class not found: ", ex);
-		}
-		return keySerde;
-	}
-
-	private Serde<?> getValueSerde(String valueSerdeString)
-			throws ClassNotFoundException {
-		Serde<?> valueSerde;
-		if (StringUtils.hasText(valueSerdeString)) {
-			valueSerde = Utils.newInstance(valueSerdeString, Serde.class);
-		}
-		else {
-			valueSerde = this.binderConfigurationProperties.getConfiguration()
-					.containsKey("default.value.serde")
-							? Utils.newInstance(this.binderConfigurationProperties
-									.getConfiguration().get("default.value.serde"),
-									Serde.class)
-							: Serdes.ByteArray();
-		}
-		return valueSerde;
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/QueryableStoreRegistry.java

@@ -1,66 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams;
-
-import org.apache.kafka.streams.KafkaStreams;
-import org.apache.kafka.streams.errors.InvalidStateStoreException;
-import org.apache.kafka.streams.state.QueryableStoreType;
-
-/**
- * Registry that contains {@link QueryableStoreType}s those created from the user
- * applications.
- *
- * @author Soby Chacko
- * @author Renwei Han
- * @since 2.0.0
- * @deprecated in favor of {@link InteractiveQueryService}
- */
-public class QueryableStoreRegistry {
-
-	private final KafkaStreamsRegistry kafkaStreamsRegistry;
-
-	public QueryableStoreRegistry(KafkaStreamsRegistry kafkaStreamsRegistry) {
-		this.kafkaStreamsRegistry = kafkaStreamsRegistry;
-	}
-
-	/**
-	 * Retrieve and return a queryable store by name created in the application.
-	 * @param storeName name of the queryable store
-	 * @param storeType type of the queryable store
-	 * @param <T> generic queryable store
-	 * @return queryable store.
-	 * @deprecated in favor of
-	 * {@link InteractiveQueryService#getQueryableStore(String, QueryableStoreType)}
-	 */
-	public <T> T getQueryableStoreType(String storeName,
-			QueryableStoreType<T> storeType) {
-
-		for (KafkaStreams kafkaStream : this.kafkaStreamsRegistry.getKafkaStreams()) {
-			try {
-				T store = kafkaStream.store(storeName, storeType);
-				if (store != null) {
-					return store;
-				}
-			}
-			catch (InvalidStateStoreException ignored) {
-				// pass through
-			}
-		}
-		return null;
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/SendToDlqAndContinue.java

@@ -1,124 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams;
-
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
-import org.apache.kafka.clients.consumer.OffsetAndMetadata;
-import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.streams.errors.DeserializationExceptionHandler;
-import org.apache.kafka.streams.processor.ProcessorContext;
-import org.apache.kafka.streams.processor.internals.ProcessorContextImpl;
-import org.apache.kafka.streams.processor.internals.StreamTask;
-
-import org.springframework.util.ReflectionUtils;
-
-/**
- * Custom implementation for {@link DeserializationExceptionHandler} that sends the
- * records in error to a DLQ topic, then continue stream processing on new records.
- *
- * @author Soby Chacko
- * @since 2.0.0
- */
-public class SendToDlqAndContinue implements DeserializationExceptionHandler {
-
-	/**
-	 * Key used for DLQ dispatchers.
-	 */
-	public static final String KAFKA_STREAMS_DLQ_DISPATCHERS = "spring.cloud.stream.kafka.streams.dlq.dispatchers";
-
-	/**
-	 * DLQ dispatcher per topic in the application context. The key here is not the actual
-	 * DLQ topic but the incoming topic that caused the error.
-	 */
-	private Map<String, KafkaStreamsDlqDispatch> dlqDispatchers = new HashMap<>();
-
-	/**
-	 * For a given topic, send the key/value record to DLQ topic.
-	 * @param topic incoming topic that caused the error
-	 * @param key to send
-	 * @param value to send
-	 * @param partition for the topic where this record should be sent
-	 */
-	public void sendToDlq(String topic, byte[] key, byte[] value, int partition) {
-		KafkaStreamsDlqDispatch kafkaStreamsDlqDispatch = this.dlqDispatchers.get(topic);
-		kafkaStreamsDlqDispatch.sendToDlq(key, value, partition);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public DeserializationHandlerResponse handle(ProcessorContext context,
-			ConsumerRecord<byte[], byte[]> record, Exception exception) {
-		KafkaStreamsDlqDispatch kafkaStreamsDlqDispatch = this.dlqDispatchers
-				.get(record.topic());
-		kafkaStreamsDlqDispatch.sendToDlq(record.key(), record.value(),
-				record.partition());
-		context.commit();
-
-		// The following conditional block should be reconsidered when we have a solution
-		// for this SO problem:
-		// https://stackoverflow.com/questions/48470899/kafka-streams-deserialization-handler
-		// Currently it seems like when deserialization error happens, there is no commits
-		// happening and the
-		// following code will use reflection to get access to the underlying
-		// KafkaConsumer.
-		// It works with Kafka 1.0.0, but there is no guarantee it will work in future
-		// versions of kafka as
-		// we access private fields by name using reflection, but it is a temporary fix.
-		if (context instanceof ProcessorContextImpl) {
-			ProcessorContextImpl processorContextImpl = (ProcessorContextImpl) context;
-			Field task = ReflectionUtils.findField(ProcessorContextImpl.class, "task");
-			ReflectionUtils.makeAccessible(task);
-			Object taskField = ReflectionUtils.getField(task, processorContextImpl);
-
-			if (taskField.getClass().isAssignableFrom(StreamTask.class)) {
-				StreamTask streamTask = (StreamTask) taskField;
-				Field consumer = ReflectionUtils.findField(StreamTask.class, "consumer");
-				ReflectionUtils.makeAccessible(consumer);
-				Object kafkaConsumerField = ReflectionUtils.getField(consumer,
-						streamTask);
-				if (kafkaConsumerField.getClass().isAssignableFrom(KafkaConsumer.class)) {
-					KafkaConsumer kafkaConsumer = (KafkaConsumer) kafkaConsumerField;
-					final Map<TopicPartition, OffsetAndMetadata> consumedOffsetsAndMetadata = new HashMap<>();
-					TopicPartition tp = new TopicPartition(record.topic(),
-							record.partition());
-					OffsetAndMetadata oam = new OffsetAndMetadata(record.offset() + 1);
-					consumedOffsetsAndMetadata.put(tp, oam);
-					kafkaConsumer.commitSync(consumedOffsetsAndMetadata);
-				}
-			}
-		}
-		return DeserializationHandlerResponse.CONTINUE;
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void configure(Map<String, ?> configs) {
-		this.dlqDispatchers = (Map<String, KafkaStreamsDlqDispatch>) configs
-				.get(KAFKA_STREAMS_DLQ_DISPATCHERS);
-	}
-
-	void addKStreamDlqDispatch(String topic,
-			KafkaStreamsDlqDispatch kafkaStreamsDlqDispatch) {
-		this.dlqDispatchers.put(topic, kafkaStreamsDlqDispatch);
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/StreamsBuilderFactoryManager.java

@@ -1,114 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams;
-
-import java.util.Set;
-
-import org.springframework.context.SmartLifecycle;
-import org.springframework.kafka.KafkaException;
-import org.springframework.kafka.config.StreamsBuilderFactoryBean;
-
-/**
- * Iterate through all {@link StreamsBuilderFactoryBean} in the application context and
- * start them. As each one completes starting, register the associated KafkaStreams object
- * into {@link QueryableStoreRegistry}.
- *
- * This {@link SmartLifecycle} class ensures that the bean created from it is started very
- * late through the bootstrap process by setting the phase value closer to
- * Integer.MAX_VALUE. This is to guarantee that the {@link StreamsBuilderFactoryBean} on a
- * {@link org.springframework.cloud.stream.annotation.StreamListener} method with multiple
- * bindings is only started after all the binding phases have completed successfully.
- *
- * @author Soby Chacko
- */
-class StreamsBuilderFactoryManager implements SmartLifecycle {
-
-	private final KafkaStreamsBindingInformationCatalogue kafkaStreamsBindingInformationCatalogue;
-
-	private final KafkaStreamsRegistry kafkaStreamsRegistry;
-
-	private volatile boolean running;
-
-	StreamsBuilderFactoryManager(
-			KafkaStreamsBindingInformationCatalogue kafkaStreamsBindingInformationCatalogue,
-			KafkaStreamsRegistry kafkaStreamsRegistry) {
-		this.kafkaStreamsBindingInformationCatalogue = kafkaStreamsBindingInformationCatalogue;
-		this.kafkaStreamsRegistry = kafkaStreamsRegistry;
-	}
-
-	@Override
-	public boolean isAutoStartup() {
-		return true;
-	}
-
-	@Override
-	public void stop(Runnable callback) {
-		stop();
-		if (callback != null) {
-			callback.run();
-		}
-	}
-
-	@Override
-	public synchronized void start() {
-		if (!this.running) {
-			try {
-				Set<StreamsBuilderFactoryBean> streamsBuilderFactoryBeans = this.kafkaStreamsBindingInformationCatalogue
-						.getStreamsBuilderFactoryBeans();
-				for (StreamsBuilderFactoryBean streamsBuilderFactoryBean : streamsBuilderFactoryBeans) {
-					streamsBuilderFactoryBean.start();
-					this.kafkaStreamsRegistry.registerKafkaStreams(
-							streamsBuilderFactoryBean.getKafkaStreams());
-				}
-				this.running = true;
-			}
-			catch (Exception ex) {
-				throw new KafkaException("Could not start stream: ", ex);
-			}
-		}
-	}
-
-	@Override
-	public synchronized void stop() {
-		if (this.running) {
-			try {
-				Set<StreamsBuilderFactoryBean> streamsBuilderFactoryBeans = this.kafkaStreamsBindingInformationCatalogue
-						.getStreamsBuilderFactoryBeans();
-				for (StreamsBuilderFactoryBean streamsBuilderFactoryBean : streamsBuilderFactoryBeans) {
-					streamsBuilderFactoryBean.stop();
-				}
-			}
-			catch (Exception ex) {
-				throw new IllegalStateException(ex);
-			}
-			finally {
-				this.running = false;
-			}
-		}
-	}
-
-	@Override
-	public synchronized boolean isRunning() {
-		return this.running;
-	}
-
-	@Override
-	public int getPhase() {
-		return Integer.MAX_VALUE - 100;
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/annotations/KafkaStreamsProcessor.java

@@ -1,90 +0,0 @@
-/*
- * Copyright 2017-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.annotations;
-
-import org.apache.kafka.streams.kstream.KStream;
-
-import org.springframework.cloud.stream.annotation.Input;
-import org.springframework.cloud.stream.annotation.Output;
-
-/**
- * Bindable interface for {@link KStream} input and output.
- *
- * This interface can be used as a bindable interface with
- * {@link org.springframework.cloud.stream.annotation.EnableBinding} when both input and
- * output types are single KStream. In other scenarios where multiple types are required,
- * other similar bindable interfaces can be created and used. For example, there are cases
- * in which multiple KStreams are required on the outbound in the case of KStream
- * branching or multiple input types are required either in the form of multiple KStreams
- * and a combination of KStreams and KTables. In those cases, new bindable interfaces
- * compatible with the requirements must be created. Here are some examples.
- *
- * <pre class="code">
- *     interface KStreamBranchProcessor {
- *         &#064;Input("input")
- *         KStream&lt;?, ?&gt; input();
- *
- *         &#064;Output("output-1")
- *         KStream&lt;?, ?&gt; output1();
- *
- *         &#064;Output("output-2")
- *         KStream&lt;?, ?&gt; output2();
- *
- *         &#064;Output("output-3")
- *         KStream&lt;?, ?&gt; output3();
- *
- *         ......
- *
- *     }
- *</pre>
- *
- * <pre class="code">
- *     interface KStreamKtableProcessor {
- *         &#064;Input("input-1")
- *         KStream&lt;?, ?&gt; input1();
- *
- *         &#064;Input("input-2")
- *         KTable&lt;?, ?&gt; input2();
- *
- *         &#064;Output("output")
- *         KStream&lt;?, ?&gt; output();
- *
- *         ......
- *
- *     }
- *</pre>
- *
- * @author Marius Bogoevici
- * @author Soby Chacko
- */
-public interface KafkaStreamsProcessor {
-
-	/**
-	 * Input binding.
-	 * @return {@link Input} binding for {@link KStream} type.
-	 */
-	@Input("input")
-	KStream<?, ?> input();
-
-	/**
-	 * Output binding.
-	 * @return {@link Output} binding for {@link KStream} type.
-	 */
-	@Output("output")
-	KStream<?, ?> output();
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/annotations/KafkaStreamsStateStore.java

@@ -1,115 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsStateStoreProperties;
-
-/**
- * Interface for Kafka Stream state store.
- *
- * This interface can be used to inject a state store specification into KStream building
- * process so that the desired store can be built by StreamBuilder and added to topology
- * for later use by processors. This is particularly useful when need to combine stream
- * DSL with low level processor APIs. In those cases, if a writable state store is desired
- * in processors, it needs to be created using this annotation. Here is the example.
- *
- * <pre class="code">
- *     &#064;StreamListener("input")
- *     &#064;KafkaStreamsStateStore(name="mystate", type= KafkaStreamsStateStoreProperties.StoreType.WINDOW,
- *     								size=300000)
- *	   public void process(KStream&lt;Object, Product&gt; input) {
- *         ......
- *     }
- * </pre>
- *
- * With that, you should be able to read/write this state store in your
- * processor/transformer code.
- *
- * <pre class="code">
- * 		new Processor&lt;Object, Product&gt;() {
- * 			WindowStore&lt;Object, String&gt; state;
- * 			&#064;Override
- *			public void init(ProcessorContext processorContext) {
- *			state = (WindowStore)processorContext.getStateStore("mystate");
- *				......
- *			}
- *		}
- * </pre>
- *
- * @author Lei Chen
- */
-
-@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.ANNOTATION_TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-
-public @interface KafkaStreamsStateStore {
-
-	/**
-	 * Provides name of the state store.
-	 * @return name of state store.
-	 */
-	String name() default "";
-
-	/**
-	 * State store type.
-	 * @return {@link KafkaStreamsStateStoreProperties.StoreType} of state store.
-	 */
-	KafkaStreamsStateStoreProperties.StoreType type() default KafkaStreamsStateStoreProperties.StoreType.KEYVALUE;
-
-	/**
-	 * Serde used for key.
-	 * @return key serde of state store.
-	 */
-	String keySerde() default "org.apache.kafka.common.serialization.Serdes$StringSerde";
-
-	/**
-	 * Serde used for value.
-	 * @return value serde of state store.
-	 */
-	String valueSerde() default "org.apache.kafka.common.serialization.Serdes$StringSerde";
-
-	/**
-	 * Length in milli-second of Windowed store window.
-	 * @return length in milli-second of window(for windowed store).
-	 */
-	long lengthMs() default 0;
-
-	/**
-	 * Retention period for Windowed store windows.
-	 * @return the maximum period of time in milli-second to keep each window in this
-	 * store(for windowed store).
-	 */
-	long retentionMs() default 0;
-
-	/**
-	 * Whether catching is enabled or not.
-	 * @return whether caching should be enabled on the created store.
-	 */
-	boolean cache() default false;
-
-	/**
-	 * Whether logging is enabled or not.
-	 * @return whether logging should be enabled on the created store.
-	 */
-	boolean logging() default true;
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/function/KafkaStreamsFunctionAutoConfiguration.java

@@ -1,49 +0,0 @@
-/*
- * Copyright 2019-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.function;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.stream.binder.kafka.streams.KafkaStreamsFunctionProcessor;
-import org.springframework.cloud.stream.function.StreamFunctionProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Soby Chacko
- */
-@Configuration
-@ConditionalOnProperty("spring.cloud.stream.function.definition")
-@EnableConfigurationProperties(StreamFunctionProperties.class)
-public class KafkaStreamsFunctionAutoConfiguration {
-
-	@Bean
-	public KafkaStreamsFunctionProcessorInvoker kafkaStreamsFunctionProcessorInvoker(
-																					KafkaStreamsFunctionBeanPostProcessor kafkaStreamsFunctionBeanPostProcessor,
-																					KafkaStreamsFunctionProcessor kafkaStreamsFunctionProcessor,
-																					StreamFunctionProperties properties) {
-		return new KafkaStreamsFunctionProcessorInvoker(kafkaStreamsFunctionBeanPostProcessor.getResolvableType(),
-				properties.getDefinition(), kafkaStreamsFunctionProcessor);
-	}
-
-	@Bean
-	public KafkaStreamsFunctionBeanPostProcessor kafkaStreamsFunctionBeanPostProcessor(
-			StreamFunctionProperties properties) {
-		return new KafkaStreamsFunctionBeanPostProcessor(properties);
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/function/KafkaStreamsFunctionBeanPostProcessor.java

@@ -1,71 +0,0 @@
-/*
- * Copyright 2019-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.function;
-
-import java.lang.reflect.Method;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.cloud.stream.function.StreamFunctionProperties;
-import org.springframework.core.ResolvableType;
-import org.springframework.util.ClassUtils;
-
-/**
- *
- * @author Soby Chacko
- * @since 2.1.0
- *
- */
-class KafkaStreamsFunctionBeanPostProcessor implements InitializingBean, BeanFactoryAware {
-
-	private final StreamFunctionProperties kafkaStreamsFunctionProperties;
-	private ConfigurableListableBeanFactory beanFactory;
-	private ResolvableType resolvableType;
-
-	KafkaStreamsFunctionBeanPostProcessor(StreamFunctionProperties properties) {
-		this.kafkaStreamsFunctionProperties = properties;
-	}
-
-	public ResolvableType getResolvableType() {
-		return this.resolvableType;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		final Class<?> classObj = ClassUtils.resolveClassName(((AnnotatedBeanDefinition)
-						this.beanFactory.getBeanDefinition(kafkaStreamsFunctionProperties.getDefinition()))
-						.getMetadata().getClassName(),
-				ClassUtils.getDefaultClassLoader());
-
-		try {
-			Method method = classObj.getMethod(this.kafkaStreamsFunctionProperties.getDefinition());
-			this.resolvableType = ResolvableType.forMethodReturnType(method, classObj);
-		}
-		catch (NoSuchMethodException e) {
-			//ignore
-		}
-	}
-
-	@Override
-	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-		this.beanFactory = (ConfigurableListableBeanFactory) beanFactory;
-	}
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/function/KafkaStreamsFunctionProcessorInvoker.java

@@ -1,46 +0,0 @@
-/*
- * Copyright 2019-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.function;
-
-import javax.annotation.PostConstruct;
-
-import org.springframework.cloud.stream.binder.kafka.streams.KafkaStreamsFunctionProcessor;
-import org.springframework.core.ResolvableType;
-
-/**
- *
- * @author Soby Chacko
- * @since 2.1.0
- */
-class KafkaStreamsFunctionProcessorInvoker {
-
-	private final KafkaStreamsFunctionProcessor kafkaStreamsFunctionProcessor;
-	private final ResolvableType resolvableType;
-	private final String functionName;
-
-	KafkaStreamsFunctionProcessorInvoker(ResolvableType resolvableType, String functionName,
-												KafkaStreamsFunctionProcessor kafkaStreamsFunctionProcessor) {
-		this.kafkaStreamsFunctionProcessor = kafkaStreamsFunctionProcessor;
-		this.resolvableType = resolvableType;
-		this.functionName = functionName;
-	}
-
-	@PostConstruct
-	void invoke() {
-		this.kafkaStreamsFunctionProcessor.orchestrateStreamListenerSetupMethod(resolvableType, functionName);
-	}
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/function/KafkaStreamsFunctionWrapperDetector.java

@@ -1,42 +0,0 @@
-/*
- * Copyright 2019-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.function;
-
-import java.lang.reflect.Type;
-
-import org.apache.kafka.streams.kstream.GlobalKTable;
-import org.apache.kafka.streams.kstream.KStream;
-import org.apache.kafka.streams.kstream.KTable;
-
-import org.springframework.cloud.function.context.WrapperDetector;
-
-/**
- * @author Soby Chacko
- */
-public class KafkaStreamsFunctionWrapperDetector implements WrapperDetector {
-	@Override
-	public boolean isWrapper(Type type) {
-		if (type instanceof Class<?>) {
-			Class<?> cls = (Class<?>) type;
-			return KStream.class.isAssignableFrom(cls) ||
-					KTable.class.isAssignableFrom(cls) ||
-					GlobalKTable.class.isAssignableFrom(cls);
-		}
-		return false;
-	}
-}
-

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/properties/KafkaStreamsBinderConfigurationProperties.java

@@ -1,82 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.properties;
-
-import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
-import org.springframework.cloud.stream.binder.kafka.properties.KafkaBinderConfigurationProperties;
-
-/**
- * Kafka Streams binder configuration properties.
- *
- * @author Soby Chacko
- * @author Gary Russell
- */
-public class KafkaStreamsBinderConfigurationProperties
-		extends KafkaBinderConfigurationProperties {
-
-	public KafkaStreamsBinderConfigurationProperties(KafkaProperties kafkaProperties) {
-		super(kafkaProperties);
-	}
-
-	/**
-	 * Enumeration for various Serde errors.
-	 */
-	public enum SerdeError {
-
-		/**
-		 * Deserialization error handler with log and continue.
-		 */
-		logAndContinue,
-		/**
-		 * Deserialization error handler with log and fail.
-		 */
-		logAndFail,
-		/**
-		 * Deserialization error handler with DLQ send.
-		 */
-		sendToDlq
-
-	}
-
-	private String applicationId;
-
-	public String getApplicationId() {
-		return this.applicationId;
-	}
-
-	public void setApplicationId(String applicationId) {
-		this.applicationId = applicationId;
-	}
-
-	/**
-	 * {@link org.apache.kafka.streams.errors.DeserializationExceptionHandler} to use when
-	 * there is a Serde error.
-	 * {@link KafkaStreamsBinderConfigurationProperties.SerdeError} values are used to
-	 * provide the exception handler on consumer binding.
-	 */
-	private KafkaStreamsBinderConfigurationProperties.SerdeError serdeError;
-
-	public KafkaStreamsBinderConfigurationProperties.SerdeError getSerdeError() {
-		return this.serdeError;
-	}
-
-	public void setSerdeError(
-			KafkaStreamsBinderConfigurationProperties.SerdeError serdeError) {
-		this.serdeError = serdeError;
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/properties/KafkaStreamsBindingProperties.java

@@ -1,49 +0,0 @@
-/*
- * Copyright 2017-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.properties;
-
-import org.springframework.cloud.stream.binder.BinderSpecificPropertiesProvider;
-
-/**
- * Extended binding properties holder that delegates to Kafka Streams producer and
- * consumer properties.
- *
- * @author Marius Bogoevici
- */
-public class KafkaStreamsBindingProperties implements BinderSpecificPropertiesProvider {
-
-	private KafkaStreamsConsumerProperties consumer = new KafkaStreamsConsumerProperties();
-
-	private KafkaStreamsProducerProperties producer = new KafkaStreamsProducerProperties();
-
-	public KafkaStreamsConsumerProperties getConsumer() {
-		return this.consumer;
-	}
-
-	public void setConsumer(KafkaStreamsConsumerProperties consumer) {
-		this.consumer = consumer;
-	}
-
-	public KafkaStreamsProducerProperties getProducer() {
-		return this.producer;
-	}
-
-	public void setProducer(KafkaStreamsProducerProperties producer) {
-		this.producer = producer;
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/properties/KafkaStreamsConsumerProperties.java

@@ -1,78 +0,0 @@
-/*
- * Copyright 2017-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.properties;
-
-import org.springframework.cloud.stream.binder.kafka.properties.KafkaConsumerProperties;
-
-/**
- * Extended properties for Kafka Streams consumer.
- *
- * @author Marius Bogoevici
- * @author Soby Chacko
- */
-public class KafkaStreamsConsumerProperties extends KafkaConsumerProperties {
-
-	private String applicationId;
-
-	/**
-	 * Key serde specified per binding.
-	 */
-	private String keySerde;
-
-	/**
-	 * Value serde specified per binding.
-	 */
-	private String valueSerde;
-
-	/**
-	 * Materialized as a KeyValueStore.
-	 */
-	private String materializedAs;
-
-	public String getApplicationId() {
-		return this.applicationId;
-	}
-
-	public void setApplicationId(String applicationId) {
-		this.applicationId = applicationId;
-	}
-
-	public String getKeySerde() {
-		return this.keySerde;
-	}
-
-	public void setKeySerde(String keySerde) {
-		this.keySerde = keySerde;
-	}
-
-	public String getValueSerde() {
-		return this.valueSerde;
-	}
-
-	public void setValueSerde(String valueSerde) {
-		this.valueSerde = valueSerde;
-	}
-
-	public String getMaterializedAs() {
-		return this.materializedAs;
-	}
-
-	public void setMaterializedAs(String materializedAs) {
-		this.materializedAs = materializedAs;
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/properties/KafkaStreamsExtendedBindingProperties.java

@@ -1,56 +0,0 @@
-/*
- * Copyright 2017-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.properties;
-
-import java.util.Map;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cloud.stream.binder.AbstractExtendedBindingProperties;
-import org.springframework.cloud.stream.binder.BinderSpecificPropertiesProvider;
-
-/**
- * Kafka streams specific extended binding properties class that extends from
- * {@link AbstractExtendedBindingProperties}.
- *
- * @author Marius Bogoevici
- * @author Oleg Zhurakousky
- */
-@ConfigurationProperties("spring.cloud.stream.kafka.streams")
-public class KafkaStreamsExtendedBindingProperties
-		// @checkstyle:off
-		extends
-		AbstractExtendedBindingProperties<KafkaStreamsConsumerProperties, KafkaStreamsProducerProperties, KafkaStreamsBindingProperties> {
-
-	// @checkstyle:on
-	private static final String DEFAULTS_PREFIX = "spring.cloud.stream.kafka.streams.default";
-
-	@Override
-	public String getDefaultsPrefix() {
-		return DEFAULTS_PREFIX;
-	}
-
-	@Override
-	public Map<String, KafkaStreamsBindingProperties> getBindings() {
-		return this.doGetBindings();
-	}
-
-	@Override
-	public Class<? extends BinderSpecificPropertiesProvider> getExtendedPropertiesEntryClass() {
-		return KafkaStreamsBindingProperties.class;
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/properties/KafkaStreamsStateStoreProperties.java

@@ -1,161 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.properties;
-
-/**
- * Properties for Kafka Streams state store.
- *
- * @author Lei Chen
- */
-public class KafkaStreamsStateStoreProperties {
-
-	/**
-	 * Enumeration for store type.
-	 */
-	public enum StoreType {
-
-		/**
-		 * Key value store.
-		 */
-		KEYVALUE("keyvalue"),
-		/**
-		 * Window store.
-		 */
-		WINDOW("window"),
-		/**
-		 * Session store.
-		 */
-		SESSION("session");
-
-		private final String type;
-
-		StoreType(final String type) {
-			this.type = type;
-		}
-
-		@Override
-		public String toString() {
-			return this.type;
-		}
-
-	}
-
-	/**
-	 * Name for this state store.
-	 */
-	private String name;
-
-	/**
-	 * Type for this state store.
-	 */
-	private StoreType type;
-
-	/**
-	 * Size/length of this state store in ms. Only applicable for window store.
-	 */
-	private long length;
-
-	/**
-	 * Retention period for this state store in ms.
-	 */
-	private long retention;
-
-	/**
-	 * Key serde class specified per state store.
-	 */
-	private String keySerdeString;
-
-	/**
-	 * Value serde class specified per state store.
-	 */
-	private String valueSerdeString;
-
-	/**
-	 * Whether caching is enabled on this state store.
-	 */
-	private boolean cacheEnabled;
-
-	/**
-	 * Whether logging is enabled on this state store.
-	 */
-	private boolean loggingDisabled;
-
-	public String getName() {
-		return this.name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public StoreType getType() {
-		return this.type;
-	}
-
-	public void setType(StoreType type) {
-		this.type = type;
-	}
-
-	public long getLength() {
-		return this.length;
-	}
-
-	public void setLength(long length) {
-		this.length = length;
-	}
-
-	public long getRetention() {
-		return this.retention;
-	}
-
-	public void setRetention(long retention) {
-		this.retention = retention;
-	}
-
-	public String getKeySerdeString() {
-		return this.keySerdeString;
-	}
-
-	public void setKeySerdeString(String keySerdeString) {
-		this.keySerdeString = keySerdeString;
-	}
-
-	public String getValueSerdeString() {
-		return this.valueSerdeString;
-	}
-
-	public void setValueSerdeString(String valueSerdeString) {
-		this.valueSerdeString = valueSerdeString;
-	}
-
-	public boolean isCacheEnabled() {
-		return this.cacheEnabled;
-	}
-
-	public void setCacheEnabled(boolean cacheEnabled) {
-		this.cacheEnabled = cacheEnabled;
-	}
-
-	public boolean isLoggingDisabled() {
-		return this.loggingDisabled;
-	}
-
-	public void setLoggingDisabled(boolean loggingDisabled) {
-		this.loggingDisabled = loggingDisabled;
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/serde/CompositeNonNativeSerde.java

@@ -1,228 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.serde;
-
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.kafka.common.serialization.Deserializer;
-import org.apache.kafka.common.serialization.Serde;
-import org.apache.kafka.common.serialization.Serializer;
-
-import org.springframework.cloud.stream.converter.CompositeMessageConverterFactory;
-import org.springframework.messaging.Message;
-import org.springframework.messaging.MessageHeaders;
-import org.springframework.messaging.converter.MessageConverter;
-import org.springframework.messaging.support.MessageBuilder;
-import org.springframework.util.Assert;
-import org.springframework.util.MimeType;
-import org.springframework.util.MimeTypeUtils;
-
-/**
- * A {@link Serde} implementation that wraps the list of {@link MessageConverter}s from
- * {@link CompositeMessageConverterFactory}.
- *
- * The primary motivation for this class is to provide an avro based {@link Serde} that is
- * compatible with the schema registry that Spring Cloud Stream provides. When using the
- * schema registry support from Spring Cloud Stream in a Kafka Streams binder based
- * application, the applications can deserialize the incoming Kafka Streams records using
- * the built in Avro {@link MessageConverter}. However, this same message conversion
- * approach will not work downstream in other operations in the topology for Kafka Streams
- * as some of them needs a {@link Serde} instance that can talk to the Spring Cloud Stream
- * provided Schema Registry. This implementation will solve that problem.
- *
- * Only Avro and JSON based converters are exposed as binder provided {@link Serde}
- * implementations currently.
- *
- * Users of this class must call the
- * {@link CompositeNonNativeSerde#configure(Map, boolean)} method to configure the
- * {@link Serde} object. At the very least the configuration map must include a key called
- * "valueClass" to indicate the type of the target object for deserialization. If any
- * other content type other than JSON is needed (only Avro is available now other than
- * JSON), that needs to be included in the configuration map with the key "contentType".
- * For example,
- *
- * <pre class="code">
- * Map&lt;String, Object&gt; config = new HashMap&lt;&gt;();
- * config.put("valueClass", Foo.class);
- * config.put("contentType", "application/avro");
- * </pre>
- *
- * Then use the above map when calling the configure method.
- *
- * This class is only intended to be used when writing a Spring Cloud Stream Kafka Streams
- * application that uses Spring Cloud Stream schema registry for schema evolution.
- *
- * An instance of this class is provided as a bean by the binder configuration and
- * typically the applications can autowire that bean. This is the expected usage pattern
- * of this class.
- *
- * @param <T> type of the object to marshall
- * @author Soby Chacko
- * @since 2.1
- */
-public class CompositeNonNativeSerde<T> implements Serde<T> {
-
-	private static final String VALUE_CLASS_HEADER = "valueClass";
-
-	private static final String AVRO_FORMAT = "avro";
-
-	private static final MimeType DEFAULT_AVRO_MIME_TYPE = new MimeType("application",
-			"*+" + AVRO_FORMAT);
-
-	private final CompositeNonNativeDeserializer<T> compositeNonNativeDeserializer;
-
-	private final CompositeNonNativeSerializer<T> compositeNonNativeSerializer;
-
-	public CompositeNonNativeSerde(
-			CompositeMessageConverterFactory compositeMessageConverterFactory) {
-		this.compositeNonNativeDeserializer = new CompositeNonNativeDeserializer<>(
-				compositeMessageConverterFactory);
-		this.compositeNonNativeSerializer = new CompositeNonNativeSerializer<>(
-				compositeMessageConverterFactory);
-	}
-
-	@Override
-	public void configure(Map<String, ?> configs, boolean isKey) {
-		this.compositeNonNativeDeserializer.configure(configs, isKey);
-		this.compositeNonNativeSerializer.configure(configs, isKey);
-	}
-
-	@Override
-	public void close() {
-		// No-op
-	}
-
-	@Override
-	public Serializer<T> serializer() {
-		return this.compositeNonNativeSerializer;
-	}
-
-	@Override
-	public Deserializer<T> deserializer() {
-		return this.compositeNonNativeDeserializer;
-	}
-
-	private static MimeType resolveMimeType(Map<String, ?> configs) {
-		if (configs.containsKey(MessageHeaders.CONTENT_TYPE)) {
-			String contentType = (String) configs.get(MessageHeaders.CONTENT_TYPE);
-			if (DEFAULT_AVRO_MIME_TYPE.equals(MimeTypeUtils.parseMimeType(contentType))) {
-				return DEFAULT_AVRO_MIME_TYPE;
-			}
-			else if (contentType.contains("avro")) {
-				return MimeTypeUtils.parseMimeType("application/avro");
-			}
-			else {
-				return new MimeType("application", "json", StandardCharsets.UTF_8);
-			}
-		}
-		else {
-			return new MimeType("application", "json", StandardCharsets.UTF_8);
-		}
-	}
-
-	/**
-	 * Custom {@link Deserializer} that uses the {@link CompositeMessageConverterFactory}.
-	 *
-	 * @param <U> parameterized target type for deserialization
-	 */
-	private static class CompositeNonNativeDeserializer<U> implements Deserializer<U> {
-
-		private final MessageConverter messageConverter;
-
-		private MimeType mimeType;
-
-		private Class<?> valueClass;
-
-		CompositeNonNativeDeserializer(
-				CompositeMessageConverterFactory compositeMessageConverterFactory) {
-			this.messageConverter = compositeMessageConverterFactory
-					.getMessageConverterForAllRegistered();
-		}
-
-		@Override
-		public void configure(Map<String, ?> configs, boolean isKey) {
-			Assert.isTrue(configs.containsKey(VALUE_CLASS_HEADER),
-					"Deserializers must provide a configuration for valueClass.");
-			final Object valueClass = configs.get(VALUE_CLASS_HEADER);
-			Assert.isTrue(valueClass instanceof Class,
-					"Deserializers must provide a valid value for valueClass.");
-			this.valueClass = (Class<?>) valueClass;
-			this.mimeType = resolveMimeType(configs);
-		}
-
-		@SuppressWarnings("unchecked")
-		@Override
-		public U deserialize(String topic, byte[] data) {
-			Message<?> message = MessageBuilder.withPayload(data)
-					.setHeader(MessageHeaders.CONTENT_TYPE, this.mimeType.toString())
-					.build();
-			U messageConverted = (U) this.messageConverter.fromMessage(message,
-					this.valueClass);
-			Assert.notNull(messageConverted, "Deserialization failed.");
-			return messageConverted;
-		}
-
-		@Override
-		public void close() {
-			// No-op
-		}
-
-	}
-
-	/**
-	 * Custom {@link Serializer} that uses the {@link CompositeMessageConverterFactory}.
-	 *
-	 * @param <V> parameterized type for serialization
-	 */
-	private static class CompositeNonNativeSerializer<V> implements Serializer<V> {
-
-		private final MessageConverter messageConverter;
-
-		private MimeType mimeType;
-
-		CompositeNonNativeSerializer(
-				CompositeMessageConverterFactory compositeMessageConverterFactory) {
-			this.messageConverter = compositeMessageConverterFactory
-					.getMessageConverterForAllRegistered();
-		}
-
-		@Override
-		public void configure(Map<String, ?> configs, boolean isKey) {
-			this.mimeType = resolveMimeType(configs);
-		}
-
-		@Override
-		public byte[] serialize(String topic, V data) {
-			Message<?> message = MessageBuilder.withPayload(data).build();
-			Map<String, Object> headers = new HashMap<>(message.getHeaders());
-			headers.put(MessageHeaders.CONTENT_TYPE, this.mimeType.toString());
-			MessageHeaders messageHeaders = new MessageHeaders(headers);
-			final Object payload = this.messageConverter
-					.toMessage(message.getPayload(), messageHeaders).getPayload();
-			return (byte[]) payload;
-		}
-
-		@Override
-		public void close() {
-			// No-op
-		}
-
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/main/resources/META-INF/spring.binders

@@ -1,8 +0,0 @@
-kstream:\
-org.springframework.cloud.stream.binder.kafka.streams.KStreamBinderConfiguration
-ktable:\
-org.springframework.cloud.stream.binder.kafka.streams.KTableBinderConfiguration
-globalktable:\
-org.springframework.cloud.stream.binder.kafka.streams.GlobalKTableBinderConfiguration
-
-

spring-cloud-stream-binder-kafka-streams/src/main/resources/META-INF/spring.factories

@@ -1,9 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  org.springframework.cloud.stream.binder.kafka.streams.KafkaStreamsBinderSupportAutoConfiguration,\
-  org.springframework.cloud.stream.binder.kafka.streams.KafkaStreamsApplicationSupportAutoConfiguration,\
-  org.springframework.cloud.stream.binder.kafka.streams.function.KafkaStreamsFunctionAutoConfiguration
-
-org.springframework.cloud.function.context.WrapperDetector=\
-  org.springframework.cloud.stream.binder.kafka.streams.function.KafkaStreamsFunctionWrapperDetector
-
-  

spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/bootstrap/KafkaStreamsBinderBootstrapTest.java

@@ -1,92 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.bootstrap;
-
-import org.apache.kafka.streams.kstream.KStream;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.cloud.stream.annotation.EnableBinding;
-import org.springframework.cloud.stream.annotation.Input;
-import org.springframework.cloud.stream.annotation.StreamListener;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.kafka.test.rule.KafkaEmbedded;
-
-/**
- * @author Soby Chacko
- */
-public class KafkaStreamsBinderBootstrapTest {
-
-	@ClassRule
-	public static KafkaEmbedded embeddedKafka = new KafkaEmbedded(1, true, 10);
-
-	@Test
-	public void testKafkaStreamsBinderWithCustomEnvironmentCanStart() {
-		ConfigurableApplicationContext applicationContext = new SpringApplicationBuilder(
-				SimpleApplication.class).web(WebApplicationType.NONE).run(
-						"--spring.cloud.stream.kafka.streams.default.consumer.application-id"
-								+ "=testKafkaStreamsBinderWithCustomEnvironmentCanStart",
-						"--spring.cloud.stream.bindings.input.destination=foo",
-						"--spring.cloud.stream.bindings.input.binder=kBind1",
-						"--spring.cloud.stream.binders.kBind1.type=kstream",
-						"--spring.cloud.stream.binders.kBind1.environment"
-								+ ".spring.cloud.stream.kafka.streams.binder.brokers"
-								+ "=" + embeddedKafka.getBrokersAsString(),
-						"--spring.cloud.stream.binders.kBind1.environment.spring"
-								+ ".cloud.stream.kafka.streams.binder.zkNodes="
-								+ embeddedKafka.getZookeeperConnectionString());
-
-		applicationContext.close();
-	}
-
-	@Test
-	public void testKafkaStreamsBinderWithStandardConfigurationCanStart() {
-		ConfigurableApplicationContext applicationContext = new SpringApplicationBuilder(
-				SimpleApplication.class).web(WebApplicationType.NONE).run(
-						"--spring.cloud.stream.kafka.streams.default.consumer.application-id"
-								+ "=testKafkaStreamsBinderWithStandardConfigurationCanStart",
-						"--spring.cloud.stream.bindings.input.destination=foo",
-						"--spring.cloud.stream.kafka.streams.binder.brokers="
-								+ embeddedKafka.getBrokersAsString(),
-						"--spring.cloud.stream.kafka.streams.binder.zkNodes="
-								+ embeddedKafka.getZookeeperConnectionString());
-
-		applicationContext.close();
-	}
-
-	@SpringBootApplication
-	@EnableBinding(StreamSourceProcessor.class)
-	static class SimpleApplication {
-
-		@StreamListener
-		public void handle(@Input("input") KStream<Object, String> stream) {
-
-		}
-
-	}
-
-	interface StreamSourceProcessor {
-
-		@Input("input")
-		KStream<?, ?> inputStream();
-
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/function/KafkaStreamsBinderWordCountBranchesFunctionTests.java

@@ -1,225 +0,0 @@
-/*
- * Copyright 2019-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.function;
-
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Map;
-import java.util.function.Function;
-
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.streams.KeyValue;
-import org.apache.kafka.streams.kstream.KStream;
-import org.apache.kafka.streams.kstream.Materialized;
-import org.apache.kafka.streams.kstream.Predicate;
-import org.apache.kafka.streams.kstream.TimeWindows;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.stream.annotation.EnableBinding;
-import org.springframework.cloud.stream.annotation.Input;
-import org.springframework.cloud.stream.annotation.Output;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsApplicationSupportProperties;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.test.EmbeddedKafkaBroker;
-import org.springframework.kafka.test.rule.EmbeddedKafkaRule;
-import org.springframework.kafka.test.utils.KafkaTestUtils;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class KafkaStreamsBinderWordCountBranchesFunctionTests {
-
-	@ClassRule
-	public static EmbeddedKafkaRule embeddedKafkaRule = new EmbeddedKafkaRule(1, true,
-			"counts", "foo", "bar");
-
-	private static EmbeddedKafkaBroker embeddedKafka = embeddedKafkaRule.getEmbeddedKafka();
-
-	private static Consumer<String, String> consumer;
-
-	@BeforeClass
-	public static void setUp() throws Exception {
-		Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("groupx", "false",
-				embeddedKafka);
-		consumerProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-		DefaultKafkaConsumerFactory<String, String> cf = new DefaultKafkaConsumerFactory<>(consumerProps);
-		consumer = cf.createConsumer();
-		embeddedKafka.consumeFromEmbeddedTopics(consumer, "counts", "foo", "bar");
-	}
-
-	@AfterClass
-	public static void tearDown() {
-		consumer.close();
-	}
-
-	@Test
-	public void testKstreamWordCountWithStringInputAndPojoOuput() throws Exception {
-		SpringApplication app = new SpringApplication(WordCountProcessorApplication.class);
-		app.setWebApplicationType(WebApplicationType.NONE);
-
-		ConfigurableApplicationContext context = app.run("--server.port=0",
-				"--spring.jmx.enabled=false",
-				"--spring.cloud.stream.function.definition=process",
-				"--spring.cloud.stream.bindings.input.destination=words",
-				"--spring.cloud.stream.bindings.output1.destination=counts",
-				"--spring.cloud.stream.bindings.output1.contentType=application/json",
-				"--spring.cloud.stream.bindings.output2.destination=foo",
-				"--spring.cloud.stream.bindings.output2.contentType=application/json",
-				"--spring.cloud.stream.bindings.output3.destination=bar",
-				"--spring.cloud.stream.bindings.output3.contentType=application/json",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.commit.interval.ms=1000",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.key.serde" +
-						"=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.value.serde" +
-						"=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.timeWindow.length=5000",
-				"--spring.cloud.stream.kafka.streams.timeWindow.advanceBy=0",
-				"--spring.cloud.stream.kafka.streams.bindings.input.consumer.applicationId" +
-						"=KafkaStreamsBinderWordCountBranchesFunctionTests-abc",
-				"--spring.cloud.stream.kafka.streams.binder.brokers=" + embeddedKafka.getBrokersAsString(),
-				"--spring.cloud.stream.kafka.streams.binder.zkNodes=" + embeddedKafka.getZookeeperConnectionString());
-		try {
-			receiveAndValidate(context);
-		}
-		finally {
-			context.close();
-		}
-	}
-
-	private void receiveAndValidate(ConfigurableApplicationContext context) throws Exception {
-		Map<String, Object> senderProps = KafkaTestUtils.producerProps(embeddedKafka);
-		DefaultKafkaProducerFactory<Integer, String> pf = new DefaultKafkaProducerFactory<>(senderProps);
-		KafkaTemplate<Integer, String> template = new KafkaTemplate<>(pf, true);
-		template.setDefaultTopic("words");
-		template.sendDefault("english");
-		ConsumerRecord<String, String> cr = KafkaTestUtils.getSingleRecord(consumer, "counts");
-		assertThat(cr.value().contains("\"word\":\"english\",\"count\":1")).isTrue();
-
-		template.sendDefault("french");
-		template.sendDefault("french");
-		cr = KafkaTestUtils.getSingleRecord(consumer, "foo");
-		assertThat(cr.value().contains("\"word\":\"french\",\"count\":2")).isTrue();
-
-		template.sendDefault("spanish");
-		template.sendDefault("spanish");
-		template.sendDefault("spanish");
-		cr = KafkaTestUtils.getSingleRecord(consumer, "bar");
-		assertThat(cr.value().contains("\"word\":\"spanish\",\"count\":3")).isTrue();
-	}
-
-	static class WordCount {
-
-		private String word;
-
-		private long count;
-
-		private Date start;
-
-		private Date end;
-
-		WordCount(String word, long count, Date start, Date end) {
-			this.word = word;
-			this.count = count;
-			this.start = start;
-			this.end = end;
-		}
-
-		public String getWord() {
-			return word;
-		}
-
-		public void setWord(String word) {
-			this.word = word;
-		}
-
-		public long getCount() {
-			return count;
-		}
-
-		public void setCount(long count) {
-			this.count = count;
-		}
-
-		public Date getStart() {
-			return start;
-		}
-
-		public void setStart(Date start) {
-			this.start = start;
-		}
-
-		public Date getEnd() {
-			return end;
-		}
-
-		public void setEnd(Date end) {
-			this.end = end;
-		}
-	}
-
-	@EnableBinding(KStreamProcessorX.class)
-	@EnableAutoConfiguration
-	@EnableConfigurationProperties(KafkaStreamsApplicationSupportProperties.class)
-	public static class WordCountProcessorApplication {
-
-		@Bean
-		@SuppressWarnings("unchecked")
-		public Function<KStream<Object, String>, KStream<?, WordCount>[]> process() {
-
-			Predicate<Object, WordCount> isEnglish = (k, v) -> v.word.equals("english");
-			Predicate<Object, WordCount> isFrench = (k, v) -> v.word.equals("french");
-			Predicate<Object, WordCount> isSpanish = (k, v) -> v.word.equals("spanish");
-
-			return input -> input
-					.flatMapValues(value -> Arrays.asList(value.toLowerCase().split("\\W+")))
-					.groupBy((key, value) -> value)
-					.windowedBy(TimeWindows.of(5000))
-					.count(Materialized.as("WordCounts-branch"))
-					.toStream()
-					.map((key, value) -> new KeyValue<>(null, new WordCount(key.key(), value,
-							new Date(key.window().start()), new Date(key.window().end()))))
-					.branch(isEnglish, isFrench, isSpanish);
-		}
-	}
-
-	interface KStreamProcessorX {
-
-		@Input("input")
-		KStream<?, ?> input();
-
-		@Output("output1")
-		KStream<?, ?> output1();
-
-		@Output("output2")
-		KStream<?, ?> output2();
-
-		@Output("output3")
-		KStream<?, ?> output3();
-	}
-}

spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/function/StreamToGlobalKTableFunctionTests.java

@@ -1,353 +0,0 @@
-/*
- * Copyright 2019-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.function;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.ConsumerRecords;
-import org.apache.kafka.clients.producer.ProducerConfig;
-import org.apache.kafka.common.serialization.LongDeserializer;
-import org.apache.kafka.common.serialization.LongSerializer;
-import org.apache.kafka.streams.KeyValue;
-import org.apache.kafka.streams.kstream.GlobalKTable;
-import org.apache.kafka.streams.kstream.KStream;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.stream.annotation.EnableBinding;
-import org.springframework.cloud.stream.annotation.Input;
-import org.springframework.cloud.stream.binder.kafka.streams.annotations.KafkaStreamsProcessor;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsApplicationSupportProperties;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.support.serializer.JsonDeserializer;
-import org.springframework.kafka.support.serializer.JsonSerde;
-import org.springframework.kafka.test.EmbeddedKafkaBroker;
-import org.springframework.kafka.test.rule.EmbeddedKafkaRule;
-import org.springframework.kafka.test.utils.KafkaTestUtils;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class StreamToGlobalKTableFunctionTests {
-
-	@ClassRule
-	public static EmbeddedKafkaRule embeddedKafkaRule = new EmbeddedKafkaRule(1, true,
-			"enriched-order");
-
-	private static EmbeddedKafkaBroker embeddedKafka = embeddedKafkaRule.getEmbeddedKafka();
-
-	private static Consumer<Long, EnrichedOrder> consumer;
-
-	@Test
-	public void testStreamToGlobalKTable() throws Exception {
-		SpringApplication app = new SpringApplication(OrderEnricherApplication.class);
-		app.setWebApplicationType(WebApplicationType.NONE);
-		try (ConfigurableApplicationContext ignored = app.run("--server.port=0",
-				"--spring.jmx.enabled=false",
-				"--spring.cloud.stream.function.definition=process",
-				"--spring.cloud.stream.bindings.input.destination=orders",
-				"--spring.cloud.stream.bindings.input-x.destination=customers",
-				"--spring.cloud.stream.bindings.input-y.destination=products",
-				"--spring.cloud.stream.bindings.output.destination=enriched-order",
-				"--spring.cloud.stream.bindings.input.consumer.useNativeDecoding=true",
-				"--spring.cloud.stream.bindings.input-x.consumer.useNativeDecoding=true",
-				"--spring.cloud.stream.bindings.input-y.consumer.useNativeDecoding=true",
-				"--spring.cloud.stream.bindings.output.producer.useNativeEncoding=true",
-				"--spring.cloud.stream.kafka.streams.bindings.input.consumer.keySerde" +
-						"=org.apache.kafka.common.serialization.Serdes$LongSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.input.consumer.valueSerde" +
-						"=org.springframework.cloud.stream.binder.kafka.streams.function" +
-						".StreamToGlobalKTableFunctionTests$OrderSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.input-x.consumer.keySerde" +
-						"=org.apache.kafka.common.serialization.Serdes$LongSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.input-x.consumer.valueSerde" +
-						"=org.springframework.cloud.stream.binder.kafka.streams.function" +
-						".StreamToGlobalKTableFunctionTests$CustomerSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.input-y.consumer.keySerde" +
-						"=org.apache.kafka.common.serialization.Serdes$LongSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.input-y.consumer.valueSerde" +
-						"=org.springframework.cloud.stream.binder.kafka.streams.function" +
-						".StreamToGlobalKTableFunctionTests$ProductSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.output.producer.keySerde" +
-						"=org.apache.kafka.common.serialization.Serdes$LongSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.output.producer.valueSerde" +
-						"=org.springframework.cloud.stream.binder.kafka.streams." +
-						"function.StreamToGlobalKTableFunctionTests$EnrichedOrderSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.key.serde" +
-						"=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.value.serde" +
-						"=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.commit.interval.ms=10000",
-				"--spring.cloud.stream.kafka.streams.bindings.input.consumer.applicationId=" +
-						"StreamToGlobalKTableJoinFunctionTests-abc",
-				"--spring.cloud.stream.kafka.streams.binder.brokers=" + embeddedKafka.getBrokersAsString(),
-				"--spring.cloud.stream.kafka.streams.binder.zkNodes=" + embeddedKafka.getZookeeperConnectionString())) {
-			Map<String, Object> senderPropsCustomer = KafkaTestUtils.producerProps(embeddedKafka);
-			senderPropsCustomer.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, LongSerializer.class);
-			CustomerSerde customerSerde = new CustomerSerde();
-			senderPropsCustomer.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,
-					customerSerde.serializer().getClass());
-
-			DefaultKafkaProducerFactory<Long, Customer> pfCustomer =
-					new DefaultKafkaProducerFactory<>(senderPropsCustomer);
-			KafkaTemplate<Long, Customer> template = new KafkaTemplate<>(pfCustomer, true);
-			template.setDefaultTopic("customers");
-			for (long i = 0; i < 5; i++) {
-				final Customer customer = new Customer();
-				customer.setName("customer-" + i);
-				template.sendDefault(i, customer);
-			}
-
-			Map<String, Object> senderPropsProduct = KafkaTestUtils.producerProps(embeddedKafka);
-			senderPropsProduct.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, LongSerializer.class);
-			ProductSerde productSerde = new ProductSerde();
-			senderPropsProduct.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, productSerde.serializer().getClass());
-
-			DefaultKafkaProducerFactory<Long, Product> pfProduct =
-					new DefaultKafkaProducerFactory<>(senderPropsProduct);
-			KafkaTemplate<Long, Product> productTemplate = new KafkaTemplate<>(pfProduct, true);
-			productTemplate.setDefaultTopic("products");
-
-			for (long i = 0; i < 5; i++) {
-				final Product product = new Product();
-				product.setName("product-" + i);
-				productTemplate.sendDefault(i, product);
-			}
-
-			Map<String, Object> senderPropsOrder = KafkaTestUtils.producerProps(embeddedKafka);
-			senderPropsOrder.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, LongSerializer.class);
-			OrderSerde orderSerde = new OrderSerde();
-			senderPropsOrder.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, orderSerde.serializer().getClass());
-
-			DefaultKafkaProducerFactory<Long, Order> pfOrder = new DefaultKafkaProducerFactory<>(senderPropsOrder);
-			KafkaTemplate<Long, Order> orderTemplate = new KafkaTemplate<>(pfOrder, true);
-			orderTemplate.setDefaultTopic("orders");
-
-			for (long i = 0; i < 5; i++) {
-				final Order order = new Order();
-				order.setCustomerId(i);
-				order.setProductId(i);
-				orderTemplate.sendDefault(i, order);
-			}
-
-			Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("group", "false",
-					embeddedKafka);
-			consumerProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-			consumerProps.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, LongDeserializer.class);
-			EnrichedOrderSerde enrichedOrderSerde = new EnrichedOrderSerde();
-			consumerProps.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
-					enrichedOrderSerde.deserializer().getClass());
-			consumerProps.put(JsonDeserializer.VALUE_DEFAULT_TYPE,
-					"org.springframework.cloud.stream.binder.kafka.streams." +
-							"function.StreamToGlobalKTableFunctionTests.EnrichedOrder");
-			DefaultKafkaConsumerFactory<Long, EnrichedOrder> cf = new DefaultKafkaConsumerFactory<>(consumerProps);
-
-			consumer = cf.createConsumer();
-			embeddedKafka.consumeFromAnEmbeddedTopic(consumer, "enriched-order");
-
-			int count = 0;
-			long start = System.currentTimeMillis();
-			List<KeyValue<Long, EnrichedOrder>> enrichedOrders = new ArrayList<>();
-			do {
-				ConsumerRecords<Long, EnrichedOrder> records = KafkaTestUtils.getRecords(consumer);
-				count = count + records.count();
-				for (ConsumerRecord<Long, EnrichedOrder> record : records) {
-					enrichedOrders.add(new KeyValue<>(record.key(), record.value()));
-				}
-			} while (count < 5 && (System.currentTimeMillis() - start) < 30000);
-
-			assertThat(count == 5).isTrue();
-			assertThat(enrichedOrders.size() == 5).isTrue();
-
-			enrichedOrders.sort(Comparator.comparing(o -> o.key));
-
-			for (int i = 0; i < 5; i++) {
-				KeyValue<Long, EnrichedOrder> enrichedOrderKeyValue = enrichedOrders.get(i);
-				assertThat(enrichedOrderKeyValue.key == i).isTrue();
-				EnrichedOrder enrichedOrder = enrichedOrderKeyValue.value;
-				assertThat(enrichedOrder.getOrder().customerId == i).isTrue();
-				assertThat(enrichedOrder.getOrder().productId == i).isTrue();
-				assertThat(enrichedOrder.getCustomer().name.equals("customer-" + i)).isTrue();
-				assertThat(enrichedOrder.getProduct().name.equals("product-" + i)).isTrue();
-			}
-			pfCustomer.destroy();
-			pfProduct.destroy();
-			pfOrder.destroy();
-			consumer.close();
-		}
-	}
-
-	interface CustomGlobalKTableProcessor extends KafkaStreamsProcessor {
-
-		@Input("input-x")
-		GlobalKTable<?, ?> inputX();
-
-		@Input("input-y")
-		GlobalKTable<?, ?> inputY();
-	}
-
-	@EnableBinding(CustomGlobalKTableProcessor.class)
-	@EnableAutoConfiguration
-	@EnableConfigurationProperties(KafkaStreamsApplicationSupportProperties.class)
-	public static class OrderEnricherApplication {
-
-		@Bean
-		public Function<KStream<Long, Order>,
-				Function<GlobalKTable<Long, Customer>,
-						Function<GlobalKTable<Long, Product>, KStream<Long, EnrichedOrder>>>> process() {
-
-			return orderStream -> (
-					customers -> (
-							products -> (
-									orderStream.join(customers,
-											(orderId, order) -> order.getCustomerId(),
-											(order, customer) -> new CustomerOrder(customer, order))
-											.join(products,
-													(orderId, customerOrder) -> customerOrder
-															.productId(),
-													(customerOrder, product) -> {
-														EnrichedOrder enrichedOrder = new EnrichedOrder();
-														enrichedOrder.setProduct(product);
-														enrichedOrder.setCustomer(customerOrder.customer);
-														enrichedOrder.setOrder(customerOrder.order);
-														return enrichedOrder;
-													})
-							)
-					)
-			);
-		}
-	}
-
-	static class Order {
-
-		long customerId;
-		long productId;
-
-		public long getCustomerId() {
-			return customerId;
-		}
-
-		public void setCustomerId(long customerId) {
-			this.customerId = customerId;
-		}
-
-		public long getProductId() {
-			return productId;
-		}
-
-		public void setProductId(long productId) {
-			this.productId = productId;
-		}
-	}
-
-	static class Customer {
-
-		String name;
-
-		public String getName() {
-			return name;
-		}
-
-		public void setName(String name) {
-			this.name = name;
-		}
-	}
-
-	static class Product {
-
-		String name;
-
-		public String getName() {
-			return name;
-		}
-
-		public void setName(String name) {
-			this.name = name;
-		}
-	}
-
-	static class EnrichedOrder {
-
-		Product product;
-		Customer customer;
-		Order order;
-
-		public Product getProduct() {
-			return product;
-		}
-
-		public void setProduct(Product product) {
-			this.product = product;
-		}
-
-		public Customer getCustomer() {
-			return customer;
-		}
-
-		public void setCustomer(Customer customer) {
-			this.customer = customer;
-		}
-
-		public Order getOrder() {
-			return order;
-		}
-
-		public void setOrder(Order order) {
-			this.order = order;
-		}
-	}
-
-	private static class CustomerOrder {
-		private final Customer customer;
-		private final Order order;
-
-		CustomerOrder(final Customer customer, final Order order) {
-			this.customer = customer;
-			this.order = order;
-		}
-
-		long productId() {
-			return order.getProductId();
-		}
-	}
-
-	public static class OrderSerde extends JsonSerde<Order> {
-	}
-
-	public static class CustomerSerde extends JsonSerde<Customer> {
-	}
-
-	public static class ProductSerde extends JsonSerde<Product> {
-	}
-
-	public static class EnrichedOrderSerde extends JsonSerde<EnrichedOrder> {
-	}
-}

spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/function/StreamToTableJoinFunctionTests.java

@@ -1,410 +0,0 @@
-/*
- * Copyright 2019-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.function;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.ConsumerRecords;
-import org.apache.kafka.clients.producer.ProducerConfig;
-import org.apache.kafka.common.serialization.LongDeserializer;
-import org.apache.kafka.common.serialization.LongSerializer;
-import org.apache.kafka.common.serialization.Serdes;
-import org.apache.kafka.common.serialization.StringDeserializer;
-import org.apache.kafka.common.serialization.StringSerializer;
-import org.apache.kafka.streams.KeyValue;
-import org.apache.kafka.streams.kstream.Joined;
-import org.apache.kafka.streams.kstream.KStream;
-import org.apache.kafka.streams.kstream.KTable;
-import org.apache.kafka.streams.kstream.Serialized;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.stream.annotation.EnableBinding;
-import org.springframework.cloud.stream.annotation.Input;
-import org.springframework.cloud.stream.annotation.Output;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsApplicationSupportProperties;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.test.EmbeddedKafkaBroker;
-import org.springframework.kafka.test.rule.EmbeddedKafkaRule;
-import org.springframework.kafka.test.utils.KafkaTestUtils;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class StreamToTableJoinFunctionTests {
-
-	@ClassRule
-	public static EmbeddedKafkaRule embeddedKafkaRule = new EmbeddedKafkaRule(1,
-			true, "output-topic-1", "output-topic-2");
-
-	private static EmbeddedKafkaBroker embeddedKafka = embeddedKafkaRule.getEmbeddedKafka();
-
-	@Test
-	public void testStreamToTable() throws Exception {
-		SpringApplication app = new SpringApplication(CountClicksPerRegionApplication.class);
-		app.setWebApplicationType(WebApplicationType.NONE);
-
-		Consumer<String, Long> consumer;
-		Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("group-1",
-				"false", embeddedKafka);
-		consumerProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-		consumerProps.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
-		consumerProps.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, LongDeserializer.class);
-		DefaultKafkaConsumerFactory<String, Long> cf = new DefaultKafkaConsumerFactory<>(consumerProps);
-		consumer = cf.createConsumer();
-		embeddedKafka.consumeFromAnEmbeddedTopic(consumer, "output-topic-1");
-
-		try (ConfigurableApplicationContext ignored = app.run("--server.port=0",
-				"--spring.jmx.enabled=false",
-				"--spring.cloud.stream.function.definition=process1",
-				"--spring.cloud.stream.bindings.input-1.destination=user-clicks-1",
-				"--spring.cloud.stream.bindings.input-2.destination=user-regions-1",
-				"--spring.cloud.stream.bindings.output.destination=output-topic-1",
-				"--spring.cloud.stream.bindings.input-1.consumer.useNativeDecoding=true",
-				"--spring.cloud.stream.bindings.input-2.consumer.useNativeDecoding=true",
-				"--spring.cloud.stream.bindings.output.producer.useNativeEncoding=true",
-				"--spring.cloud.stream.kafka.streams.bindings.input-1.consumer.keySerde" +
-						"=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.input-1.consumer.valueSerde" +
-						"=org.apache.kafka.common.serialization.Serdes$LongSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.input-2.consumer.keySerde" +
-						"=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.input-2.consumer.valueSerde" +
-						"=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.output.producer.keySerde" +
-						"=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.output.producer.valueSerde" +
-						"=org.apache.kafka.common.serialization.Serdes$LongSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.key.serde" +
-						"=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.value.serde" +
-						"=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.commit.interval.ms=10000",
-				"--spring.cloud.stream.kafka.streams.bindings.input-1.consumer.applicationId" +
-						"=StreamToTableJoinFunctionTests-abc",
-				"--spring.cloud.stream.kafka.streams.binder.brokers=" + embeddedKafka.getBrokersAsString(),
-				"--spring.cloud.stream.kafka.streams.binder.zkNodes=" + embeddedKafka.getZookeeperConnectionString())) {
-
-			// Input 1: Region per user (multiple records allowed per user).
-			List<KeyValue<String, String>> userRegions = Arrays.asList(
-					new KeyValue<>("alice", "asia"),   /* Alice lived in Asia originally... */
-					new KeyValue<>("bob", "americas"),
-					new KeyValue<>("chao", "asia"),
-					new KeyValue<>("dave", "europe"),
-					new KeyValue<>("alice", "europe"), /* ...but moved to Europe some time later. */
-					new KeyValue<>("eve", "americas"),
-					new KeyValue<>("fang", "asia")
-			);
-
-			Map<String, Object> senderProps1 = KafkaTestUtils.producerProps(embeddedKafka);
-			senderProps1.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
-			senderProps1.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
-
-			DefaultKafkaProducerFactory<String, String> pf1 = new DefaultKafkaProducerFactory<>(senderProps1);
-			KafkaTemplate<String, String> template1 = new KafkaTemplate<>(pf1, true);
-			template1.setDefaultTopic("user-regions-1");
-
-			for (KeyValue<String, String> keyValue : userRegions) {
-				template1.sendDefault(keyValue.key, keyValue.value);
-			}
-
-			// Input 2: Clicks per user (multiple records allowed per user).
-			List<KeyValue<String, Long>> userClicks = Arrays.asList(
-					new KeyValue<>("alice", 13L),
-					new KeyValue<>("bob", 4L),
-					new KeyValue<>("chao", 25L),
-					new KeyValue<>("bob", 19L),
-					new KeyValue<>("dave", 56L),
-					new KeyValue<>("eve", 78L),
-					new KeyValue<>("alice", 40L),
-					new KeyValue<>("fang", 99L)
-			);
-
-			Map<String, Object> senderProps = KafkaTestUtils.producerProps(embeddedKafka);
-			senderProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
-			senderProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, LongSerializer.class);
-
-			DefaultKafkaProducerFactory<String, Long> pf = new DefaultKafkaProducerFactory<>(senderProps);
-			KafkaTemplate<String, Long> template = new KafkaTemplate<>(pf, true);
-			template.setDefaultTopic("user-clicks-1");
-
-			for (KeyValue<String, Long> keyValue : userClicks) {
-				template.sendDefault(keyValue.key, keyValue.value);
-			}
-
-			List<KeyValue<String, Long>> expectedClicksPerRegion = Arrays.asList(
-					new KeyValue<>("americas", 101L),
-					new KeyValue<>("europe", 109L),
-					new KeyValue<>("asia", 124L)
-			);
-
-			//Verify that we receive the expected data
-			int count = 0;
-			long start = System.currentTimeMillis();
-			List<KeyValue<String, Long>> actualClicksPerRegion = new ArrayList<>();
-			do {
-				ConsumerRecords<String, Long> records = KafkaTestUtils.getRecords(consumer);
-				count = count + records.count();
-				for (ConsumerRecord<String, Long> record : records) {
-					actualClicksPerRegion.add(new KeyValue<>(record.key(), record.value()));
-				}
-			} while (count < expectedClicksPerRegion.size() && (System.currentTimeMillis() - start) < 30000);
-
-			assertThat(count == expectedClicksPerRegion.size()).isTrue();
-			assertThat(actualClicksPerRegion).hasSameElementsAs(expectedClicksPerRegion);
-		}
-		finally {
-			consumer.close();
-		}
-	}
-
-	@Test
-	public void testGlobalStartOffsetWithLatestAndIndividualBindingWthEarliest() throws Exception {
-		SpringApplication app = new SpringApplication(CountClicksPerRegionApplication.class);
-		app.setWebApplicationType(WebApplicationType.NONE);
-
-		Consumer<String, Long> consumer;
-		Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("group-2",
-				"false", embeddedKafka);
-		consumerProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-		consumerProps.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
-		consumerProps.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, LongDeserializer.class);
-		DefaultKafkaConsumerFactory<String, Long> cf = new DefaultKafkaConsumerFactory<>(consumerProps);
-		consumer = cf.createConsumer();
-		embeddedKafka.consumeFromAnEmbeddedTopic(consumer, "output-topic-2");
-
-		// Produce data first to the input topic to test the startOffset setting on the
-		// binding (which is set to earliest below).
-		// Input 1: Clicks per user (multiple records allowed per user).
-		List<KeyValue<String, Long>> userClicks = Arrays.asList(
-				new KeyValue<>("alice", 100L),
-				new KeyValue<>("alice", 100L),
-				new KeyValue<>("alice", 100L),
-				new KeyValue<>("alice", 100L),
-				new KeyValue<>("alice", 100L),
-				new KeyValue<>("alice", 100L),
-				new KeyValue<>("alice", 100L),
-				new KeyValue<>("alice", 100L),
-				new KeyValue<>("alice", 100L),
-				new KeyValue<>("alice", 100L)
-		);
-
-		Map<String, Object> senderProps = KafkaTestUtils.producerProps(embeddedKafka);
-		senderProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
-		senderProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, LongSerializer.class);
-
-		DefaultKafkaProducerFactory<String, Long> pf = new DefaultKafkaProducerFactory<>(senderProps);
-		KafkaTemplate<String, Long> template = new KafkaTemplate<>(pf, true);
-		template.setDefaultTopic("user-clicks-2");
-
-		for (KeyValue<String, Long> keyValue : userClicks) {
-			template.sendDefault(keyValue.key, keyValue.value);
-		}
-
-		try (ConfigurableApplicationContext ignored = app.run("--server.port=0",
-				"--spring.jmx.enabled=false",
-				"--spring.cloud.stream.function.definition=process1",
-				"--spring.cloud.stream.bindings.input-1.destination=user-clicks-2",
-				"--spring.cloud.stream.bindings.input-2.destination=user-regions-2",
-				"--spring.cloud.stream.bindings.output.destination=output-topic-2",
-				"--spring.cloud.stream.bindings.input-1.consumer.useNativeDecoding=true",
-				"--spring.cloud.stream.bindings.input-2.consumer.useNativeDecoding=true",
-				"--spring.cloud.stream.bindings.output.producer.useNativeEncoding=true",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.auto.offset.reset=latest",
-				"--spring.cloud.stream.kafka.streams.bindings.input-1.consumer.startOffset=earliest",
-				"--spring.cloud.stream.kafka.streams.bindings.input-1.consumer.keySerde" +
-						"=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.input-1.consumer.valueSerde" +
-						"=org.apache.kafka.common.serialization.Serdes$LongSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.input-2.consumer.keySerde" +
-						"=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.input-2.consumer.valueSerde" +
-						"=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.output.producer.keySerde" +
-						"=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.output.producer.valueSerde" +
-						"=org.apache.kafka.common.serialization.Serdes$LongSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.key.serde" +
-						"=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.value.serde" +
-						"=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.commit.interval.ms=10000",
-				"--spring.cloud.stream.kafka.streams.bindings.input-1.consumer.application-id" +
-						"=StreamToTableJoinFunctionTests-foobar",
-				"--spring.cloud.stream.kafka.streams.binder.brokers=" + embeddedKafka.getBrokersAsString(),
-				"--spring.cloud.stream.kafka.streams.binder.zkNodes=" + embeddedKafka.getZookeeperConnectionString())) {
-			Thread.sleep(1000L);
-
-			// Input 2: Region per user (multiple records allowed per user).
-			List<KeyValue<String, String>> userRegions = Arrays.asList(
-					new KeyValue<>("alice", "asia"),   /* Alice lived in Asia originally... */
-					new KeyValue<>("bob", "americas"),
-					new KeyValue<>("chao", "asia"),
-					new KeyValue<>("dave", "europe"),
-					new KeyValue<>("alice", "europe"), /* ...but moved to Europe some time later. */
-					new KeyValue<>("eve", "americas"),
-					new KeyValue<>("fang", "asia")
-			);
-
-			Map<String, Object> senderProps1 = KafkaTestUtils.producerProps(embeddedKafka);
-			senderProps1.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
-			senderProps1.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
-
-			DefaultKafkaProducerFactory<String, String> pf1 = new DefaultKafkaProducerFactory<>(senderProps1);
-			KafkaTemplate<String, String> template1 = new KafkaTemplate<>(pf1, true);
-			template1.setDefaultTopic("user-regions-2");
-
-			for (KeyValue<String, String> keyValue : userRegions) {
-				template1.sendDefault(keyValue.key, keyValue.value);
-			}
-
-
-			// Input 1: Clicks per user (multiple records allowed per user).
-			List<KeyValue<String, Long>> userClicks1 = Arrays.asList(
-					new KeyValue<>("bob", 4L),
-					new KeyValue<>("chao", 25L),
-					new KeyValue<>("bob", 19L),
-					new KeyValue<>("dave", 56L),
-					new KeyValue<>("eve", 78L),
-					new KeyValue<>("fang", 99L)
-			);
-
-			for (KeyValue<String, Long> keyValue : userClicks1) {
-				template.sendDefault(keyValue.key, keyValue.value);
-			}
-
-
-			List<KeyValue<String, Long>> expectedClicksPerRegion = Arrays.asList(
-					new KeyValue<>("americas", 101L),
-					new KeyValue<>("europe", 56L),
-					new KeyValue<>("asia", 124L),
-					//1000 alice entries which were there in the topic before the consumer started.
-					//Since we set the startOffset to earliest for the topic, it will read them,
-					//but the join fails to associate with a valid region, thus UNKNOWN.
-					new KeyValue<>("UNKNOWN", 1000L)
-			);
-
-			//Verify that we receive the expected data
-			int count = 0;
-			long start = System.currentTimeMillis();
-			List<KeyValue<String, Long>> actualClicksPerRegion = new ArrayList<>();
-			do {
-				ConsumerRecords<String, Long> records = KafkaTestUtils.getRecords(consumer);
-				count = count + records.count();
-				for (ConsumerRecord<String, Long> record : records) {
-					actualClicksPerRegion.add(new KeyValue<>(record.key(), record.value()));
-				}
-			} while (count < expectedClicksPerRegion.size() && (System.currentTimeMillis() - start) < 30000);
-
-			assertThat(count).isEqualTo(expectedClicksPerRegion.size());
-			assertThat(actualClicksPerRegion).hasSameElementsAs(expectedClicksPerRegion);
-		}
-		finally {
-			consumer.close();
-		}
-	}
-
-	/**
-	 * Tuple for a region and its associated number of clicks.
-	 */
-	private static final class RegionWithClicks {
-
-		private final String region;
-		private final long clicks;
-
-		RegionWithClicks(String region, long clicks) {
-			if (region == null || region.isEmpty()) {
-				throw new IllegalArgumentException("region must be set");
-			}
-			if (clicks < 0) {
-				throw new IllegalArgumentException("clicks must not be negative");
-			}
-			this.region = region;
-			this.clicks = clicks;
-		}
-
-		public String getRegion() {
-			return region;
-		}
-
-		public long getClicks() {
-			return clicks;
-		}
-
-	}
-
-	@EnableBinding(KStreamKTableProcessor.class)
-	@EnableAutoConfiguration
-	@EnableConfigurationProperties(KafkaStreamsApplicationSupportProperties.class)
-	public static class CountClicksPerRegionApplication {
-
-		@Bean
-		public Function<KStream<String, Long>, Function<KTable<String, String>, KStream<String, Long>>> process1() {
-			return userClicksStream -> (userRegionsTable -> (userClicksStream
-					.leftJoin(userRegionsTable, (clicks, region) -> new RegionWithClicks(region == null ?
-									"UNKNOWN" : region, clicks),
-							Joined.with(Serdes.String(), Serdes.Long(), null))
-					.map((user, regionWithClicks) -> new KeyValue<>(regionWithClicks.getRegion(),
-							regionWithClicks.getClicks()))
-					.groupByKey(Serialized.with(Serdes.String(), Serdes.Long()))
-					.reduce((firstClicks, secondClicks) -> firstClicks + secondClicks)
-					.toStream()));
-		}
-	}
-
-	interface KStreamKTableProcessor {
-
-		/**
-		 * Input binding.
-		 *
-		 * @return {@link Input} binding for {@link KStream} type.
-		 */
-		@Input("input-1")
-		KStream<?, ?> input1();
-
-		/**
-		 * Input binding.
-		 *
-		 * @return {@link Input} binding for {@link KStream} type.
-		 */
-		@Input("input-2")
-		KTable<?, ?> input2();
-
-		/**
-		 * Output binding.
-		 *
-		 * @return {@link Output} binding for {@link KStream} type.
-		 */
-		@Output("output")
-		KStream<?, ?> output();
-
-	}
-}

spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/integration/DeserializationErrorHandlerByKafkaTests.java

@@ -1,228 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.integration;
-
-import java.util.Arrays;
-import java.util.Map;
-
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.common.serialization.Serdes;
-import org.apache.kafka.streams.KeyValue;
-import org.apache.kafka.streams.kstream.KStream;
-import org.apache.kafka.streams.kstream.Materialized;
-import org.apache.kafka.streams.kstream.Serialized;
-import org.apache.kafka.streams.kstream.TimeWindows;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.SpyBean;
-import org.springframework.cloud.stream.annotation.EnableBinding;
-import org.springframework.cloud.stream.annotation.StreamListener;
-import org.springframework.cloud.stream.binder.kafka.streams.annotations.KafkaStreamsProcessor;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsApplicationSupportProperties;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.test.EmbeddedKafkaBroker;
-import org.springframework.kafka.test.rule.EmbeddedKafkaRule;
-import org.springframework.kafka.test.utils.KafkaTestUtils;
-import org.springframework.messaging.handler.annotation.SendTo;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-
-/**
- * @author Soby Chacko
- */
-@RunWith(SpringRunner.class)
-@ContextConfiguration
-@DirtiesContext
-public abstract class DeserializationErrorHandlerByKafkaTests {
-
-	@ClassRule
-	public static EmbeddedKafkaRule embeddedKafkaRule = new EmbeddedKafkaRule(1, true,
-			"counts", "error.words.group", "error.word1.groupx", "error.word2.groupx");
-
-	private static EmbeddedKafkaBroker embeddedKafka = embeddedKafkaRule
-			.getEmbeddedKafka();
-
-	@SpyBean
-	org.springframework.cloud.stream.binder.kafka.streams.KafkaStreamsMessageConversionDelegate conversionDelegate;
-
-	private static Consumer<String, String> consumer;
-
-	@BeforeClass
-	public static void setUp() throws Exception {
-		System.setProperty("spring.cloud.stream.kafka.streams.binder.brokers",
-				embeddedKafka.getBrokersAsString());
-		System.setProperty("spring.cloud.stream.kafka.streams.binder.zkNodes",
-				embeddedKafka.getZookeeperConnectionString());
-
-		System.setProperty("server.port", "0");
-		System.setProperty("spring.jmx.enabled", "false");
-
-		Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("fooc", "false",
-				embeddedKafka);
-		consumerProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-		DefaultKafkaConsumerFactory<String, String> cf = new DefaultKafkaConsumerFactory<>(
-				consumerProps);
-		consumer = cf.createConsumer();
-		embeddedKafka.consumeFromAnEmbeddedTopic(consumer, "counts");
-	}
-
-	@AfterClass
-	public static void tearDown() {
-		consumer.close();
-	}
-
-	// @checkstyle:off
-	@SpringBootTest(properties = {
-			"spring.cloud.stream.bindings.input.consumer.useNativeDecoding=true",
-			"spring.cloud.stream.bindings.output.producer.useNativeEncoding=true",
-			"spring.cloud.stream.kafka.streams.bindings.input.consumer.application-id=deser-kafka-dlq",
-			"spring.cloud.stream.bindings.input.group=group",
-			"spring.cloud.stream.kafka.streams.binder.serdeError=sendToDlq",
-			"spring.cloud.stream.kafka.streams.binder.configuration.default.value.serde="
-					+ "org.apache.kafka.common.serialization.Serdes$IntegerSerde" }, webEnvironment = SpringBootTest.WebEnvironment.NONE)
-	// @checkstyle:on
-	public static class DeserializationByKafkaAndDlqTests
-			extends DeserializationErrorHandlerByKafkaTests {
-
-		@Test
-		@SuppressWarnings("unchecked")
-		public void test() throws Exception {
-			Map<String, Object> senderProps = KafkaTestUtils.producerProps(embeddedKafka);
-			DefaultKafkaProducerFactory<Integer, String> pf = new DefaultKafkaProducerFactory<>(
-					senderProps);
-			KafkaTemplate<Integer, String> template = new KafkaTemplate<>(pf, true);
-			template.setDefaultTopic("words");
-			template.sendDefault("foobar");
-
-			Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("foobar",
-					"false", embeddedKafka);
-			consumerProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-			DefaultKafkaConsumerFactory<String, String> cf = new DefaultKafkaConsumerFactory<>(
-					consumerProps);
-			Consumer<String, String> consumer1 = cf.createConsumer();
-			embeddedKafka.consumeFromAnEmbeddedTopic(consumer1, "error.words.group");
-
-			ConsumerRecord<String, String> cr = KafkaTestUtils.getSingleRecord(consumer1,
-					"error.words.group");
-			assertThat(cr.value().equals("foobar")).isTrue();
-
-			// Ensuring that the deserialization was indeed done by Kafka natively
-			verify(conversionDelegate, never()).deserializeOnInbound(any(Class.class),
-					any(KStream.class));
-			verify(conversionDelegate, never()).serializeOnOutbound(any(KStream.class));
-		}
-
-	}
-
-	// @checkstyle:off
-	@SpringBootTest(properties = {
-			"spring.cloud.stream.bindings.input.consumer.useNativeDecoding=true",
-			"spring.cloud.stream.bindings.output.producer.useNativeEncoding=true",
-			"spring.cloud.stream.bindings.input.destination=word1,word2",
-			"spring.cloud.stream.kafka.streams.default.consumer.applicationId=deser-kafka-dlq-multi-input",
-			"spring.cloud.stream.bindings.input.group=groupx",
-			"spring.cloud.stream.kafka.streams.binder.serdeError=sendToDlq",
-			"spring.cloud.stream.kafka.streams.binder.configuration.default.value.serde="
-					+ "org.apache.kafka.common.serialization.Serdes$IntegerSerde" }, webEnvironment = SpringBootTest.WebEnvironment.NONE)
-	// @checkstyle:on
-	public static class DeserializationByKafkaAndDlqTestsWithMultipleInputs
-			extends DeserializationErrorHandlerByKafkaTests {
-
-		@Test
-		@SuppressWarnings("unchecked")
-		public void test() {
-			Map<String, Object> senderProps = KafkaTestUtils.producerProps(embeddedKafka);
-			DefaultKafkaProducerFactory<Integer, String> pf = new DefaultKafkaProducerFactory<>(
-					senderProps);
-			KafkaTemplate<Integer, String> template = new KafkaTemplate<>(pf, true);
-			template.setDefaultTopic("word1");
-			template.sendDefault("foobar");
-
-			template.setDefaultTopic("word2");
-			template.sendDefault("foobar");
-
-			Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("foobarx",
-					"false", embeddedKafka);
-			consumerProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-			DefaultKafkaConsumerFactory<String, String> cf = new DefaultKafkaConsumerFactory<>(
-					consumerProps);
-			Consumer<String, String> consumer1 = cf.createConsumer();
-			embeddedKafka.consumeFromEmbeddedTopics(consumer1, "error.word1.groupx",
-					"error.word2.groupx");
-
-			// TODO: Investigate why the ordering matters below: i.e.
-			// if we consume from error.word1.groupx first, an exception is thrown.
-			ConsumerRecord<String, String> cr1 = KafkaTestUtils.getSingleRecord(consumer1,
-					"error.word2.groupx");
-			assertThat(cr1.value().equals("foobar")).isTrue();
-			ConsumerRecord<String, String> cr2 = KafkaTestUtils.getSingleRecord(consumer1,
-					"error.word1.groupx");
-			assertThat(cr2.value().equals("foobar")).isTrue();
-
-			// Ensuring that the deserialization was indeed done by Kafka natively
-			verify(conversionDelegate, never()).deserializeOnInbound(any(Class.class),
-					any(KStream.class));
-			verify(conversionDelegate, never()).serializeOnOutbound(any(KStream.class));
-		}
-
-	}
-
-	@EnableBinding(KafkaStreamsProcessor.class)
-	@EnableAutoConfiguration
-	@PropertySource("classpath:/org/springframework/cloud/stream/binder/kstream/integTest-1.properties")
-	@EnableConfigurationProperties(KafkaStreamsApplicationSupportProperties.class)
-	public static class WordCountProcessorApplication {
-
-		@Autowired
-		private TimeWindows timeWindows;
-
-		@StreamListener("input")
-		@SendTo("output")
-		public KStream<?, String> process(KStream<Object, String> input) {
-
-			return input
-					.flatMapValues(
-							value -> Arrays.asList(value.toLowerCase().split("\\W+")))
-					.map((key, value) -> new KeyValue<>(value, value))
-					.groupByKey(Serialized.with(Serdes.String(), Serdes.String()))
-					.windowedBy(timeWindows).count(Materialized.as("foo-WordCounts-x"))
-					.toStream().map((key, value) -> new KeyValue<>(null,
-							"Count for " + key.key() + " : " + value));
-		}
-
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/integration/DeserializtionErrorHandlerByBinderTests.java

@@ -1,238 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.integration;
-
-import java.util.Map;
-
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.streams.KeyValue;
-import org.apache.kafka.streams.kstream.KStream;
-import org.apache.kafka.streams.kstream.Materialized;
-import org.apache.kafka.streams.kstream.Serialized;
-import org.apache.kafka.streams.kstream.TimeWindows;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.SpyBean;
-import org.springframework.cloud.stream.annotation.EnableBinding;
-import org.springframework.cloud.stream.annotation.StreamListener;
-import org.springframework.cloud.stream.binder.kafka.streams.annotations.KafkaStreamsProcessor;
-import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.support.serializer.JsonSerde;
-import org.springframework.kafka.test.EmbeddedKafkaBroker;
-import org.springframework.kafka.test.rule.EmbeddedKafkaRule;
-import org.springframework.kafka.test.utils.KafkaTestUtils;
-import org.springframework.messaging.handler.annotation.SendTo;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.verify;
-
-/**
- * @author Soby Chacko
- */
-@RunWith(SpringRunner.class)
-@ContextConfiguration
-@DirtiesContext
-public abstract class DeserializtionErrorHandlerByBinderTests {
-
-	@ClassRule
-	public static EmbeddedKafkaRule embeddedKafkaRule = new EmbeddedKafkaRule(1, true,
-			"counts-id", "error.foos.foobar-group", "error.foos1.fooz-group",
-			"error.foos2.fooz-group");
-
-	private static EmbeddedKafkaBroker embeddedKafka = embeddedKafkaRule
-			.getEmbeddedKafka();
-
-	@SpyBean
-	org.springframework.cloud.stream.binder.kafka.streams.KafkaStreamsMessageConversionDelegate conversionDelegate;
-
-	private static Consumer<Integer, String> consumer;
-
-	@BeforeClass
-	public static void setUp() throws Exception {
-		System.setProperty("spring.cloud.stream.kafka.streams.binder.brokers",
-				embeddedKafka.getBrokersAsString());
-		System.setProperty("spring.cloud.stream.kafka.streams.binder.zkNodes",
-				embeddedKafka.getZookeeperConnectionString());
-
-		System.setProperty("server.port", "0");
-		System.setProperty("spring.jmx.enabled", "false");
-
-		Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("foob", "false",
-				embeddedKafka);
-		// consumerProps.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
-		// Deserializer.class.getName());
-		consumerProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-		DefaultKafkaConsumerFactory<Integer, String> cf = new DefaultKafkaConsumerFactory<>(
-				consumerProps);
-		consumer = cf.createConsumer();
-		embeddedKafka.consumeFromAnEmbeddedTopic(consumer, "counts-id");
-	}
-
-	@AfterClass
-	public static void tearDown() {
-		consumer.close();
-	}
-
-	@SpringBootTest(properties = { "spring.cloud.stream.bindings.input.destination=foos",
-			"spring.cloud.stream.bindings.output.destination=counts-id",
-			"spring.cloud.stream.kafka.streams.binder.configuration.commit.interval.ms=1000",
-			"spring.cloud.stream.kafka.streams.binder.configuration.default.key.serde"
-					+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-			"spring.cloud.stream.kafka.streams.binder.configuration.default.value.serde"
-					+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-			"spring.cloud.stream.bindings.output.producer.headerMode=raw",
-			"spring.cloud.stream.kafka.streams.bindings.output.producer.keySerde"
-					+ "=org.apache.kafka.common.serialization.Serdes$IntegerSerde",
-			"spring.cloud.stream.bindings.input.consumer.headerMode=raw",
-			"spring.cloud.stream.kafka.streams.binder.serdeError=sendToDlq",
-			"spring.cloud.stream.kafka.streams.bindings.input.consumer.application-id"
-					+ "=deserializationByBinderAndDlqTests",
-			"spring.cloud.stream.bindings.input.group=foobar-group" }, webEnvironment = SpringBootTest.WebEnvironment.NONE)
-	public static class DeserializationByBinderAndDlqTests
-			extends DeserializtionErrorHandlerByBinderTests {
-
-		@Test
-		@SuppressWarnings("unchecked")
-		public void test() throws Exception {
-			Map<String, Object> senderProps = KafkaTestUtils.producerProps(embeddedKafka);
-			DefaultKafkaProducerFactory<Integer, String> pf = new DefaultKafkaProducerFactory<>(
-					senderProps);
-			KafkaTemplate<Integer, String> template = new KafkaTemplate<>(pf, true);
-			template.setDefaultTopic("foos");
-			template.sendDefault("hello");
-
-			Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("foobar",
-					"false", embeddedKafka);
-			consumerProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-			DefaultKafkaConsumerFactory<String, String> cf = new DefaultKafkaConsumerFactory<>(
-					consumerProps);
-			Consumer<String, String> consumer1 = cf.createConsumer();
-			embeddedKafka.consumeFromAnEmbeddedTopic(consumer1,
-					"error.foos.foobar-group");
-
-			ConsumerRecord<String, String> cr = KafkaTestUtils.getSingleRecord(consumer1,
-					"error.foos.foobar-group");
-			assertThat(cr.value().equals("hello")).isTrue();
-
-			// Ensuring that the deserialization was indeed done by the binder
-			verify(conversionDelegate).deserializeOnInbound(any(Class.class),
-					any(KStream.class));
-		}
-
-	}
-
-	@SpringBootTest(properties = {
-			"spring.cloud.stream.bindings.input.destination=foos1,foos2",
-			"spring.cloud.stream.bindings.output.destination=counts-id",
-			"spring.cloud.stream.kafka.streams.binder.configuration.commit.interval.ms=1000",
-			"spring.cloud.stream.kafka.streams.binder.configuration.default.key.serde"
-					+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-			"spring.cloud.stream.kafka.streams.binder.configuration.default.value.serde"
-					+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-			"spring.cloud.stream.kafka.streams.bindings.output.producer.keySerde"
-					+ "=org.apache.kafka.common.serialization.Serdes$IntegerSerde",
-			"spring.cloud.stream.kafka.streams.binder.serdeError=sendToDlq",
-			"spring.cloud.stream.kafka.streams.bindings.input.consumer.application-id"
-					+ "=deserializationByBinderAndDlqTestsWithMultipleInputs",
-			"spring.cloud.stream.bindings.input.group=fooz-group" }, webEnvironment = SpringBootTest.WebEnvironment.NONE)
-	public static class DeserializationByBinderAndDlqTestsWithMultipleInputs
-			extends DeserializtionErrorHandlerByBinderTests {
-
-		@Test
-		@SuppressWarnings("unchecked")
-		public void test() throws Exception {
-			Map<String, Object> senderProps = KafkaTestUtils.producerProps(embeddedKafka);
-			DefaultKafkaProducerFactory<Integer, String> pf = new DefaultKafkaProducerFactory<>(
-					senderProps);
-			KafkaTemplate<Integer, String> template = new KafkaTemplate<>(pf, true);
-			template.setDefaultTopic("foos1");
-			template.sendDefault("hello");
-
-			template.setDefaultTopic("foos2");
-			template.sendDefault("hello");
-
-			Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("foobar1",
-					"false", embeddedKafka);
-			consumerProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-			DefaultKafkaConsumerFactory<String, String> cf = new DefaultKafkaConsumerFactory<>(
-					consumerProps);
-			Consumer<String, String> consumer1 = cf.createConsumer();
-			embeddedKafka.consumeFromEmbeddedTopics(consumer1, "error.foos1.fooz-group",
-					"error.foos2.fooz-group");
-
-			ConsumerRecord<String, String> cr1 = KafkaTestUtils.getSingleRecord(consumer1,
-					"error.foos1.fooz-group");
-			assertThat(cr1.value().equals("hello")).isTrue();
-
-			ConsumerRecord<String, String> cr2 = KafkaTestUtils.getSingleRecord(consumer1,
-					"error.foos2.fooz-group");
-			assertThat(cr2.value().equals("hello")).isTrue();
-
-			// Ensuring that the deserialization was indeed done by the binder
-			verify(conversionDelegate).deserializeOnInbound(any(Class.class),
-					any(KStream.class));
-		}
-
-	}
-
-	@EnableBinding(KafkaStreamsProcessor.class)
-	@EnableAutoConfiguration
-	public static class ProductCountApplication {
-
-		@StreamListener("input")
-		@SendTo("output")
-		public KStream<Integer, Long> process(KStream<Object, Product> input) {
-			return input.filter((key, product) -> product.getId() == 123)
-					.map((key, value) -> new KeyValue<>(value, value))
-					.groupByKey(Serialized.with(new JsonSerde<>(Product.class),
-							new JsonSerde<>(Product.class)))
-					.windowedBy(TimeWindows.of(5000))
-					.count(Materialized.as("id-count-store-x")).toStream()
-					.map((key, value) -> new KeyValue<>(key.key().id, value));
-		}
-
-	}
-
-	static class Product {
-
-		Integer id;
-
-		public Integer getId() {
-			return id;
-		}
-
-		public void setId(Integer id) {
-			this.id = id;
-		}
-
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/integration/KafkaStreamsBinderHealthIndicatorTests.java

@@ -1,319 +0,0 @@
-/*
- * Copyright 2019-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.integration;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.producer.ProducerRecord;
-import org.apache.kafka.streams.KafkaStreams;
-import org.apache.kafka.streams.kstream.KStream;
-import org.assertj.core.util.Lists;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.actuate.health.Health;
-import org.springframework.boot.actuate.health.HealthIndicator;
-import org.springframework.boot.actuate.health.Status;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.stream.annotation.EnableBinding;
-import org.springframework.cloud.stream.annotation.Input;
-import org.springframework.cloud.stream.annotation.Output;
-import org.springframework.cloud.stream.annotation.StreamListener;
-import org.springframework.cloud.stream.binder.kafka.streams.annotations.KafkaStreamsProcessor;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsApplicationSupportProperties;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.support.SendResult;
-import org.springframework.kafka.test.EmbeddedKafkaBroker;
-import org.springframework.kafka.test.rule.EmbeddedKafkaRule;
-import org.springframework.kafka.test.utils.KafkaTestUtils;
-import org.springframework.messaging.handler.annotation.SendTo;
-import org.springframework.util.concurrent.ListenableFuture;
-import org.springframework.util.concurrent.ListenableFutureCallback;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Arnaud Jardiné
- */
-public class KafkaStreamsBinderHealthIndicatorTests {
-
-	@ClassRule
-	public static EmbeddedKafkaRule embeddedKafkaRule = new EmbeddedKafkaRule(1, true,
-			"out", "out2");
-
-	private static EmbeddedKafkaBroker embeddedKafka = embeddedKafkaRule
-			.getEmbeddedKafka();
-
-	@BeforeClass
-	public static void setUp() {
-		System.setProperty("logging.level.org.apache.kafka", "OFF");
-	}
-
-	@Test
-	public void healthIndicatorUpTest() throws Exception {
-		try (ConfigurableApplicationContext context = singleStream()) {
-			receive(context,
-					Lists.newArrayList(new ProducerRecord<>("in", "{\"id\":\"123\"}"),
-							new ProducerRecord<>("in", "{\"id\":\"123\"}")),
-					Status.UP, "out");
-		}
-	}
-
-	@Test
-	public void healthIndicatorDownTest() throws Exception {
-		try (ConfigurableApplicationContext context = singleStream()) {
-			receive(context,
-					Lists.newArrayList(new ProducerRecord<>("in", "{\"id\":\"123\"}"),
-							new ProducerRecord<>("in", "{\"id\":\"124\"}")),
-					Status.DOWN, "out");
-		}
-	}
-
-	@Test
-	public void healthIndicatorUpMultipleKStreamsTest() throws Exception {
-		try (ConfigurableApplicationContext context = multipleStream()) {
-			receive(context,
-					Lists.newArrayList(new ProducerRecord<>("in", "{\"id\":\"123\"}"),
-							new ProducerRecord<>("in2", "{\"id\":\"123\"}")),
-					Status.UP, "out", "out2");
-		}
-	}
-
-	@Test
-	public void healthIndicatorDownMultipleKStreamsTest() throws Exception {
-		try (ConfigurableApplicationContext context = multipleStream()) {
-			receive(context,
-					Lists.newArrayList(new ProducerRecord<>("in", "{\"id\":\"123\"}"),
-							new ProducerRecord<>("in2", "{\"id\":\"124\"}")),
-					Status.DOWN, "out", "out2");
-		}
-	}
-
-	private static Status getStatusKStream(Map<String, Object> details) {
-		Health health = (Health) details.get("kstream");
-		return health != null ? health.getStatus() : Status.DOWN;
-	}
-
-	private static boolean waitFor(Map<String, Object> details) {
-		Health health = (Health) details.get("kstream");
-		if (health.getStatus() == Status.UP) {
-			Map<String, Object> moreDetails = health.getDetails();
-			Health kStreamHealth = (Health) moreDetails
-					.get("kafkaStreamsBinderHealthIndicator");
-			String status = (String) kStreamHealth.getDetails().get("threadState");
-			return status != null
-					&& (status.equalsIgnoreCase(KafkaStreams.State.REBALANCING.name())
-							|| status.equalsIgnoreCase("PARTITIONS_REVOKED")
-							|| status.equalsIgnoreCase("PARTITIONS_ASSIGNED")
-							|| status.equalsIgnoreCase(
-									KafkaStreams.State.PENDING_SHUTDOWN.name()));
-		}
-		return false;
-	}
-
-	private void receive(ConfigurableApplicationContext context,
-			List<ProducerRecord<Integer, String>> records, Status expected,
-			String... topics) throws Exception {
-		Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("group-id0",
-				"false", embeddedKafka);
-		consumerProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-		DefaultKafkaConsumerFactory<String, String> cf = new DefaultKafkaConsumerFactory<>(
-				consumerProps);
-
-		Map<String, Object> senderProps = KafkaTestUtils.producerProps(embeddedKafka);
-		DefaultKafkaProducerFactory<Integer, String> pf = new DefaultKafkaProducerFactory<>(
-				senderProps);
-		try (Consumer<String, String> consumer = cf.createConsumer()) {
-			KafkaTemplate<Integer, String> template = new KafkaTemplate<>(pf, true);
-			CountDownLatch latch = new CountDownLatch(records.size());
-			for (ProducerRecord<Integer, String> record : records) {
-				ListenableFuture<SendResult<Integer, String>> future = template
-						.send(record);
-				future.addCallback(
-						new ListenableFutureCallback<SendResult<Integer, String>>() {
-							@Override
-							public void onFailure(Throwable ex) {
-								Assert.fail();
-							}
-
-							@Override
-							public void onSuccess(SendResult<Integer, String> result) {
-								latch.countDown();
-							}
-						});
-			}
-
-			latch.await(5, TimeUnit.SECONDS);
-
-			embeddedKafka.consumeFromEmbeddedTopics(consumer, topics);
-			KafkaTestUtils.getRecords(consumer, 1000);
-
-			TimeUnit.SECONDS.sleep(2);
-			checkHealth(context, expected);
-		}
-		finally {
-			pf.destroy();
-		}
-	}
-
-	private static void checkHealth(ConfigurableApplicationContext context,
-			Status expected) throws InterruptedException {
-		HealthIndicator healthIndicator = context.getBean("bindersHealthIndicator",
-				HealthIndicator.class);
-		Health health = healthIndicator.health();
-		while (waitFor(health.getDetails())) {
-			TimeUnit.SECONDS.sleep(2);
-			health = healthIndicator.health();
-		}
-		assertThat(health.getStatus()).isEqualTo(expected);
-		assertThat(getStatusKStream(health.getDetails())).isEqualTo(expected);
-	}
-
-	private ConfigurableApplicationContext singleStream() {
-		SpringApplication app = new SpringApplication(KStreamApplication.class);
-		app.setWebApplicationType(WebApplicationType.NONE);
-		return app.run("--server.port=0", "--spring.jmx.enabled=false",
-				"--spring.cloud.stream.bindings.input.destination=in",
-				"--spring.cloud.stream.bindings.output.destination=out",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.commit.interval.ms=1000",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.key.serde="
-						+ "org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.value.serde="
-						+ "org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.output.producer.keySerde="
-						+ "org.apache.kafka.common.serialization.Serdes$IntegerSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.input.consumer.applicationId="
-						+ "ApplicationHealthTest-xyz",
-				"--spring.cloud.stream.kafka.streams.binder.brokers="
-						+ embeddedKafka.getBrokersAsString(),
-				"--spring.cloud.stream.kafka.streams.binder.zkNodes="
-						+ embeddedKafka.getZookeeperConnectionString());
-	}
-
-	private ConfigurableApplicationContext multipleStream() {
-		System.setProperty("logging.level.org.apache.kafka", "OFF");
-		SpringApplication app = new SpringApplication(AnotherKStreamApplication.class);
-		app.setWebApplicationType(WebApplicationType.NONE);
-		return app.run("--server.port=0", "--spring.jmx.enabled=false",
-				"--spring.cloud.stream.bindings.input.destination=in",
-				"--spring.cloud.stream.bindings.output.destination=out",
-				"--spring.cloud.stream.bindings.input2.destination=in2",
-				"--spring.cloud.stream.bindings.output2.destination=out2",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.commit.interval.ms=1000",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.key.serde="
-						+ "org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.value.serde="
-						+ "org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.output.producer.keySerde="
-						+ "org.apache.kafka.common.serialization.Serdes$IntegerSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.output2.producer.keySerde="
-						+ "org.apache.kafka.common.serialization.Serdes$IntegerSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.input.consumer.applicationId="
-						+ "ApplicationHealthTest-xyz",
-				"--spring.cloud.stream.kafka.streams.bindings.input2.consumer.applicationId="
-						+ "ApplicationHealthTest2-xyz",
-				"--spring.cloud.stream.kafka.streams.binder.brokers="
-						+ embeddedKafka.getBrokersAsString(),
-				"--spring.cloud.stream.kafka.streams.binder.zkNodes="
-						+ embeddedKafka.getZookeeperConnectionString());
-	}
-
-	@EnableBinding(KafkaStreamsProcessor.class)
-	@EnableAutoConfiguration
-	@EnableConfigurationProperties(KafkaStreamsApplicationSupportProperties.class)
-	public static class KStreamApplication {
-
-		@StreamListener("input")
-		@SendTo("output")
-		public KStream<Object, Product> process(KStream<Object, Product> input) {
-			return input.filter((key, product) -> {
-				if (product.getId() != 123) {
-					throw new IllegalArgumentException();
-				}
-				return true;
-			});
-		}
-
-	}
-
-	@EnableBinding({ KafkaStreamsProcessor.class, KafkaStreamsProcessorX.class })
-	@EnableAutoConfiguration
-	@EnableConfigurationProperties(KafkaStreamsApplicationSupportProperties.class)
-	public static class AnotherKStreamApplication {
-
-		@StreamListener("input")
-		@SendTo("output")
-		public KStream<Object, Product> process(KStream<Object, Product> input) {
-			return input.filter((key, product) -> {
-				if (product.getId() != 123) {
-					throw new IllegalArgumentException();
-				}
-				return true;
-			});
-		}
-
-		@StreamListener("input2")
-		@SendTo("output2")
-		public KStream<Object, Product> process2(KStream<Object, Product> input) {
-			return input.filter((key, product) -> {
-				if (product.getId() != 123) {
-					throw new IllegalArgumentException();
-				}
-				return true;
-			});
-		}
-
-	}
-
-	public interface KafkaStreamsProcessorX {
-
-		@Input("input2")
-		KStream<?, ?> input();
-
-		@Output("output2")
-		KStream<?, ?> output();
-
-	}
-
-	static class Product {
-
-		Integer id;
-
-		public Integer getId() {
-			return id;
-		}
-
-		public void setId(Integer id) {
-			this.id = id;
-		}
-
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/integration/KafkaStreamsBinderMultipleInputTopicsTest.java

@@ -1,207 +0,0 @@
-/*
- * Copyright 2017-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.integration;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.ConsumerRecords;
-import org.apache.kafka.common.serialization.Serdes;
-import org.apache.kafka.streams.KeyValue;
-import org.apache.kafka.streams.kstream.KStream;
-import org.apache.kafka.streams.kstream.Materialized;
-import org.apache.kafka.streams.kstream.Serialized;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.stream.annotation.EnableBinding;
-import org.springframework.cloud.stream.annotation.Input;
-import org.springframework.cloud.stream.annotation.StreamListener;
-import org.springframework.cloud.stream.binder.kafka.streams.annotations.KafkaStreamsProcessor;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsApplicationSupportProperties;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.test.EmbeddedKafkaBroker;
-import org.springframework.kafka.test.rule.EmbeddedKafkaRule;
-import org.springframework.kafka.test.utils.KafkaTestUtils;
-import org.springframework.messaging.handler.annotation.SendTo;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * This test case demonstrates a kafk-streams topology which consumes messages from
- * multiple kafka topics(destinations).
- *
- * See
- * {@link KafkaStreamsBinderMultipleInputTopicsTest#testKstreamWordCountWithStringInputAndPojoOuput}
- * where the input topic names are specified as comma-separated String values for the
- * property spring.cloud.stream.bindings.input.destination.
- *
- * @author Sarath Shyam
- */
-public class KafkaStreamsBinderMultipleInputTopicsTest {
-
-	@ClassRule
-	public static EmbeddedKafkaRule embeddedKafkaRule = new EmbeddedKafkaRule(1, true,
-			"counts");
-
-	private static EmbeddedKafkaBroker embeddedKafka = embeddedKafkaRule
-			.getEmbeddedKafka();
-
-	private static Consumer<String, String> consumer;
-
-	@BeforeClass
-	public static void setUp() throws Exception {
-		Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("group", "false",
-				embeddedKafka);
-		consumerProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-		DefaultKafkaConsumerFactory<String, String> cf = new DefaultKafkaConsumerFactory<>(
-				consumerProps);
-		consumer = cf.createConsumer();
-		embeddedKafka.consumeFromAnEmbeddedTopic(consumer, "counts");
-	}
-
-	@AfterClass
-	public static void tearDown() {
-		consumer.close();
-	}
-
-	@Test
-	public void testKstreamWordCountWithStringInputAndPojoOuput() throws Exception {
-		SpringApplication app = new SpringApplication(
-				WordCountProcessorApplication.class);
-		app.setWebApplicationType(WebApplicationType.NONE);
-
-		ConfigurableApplicationContext context = app.run("--server.port=0",
-				"--spring.jmx.enabled=false",
-				"--spring.cloud.stream.bindings.input.destination=words1,words2",
-				"--spring.cloud.stream.bindings.output.destination=counts",
-				"--spring.cloud.stream.bindings.output.contentType=application/json",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.commit.interval.ms=1000",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.key.serde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.value.serde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.bindings.input.consumer.headerMode=raw",
-				"--spring.cloud.stream.kafka.streams.timeWindow.length=5000",
-				"--spring.cloud.stream.kafka.streams.timeWindow.advanceBy=0",
-				"--spring.cloud.stream.kafka.streams.bindings.input.consumer.applicationId"
-						+ "=WordCountProcessorApplication-xyz",
-				"--spring.cloud.stream.kafka.streams.binder.brokers="
-						+ embeddedKafka.getBrokersAsString(),
-				"--spring.cloud.stream.kafka.streams.binder.zkNodes="
-						+ embeddedKafka.getZookeeperConnectionString());
-		try {
-			receiveAndValidate(context);
-		}
-		finally {
-			context.close();
-		}
-	}
-
-	private void receiveAndValidate(ConfigurableApplicationContext context)
-			throws Exception {
-		Map<String, Object> senderProps = KafkaTestUtils.producerProps(embeddedKafka);
-		DefaultKafkaProducerFactory<Integer, String> pf = new DefaultKafkaProducerFactory<>(
-				senderProps);
-		KafkaTemplate<Integer, String> template = new KafkaTemplate<>(pf, true);
-		template.setDefaultTopic("words1");
-		template.sendDefault("foobar1");
-		template.setDefaultTopic("words2");
-		template.sendDefault("foobar2");
-		// Sleep a bit so that both the messages are processed before reading from the
-		// output topic.
-		// Else assertions might fail arbitrarily.
-		Thread.sleep(5000);
-		ConsumerRecords<String, String> received = KafkaTestUtils.getRecords(consumer);
-		List<String> wordCounts = new ArrayList<>(2);
-
-		received.records("counts")
-				.forEach((consumerRecord) -> wordCounts.add((consumerRecord.value())));
-		System.out.println(wordCounts);
-		assertThat(wordCounts.contains("{\"word\":\"foobar1\",\"count\":1}")).isTrue();
-		assertThat(wordCounts.contains("{\"word\":\"foobar2\",\"count\":1}")).isTrue();
-	}
-
-	@EnableBinding(KafkaStreamsProcessor.class)
-	@EnableAutoConfiguration
-	@EnableConfigurationProperties(KafkaStreamsApplicationSupportProperties.class)
-	static class WordCountProcessorApplication {
-
-		@StreamListener
-		@SendTo("output")
-		public KStream<?, WordCount> process(
-				@Input("input") KStream<Object, String> input) {
-
-			input.map((k, v) -> {
-				System.out.println(k);
-				System.out.println(v);
-				return new KeyValue<>(k, v);
-			});
-			return input
-					.flatMapValues(
-							value -> Arrays.asList(value.toLowerCase().split("\\W+")))
-					.map((key, value) -> new KeyValue<>(value, value))
-					.groupByKey(Serialized.with(Serdes.String(), Serdes.String()))
-					.count(Materialized.as("WordCounts")).toStream()
-					.map((key, value) -> new KeyValue<>(null, new WordCount(key, value)));
-		}
-
-	}
-
-	static class WordCount {
-
-		private String word;
-
-		private long count;
-
-		WordCount(String word, long count) {
-			this.word = word;
-			this.count = count;
-		}
-
-		public String getWord() {
-			return word;
-		}
-
-		public void setWord(String word) {
-			this.word = word;
-		}
-
-		public long getCount() {
-			return count;
-		}
-
-		public void setCount(long count) {
-			this.count = count;
-		}
-
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/integration/KafkaStreamsBinderWordCountIntegrationTests.java

@@ -1,304 +0,0 @@
-/*
- * Copyright 2017-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.integration;
-
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Map;
-
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.ConsumerRecords;
-import org.apache.kafka.common.serialization.Serdes;
-import org.apache.kafka.streams.KafkaStreams;
-import org.apache.kafka.streams.KeyValue;
-import org.apache.kafka.streams.StreamsConfig;
-import org.apache.kafka.streams.kstream.KStream;
-import org.apache.kafka.streams.kstream.Materialized;
-import org.apache.kafka.streams.kstream.Serialized;
-import org.apache.kafka.streams.kstream.TimeWindows;
-import org.apache.kafka.streams.state.QueryableStoreTypes;
-import org.apache.kafka.streams.state.ReadOnlyWindowStore;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.stream.annotation.EnableBinding;
-import org.springframework.cloud.stream.annotation.Input;
-import org.springframework.cloud.stream.annotation.StreamListener;
-import org.springframework.cloud.stream.binder.kafka.streams.annotations.KafkaStreamsProcessor;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsApplicationSupportProperties;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.integration.test.util.TestUtils;
-import org.springframework.kafka.config.StreamsBuilderFactoryBean;
-import org.springframework.kafka.core.CleanupConfig;
-import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.test.EmbeddedKafkaBroker;
-import org.springframework.kafka.test.rule.EmbeddedKafkaRule;
-import org.springframework.kafka.test.utils.KafkaTestUtils;
-import org.springframework.messaging.handler.annotation.SendTo;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Marius Bogoevici
- * @author Soby Chacko
- * @author Gary Russell
- */
-public class KafkaStreamsBinderWordCountIntegrationTests {
-
-	@ClassRule
-	public static EmbeddedKafkaRule embeddedKafkaRule = new EmbeddedKafkaRule(1, true,
-			"counts");
-
-	private static EmbeddedKafkaBroker embeddedKafka = embeddedKafkaRule
-			.getEmbeddedKafka();
-
-	private static Consumer<String, String> consumer;
-
-	@BeforeClass
-	public static void setUp() throws Exception {
-		Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("group", "false",
-				embeddedKafka);
-		consumerProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-		DefaultKafkaConsumerFactory<String, String> cf = new DefaultKafkaConsumerFactory<>(
-				consumerProps);
-		consumer = cf.createConsumer();
-		embeddedKafka.consumeFromAnEmbeddedTopic(consumer, "counts");
-	}
-
-	@AfterClass
-	public static void tearDown() {
-		consumer.close();
-	}
-
-	@Test
-	public void testKstreamWordCountWithApplicationIdSpecifiedAtDefaultConsumer()
-			throws Exception {
-		SpringApplication app = new SpringApplication(
-				WordCountProcessorApplication.class);
-		app.setWebApplicationType(WebApplicationType.NONE);
-
-		try (ConfigurableApplicationContext context = app.run("--server.port=0",
-				"--spring.jmx.enabled=false",
-				"--spring.cloud.stream.bindings.input.destination=words",
-				"--spring.cloud.stream.bindings.output.destination=counts",
-				"--spring.cloud.stream.bindings.output.contentType=application/json",
-				"--spring.cloud.stream.kafka.streams.default.consumer.application-id=basic-word-count",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.commit.interval.ms=1000",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.key.serde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.value.serde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.bindings.output.producer.headerMode=raw",
-				"--spring.cloud.stream.bindings.input.consumer.headerMode=raw",
-				"--spring.cloud.stream.kafka.streams.timeWindow.length=5000",
-				"--spring.cloud.stream.kafka.streams.timeWindow.advanceBy=0",
-				"--spring.cloud.stream.kafka.streams.binder.brokers="
-						+ embeddedKafka.getBrokersAsString(),
-				"--spring.cloud.stream.kafka.streams.binder.zkNodes="
-						+ embeddedKafka.getZookeeperConnectionString())) {
-			receiveAndValidate(context);
-		}
-	}
-
-	@Test
-	public void testKstreamWordCountWithInputBindingLevelApplicationId()
-			throws Exception {
-		SpringApplication app = new SpringApplication(
-				WordCountProcessorApplication.class);
-		app.setWebApplicationType(WebApplicationType.NONE);
-
-		try (ConfigurableApplicationContext context = app.run("--server.port=0",
-				"--spring.jmx.enabled=false",
-				"--spring.cloud.stream.bindings.input.destination=words",
-				"--spring.cloud.stream.bindings.output.destination=counts",
-				"--spring.cloud.stream.bindings.output.contentType=application/json",
-				"--spring.cloud.stream.kafka.streams.bindings.input.consumer.application-id=basic-word-count",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.commit.interval.ms=1000",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.key.serde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.value.serde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.timeWindow.length=5000",
-				"--spring.cloud.stream.kafka.streams.timeWindow.advanceBy=0",
-				"--spring.cloud.stream.bindings.input.consumer.concurrency=2",
-				"--spring.cloud.stream.kafka.streams.binder.brokers="
-						+ embeddedKafka.getBrokersAsString(),
-				"--spring.cloud.stream.kafka.streams.binder.zkNodes="
-						+ embeddedKafka.getZookeeperConnectionString())) {
-			receiveAndValidate(context);
-			// Assertions on StreamBuilderFactoryBean
-			StreamsBuilderFactoryBean streamsBuilderFactoryBean = context
-					.getBean("&stream-builder-WordCountProcessorApplication-process", StreamsBuilderFactoryBean.class);
-			KafkaStreams kafkaStreams = streamsBuilderFactoryBean.getKafkaStreams();
-			ReadOnlyWindowStore<Object, Object> store = kafkaStreams
-					.store("foo-WordCounts", QueryableStoreTypes.windowStore());
-			assertThat(store).isNotNull();
-
-			Map streamConfigGlobalProperties = context
-					.getBean("streamConfigGlobalProperties", Map.class);
-
-			// Ensure that concurrency settings are mapped to number of stream task
-			// threads in Kafka Streams.
-			final Integer concurrency = (Integer) streamConfigGlobalProperties
-					.get(StreamsConfig.NUM_STREAM_THREADS_CONFIG);
-			assertThat(concurrency).isEqualTo(2);
-
-			sendTombStoneRecordsAndVerifyGracefulHandling();
-
-			CleanupConfig cleanup = TestUtils.getPropertyValue(streamsBuilderFactoryBean,
-					"cleanupConfig", CleanupConfig.class);
-			assertThat(cleanup.cleanupOnStart()).isTrue();
-			assertThat(cleanup.cleanupOnStop()).isFalse();
-		}
-	}
-
-	private void receiveAndValidate(ConfigurableApplicationContext context)
-			throws Exception {
-		Map<String, Object> senderProps = KafkaTestUtils.producerProps(embeddedKafka);
-		DefaultKafkaProducerFactory<Integer, String> pf = new DefaultKafkaProducerFactory<>(
-				senderProps);
-		try {
-			KafkaTemplate<Integer, String> template = new KafkaTemplate<>(pf, true);
-			template.setDefaultTopic("words");
-			template.sendDefault("foobar");
-			ConsumerRecord<String, String> cr = KafkaTestUtils.getSingleRecord(consumer,
-					"counts");
-			assertThat(cr.value().contains("\"word\":\"foobar\",\"count\":1")).isTrue();
-		}
-		finally {
-			pf.destroy();
-		}
-	}
-
-	private void sendTombStoneRecordsAndVerifyGracefulHandling() throws Exception {
-		Map<String, Object> senderProps = KafkaTestUtils.producerProps(embeddedKafka);
-		DefaultKafkaProducerFactory<Integer, String> pf = new DefaultKafkaProducerFactory<>(
-				senderProps);
-		try {
-			KafkaTemplate<Integer, String> template = new KafkaTemplate<>(pf, true);
-			template.setDefaultTopic("words");
-			template.sendDefault(null);
-			ConsumerRecords<String, String> received = consumer
-					.poll(Duration.ofMillis(5000));
-			// By asserting that the received record is empty, we are ensuring that the
-			// tombstone record
-			// was handled by the binder gracefully.
-			assertThat(received.isEmpty()).isTrue();
-		}
-		finally {
-			pf.destroy();
-		}
-	}
-
-	@EnableBinding(KafkaStreamsProcessor.class)
-	@EnableAutoConfiguration
-	@EnableConfigurationProperties(KafkaStreamsApplicationSupportProperties.class)
-	static class WordCountProcessorApplication {
-
-		@Autowired
-		private TimeWindows timeWindows;
-
-		@StreamListener
-		@SendTo("output")
-		public KStream<?, WordCount> process(
-				@Input("input") KStream<Object, String> input) {
-
-			return input
-					.flatMapValues(
-							value -> Arrays.asList(value.toLowerCase().split("\\W+")))
-					.map((key, value) -> new KeyValue<>(value, value))
-					.groupByKey(Serialized.with(Serdes.String(), Serdes.String()))
-					.windowedBy(timeWindows).count(Materialized.as("foo-WordCounts"))
-					.toStream()
-					.map((key, value) -> new KeyValue<>(null,
-							new WordCount(key.key(), value,
-									new Date(key.window().start()),
-									new Date(key.window().end()))));
-		}
-
-		@Bean
-		public CleanupConfig cleanupConfig() {
-			return new CleanupConfig(true, false);
-		}
-
-	}
-
-	static class WordCount {
-
-		private String word;
-
-		private long count;
-
-		private Date start;
-
-		private Date end;
-
-		WordCount(String word, long count, Date start, Date end) {
-			this.word = word;
-			this.count = count;
-			this.start = start;
-			this.end = end;
-		}
-
-		public String getWord() {
-			return word;
-		}
-
-		public void setWord(String word) {
-			this.word = word;
-		}
-
-		public long getCount() {
-			return count;
-		}
-
-		public void setCount(long count) {
-			this.count = count;
-		}
-
-		public Date getStart() {
-			return start;
-		}
-
-		public void setStart(Date start) {
-			this.start = start;
-		}
-
-		public Date getEnd() {
-			return end;
-		}
-
-		public void setEnd(Date end) {
-			this.end = end;
-		}
-
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/integration/KafkaStreamsInteractiveQueryIntegrationTests.java

@@ -1,207 +0,0 @@
-/*
- * Copyright 2017-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.integration;
-
-import java.util.Map;
-
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.common.serialization.IntegerSerializer;
-import org.apache.kafka.common.serialization.Serdes;
-import org.apache.kafka.streams.KeyValue;
-import org.apache.kafka.streams.kstream.KStream;
-import org.apache.kafka.streams.kstream.Materialized;
-import org.apache.kafka.streams.kstream.Serialized;
-import org.apache.kafka.streams.state.HostInfo;
-import org.apache.kafka.streams.state.QueryableStoreTypes;
-import org.apache.kafka.streams.state.ReadOnlyKeyValueStore;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.cloud.stream.annotation.EnableBinding;
-import org.springframework.cloud.stream.annotation.StreamListener;
-import org.springframework.cloud.stream.binder.kafka.streams.InteractiveQueryService;
-import org.springframework.cloud.stream.binder.kafka.streams.annotations.KafkaStreamsProcessor;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.support.serializer.JsonSerde;
-import org.springframework.kafka.test.EmbeddedKafkaBroker;
-import org.springframework.kafka.test.rule.EmbeddedKafkaRule;
-import org.springframework.kafka.test.utils.KafkaTestUtils;
-import org.springframework.messaging.handler.annotation.SendTo;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Soby Chacko
- * @author Gary Russell
- */
-public class KafkaStreamsInteractiveQueryIntegrationTests {
-
-	@ClassRule
-	public static EmbeddedKafkaRule embeddedKafkaRule = new EmbeddedKafkaRule(1, true,
-			"counts-id");
-
-	private static EmbeddedKafkaBroker embeddedKafka = embeddedKafkaRule
-			.getEmbeddedKafka();
-
-	private static Consumer<String, String> consumer;
-
-	@BeforeClass
-	public static void setUp() throws Exception {
-		Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("group-id",
-				"false", embeddedKafka);
-		consumerProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-		DefaultKafkaConsumerFactory<String, String> cf = new DefaultKafkaConsumerFactory<>(
-				consumerProps);
-		consumer = cf.createConsumer();
-		embeddedKafka.consumeFromAnEmbeddedTopic(consumer, "counts-id");
-	}
-
-	@AfterClass
-	public static void tearDown() {
-		consumer.close();
-	}
-
-	@Test
-	public void testKstreamBinderWithPojoInputAndStringOuput() throws Exception {
-		SpringApplication app = new SpringApplication(ProductCountApplication.class);
-		app.setWebApplicationType(WebApplicationType.NONE);
-		ConfigurableApplicationContext context = app.run("--server.port=0",
-				"--spring.jmx.enabled=false",
-				"--spring.cloud.stream.bindings.input.destination=foos",
-				"--spring.cloud.stream.bindings.output.destination=counts-id",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.commit.interval.ms=1000",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.key.serde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.value.serde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.input.consumer.applicationId=ProductCountApplication-abc",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.application.server"
-						+ "=" + embeddedKafka.getBrokersAsString(),
-				"--spring.cloud.stream.kafka.streams.binder.brokers="
-						+ embeddedKafka.getBrokersAsString(),
-				"--spring.cloud.stream.kafka.streams.binder.zkNodes="
-						+ embeddedKafka.getZookeeperConnectionString());
-		try {
-			receiveAndValidateFoo(context);
-		}
-		finally {
-			context.close();
-		}
-	}
-
-	private void receiveAndValidateFoo(ConfigurableApplicationContext context)
-			throws Exception {
-		Map<String, Object> senderProps = KafkaTestUtils.producerProps(embeddedKafka);
-		DefaultKafkaProducerFactory<Integer, String> pf = new DefaultKafkaProducerFactory<>(
-				senderProps);
-		KafkaTemplate<Integer, String> template = new KafkaTemplate<>(pf, true);
-		template.setDefaultTopic("foos");
-		template.sendDefault("{\"id\":\"123\"}");
-		ConsumerRecord<String, String> cr = KafkaTestUtils.getSingleRecord(consumer,
-				"counts-id");
-		assertThat(cr.value().contains("Count for product with ID 123: 1")).isTrue();
-
-		ProductCountApplication.Foo foo = context
-				.getBean(ProductCountApplication.Foo.class);
-		assertThat(foo.getProductStock(123).equals(1L));
-
-		// perform assertions on HostInfo related methods in InteractiveQueryService
-		InteractiveQueryService interactiveQueryService = context
-				.getBean(InteractiveQueryService.class);
-		HostInfo currentHostInfo = interactiveQueryService.getCurrentHostInfo();
-		assertThat(currentHostInfo.host() + ":" + currentHostInfo.port())
-				.isEqualTo(embeddedKafka.getBrokersAsString());
-
-		HostInfo hostInfo = interactiveQueryService.getHostInfo("prod-id-count-store",
-				123, new IntegerSerializer());
-		assertThat(hostInfo.host() + ":" + hostInfo.port())
-				.isEqualTo(embeddedKafka.getBrokersAsString());
-
-		HostInfo hostInfoFoo = interactiveQueryService
-				.getHostInfo("prod-id-count-store-foo", 123, new IntegerSerializer());
-		assertThat(hostInfoFoo).isNull();
-	}
-
-	@EnableBinding(KafkaStreamsProcessor.class)
-	@EnableAutoConfiguration
-	public static class ProductCountApplication {
-
-		@StreamListener("input")
-		@SendTo("output")
-		@SuppressWarnings("deprecation")
-		public KStream<?, String> process(KStream<Object, Product> input) {
-
-			return input.filter((key, product) -> product.getId() == 123)
-					.map((key, value) -> new KeyValue<>(value.id, value))
-					.groupByKey(Serialized.with(new Serdes.IntegerSerde(),
-							new JsonSerde<>(Product.class)))
-					.count(Materialized.as("prod-id-count-store")).toStream()
-					.map((key, value) -> new KeyValue<>(null,
-							"Count for product with ID 123: " + value));
-		}
-
-		@Bean
-		public Foo foo(InteractiveQueryService interactiveQueryService) {
-			return new Foo(interactiveQueryService);
-		}
-
-		static class Foo {
-
-			InteractiveQueryService interactiveQueryService;
-
-			Foo(InteractiveQueryService interactiveQueryService) {
-				this.interactiveQueryService = interactiveQueryService;
-			}
-
-			public Long getProductStock(Integer id) {
-				ReadOnlyKeyValueStore<Object, Object> keyValueStore = interactiveQueryService
-						.getQueryableStore("prod-id-count-store",
-								QueryableStoreTypes.keyValueStore());
-
-				return (Long) keyValueStore.get(id);
-			}
-
-		}
-
-	}
-
-	static class Product {
-
-		Integer id;
-
-		public Integer getId() {
-			return id;
-		}
-
-		public void setId(Integer id) {
-			this.id = id;
-		}
-
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/integration/KafkaStreamsNativeEncodingDecodingTests.java

@@ -1,185 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.integration;
-
-import java.util.Arrays;
-import java.util.Map;
-
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.common.serialization.Serdes;
-import org.apache.kafka.streams.KeyValue;
-import org.apache.kafka.streams.kstream.KStream;
-import org.apache.kafka.streams.kstream.Materialized;
-import org.apache.kafka.streams.kstream.Serialized;
-import org.apache.kafka.streams.kstream.TimeWindows;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.SpyBean;
-import org.springframework.cloud.stream.annotation.EnableBinding;
-import org.springframework.cloud.stream.annotation.StreamListener;
-import org.springframework.cloud.stream.binder.kafka.streams.annotations.KafkaStreamsProcessor;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsApplicationSupportProperties;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.test.EmbeddedKafkaBroker;
-import org.springframework.kafka.test.rule.EmbeddedKafkaRule;
-import org.springframework.kafka.test.utils.KafkaTestUtils;
-import org.springframework.messaging.handler.annotation.SendTo;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-
-/**
- * @author Soby Chacko
- */
-@RunWith(SpringRunner.class)
-@ContextConfiguration
-@DirtiesContext
-public abstract class KafkaStreamsNativeEncodingDecodingTests {
-
-	@ClassRule
-	public static EmbeddedKafkaRule embeddedKafkaRule = new EmbeddedKafkaRule(1, true,
-			"counts");
-
-	private static EmbeddedKafkaBroker embeddedKafka = embeddedKafkaRule
-			.getEmbeddedKafka();
-
-	@SpyBean
-	org.springframework.cloud.stream.binder.kafka.streams.KafkaStreamsMessageConversionDelegate conversionDelegate;
-
-	private static Consumer<String, String> consumer;
-
-	@BeforeClass
-	public static void setUp() {
-		System.setProperty("spring.cloud.stream.kafka.streams.binder.brokers",
-				embeddedKafka.getBrokersAsString());
-		System.setProperty("spring.cloud.stream.kafka.streams.binder.zkNodes",
-				embeddedKafka.getZookeeperConnectionString());
-
-		System.setProperty("server.port", "0");
-		System.setProperty("spring.jmx.enabled", "false");
-
-		Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("group", "false",
-				embeddedKafka);
-		consumerProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-		DefaultKafkaConsumerFactory<String, String> cf = new DefaultKafkaConsumerFactory<>(
-				consumerProps);
-		consumer = cf.createConsumer();
-		embeddedKafka.consumeFromAnEmbeddedTopic(consumer, "counts");
-	}
-
-	@AfterClass
-	public static void tearDown() {
-		consumer.close();
-	}
-
-	@SpringBootTest(properties = {
-			"spring.cloud.stream.bindings.input.consumer.useNativeDecoding=true",
-			"spring.cloud.stream.bindings.output.producer.useNativeEncoding=true",
-			"spring.cloud.stream.kafka.streams.bindings.input.consumer.applicationId"
-					+ "=NativeEncodingDecodingEnabledTests-abc" }, webEnvironment = SpringBootTest.WebEnvironment.NONE)
-	public static class NativeEncodingDecodingEnabledTests
-			extends KafkaStreamsNativeEncodingDecodingTests {
-
-		@Test
-		public void test() throws Exception {
-			Map<String, Object> senderProps = KafkaTestUtils.producerProps(embeddedKafka);
-			DefaultKafkaProducerFactory<Integer, String> pf = new DefaultKafkaProducerFactory<>(
-					senderProps);
-			KafkaTemplate<Integer, String> template = new KafkaTemplate<>(pf, true);
-			template.setDefaultTopic("words");
-			template.sendDefault("foobar");
-			ConsumerRecord<String, String> cr = KafkaTestUtils.getSingleRecord(consumer,
-					"counts");
-			assertThat(cr.value().equals("Count for foobar : 1")).isTrue();
-
-			verify(conversionDelegate, never()).serializeOnOutbound(any(KStream.class));
-			verify(conversionDelegate, never()).deserializeOnInbound(any(Class.class),
-					any(KStream.class));
-		}
-
-	}
-
-	// @checkstyle:off
-	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = "spring.cloud.stream.kafka.streams.bindings.input.consumer.applicationId"
-			+ "=NativeEncodingDecodingEnabledTests-xyz")
-	// @checkstyle:on
-	public static class NativeEncodingDecodingDisabledTests
-			extends KafkaStreamsNativeEncodingDecodingTests {
-
-		@Test
-		public void test() throws Exception {
-			Map<String, Object> senderProps = KafkaTestUtils.producerProps(embeddedKafka);
-			DefaultKafkaProducerFactory<Integer, String> pf = new DefaultKafkaProducerFactory<>(
-					senderProps);
-			KafkaTemplate<Integer, String> template = new KafkaTemplate<>(pf, true);
-			template.setDefaultTopic("words");
-			template.sendDefault("foobar");
-			ConsumerRecord<String, String> cr = KafkaTestUtils.getSingleRecord(consumer,
-					"counts");
-			assertThat(cr.value().equals("Count for foobar : 1")).isTrue();
-
-			verify(conversionDelegate).serializeOnOutbound(any(KStream.class));
-			verify(conversionDelegate).deserializeOnInbound(any(Class.class),
-					any(KStream.class));
-		}
-
-	}
-
-	@EnableBinding(KafkaStreamsProcessor.class)
-	@EnableAutoConfiguration
-	@PropertySource("classpath:/org/springframework/cloud/stream/binder/kstream/integTest-1.properties")
-	@EnableConfigurationProperties(KafkaStreamsApplicationSupportProperties.class)
-	public static class WordCountProcessorApplication {
-
-		@Autowired
-		private TimeWindows timeWindows;
-
-		@StreamListener("input")
-		@SendTo("output")
-		public KStream<?, String> process(KStream<Object, String> input) {
-
-			return input
-					.flatMapValues(
-							value -> Arrays.asList(value.toLowerCase().split("\\W+")))
-					.map((key, value) -> new KeyValue<>(value, value))
-					.groupByKey(Serialized.with(Serdes.String(), Serdes.String()))
-					.windowedBy(timeWindows).count(Materialized.as("foo-WordCounts-x"))
-					.toStream().map((key, value) -> new KeyValue<>(null,
-							"Count for " + key.key() + " : " + value));
-		}
-
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/integration/KafkaStreamsStateStoreIntegrationTests.java

@@ -1,243 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.integration;
-
-import java.util.Map;
-
-import org.apache.kafka.streams.kstream.KStream;
-import org.apache.kafka.streams.processor.Processor;
-import org.apache.kafka.streams.processor.ProcessorContext;
-import org.apache.kafka.streams.state.WindowStore;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.cloud.stream.annotation.EnableBinding;
-import org.springframework.cloud.stream.annotation.Input;
-import org.springframework.cloud.stream.annotation.StreamListener;
-import org.springframework.cloud.stream.binder.kafka.streams.annotations.KafkaStreamsStateStore;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsStateStoreProperties;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.test.EmbeddedKafkaBroker;
-import org.springframework.kafka.test.rule.EmbeddedKafkaRule;
-import org.springframework.kafka.test.utils.KafkaTestUtils;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Lei Chen
- * @author Soby Chacko
- */
-public class KafkaStreamsStateStoreIntegrationTests {
-
-	@ClassRule
-	public static EmbeddedKafkaRule embeddedKafkaRule = new EmbeddedKafkaRule(1, true,
-			"counts-id");
-
-	private static EmbeddedKafkaBroker embeddedKafka = embeddedKafkaRule
-			.getEmbeddedKafka();
-
-	@Test
-	public void testKstreamStateStore() throws Exception {
-		SpringApplication app = new SpringApplication(ProductCountApplication.class);
-		app.setWebApplicationType(WebApplicationType.NONE);
-		ConfigurableApplicationContext context = app.run("--server.port=0",
-				"--spring.jmx.enabled=false",
-				"--spring.cloud.stream.bindings.input.destination=foobar",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.commit.interval.ms=1000",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.key.serde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.value.serde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.input.consumer.applicationId"
-						+ "=KafkaStreamsStateStoreIntegrationTests-abc",
-				"--spring.cloud.stream.kafka.streams.binder.brokers="
-						+ embeddedKafka.getBrokersAsString(),
-				"--spring.cloud.stream.kafka.streams.binder.zkNodes="
-						+ embeddedKafka.getZookeeperConnectionString());
-		try {
-			Thread.sleep(2000);
-			receiveAndValidateFoo(context);
-		}
-		catch (Exception e) {
-			throw e;
-		}
-		finally {
-			context.close();
-		}
-	}
-
-	@Test
-	public void testSameStateStoreIsCreatedOnlyOnceWhenMultipleInputBindingsArePresent() throws Exception {
-		SpringApplication app = new SpringApplication(ProductCountApplicationWithMultipleInputBindings.class);
-		app.setWebApplicationType(WebApplicationType.NONE);
-		ConfigurableApplicationContext context = app.run("--server.port=0",
-				"--spring.jmx.enabled=false",
-				"--spring.cloud.stream.bindings.input.destination=foobar",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.commit.interval.ms=1000",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.key.serde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.value.serde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.input1.consumer.applicationId"
-						+ "=KafkaStreamsStateStoreIntegrationTests-abc",
-				"--spring.cloud.stream.kafka.streams.binder.brokers="
-						+ embeddedKafka.getBrokersAsString(),
-				"--spring.cloud.stream.kafka.streams.binder.zkNodes="
-						+ embeddedKafka.getZookeeperConnectionString());
-		try {
-			Thread.sleep(2000);
-			// We are not particularly interested in querying the state store here, as that is verified by the other test
-			// in this class. This test verifies that the same store is not attempted to be created by multiple input bindings.
-			// Normally, that will cause an exception to be thrown. However by not getting any exceptions, we are verifying
-			// that the binder is handling it appropriately.
-			//For more info, see this issue: https://github.com/spring-cloud/spring-cloud-stream-binder-kafka/issues/551
-		}
-		catch (Exception e) {
-			throw e;
-		}
-		finally {
-			context.close();
-		}
-	}
-
-	private void receiveAndValidateFoo(ConfigurableApplicationContext context)
-			throws Exception {
-		Map<String, Object> senderProps = KafkaTestUtils.producerProps(embeddedKafka);
-		DefaultKafkaProducerFactory<Integer, String> pf = new DefaultKafkaProducerFactory<>(
-				senderProps);
-		KafkaTemplate<Integer, String> template = new KafkaTemplate<>(pf, true);
-		template.setDefaultTopic("foobar");
-		template.sendDefault("{\"id\":\"123\"}");
-		Thread.sleep(1000);
-
-		// assertions
-		ProductCountApplication productCount = context
-				.getBean(ProductCountApplication.class);
-		WindowStore<Object, String> state = productCount.state;
-		assertThat(state != null).isTrue();
-		assertThat(state.name()).isEqualTo("mystate");
-		assertThat(state.persistent()).isTrue();
-		assertThat(productCount.processed).isTrue();
-	}
-
-	@EnableBinding(KafkaStreamsProcessorX.class)
-	@EnableAutoConfiguration
-	public static class ProductCountApplication {
-
-		WindowStore<Object, String> state;
-
-		boolean processed;
-
-		@StreamListener("input")
-		@KafkaStreamsStateStore(name = "mystate", type = KafkaStreamsStateStoreProperties.StoreType.WINDOW, lengthMs = 300000)
-		@SuppressWarnings({ "deprecation", "unchecked" })
-		public void process(KStream<Object, Product> input) {
-
-			input.process(() -> new Processor<Object, Product>() {
-
-				@Override
-				public void init(ProcessorContext processorContext) {
-					state = (WindowStore) processorContext.getStateStore("mystate");
-				}
-
-				@Override
-				public void process(Object s, Product product) {
-					processed = true;
-				}
-
-				@Override
-				public void close() {
-					if (state != null) {
-						state.close();
-					}
-				}
-			}, "mystate");
-		}
-	}
-
-	@EnableBinding(KafkaStreamsProcessorY.class)
-	@EnableAutoConfiguration
-	public static class ProductCountApplicationWithMultipleInputBindings {
-
-		WindowStore<Object, String> state;
-
-		boolean processed;
-
-		@StreamListener
-		@KafkaStreamsStateStore(name = "mystate", type = KafkaStreamsStateStoreProperties.StoreType.WINDOW, lengthMs = 300000)
-		@SuppressWarnings({ "deprecation", "unchecked" })
-		public void process(@Input("input1")KStream<Object, Product> input, @Input("input2")KStream<Object, Product> input2) {
-
-			input.process(() -> new Processor<Object, Product>() {
-
-				@Override
-				public void init(ProcessorContext processorContext) {
-					state = (WindowStore) processorContext.getStateStore("mystate");
-				}
-
-				@Override
-				public void process(Object s, Product product) {
-					processed = true;
-				}
-
-				@Override
-				public void close() {
-					if (state != null) {
-						state.close();
-					}
-				}
-			}, "mystate");
-
-			//simple use of input2, we are not using input2 for anything other than triggering some test behavior.
-			input2.foreach((key, value) -> { });
-		}
-	}
-
-	public static class Product {
-
-		Integer id;
-
-		public Integer getId() {
-			return id;
-		}
-
-		public void setId(Integer id) {
-			this.id = id;
-		}
-
-	}
-
-	interface KafkaStreamsProcessorX {
-
-		@Input("input")
-		KStream<?, ?> input();
-	}
-
-	interface KafkaStreamsProcessorY {
-
-		@Input("input1")
-		KStream<?, ?> input1();
-
-		@Input("input2")
-		KStream<?, ?> input2();
-	}
-}

spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/integration/MultiProcessorsWithSameNameTests.java

@@ -1,105 +0,0 @@
-/*
- * Copyright 2019-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.integration;
-
-import org.apache.kafka.streams.kstream.KStream;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.stream.annotation.EnableBinding;
-import org.springframework.cloud.stream.annotation.Input;
-import org.springframework.cloud.stream.annotation.StreamListener;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsApplicationSupportProperties;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.kafka.config.StreamsBuilderFactoryBean;
-import org.springframework.kafka.test.EmbeddedKafkaBroker;
-import org.springframework.kafka.test.rule.EmbeddedKafkaRule;
-import org.springframework.stereotype.Component;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class MultiProcessorsWithSameNameTests {
-
-	@ClassRule
-	public static EmbeddedKafkaRule embeddedKafkaRule = new EmbeddedKafkaRule(1, true,
-			"counts");
-
-	private static EmbeddedKafkaBroker embeddedKafka = embeddedKafkaRule
-			.getEmbeddedKafka();
-
-	@Test
-	public void testBinderStartsSuccessfullyWhenTwoProcessorsWithSameNamesArePresent() {
-		SpringApplication app = new SpringApplication(
-				MultiProcessorsWithSameNameTests.WordCountProcessorApplication.class);
-		app.setWebApplicationType(WebApplicationType.NONE);
-
-		try (ConfigurableApplicationContext context = app.run("--server.port=0",
-				"--spring.jmx.enabled=false",
-				"--spring.cloud.stream.bindings.input.destination=words",
-				"--spring.cloud.stream.bindings.input-2.destination=words",
-				"--spring.cloud.stream.bindings.output.destination=counts",
-				"--spring.cloud.stream.bindings.output.contentType=application/json",
-				"--spring.cloud.stream.kafka.streams.bindings.input-1.consumer.application-id=basic-word-count",
-				"--spring.cloud.stream.kafka.streams.bindings.input-2.consumer.application-id=basic-word-count-1",
-				"--spring.cloud.stream.kafka.streams.binder.brokers="
-						+ embeddedKafka.getBrokersAsString(),
-				"--spring.cloud.stream.kafka.streams.binder.zkNodes="
-						+ embeddedKafka.getZookeeperConnectionString())) {
-			StreamsBuilderFactoryBean streamsBuilderFactoryBean1 = context
-					.getBean("&stream-builder-Foo-process", StreamsBuilderFactoryBean.class);
-			assertThat(streamsBuilderFactoryBean1).isNotNull();
-			StreamsBuilderFactoryBean streamsBuilderFactoryBean2 = context
-					.getBean("&stream-builder-Bar-process", StreamsBuilderFactoryBean.class);
-			assertThat(streamsBuilderFactoryBean2).isNotNull();
-		}
-	}
-
-	@EnableBinding(KafkaStreamsProcessorX.class)
-	@EnableAutoConfiguration
-	@EnableConfigurationProperties(KafkaStreamsApplicationSupportProperties.class)
-	static class WordCountProcessorApplication {
-
-		@Component
-		static class Foo {
-			@StreamListener
-			public void process(@Input("input-1") KStream<Object, String> input) {
-			}
-		}
-
-		//Second class with a stub processor that has the same name as above ("process")
-		@Component
-		static class Bar {
-			@StreamListener
-			public void process(@Input("input-2") KStream<Object, String> input) {
-			}
-		}
-	}
-
-	interface KafkaStreamsProcessorX {
-
-		@Input("input-1")
-		KStream<?, ?> input1();
-
-		@Input("input-2")
-		KStream<?, ?> input2();
-
-	}
-}

spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/integration/PerRecordAvroContentTypeTests.java

@@ -1,182 +0,0 @@
-/*
- * Copyright 2017-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.integration;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.Random;
-import java.util.UUID;
-
-import com.example.Sensor;
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.producer.ProducerConfig;
-import org.apache.kafka.common.serialization.ByteArrayDeserializer;
-import org.apache.kafka.streams.KeyValue;
-import org.apache.kafka.streams.kstream.KStream;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.cloud.stream.annotation.EnableBinding;
-import org.springframework.cloud.stream.annotation.Input;
-import org.springframework.cloud.stream.annotation.StreamListener;
-import org.springframework.cloud.stream.annotation.StreamMessageConverter;
-import org.springframework.cloud.stream.binder.kafka.streams.annotations.KafkaStreamsProcessor;
-import org.springframework.cloud.stream.binder.kafka.streams.integration.utils.TestAvroSerializer;
-import org.springframework.cloud.stream.schema.avro.AvroSchemaMessageConverter;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.test.EmbeddedKafkaBroker;
-import org.springframework.kafka.test.rule.EmbeddedKafkaRule;
-import org.springframework.kafka.test.utils.KafkaTestUtils;
-import org.springframework.messaging.Message;
-import org.springframework.messaging.converter.MessageConverter;
-import org.springframework.messaging.handler.annotation.SendTo;
-import org.springframework.messaging.support.MessageBuilder;
-import org.springframework.util.MimeTypeUtils;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Soby Chacko
- */
-public class PerRecordAvroContentTypeTests {
-
-	@ClassRule
-	public static EmbeddedKafkaRule embeddedKafkaRule = new EmbeddedKafkaRule(1, true,
-			"received-sensors");
-
-	private static EmbeddedKafkaBroker embeddedKafka = embeddedKafkaRule
-			.getEmbeddedKafka();
-
-	private static Consumer<String, byte[]> consumer;
-
-	@BeforeClass
-	public static void setUp() throws Exception {
-		Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("avro-ct-test",
-				"false", embeddedKafka);
-
-		// Receive the data as byte[]
-		consumerProps.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
-				ByteArrayDeserializer.class);
-
-		consumerProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-		DefaultKafkaConsumerFactory<String, byte[]> cf = new DefaultKafkaConsumerFactory<>(
-				consumerProps);
-		consumer = cf.createConsumer();
-		embeddedKafka.consumeFromAnEmbeddedTopic(consumer, "received-sensors");
-	}
-
-	@AfterClass
-	public static void tearDown() {
-		consumer.close();
-	}
-
-	@Test
-	public void testPerRecordAvroConentTypeAndVerifySerialization() throws Exception {
-		SpringApplication app = new SpringApplication(SensorCountAvroApplication.class);
-		app.setWebApplicationType(WebApplicationType.NONE);
-
-		try (ConfigurableApplicationContext ignored = app.run("--server.port=0",
-				"--spring.jmx.enabled=false",
-				"--spring.cloud.stream.bindings.input.destination=sensors",
-				"--spring.cloud.stream.bindings.output.destination=received-sensors",
-				"--spring.cloud.stream.bindings.output.contentType=application/avro",
-				"--spring.cloud.stream.kafka.streams.bindings.input.consumer.application-id=per-record-avro-contentType-test",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.commit.interval.ms=1000",
-				"--spring.cloud.stream.kafka.streams.binder.brokers="
-						+ embeddedKafka.getBrokersAsString())) {
-
-			Map<String, Object> senderProps = KafkaTestUtils.producerProps(embeddedKafka);
-			// Use a custom avro test serializer
-			senderProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,
-					TestAvroSerializer.class);
-			DefaultKafkaProducerFactory<Integer, Sensor> pf = new DefaultKafkaProducerFactory<>(
-					senderProps);
-			try {
-				KafkaTemplate<Integer, Sensor> template = new KafkaTemplate<>(pf, true);
-
-				Random random = new Random();
-				Sensor sensor = new Sensor();
-				sensor.setId(UUID.randomUUID().toString() + "-v1");
-				sensor.setAcceleration(random.nextFloat() * 10);
-				sensor.setVelocity(random.nextFloat() * 100);
-				sensor.setTemperature(random.nextFloat() * 50);
-				// Send with avro content type set.
-				Message<?> message = MessageBuilder.withPayload(sensor)
-						.setHeader("contentType", "application/avro").build();
-				template.setDefaultTopic("sensors");
-				template.send(message);
-
-				// Serialized byte[] ^^ is received by the binding process and deserialzed
-				// it using avro converter.
-				// Then finally, the data will be output to a return topic as byte[]
-				// (using the same avro converter).
-
-				// Receive the byte[] from return topic
-				ConsumerRecord<String, byte[]> cr = KafkaTestUtils
-						.getSingleRecord(consumer, "received-sensors");
-				final byte[] value = cr.value();
-
-				// Convert the byte[] received back to avro object and verify that it is
-				// the same as the one we sent ^^.
-				AvroSchemaMessageConverter avroSchemaMessageConverter = new AvroSchemaMessageConverter();
-
-				Message<?> receivedMessage = MessageBuilder.withPayload(value)
-						.setHeader("contentType",
-								MimeTypeUtils.parseMimeType("application/avro"))
-						.build();
-				Sensor messageConverted = (Sensor) avroSchemaMessageConverter
-						.fromMessage(receivedMessage, Sensor.class);
-				assertThat(messageConverted).isEqualTo(sensor);
-			}
-			finally {
-				pf.destroy();
-			}
-		}
-	}
-
-	@EnableBinding(KafkaStreamsProcessor.class)
-	@EnableAutoConfiguration
-	static class SensorCountAvroApplication {
-
-		@StreamListener
-		@SendTo("output")
-		public KStream<?, Sensor> process(@Input("input") KStream<Object, Sensor> input) {
-			// return the same Sensor object unchanged so that we can do test
-			// verifications
-			return input.map(KeyValue::new);
-		}
-
-		@Bean
-		@StreamMessageConverter
-		public MessageConverter sensorMessageConverter() throws IOException {
-			return new AvroSchemaMessageConverter();
-		}
-
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/integration/StreamToGlobalKTableJoinIntegrationTests.java

@@ -1,391 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.integration;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.ConsumerRecords;
-import org.apache.kafka.clients.producer.ProducerConfig;
-import org.apache.kafka.common.serialization.LongDeserializer;
-import org.apache.kafka.common.serialization.LongSerializer;
-import org.apache.kafka.streams.KeyValue;
-import org.apache.kafka.streams.kstream.GlobalKTable;
-import org.apache.kafka.streams.kstream.KStream;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.stream.annotation.EnableBinding;
-import org.springframework.cloud.stream.annotation.Input;
-import org.springframework.cloud.stream.annotation.StreamListener;
-import org.springframework.cloud.stream.binder.kafka.streams.annotations.KafkaStreamsProcessor;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsApplicationSupportProperties;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.support.serializer.JsonDeserializer;
-import org.springframework.kafka.support.serializer.JsonSerde;
-import org.springframework.kafka.test.EmbeddedKafkaBroker;
-import org.springframework.kafka.test.rule.EmbeddedKafkaRule;
-import org.springframework.kafka.test.utils.KafkaTestUtils;
-import org.springframework.messaging.handler.annotation.SendTo;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Soby Chacko
- */
-public class StreamToGlobalKTableJoinIntegrationTests {
-
-	@ClassRule
-	public static EmbeddedKafkaRule embeddedKafkaRule = new EmbeddedKafkaRule(1, true,
-			"enriched-order");
-
-	private static EmbeddedKafkaBroker embeddedKafka = embeddedKafkaRule
-			.getEmbeddedKafka();
-
-	private static Consumer<Long, EnrichedOrder> consumer;
-
-	@Test
-	public void testStreamToGlobalKTable() throws Exception {
-		SpringApplication app = new SpringApplication(
-				StreamToGlobalKTableJoinIntegrationTests.OrderEnricherApplication.class);
-		app.setWebApplicationType(WebApplicationType.NONE);
-		try (ConfigurableApplicationContext ignored = app.run("--server.port=0",
-				"--spring.jmx.enabled=false",
-				"--spring.cloud.stream.bindings.input.destination=orders",
-				"--spring.cloud.stream.bindings.input-x.destination=customers",
-				"--spring.cloud.stream.bindings.input-y.destination=products",
-				"--spring.cloud.stream.bindings.output.destination=enriched-order",
-				"--spring.cloud.stream.bindings.input.consumer.useNativeDecoding=true",
-				"--spring.cloud.stream.bindings.input-x.consumer.useNativeDecoding=true",
-				"--spring.cloud.stream.bindings.input-y.consumer.useNativeDecoding=true",
-				"--spring.cloud.stream.bindings.output.producer.useNativeEncoding=true",
-				"--spring.cloud.stream.kafka.streams.bindings.input.consumer.keySerde"
-						+ "=org.apache.kafka.common.serialization.Serdes$LongSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.input.consumer.valueSerde"
-						+ "=org.springframework.cloud.stream.binder.kafka.streams.integration"
-						+ ".StreamToGlobalKTableJoinIntegrationTests$OrderSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.input-x.consumer.keySerde"
-						+ "=org.apache.kafka.common.serialization.Serdes$LongSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.input-x.consumer.valueSerde"
-						+ "=org.springframework.cloud.stream.binder.kafka.streams.integration."
-						+ "StreamToGlobalKTableJoinIntegrationTests$CustomerSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.input-y.consumer.keySerde"
-						+ "=org.apache.kafka.common.serialization.Serdes$LongSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.input-y.consumer.valueSerde"
-						+ "=org.springframework.cloud.stream.binder.kafka.streams."
-						+ "integration.StreamToGlobalKTableJoinIntegrationTests$ProductSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.output.producer.keySerde"
-						+ "=org.apache.kafka.common.serialization.Serdes$LongSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.output.producer.valueSerde"
-						+ "=org.springframework.cloud.stream.binder.kafka.streams.integration"
-						+ ".StreamToGlobalKTableJoinIntegrationTests$EnrichedOrderSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.key.serde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.value.serde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.commit.interval.ms=10000",
-				"--spring.cloud.stream.kafka.streams.bindings.input.consumer.applicationId"
-						+ "=StreamToGlobalKTableJoinIntegrationTests-abc",
-				"--spring.cloud.stream.kafka.streams.binder.brokers="
-						+ embeddedKafka.getBrokersAsString(),
-				"--spring.cloud.stream.kafka.streams.binder.zkNodes="
-						+ embeddedKafka.getZookeeperConnectionString())) {
-			Map<String, Object> senderPropsCustomer = KafkaTestUtils
-					.producerProps(embeddedKafka);
-			senderPropsCustomer.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG,
-					LongSerializer.class);
-			CustomerSerde customerSerde = new CustomerSerde();
-			senderPropsCustomer.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,
-					customerSerde.serializer().getClass());
-
-			DefaultKafkaProducerFactory<Long, Customer> pfCustomer = new DefaultKafkaProducerFactory<>(
-					senderPropsCustomer);
-			KafkaTemplate<Long, Customer> template = new KafkaTemplate<>(pfCustomer,
-					true);
-			template.setDefaultTopic("customers");
-			for (long i = 0; i < 5; i++) {
-				final Customer customer = new Customer();
-				customer.setName("customer-" + i);
-				template.sendDefault(i, customer);
-			}
-
-			Map<String, Object> senderPropsProduct = KafkaTestUtils
-					.producerProps(embeddedKafka);
-			senderPropsProduct.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG,
-					LongSerializer.class);
-			ProductSerde productSerde = new ProductSerde();
-			senderPropsProduct.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,
-					productSerde.serializer().getClass());
-
-			DefaultKafkaProducerFactory<Long, Product> pfProduct = new DefaultKafkaProducerFactory<>(
-					senderPropsProduct);
-			KafkaTemplate<Long, Product> productTemplate = new KafkaTemplate<>(pfProduct,
-					true);
-			productTemplate.setDefaultTopic("products");
-
-			for (long i = 0; i < 5; i++) {
-				final Product product = new Product();
-				product.setName("product-" + i);
-				productTemplate.sendDefault(i, product);
-			}
-
-			Map<String, Object> senderPropsOrder = KafkaTestUtils
-					.producerProps(embeddedKafka);
-			senderPropsOrder.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG,
-					LongSerializer.class);
-			OrderSerde orderSerde = new OrderSerde();
-			senderPropsOrder.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,
-					orderSerde.serializer().getClass());
-
-			DefaultKafkaProducerFactory<Long, Order> pfOrder = new DefaultKafkaProducerFactory<>(
-					senderPropsOrder);
-			KafkaTemplate<Long, Order> orderTemplate = new KafkaTemplate<>(pfOrder, true);
-			orderTemplate.setDefaultTopic("orders");
-
-			for (long i = 0; i < 5; i++) {
-				final Order order = new Order();
-				order.setCustomerId(i);
-				order.setProductId(i);
-				orderTemplate.sendDefault(i, order);
-			}
-
-			Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("group",
-					"false", embeddedKafka);
-			consumerProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-			consumerProps.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG,
-					LongDeserializer.class);
-			EnrichedOrderSerde enrichedOrderSerde = new EnrichedOrderSerde();
-			consumerProps.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
-					enrichedOrderSerde.deserializer().getClass());
-			consumerProps.put(JsonDeserializer.VALUE_DEFAULT_TYPE,
-					"org.springframework.cloud.stream.binder.kafka.streams.integration."
-							+ "StreamToGlobalKTableJoinIntegrationTests.EnrichedOrder");
-			DefaultKafkaConsumerFactory<Long, EnrichedOrder> cf = new DefaultKafkaConsumerFactory<>(
-					consumerProps);
-
-			consumer = cf.createConsumer();
-			embeddedKafka.consumeFromAnEmbeddedTopic(consumer, "enriched-order");
-
-			int count = 0;
-			long start = System.currentTimeMillis();
-			List<KeyValue<Long, EnrichedOrder>> enrichedOrders = new ArrayList<>();
-			do {
-				ConsumerRecords<Long, EnrichedOrder> records = KafkaTestUtils
-						.getRecords(consumer);
-				count = count + records.count();
-				for (ConsumerRecord<Long, EnrichedOrder> record : records) {
-					enrichedOrders.add(new KeyValue<>(record.key(), record.value()));
-				}
-			}
-			while (count < 5 && (System.currentTimeMillis() - start) < 30000);
-
-			assertThat(count == 5).isTrue();
-			assertThat(enrichedOrders.size() == 5).isTrue();
-
-			enrichedOrders.sort(Comparator.comparing(o -> o.key));
-
-			for (int i = 0; i < 5; i++) {
-				KeyValue<Long, EnrichedOrder> enrichedOrderKeyValue = enrichedOrders
-						.get(i);
-				assertThat(enrichedOrderKeyValue.key == i).isTrue();
-				EnrichedOrder enrichedOrder = enrichedOrderKeyValue.value;
-				assertThat(enrichedOrder.getOrder().customerId == i).isTrue();
-				assertThat(enrichedOrder.getOrder().productId == i).isTrue();
-				assertThat(enrichedOrder.getCustomer().name.equals("customer-" + i))
-						.isTrue();
-				assertThat(enrichedOrder.getProduct().name.equals("product-" + i))
-						.isTrue();
-			}
-			pfCustomer.destroy();
-			pfProduct.destroy();
-			pfOrder.destroy();
-			consumer.close();
-		}
-
-	}
-
-	interface CustomGlobalKTableProcessor extends KafkaStreamsProcessor {
-
-		@Input("input-x")
-		GlobalKTable<?, ?> inputX();
-
-		@Input("input-y")
-		GlobalKTable<?, ?> inputY();
-
-	}
-
-	@EnableBinding(CustomGlobalKTableProcessor.class)
-	@EnableAutoConfiguration
-	@EnableConfigurationProperties(KafkaStreamsApplicationSupportProperties.class)
-	public static class OrderEnricherApplication {
-
-		@StreamListener
-		@SendTo("output")
-		public KStream<Long, EnrichedOrder> process(
-				@Input("input") KStream<Long, Order> ordersStream,
-				@Input("input-x") GlobalKTable<Long, Customer> customers,
-				@Input("input-y") GlobalKTable<Long, Product> products) {
-
-			KStream<Long, CustomerOrder> customerOrdersStream = ordersStream.join(
-					customers, (orderId, order) -> order.getCustomerId(),
-					(order, customer) -> new CustomerOrder(customer, order));
-
-			return customerOrdersStream.join(products,
-					(orderId, customerOrder) -> customerOrder.productId(),
-					(customerOrder, product) -> {
-						EnrichedOrder enrichedOrder = new EnrichedOrder();
-						enrichedOrder.setProduct(product);
-						enrichedOrder.setCustomer(customerOrder.customer);
-						enrichedOrder.setOrder(customerOrder.order);
-						return enrichedOrder;
-					});
-		}
-
-	}
-
-	static class Order {
-
-		long customerId;
-
-		long productId;
-
-		public long getCustomerId() {
-			return customerId;
-		}
-
-		public void setCustomerId(long customerId) {
-			this.customerId = customerId;
-		}
-
-		public long getProductId() {
-			return productId;
-		}
-
-		public void setProductId(long productId) {
-			this.productId = productId;
-		}
-
-	}
-
-	static class Customer {
-
-		String name;
-
-		public String getName() {
-			return name;
-		}
-
-		public void setName(String name) {
-			this.name = name;
-		}
-
-	}
-
-	static class Product {
-
-		String name;
-
-		public String getName() {
-			return name;
-		}
-
-		public void setName(String name) {
-			this.name = name;
-		}
-
-	}
-
-	static class EnrichedOrder {
-
-		Product product;
-
-		Customer customer;
-
-		Order order;
-
-		public Product getProduct() {
-			return product;
-		}
-
-		public void setProduct(Product product) {
-			this.product = product;
-		}
-
-		public Customer getCustomer() {
-			return customer;
-		}
-
-		public void setCustomer(Customer customer) {
-			this.customer = customer;
-		}
-
-		public Order getOrder() {
-			return order;
-		}
-
-		public void setOrder(Order order) {
-			this.order = order;
-		}
-
-	}
-
-	private static class CustomerOrder {
-
-		private final Customer customer;
-
-		private final Order order;
-
-		CustomerOrder(final Customer customer, final Order order) {
-			this.customer = customer;
-			this.order = order;
-		}
-
-		long productId() {
-			return order.getProductId();
-		}
-
-	}
-
-	public static class OrderSerde extends JsonSerde<Order> {
-
-	}
-
-	public static class CustomerSerde extends JsonSerde<Customer> {
-
-	}
-
-	public static class ProductSerde extends JsonSerde<Product> {
-
-	}
-
-	public static class EnrichedOrderSerde extends JsonSerde<EnrichedOrder> {
-
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/integration/StreamToTableJoinIntegrationTests.java

@@ -1,439 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.integration;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.ConsumerRecords;
-import org.apache.kafka.clients.producer.ProducerConfig;
-import org.apache.kafka.common.serialization.LongDeserializer;
-import org.apache.kafka.common.serialization.LongSerializer;
-import org.apache.kafka.common.serialization.Serdes;
-import org.apache.kafka.common.serialization.StringDeserializer;
-import org.apache.kafka.common.serialization.StringSerializer;
-import org.apache.kafka.streams.KeyValue;
-import org.apache.kafka.streams.kstream.Joined;
-import org.apache.kafka.streams.kstream.KStream;
-import org.apache.kafka.streams.kstream.KTable;
-import org.apache.kafka.streams.kstream.Serialized;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.stream.annotation.EnableBinding;
-import org.springframework.cloud.stream.annotation.Input;
-import org.springframework.cloud.stream.annotation.StreamListener;
-import org.springframework.cloud.stream.binder.kafka.streams.annotations.KafkaStreamsProcessor;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsApplicationSupportProperties;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.test.EmbeddedKafkaBroker;
-import org.springframework.kafka.test.rule.EmbeddedKafkaRule;
-import org.springframework.kafka.test.utils.KafkaTestUtils;
-import org.springframework.messaging.handler.annotation.SendTo;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Soby Chacko
- */
-public class StreamToTableJoinIntegrationTests {
-
-	@ClassRule
-	public static EmbeddedKafkaRule embeddedKafkaRule = new EmbeddedKafkaRule(1, true,
-			"output-topic-1", "output-topic-2");
-
-	private static EmbeddedKafkaBroker embeddedKafka = embeddedKafkaRule
-			.getEmbeddedKafka();
-
-	@Test
-	public void testStreamToTable() throws Exception {
-		SpringApplication app = new SpringApplication(
-				CountClicksPerRegionApplication.class);
-		app.setWebApplicationType(WebApplicationType.NONE);
-
-		Consumer<String, Long> consumer;
-		Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("group-1",
-				"false", embeddedKafka);
-		consumerProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-		consumerProps.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG,
-				StringDeserializer.class);
-		consumerProps.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
-				LongDeserializer.class);
-		DefaultKafkaConsumerFactory<String, Long> cf = new DefaultKafkaConsumerFactory<>(
-				consumerProps);
-		consumer = cf.createConsumer();
-		embeddedKafka.consumeFromAnEmbeddedTopic(consumer, "output-topic-1");
-
-		try (ConfigurableApplicationContext ignored = app.run("--server.port=0",
-				"--spring.jmx.enabled=false",
-				"--spring.cloud.stream.bindings.input.destination=user-clicks-1",
-				"--spring.cloud.stream.bindings.input-x.destination=user-regions-1",
-				"--spring.cloud.stream.bindings.output.destination=output-topic-1",
-				"--spring.cloud.stream.bindings.input.consumer.useNativeDecoding=true",
-				"--spring.cloud.stream.bindings.input-x.consumer.useNativeDecoding=true",
-				"--spring.cloud.stream.bindings.output.producer.useNativeEncoding=true",
-				"--spring.cloud.stream.kafka.streams.bindings.input.consumer.keySerde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.input.consumer.valueSerde"
-						+ "=org.apache.kafka.common.serialization.Serdes$LongSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.inputX.consumer.keySerde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.inputX.consumer.valueSerde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.output.producer.keySerde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.output.producer.valueSerde"
-						+ "=org.apache.kafka.common.serialization.Serdes$LongSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.key.serde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.value.serde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.commit.interval.ms=10000",
-				"--spring.cloud.stream.kafka.streams.bindings.input.consumer.applicationId"
-						+ "=StreamToTableJoinIntegrationTests-abc",
-				"--spring.cloud.stream.kafka.streams.binder.brokers="
-						+ embeddedKafka.getBrokersAsString(),
-				"--spring.cloud.stream.kafka.streams.binder.zkNodes="
-						+ embeddedKafka.getZookeeperConnectionString())) {
-
-			// Input 1: Region per user (multiple records allowed per user).
-			List<KeyValue<String, String>> userRegions = Arrays.asList(new KeyValue<>(
-					"alice", "asia"), /* Alice lived in Asia originally... */
-					new KeyValue<>("bob", "americas"), new KeyValue<>("chao", "asia"),
-					new KeyValue<>("dave", "europe"), new KeyValue<>("alice",
-							"europe"), /* ...but moved to Europe some time later. */
-					new KeyValue<>("eve", "americas"), new KeyValue<>("fang", "asia"));
-
-			Map<String, Object> senderProps1 = KafkaTestUtils
-					.producerProps(embeddedKafka);
-			senderProps1.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG,
-					StringSerializer.class);
-			senderProps1.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,
-					StringSerializer.class);
-
-			DefaultKafkaProducerFactory<String, String> pf1 = new DefaultKafkaProducerFactory<>(
-					senderProps1);
-			KafkaTemplate<String, String> template1 = new KafkaTemplate<>(pf1, true);
-			template1.setDefaultTopic("user-regions-1");
-
-			for (KeyValue<String, String> keyValue : userRegions) {
-				template1.sendDefault(keyValue.key, keyValue.value);
-			}
-
-			// Input 2: Clicks per user (multiple records allowed per user).
-			List<KeyValue<String, Long>> userClicks = Arrays.asList(
-					new KeyValue<>("alice", 13L), new KeyValue<>("bob", 4L),
-					new KeyValue<>("chao", 25L), new KeyValue<>("bob", 19L),
-					new KeyValue<>("dave", 56L), new KeyValue<>("eve", 78L),
-					new KeyValue<>("alice", 40L), new KeyValue<>("fang", 99L));
-
-			Map<String, Object> senderProps = KafkaTestUtils.producerProps(embeddedKafka);
-			senderProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG,
-					StringSerializer.class);
-			senderProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,
-					LongSerializer.class);
-
-			DefaultKafkaProducerFactory<String, Long> pf = new DefaultKafkaProducerFactory<>(
-					senderProps);
-			KafkaTemplate<String, Long> template = new KafkaTemplate<>(pf, true);
-			template.setDefaultTopic("user-clicks-1");
-
-			for (KeyValue<String, Long> keyValue : userClicks) {
-				template.sendDefault(keyValue.key, keyValue.value);
-			}
-
-			List<KeyValue<String, Long>> expectedClicksPerRegion = Arrays.asList(
-					new KeyValue<>("americas", 101L), new KeyValue<>("europe", 109L),
-					new KeyValue<>("asia", 124L));
-
-			// Verify that we receive the expected data
-			int count = 0;
-			long start = System.currentTimeMillis();
-			List<KeyValue<String, Long>> actualClicksPerRegion = new ArrayList<>();
-			do {
-				ConsumerRecords<String, Long> records = KafkaTestUtils
-						.getRecords(consumer);
-				count = count + records.count();
-				for (ConsumerRecord<String, Long> record : records) {
-					actualClicksPerRegion
-							.add(new KeyValue<>(record.key(), record.value()));
-				}
-			}
-			while (count < expectedClicksPerRegion.size()
-					&& (System.currentTimeMillis() - start) < 30000);
-
-			assertThat(count == expectedClicksPerRegion.size()).isTrue();
-			assertThat(actualClicksPerRegion).hasSameElementsAs(expectedClicksPerRegion);
-		}
-		finally {
-			consumer.close();
-		}
-	}
-
-	@Test
-	public void testGlobalStartOffsetWithLatestAndIndividualBindingWthEarliest()
-			throws Exception {
-		SpringApplication app = new SpringApplication(
-				CountClicksPerRegionApplication.class);
-		app.setWebApplicationType(WebApplicationType.NONE);
-
-		Consumer<String, Long> consumer;
-		Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("group-2",
-				"false", embeddedKafka);
-		consumerProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-		consumerProps.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG,
-				StringDeserializer.class);
-		consumerProps.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
-				LongDeserializer.class);
-		DefaultKafkaConsumerFactory<String, Long> cf = new DefaultKafkaConsumerFactory<>(
-				consumerProps);
-		consumer = cf.createConsumer();
-		embeddedKafka.consumeFromAnEmbeddedTopic(consumer, "output-topic-2");
-
-		// Produce data first to the input topic to test the startOffset setting on the
-		// binding (which is set to earliest below).
-		// Input 1: Clicks per user (multiple records allowed per user).
-		List<KeyValue<String, Long>> userClicks = Arrays.asList(
-				new KeyValue<>("alice", 100L), new KeyValue<>("alice", 100L),
-				new KeyValue<>("alice", 100L), new KeyValue<>("alice", 100L),
-				new KeyValue<>("alice", 100L), new KeyValue<>("alice", 100L),
-				new KeyValue<>("alice", 100L), new KeyValue<>("alice", 100L),
-				new KeyValue<>("alice", 100L), new KeyValue<>("alice", 100L));
-
-		Map<String, Object> senderProps = KafkaTestUtils.producerProps(embeddedKafka);
-		senderProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG,
-				StringSerializer.class);
-		senderProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,
-				LongSerializer.class);
-
-		DefaultKafkaProducerFactory<String, Long> pf = new DefaultKafkaProducerFactory<>(
-				senderProps);
-		KafkaTemplate<String, Long> template = new KafkaTemplate<>(pf, true);
-		template.setDefaultTopic("user-clicks-2");
-
-		for (KeyValue<String, Long> keyValue : userClicks) {
-			template.sendDefault(keyValue.key, keyValue.value);
-		}
-		// Thread.sleep(10000L);
-		try (ConfigurableApplicationContext ignored = app.run("--server.port=0",
-				"--spring.jmx.enabled=false",
-				"--spring.cloud.stream.bindings.input.destination=user-clicks-2",
-				"--spring.cloud.stream.bindings.input-x.destination=user-regions-2",
-				"--spring.cloud.stream.bindings.output.destination=output-topic-2",
-				"--spring.cloud.stream.bindings.input.consumer.useNativeDecoding=true",
-				"--spring.cloud.stream.bindings.input-x.consumer.useNativeDecoding=true",
-				"--spring.cloud.stream.bindings.output.producer.useNativeEncoding=true",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.auto.offset.reset=latest",
-				"--spring.cloud.stream.kafka.streams.bindings.input.consumer.startOffset=earliest",
-				"--spring.cloud.stream.kafka.streams.bindings.input.consumer.keySerde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.input.consumer.valueSerde"
-						+ "=org.apache.kafka.common.serialization.Serdes$LongSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.inputX.consumer.keySerde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.inputX.consumer.valueSerde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.output.producer.keySerde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.bindings.output.producer.valueSerde"
-						+ "=org.apache.kafka.common.serialization.Serdes$LongSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.key.serde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.value.serde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.commit.interval.ms=10000",
-				"--spring.cloud.stream.kafka.streams.bindings.input.consumer.application-id=helloxyz-foobar",
-				"--spring.cloud.stream.kafka.streams.binder.brokers="
-						+ embeddedKafka.getBrokersAsString(),
-				"--spring.cloud.stream.kafka.streams.binder.zkNodes="
-						+ embeddedKafka.getZookeeperConnectionString())) {
-			Thread.sleep(1000L);
-
-			// Input 2: Region per user (multiple records allowed per user).
-			List<KeyValue<String, String>> userRegions = Arrays.asList(new KeyValue<>(
-					"alice", "asia"), /* Alice lived in Asia originally... */
-					new KeyValue<>("bob", "americas"), new KeyValue<>("chao", "asia"),
-					new KeyValue<>("dave", "europe"), new KeyValue<>("alice",
-							"europe"), /* ...but moved to Europe some time later. */
-					new KeyValue<>("eve", "americas"), new KeyValue<>("fang", "asia"));
-
-			Map<String, Object> senderProps1 = KafkaTestUtils
-					.producerProps(embeddedKafka);
-			senderProps1.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG,
-					StringSerializer.class);
-			senderProps1.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,
-					StringSerializer.class);
-
-			DefaultKafkaProducerFactory<String, String> pf1 = new DefaultKafkaProducerFactory<>(
-					senderProps1);
-			KafkaTemplate<String, String> template1 = new KafkaTemplate<>(pf1, true);
-			template1.setDefaultTopic("user-regions-2");
-
-			for (KeyValue<String, String> keyValue : userRegions) {
-				template1.sendDefault(keyValue.key, keyValue.value);
-			}
-
-			// Input 1: Clicks per user (multiple records allowed per user).
-			List<KeyValue<String, Long>> userClicks1 = Arrays.asList(
-					new KeyValue<>("bob", 4L), new KeyValue<>("chao", 25L),
-					new KeyValue<>("bob", 19L), new KeyValue<>("dave", 56L),
-					new KeyValue<>("eve", 78L), new KeyValue<>("fang", 99L));
-
-			for (KeyValue<String, Long> keyValue : userClicks1) {
-				template.sendDefault(keyValue.key, keyValue.value);
-			}
-
-			List<KeyValue<String, Long>> expectedClicksPerRegion = Arrays.asList(
-					new KeyValue<>("americas", 101L), new KeyValue<>("europe", 56L),
-					new KeyValue<>("asia", 124L),
-					// 1000 alice entries which were there in the topic before the
-					// consumer started.
-					// Since we set the startOffset to earliest for the topic, it will
-					// read them,
-					// but the join fails to associate with a valid region, thus UNKNOWN.
-					new KeyValue<>("UNKNOWN", 1000L));
-
-			// Verify that we receive the expected data
-			int count = 0;
-			long start = System.currentTimeMillis();
-			List<KeyValue<String, Long>> actualClicksPerRegion = new ArrayList<>();
-			do {
-				ConsumerRecords<String, Long> records = KafkaTestUtils
-						.getRecords(consumer);
-				count = count + records.count();
-				for (ConsumerRecord<String, Long> record : records) {
-					actualClicksPerRegion
-							.add(new KeyValue<>(record.key(), record.value()));
-				}
-			}
-			while (count < expectedClicksPerRegion.size()
-					&& (System.currentTimeMillis() - start) < 30000);
-
-			assertThat(count).isEqualTo(expectedClicksPerRegion.size());
-			assertThat(actualClicksPerRegion).hasSameElementsAs(expectedClicksPerRegion);
-		}
-		finally {
-			consumer.close();
-		}
-	}
-
-	@Test
-	public void testTrivialSingleKTableInputAsNonDeclarative() {
-		SpringApplication app = new SpringApplication(
-				TrivialKTableApp.class);
-		app.setWebApplicationType(WebApplicationType.NONE);
-		app.run("--server.port=0",
-				"--spring.cloud.stream.kafka.streams.binder.brokers="
-						+ embeddedKafka.getBrokersAsString(),
-				"--spring.cloud.stream.kafka.streams.bindings.input-y.consumer.application-id=" +
-						"testTrivialSingleKTableInputAsNonDeclarative");
-		//All we are verifying is that this application didn't throw any errors.
-		//See this issue: https://github.com/spring-cloud/spring-cloud-stream-binder-kafka/issues/536
-	}
-
-	@EnableBinding(KafkaStreamsProcessorX.class)
-	@EnableAutoConfiguration
-	@EnableConfigurationProperties(KafkaStreamsApplicationSupportProperties.class)
-	public static class CountClicksPerRegionApplication {
-
-		@StreamListener
-		@SendTo("output")
-		public KStream<String, Long> process(
-				@Input("input") KStream<String, Long> userClicksStream,
-				@Input("input-x") KTable<String, String> userRegionsTable) {
-
-			return userClicksStream
-					.leftJoin(userRegionsTable,
-							(clicks, region) -> new RegionWithClicks(
-									region == null ? "UNKNOWN" : region, clicks),
-							Joined.with(Serdes.String(), Serdes.Long(), null))
-					.map((user, regionWithClicks) -> new KeyValue<>(
-							regionWithClicks.getRegion(), regionWithClicks.getClicks()))
-					.groupByKey(Serialized.with(Serdes.String(), Serdes.Long()))
-					.reduce((firstClicks, secondClicks) -> firstClicks + secondClicks)
-					.toStream();
-		}
-
-	}
-
-	@EnableBinding(KafkaStreamsProcessorY.class)
-	@EnableAutoConfiguration
-	public static class TrivialKTableApp {
-
-		@StreamListener("input-y")
-		public void process(KTable<String, String> inputTable) {
-			inputTable.toStream().foreach((key, value) -> System.out.println("key : value " + key + " : " + value));
-		}
-	}
-
-	interface KafkaStreamsProcessorX extends KafkaStreamsProcessor {
-
-		@Input("input-x")
-		KTable<?, ?> inputX();
-
-	}
-
-	interface KafkaStreamsProcessorY {
-
-		@Input("input-y")
-		KTable<?, ?> inputY();
-
-	}
-
-	/**
-	 * Tuple for a region and its associated number of clicks.
-	 */
-	private static final class RegionWithClicks {
-
-		private final String region;
-
-		private final long clicks;
-
-		RegionWithClicks(String region, long clicks) {
-			if (region == null || region.isEmpty()) {
-				throw new IllegalArgumentException("region must be set");
-			}
-			if (clicks < 0) {
-				throw new IllegalArgumentException("clicks must not be negative");
-			}
-			this.region = region;
-			this.clicks = clicks;
-		}
-
-		public String getRegion() {
-			return region;
-		}
-
-		public long getClicks() {
-			return clicks;
-		}
-
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/integration/WordCountMultipleBranchesIntegrationTests.java

@@ -1,247 +0,0 @@
-/*
- * Copyright 2017-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.integration;
-
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Map;
-
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.streams.KeyValue;
-import org.apache.kafka.streams.kstream.KStream;
-import org.apache.kafka.streams.kstream.Materialized;
-import org.apache.kafka.streams.kstream.Predicate;
-import org.apache.kafka.streams.kstream.TimeWindows;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.stream.annotation.EnableBinding;
-import org.springframework.cloud.stream.annotation.Input;
-import org.springframework.cloud.stream.annotation.Output;
-import org.springframework.cloud.stream.annotation.StreamListener;
-import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsApplicationSupportProperties;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.test.EmbeddedKafkaBroker;
-import org.springframework.kafka.test.rule.EmbeddedKafkaRule;
-import org.springframework.kafka.test.utils.KafkaTestUtils;
-import org.springframework.messaging.handler.annotation.SendTo;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Marius Bogoevici
- * @author Soby Chacko
- * @author Gary Russell
- */
-public class WordCountMultipleBranchesIntegrationTests {
-
-	@ClassRule
-	public static EmbeddedKafkaRule embeddedKafkaRule = new EmbeddedKafkaRule(1, true,
-			"counts", "foo", "bar");
-
-	private static EmbeddedKafkaBroker embeddedKafka = embeddedKafkaRule
-			.getEmbeddedKafka();
-
-	private static Consumer<String, String> consumer;
-
-	@BeforeClass
-	public static void setUp() throws Exception {
-		Map<String, Object> consumerProps = KafkaTestUtils.consumerProps("groupx",
-				"false", embeddedKafka);
-		consumerProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-		DefaultKafkaConsumerFactory<String, String> cf = new DefaultKafkaConsumerFactory<>(
-				consumerProps);
-		consumer = cf.createConsumer();
-		embeddedKafka.consumeFromEmbeddedTopics(consumer, "counts", "foo", "bar");
-	}
-
-	@AfterClass
-	public static void tearDown() {
-		consumer.close();
-	}
-
-	@Test
-	public void testKstreamWordCountWithStringInputAndPojoOuput() throws Exception {
-		SpringApplication app = new SpringApplication(
-				WordCountProcessorApplication.class);
-		app.setWebApplicationType(WebApplicationType.NONE);
-
-		ConfigurableApplicationContext context = app.run("--server.port=0",
-				"--spring.jmx.enabled=false",
-				"--spring.cloud.stream.bindings.input.destination=words",
-				"--spring.cloud.stream.bindings.output1.destination=counts",
-				"--spring.cloud.stream.bindings.output1.contentType=application/json",
-				"--spring.cloud.stream.bindings.output2.destination=foo",
-				"--spring.cloud.stream.bindings.output2.contentType=application/json",
-				"--spring.cloud.stream.bindings.output3.destination=bar",
-				"--spring.cloud.stream.bindings.output3.contentType=application/json",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.commit.interval.ms=1000",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.key.serde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.binder.configuration.default.value.serde"
-						+ "=org.apache.kafka.common.serialization.Serdes$StringSerde",
-				"--spring.cloud.stream.kafka.streams.timeWindow.length=5000",
-				"--spring.cloud.stream.kafka.streams.timeWindow.advanceBy=0",
-				"--spring.cloud.stream.kafka.streams.bindings.input.consumer.applicationId"
-						+ "=WordCountMultipleBranchesIntegrationTests-abc",
-				"--spring.cloud.stream.kafka.streams.binder.brokers="
-						+ embeddedKafka.getBrokersAsString(),
-				"--spring.cloud.stream.kafka.streams.binder.zkNodes="
-						+ embeddedKafka.getZookeeperConnectionString());
-		try {
-			receiveAndValidate(context);
-		}
-		finally {
-			context.close();
-		}
-	}
-
-	private void receiveAndValidate(ConfigurableApplicationContext context)
-			throws Exception {
-		Map<String, Object> senderProps = KafkaTestUtils.producerProps(embeddedKafka);
-		DefaultKafkaProducerFactory<Integer, String> pf = new DefaultKafkaProducerFactory<>(
-				senderProps);
-		KafkaTemplate<Integer, String> template = new KafkaTemplate<>(pf, true);
-		template.setDefaultTopic("words");
-		template.sendDefault("english");
-		ConsumerRecord<String, String> cr = KafkaTestUtils.getSingleRecord(consumer,
-				"counts");
-		assertThat(cr.value().contains("\"word\":\"english\",\"count\":1")).isTrue();
-
-		template.sendDefault("french");
-		template.sendDefault("french");
-		cr = KafkaTestUtils.getSingleRecord(consumer, "foo");
-		assertThat(cr.value().contains("\"word\":\"french\",\"count\":2")).isTrue();
-
-		template.sendDefault("spanish");
-		template.sendDefault("spanish");
-		template.sendDefault("spanish");
-		cr = KafkaTestUtils.getSingleRecord(consumer, "bar");
-		assertThat(cr.value().contains("\"word\":\"spanish\",\"count\":3")).isTrue();
-	}
-
-	@EnableBinding(KStreamProcessorX.class)
-	@EnableAutoConfiguration
-	@EnableConfigurationProperties(KafkaStreamsApplicationSupportProperties.class)
-	public static class WordCountProcessorApplication {
-
-		@Autowired
-		private TimeWindows timeWindows;
-
-		@StreamListener("input")
-		@SendTo({ "output1", "output2", "output3" })
-		@SuppressWarnings("unchecked")
-		public KStream<?, WordCount>[] process(KStream<Object, String> input) {
-
-			Predicate<Object, WordCount> isEnglish = (k, v) -> v.word.equals("english");
-			Predicate<Object, WordCount> isFrench = (k, v) -> v.word.equals("french");
-			Predicate<Object, WordCount> isSpanish = (k, v) -> v.word.equals("spanish");
-
-			return input
-					.flatMapValues(
-							value -> Arrays.asList(value.toLowerCase().split("\\W+")))
-					.groupBy((key, value) -> value).windowedBy(timeWindows)
-					.count(Materialized.as("WordCounts-multi")).toStream()
-					.map((key, value) -> new KeyValue<>(null,
-							new WordCount(key.key(), value,
-									new Date(key.window().start()),
-									new Date(key.window().end()))))
-					.branch(isEnglish, isFrench, isSpanish);
-		}
-
-	}
-
-	interface KStreamProcessorX {
-
-		@Input("input")
-		KStream<?, ?> input();
-
-		@Output("output1")
-		KStream<?, ?> output1();
-
-		@Output("output2")
-		KStream<?, ?> output2();
-
-		@Output("output3")
-		KStream<?, ?> output3();
-
-	}
-
-	static class WordCount {
-
-		private String word;
-
-		private long count;
-
-		private Date start;
-
-		private Date end;
-
-		WordCount(String word, long count, Date start, Date end) {
-			this.word = word;
-			this.count = count;
-			this.start = start;
-			this.end = end;
-		}
-
-		public String getWord() {
-			return word;
-		}
-
-		public void setWord(String word) {
-			this.word = word;
-		}
-
-		public long getCount() {
-			return count;
-		}
-
-		public void setCount(long count) {
-			this.count = count;
-		}
-
-		public Date getStart() {
-			return start;
-		}
-
-		public void setStart(Date start) {
-			this.start = start;
-		}
-
-		public Date getEnd() {
-			return end;
-		}
-
-		public void setEnd(Date end) {
-			this.end = end;
-		}
-
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/integration/utils/TestAvroSerializer.java

@@ -1,62 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.integration.utils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.kafka.common.serialization.Serializer;
-
-import org.springframework.cloud.stream.schema.avro.AvroSchemaMessageConverter;
-import org.springframework.messaging.Message;
-import org.springframework.messaging.MessageHeaders;
-import org.springframework.messaging.support.MessageBuilder;
-
-/**
- * Custom avro serializer intended to be used for testing only.
- *
- * @param <S> Target type to serialize
- * @author Soby Chacko
- */
-public class TestAvroSerializer<S> implements Serializer<S> {
-
-	public TestAvroSerializer() {
-	}
-
-	@Override
-	public void configure(Map<String, ?> configs, boolean isKey) {
-
-	}
-
-	@Override
-	public byte[] serialize(String topic, S data) {
-		AvroSchemaMessageConverter avroSchemaMessageConverter = new AvroSchemaMessageConverter();
-		Message<?> message = MessageBuilder.withPayload(data).build();
-		Map<String, Object> headers = new HashMap<>(message.getHeaders());
-		headers.put(MessageHeaders.CONTENT_TYPE, "application/avro");
-		MessageHeaders messageHeaders = new MessageHeaders(headers);
-		final Object payload = avroSchemaMessageConverter
-				.toMessage(message.getPayload(), messageHeaders).getPayload();
-		return (byte[]) payload;
-	}
-
-	@Override
-	public void close() {
-
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/serde/CompositeNonNativeSerdeTest.java

@@ -1,73 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.binder.kafka.streams.serde;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.UUID;
-
-import com.example.Sensor;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
-
-import org.springframework.cloud.stream.converter.CompositeMessageConverterFactory;
-import org.springframework.cloud.stream.schema.avro.AvroSchemaMessageConverter;
-import org.springframework.messaging.converter.MessageConverter;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Refer {@link CompositeNonNativeSerde} for motivations.
- *
- * @author Soby Chacko
- */
-public class CompositeNonNativeSerdeTest {
-
-	@Test
-	@SuppressWarnings("unchecked")
-	public void testCompositeNonNativeSerdeUsingAvroContentType() {
-		Random random = new Random();
-		Sensor sensor = new Sensor();
-		sensor.setId(UUID.randomUUID().toString() + "-v1");
-		sensor.setAcceleration(random.nextFloat() * 10);
-		sensor.setVelocity(random.nextFloat() * 100);
-		sensor.setTemperature(random.nextFloat() * 50);
-
-		List<MessageConverter> messageConverters = new ArrayList<>();
-		messageConverters.add(new AvroSchemaMessageConverter());
-		CompositeMessageConverterFactory compositeMessageConverterFactory = new CompositeMessageConverterFactory(
-				messageConverters, new ObjectMapper());
-		CompositeNonNativeSerde compositeNonNativeSerde = new CompositeNonNativeSerde(
-				compositeMessageConverterFactory);
-
-		Map<String, Object> configs = new HashMap<>();
-		configs.put("valueClass", Sensor.class);
-		configs.put("contentType", "application/avro");
-		compositeNonNativeSerde.configure(configs, false);
-		final byte[] serialized = compositeNonNativeSerde.serializer().serialize(null,
-				sensor);
-
-		final Object deserialized = compositeNonNativeSerde.deserializer()
-				.deserialize(null, serialized);
-
-		assertThat(deserialized).isEqualTo(sensor);
-	}
-
-}

spring-cloud-stream-binder-kafka-streams/src/test/resources/avro/sensor.avsc

@@ -1,11 +0,0 @@
-{
-  "namespace" : "com.example",
-  "type" : "record",
-  "name" : "Sensor",
-  "fields" : [
-    {"name":"id","type":"string"},
-    {"name":"temperature", "type":"float", "default":0.0},
-    {"name":"acceleration", "type":"float","default":0.0},
-    {"name":"velocity","type":"float","default":0.0}
-  ]
-}