升级至企业版3.3.0

调整代码结构

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,51 @@
+---
+name: 报告Bug
+about: 报告KnowStreaming的相关Bug
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+- [ ] 我已经在 [issues](https://github.com/didi/KnowStreaming/issues) 搜索过相关问题了,并没有重复的。
+
+ 你是否希望来认领这个Bug。
+
+ 「   Y   /   N  」
+
+### 环境信息
+
+* KnowStreaming version :   <font size=4 color =red>   xxx </font>
+* Operating System version :  <font size=4 color =red> xxx </font>
+* Java version : <font size=4 color =red> xxx </font>
+
+
+### 重现该问题的步骤
+
+1. xxx
+   
+
+
+2. xxx
+   
+
+3. xxx
+
+
+
+### 预期结果
+
+<!-- 写下应该出现的预期结果？-->
+
+### 实际结果
+
+<!-- 实际发生了什么? -->
+
+
+---
+
+如果有异常，请附上异常Trace:
+
+```
+Just put your stack trace here!
+```

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: true
+contact_links:
+  - name: 讨论问题
+    url: https://github.com/didi/KnowStreaming/discussions/new
+    about: 发起问题、讨论 等等
+  - name: KnowStreaming官网
+    url: https://knowstreaming.com/
+    about: KnowStreaming website

.github/ISSUE_TEMPLATE/detail_optimizing.md

@@ -0,0 +1,26 @@
+---
+name: 优化建议
+about: 相关功能优化建议
+title: ''
+labels: Optimization Suggestions
+assignees: ''
+
+---
+
+- [ ] 我已经在 [issues](https://github.com/didi/KnowStreaming/issues) 搜索过相关问题了,并没有重复的。
+
+ 你是否希望来认领这个优化建议。
+
+ 「   Y   /   N  」
+
+### 环境信息
+
+* KnowStreaming version :   <font size=4 color =red>   xxx </font>
+* Operating System version :  <font size=4 color =red> xxx </font>
+* Java version : <font size=4 color =red> xxx </font>
+
+### 需要优化的功能点
+
+
+### 建议如何优化
+

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: 提议新功能/需求
+about: 给KnowStreaming提一个功能需求
+title: ''
+labels: feature
+assignees: ''
+
+---
+
+- [ ] 我在 [issues](https://github.com/didi/KnowStreaming/issues) 中并未搜索到与此相关的功能需求。
+- [ ] 我在 [release note](https://github.com/didi/KnowStreaming/releases) 已经发布的版本中并没有搜到相关功能.
+
+你是否希望来认领这个Feature。
+
+「   Y   /   N  」
+
+
+## 这里描述需求
+<!--请尽可能的描述清楚您的需求 -->
+

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,12 @@
+---
+name: 提个问题
+about: 问KnowStreaming相关问题
+title: ''
+labels: question
+assignees: ''
+
+---
+
+- [ ] 我已经在 [issues](https://github.com/didi/KnowStreaming/issues) 搜索过相关问题了,并没有重复的。
+
+## 在这里提出你的问题

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,23 @@
+请不要在没有先创建Issue的情况下创建Pull Request。
+
+## 变更的目的是什么
+
+XXXXX
+
+## 简短的更新日志
+
+XX
+
+## 验证这一变化
+
+XXXX
+
+请遵循此清单，以帮助我们快速轻松地整合您的贡献：
+
+* [ ] 一个 PR（Pull Request的简写）只解决一个问题，禁止一个 PR 解决多个问题；
+* [ ] 确保 PR 有对应的 Issue（通常在您开始处理之前创建），除非是书写错误之类的琐碎更改不需要 Issue ；
+* [ ] 格式化 PR 及 Commit-Log 的标题及内容，例如 #861 。PS：Commit-Log 需要在 Git Commit 代码时进行填写，在 GitHub 上修改不了；
+* [ ] 编写足够详细的 PR 描述，以了解 PR 的作用、方式和原因；
+* [ ] 编写必要的单元测试来验证您的逻辑更正。如果提交了新功能或重大更改，请记住在 test 模块中添加 integration-test；
+* [ ] 确保编译通过，集成测试通过；
+

.gitignore

@@ -1,61 +1,116 @@
-.gradle/
-dist
-*classes
-*.class
-target/
-build/
-build_eclipse/
-out/
-.gradle/
-lib_managed/
-src_managed/
-project/boot/
-project/plugins/project/
-patch-process/*
-.idea
-.svn
-.classpath
-/.metadata
-/.recommenders
-*~
-*#
-.#*
-rat.out
-TAGS
+### Intellij ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+
 *.iml
-.project
-.settings
+
+## Directory-based project format:
+.idea/
+# if you remove the above rule, at least ignore the following:
+
+# User-specific stuff:
+# .idea/workspace.xml
+# .idea/tasks.xml
+# .idea/dictionaries
+# .idea/shelf
+
+# Sensitive or high-churn files:
+.idea/dataSources.ids
+.idea/dataSources.xml
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+
+
+# Mongo Explorer plugin:
+.idea/mongoSettings.xml
+
+## File-based project format:
 *.ipr
 *.iws
-.vagrant
-Vagrantfile.local
-/logs
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+
+### Java ###
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+*.tar.gz
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+
+### OSX ###
 .DS_Store
+.AppleDouble
+.LSOverride
 
-config/server-*
-config/zookeeper-*
-core/data/*
-#gradle/wrapper/*.jar
-gradlew.bat
+# Icon must end with two \r
+Icon
 
-results
-tests/results
-.ducktape
-tests/.ducktape
-tests/venv
-.cache
 
-docs/generated/
+# Thumbnails
+._*
 
-.release-settings.json
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
 
-kafkatest.egg-info/
-systest/
-*.swp
-clients/src/generated
-clients/src/generated-test
-jmh-benchmarks/generated
-streams/src/generated
-kafka-logs
-clients/src/generated-test/
-clients/src/generated/
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+/target
+target/
+*.log
+*.log.*
+*.bak
+*.vscode
+*/.vscode/*
+*/.vscode
+*/velocity.log*
+*/*.log
+*/*.log.*
+node_modules/
+node_modules/*
+workspace.xml
+/output/*
+.gitversion
+out/*
+dist/
+dist/*
+km-rest/src/main/resources/templates/
+*dependency-reduced-pom*
+#filter flattened xml
+*/.flattened-pom.xml
+.flattened-pom.xml
+*/*/.flattened-pom.xml

CODE_OF_CONDUCT.md

@@ -0,0 +1,74 @@
+
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project, and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+education, socio-economic status, nationality, personal appearance, race,
+religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at  https://knowstreaming.com/support-center .  All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org

CONTRIBUTING.md

@@ -1,11 +1,150 @@
-## Contributing to Kafka
 
-*Before opening a pull request*, review the [Contributing](https://kafka.apache.org/contributing.html) and [Contributing Code Changes](https://cwiki.apache.org/confluence/display/KAFKA/Contributing+Code+Changes) pages.
 
-It lists steps that are required before creating a PR.
 
-When you contribute code, you affirm that the contribution is your original work and that you
-license the work to the project under the project's open source license. Whether or not you
-state this explicitly, by submitting any copyrighted material via pull request, email, or
-other means you agree to license the material under the project's open source license and
-warrant that you have the legal authority to do so.
+# 为KnowStreaming做贡献
+
+
+欢迎👏🏻来到KnowStreaming！本文档是关于如何为KnowStreaming做出贡献的指南。
+
+如果您发现不正确或遗漏的内容, 请留下意见/建议。
+
+## 行为守则
+请务必阅读并遵守我们的 [行为准则](./CODE_OF_CONDUCT.md).
+
+
+
+## 贡献
+
+**KnowStreaming** 欢迎任何角色的新参与者，包括 **User** 、**Contributor**、**Committer**、**PMC** 。
+
+我们鼓励新人积极加入 **KnowStreaming** 项目，从User到Contributor、Committer ，甚至是 PMC 角色。
+
+为了做到这一点，新人需要积极地为 **KnowStreaming** 项目做出贡献。以下介绍如何对 **KnowStreaming** 进行贡献。
+
+
+### 创建/打开  Issue
+
+如果您在文档中发现拼写错误、在代码中**发现错误**或想要**新功能**或想要**提供建议**，您可以在 GitHub 上[创建一个Issue](https://github.com/didi/KnowStreaming/issues/new/choose) 进行报告。
+
+
+如果您想直接贡献, 您可以选择下面标签的问题。
+
+- [contribution welcome](https://github.com/didi/KnowStreaming/labels/contribution%20welcome) : 非常需要解决/新增  的Issues
+- [good first issue](https://github.com/didi/KnowStreaming/labels/good%20first%20issue): 对新人比较友好, 新人可以拿这个Issue来练练手热热身。
+
+<font color=red ><b> 请注意，任何 PR 都必须与有效issue相关联。否则，PR 将被拒绝。</b></font>
+
+
+
+### 开始你的贡献
+
+**分支介绍**
+
+我们将 `dev`分支作为开发分支, 说明这是一个不稳定的分支。
+
+此外,我们的分支模型符合 [https://nvie.com/posts/a-successful-git-branching-model/](https://nvie.com/posts/a-successful-git-branching-model/). 我们强烈建议新人在创建PR之前先阅读上述文章。
+
+
+
+**贡献流程**
+
+为方便描述,我们这里定义一下2个名词：
+
+自己Fork出来的仓库是私人仓库, 我们这里称之为 ：**分叉仓库**
+Fork的源项目,我们称之为：**源仓库**
+
+
+现在，如果您准备好创建PR, 以下是贡献者的工作流程:
+
+1. Fork [KnowStreaming](https://github.com/didi/KnowStreaming) 项目到自己的仓库
+
+2. 从源仓库的`dev`拉取并创建自己的本地分支,例如: `dev`
+3. 在本地分支上对代码进行修改
+4. Rebase 开发分支, 并解决冲突
+5. commit 并 push 您的更改到您自己的**分叉仓库**
+6. 创建一个 Pull Request 到**源仓库**的`dev`分支中。
+7. 等待回复。如果回复的慢，请无情的催促。
+
+
+更为详细的贡献流程请看：[贡献流程](./docs/contributer_guide/贡献流程.md)
+
+创建Pull Request时：
+
+1. 请遵循 PR的 [模板](./.github/PULL_REQUEST_TEMPLATE.md)
+2. 请确保 PR 有相应的issue。
+3. 如果您的 PR 包含较大的更改，例如组件重构或新组件，请编写有关其设计和使用的详细文档(在对应的issue中)。
+4. 注意单个 PR 不能太大。如果需要进行大量更改，最好将更改分成几个单独的 PR。
+5. 在合并PR之前，尽量的将最终的提交信息清晰简洁, 将多次修改的提交尽可能的合并为一次提交。
+6. 创建 PR 后，将为PR分配一个或多个reviewers。
+
+
+<font color=red><b>如果您的 PR 包含较大的更改，例如组件重构或新组件，请编写有关其设计和使用的详细文档。</b></font>
+
+
+# 代码审查指南
+
+Commiter将轮流review代码，以确保在合并前至少有一名Commiter
+
+一些原则：
+
+- 可读性——重要的代码应该有详细的文档。API 应该有 Javadoc。代码风格应与现有风格保持一致。
+- 优雅：新的函数、类或组件应该设计得很好。
+- 可测试性——单元测试用例应该覆盖 80% 的新代码。
+- 可维护性 - 遵守我们的编码规范。
+
+
+# 开发者
+
+## 成为Contributor
+
+只要成功提交并合并PR , 则为Contributor
+
+贡献者名单请看：[贡献者名单](./docs/contributer_guide/开发者名单.md)
+
+## 尝试成为Commiter
+
+一般来说, 贡献8个重要的补丁并至少让三个不同的人来Review他们(您需要3个Commiter的支持)。
+然后请人给你提名, 您需要展示您的
+
+1. 至少8个重要的PR和项目的相关问题
+2. 与团队合作的能力
+3. 了解项目的代码库和编码风格
+4. 编写好代码的能力
+
+当前的Commiter可以通过在KnowStreaming中的Issue标签 `nomination`(提名)来提名您
+
+1. 你的名字和姓氏
+2. 指向您的Git个人资料的链接
+3. 解释为什么你应该成为Commiter
+4. 详细说明提名人与您合作的3个PR以及相关问题,这些问题可以证明您的能力。
+
+另外2个Commiter需要支持您的**提名**，如果5个工作日内没有人反对，您就是提交者,如果有人反对或者想要更多的信息，Commiter会讨论并通常达成共识(5个工作日内) 。
+
+
+# 开源奖励计划
+
+
+我们非常欢迎开发者们为KnowStreaming开源项目贡献一份力量，相应也将给予贡献者激励以表认可与感谢。
+
+
+## 参与贡献
+
+1. 积极参与 Issue 的讨论，如答疑解惑、提供想法或报告无法解决的错误（Issue）
+2. 撰写和改进项目的文档（Wiki）
+3. 提交补丁优化代码（Coding）
+
+
+## 你将获得
+
+1. 加入KnowStreaming开源项目贡献者名单并展示
+2. KnowStreaming开源贡献者证书(纸质&电子版)
+3. KnowStreaming贡献者精美大礼包(KnowStreamin/滴滴  周边)
+
+
+## 相关规则
+
+- Contributer和Commiter都会有对应的证书和对应的礼包
+- 每季度有KnowStreaming项目团队评选出杰出贡献者,颁发相应证书。
+- 年末进行年度评选
+
+贡献者名单请看：[贡献者名单](./docs/contributer_guide/开发者名单.md)

HEADER

@@ -1,14 +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
-
-   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.

NOTICE

@@ -1,8 +0,0 @@
-Apache Kafka
-Copyright 2020 The Apache Software Foundation.
-
-This product includes software developed at
-The Apache Software Foundation (https://www.apache.org/).
-
-This distribution has a binary dependency on jersey, which is available under the CDDL
-License. The source code of jersey can be found at https://github.com/jersey/jersey/.

PULL_REQUEST_TEMPLATE.md

@@ -1,14 +0,0 @@
-*More detailed description of your change,
-if necessary. The PR title and PR message become
-the squashed commit message, so use a separate
-comment to ping reviewers.*
-
-*Summary of testing strategy (including rationale)
-for the feature or bug fix. Unit and/or integration
-tests are expected for any behaviour change and
-system tests should be considered for larger changes.*
-
-### Committer Checklist (excluded from commit message)
-- [ ] Verify design and implementation 
-- [ ] Verify test coverage and CI build status
-- [ ] Verify documentation (including upgrade notes)

README.md

@@ -1,220 +1,157 @@
-Apache Kafka
-=================
-See our [web site](https://kafka.apache.org) for details on the project.
 
-You need to have [Java](http://www.oracle.com/technetwork/java/javase/downloads/index.html) installed.
+<p align="center">
+<img src="https://user-images.githubusercontent.com/71620349/185368586-aed82d30-1534-453d-86ff-ecfa9d0f35bd.png" width = "256"  div align=center />
 
-Java 8 should be used for building in order to support both Java 8 and Java 11 at runtime.
+</p>
 
-Scala 2.12 is used by default, see below for how to use a different Scala version or all of the supported Scala versions.
+<p align="center">
+    <a href="https://knowstreaming.com">产品官网</a> | 
+    <a href="https://github.com/didi/KnowStreaming/releases">下载地址</a> | 
+    <a href="https://doc.knowstreaming.com/product">文档资源</a> | 
+    <a href="https://demo.knowstreaming.com">体验环境</a> 
+</p>
 
-### Build a jar and run it ###
-    ./gradlew jar
+<p align="center">
+<!--最近一次提交时间-->
+<a href="https://img.shields.io/github/last-commit/didi/KnowStreaming">
+    <img src="https://img.shields.io/github/last-commit/didi/KnowStreaming" alt="LastCommit">
+</a>
 
-Follow instructions in https://kafka.apache.org/documentation.html#quickstart
+<!--最新版本-->
+<a href="https://github.com/didi/KnowStreaming/blob/master/LICENSE">
+    <img src="https://img.shields.io/github/v/release/didi/KnowStreaming" alt="License">
+</a>
 
-### Build source jar ###
-    ./gradlew srcJar
+<!--License信息-->
+<a href="https://github.com/didi/KnowStreaming/blob/master/LICENSE">
+    <img src="https://img.shields.io/github/license/didi/KnowStreaming" alt="License">
+</a>
 
-### Build aggregated javadoc ###
-    ./gradlew aggregatedJavadoc
+<!--Open-Issue-->
+<a href="https://github.com/didi/KnowStreaming/issues">
+    <img src="https://img.shields.io/github/issues-raw/didi/KnowStreaming" alt="Issues">
+</a>
 
-### Build javadoc and scaladoc ###
-    ./gradlew javadoc
-    ./gradlew javadocJar # builds a javadoc jar for each module
-    ./gradlew scaladoc
-    ./gradlew scaladocJar # builds a scaladoc jar for each module
-    ./gradlew docsJar # builds both (if applicable) javadoc and scaladoc jars for each module
+<!--知识星球-->
+<a href="https://z.didi.cn/5gSF9">
+    <img src="https://img.shields.io/badge/join-%E7%9F%A5%E8%AF%86%E6%98%9F%E7%90%83-red" alt="Slack">
+</a>
 
-### Run unit/integration tests ###
-    ./gradlew test # runs both unit and integration tests
-    ./gradlew unitTest
-    ./gradlew integrationTest
-    
-### Force re-running tests without code change ###
-    ./gradlew cleanTest test
-    ./gradlew cleanTest unitTest
-    ./gradlew cleanTest integrationTest
+</p>
 
-### Running a particular unit/integration test ###
-    ./gradlew clients:test --tests RequestResponseTest
 
-### Running a particular test method within a unit/integration test ###
-    ./gradlew core:test --tests kafka.api.ProducerFailureHandlingTest.testCannotSendToInternalTopic
-    ./gradlew clients:test --tests org.apache.kafka.clients.MetadataTest.testMetadataUpdateWaitTime
+---
 
-### Running a particular unit/integration test with log4j output ###
-Change the log4j setting in either `clients/src/test/resources/log4j.properties` or `core/src/test/resources/log4j.properties`
 
-    ./gradlew clients:test --tests RequestResponseTest
+## `Know Streaming` 简介
 
-### Generating test coverage reports ###
-Generate coverage reports for the whole project:
+`Know Streaming`是一套云原生的Kafka管控平台，脱胎于众多互联网内部多年的Kafka运营实践经验，专注于Kafka运维管控、监控告警、资源治理、多活容灾等核心场景。在用户体验、监控、运维管控上进行了平台化、可视化、智能化的建设，提供一系列特色的功能，极大地方便了用户和运维人员的日常使用，让普通运维人员都能成为Kafka专家。
 
-    ./gradlew reportCoverage
+我们现在正在收集 Know Streaming 用户信息，以帮助我们进一步改进  Know Streaming。
+请在 [issue#663](https://github.com/didi/KnowStreaming/issues/663) 上提供您的使用信息来支持我们：[谁在使用 Know Streaming](https://github.com/didi/KnowStreaming/issues/663) 
 
-Generate coverage for a single module, i.e.: 
 
-    ./gradlew clients:reportCoverage
-    
-### Building a binary release gzipped tar ball ###
-    ./gradlew clean releaseTarGz
 
-The above command will fail if you haven't set up the signing key. To bypass signing the artifact, you can run:
+整体具有以下特点：
 
-    ./gradlew clean releaseTarGz -x signArchives
+- 👀 &nbsp;**零侵入、全覆盖**
+  - 无需侵入改造 `Apache Kafka` ，一键便能纳管 `0.10.x` ~ `3.x.x` 众多版本的Kafka，包括 `ZK` 或 `Raft` 运行模式的版本，同时在兼容架构上具备良好的扩展性，帮助您提升集群管理水平；
 
-The release file can be found inside `./core/build/distributions/`.
+- 🌪️ &nbsp;**零成本、界面化**
+  - 提炼高频 CLI 能力，设计合理的产品路径，提供清新美观的 GUI 界面，支持 Cluster、Broker、Zookeeper、Topic、ConsumerGroup、Message、ACL、Connect 等组件 GUI 管理，普通用户5分钟即可上手；
 
-### Cleaning the build ###
-    ./gradlew clean
+- 👏 &nbsp;**云原生、插件化**
+  - 基于云原生构建，具备水平扩展能力，只需要增加节点即可获取更强的采集及对外服务能力，提供众多可热插拔的企业级特性，覆盖可观测性生态整合、资源治理、多活容灾等核心场景；
 
-### Running a task with one of the Scala versions available (2.12.x or 2.13.x) ###
-*Note that if building the jars with a version other than 2.12.x, you need to set the `SCALA_VERSION` variable or change it in `bin/kafka-run-class.sh` to run the quick start.*
+- 🚀 &nbsp;**专业能力**
+  - 集群管理：支持一键纳管，健康分析、核心组件观测 等功能；
+  - 观测提升：多维度指标观测大盘、观测指标最佳实践 等功能； 
+  - 异常巡检：集群多维度健康巡检、集群多维度健康分 等功能； 
+  - 能力增强：集群负载均衡、Topic扩缩副本、Topic副本迁移 等功能；
 
-You can pass either the major version (eg 2.12) or the full version (eg 2.12.7):
 
-    ./gradlew -PscalaVersion=2.12 jar
-    ./gradlew -PscalaVersion=2.12 test
-    ./gradlew -PscalaVersion=2.12 releaseTarGz
+&nbsp;
+**产品图**
 
-### Running a task with all the scala versions enabled by default ###
+<p align="center">
 
-Append `All` to the task name:
+<img src="http://img-ys011.didistatic.com/static/dc2img/do1_sPmS4SNLX9m1zlpmHaLJ" width = "768" height = "473" div align=center />
 
-    ./gradlew testAll
-    ./gradlew jarAll
-    ./gradlew releaseTarGzAll
+</p>
 
-### Running a task for a specific project ###
-This is for `core`, `examples` and `clients`
 
-    ./gradlew core:jar
-    ./gradlew core:test
 
-### Listing all gradle tasks ###
-    ./gradlew tasks
 
-### Building IDE project ####
-*Note that this is not strictly necessary (IntelliJ IDEA has good built-in support for Gradle projects, for example).*
+## 文档资源
 
-    ./gradlew eclipse
-    ./gradlew idea
+**`开发相关手册`**
 
-The `eclipse` task has been configured to use `${project_dir}/build_eclipse` as Eclipse's build directory. Eclipse's default
-build directory (`${project_dir}/bin`) clashes with Kafka's scripts directory and we don't use Gradle's build directory
-to avoid known issues with this configuration.
+- [打包编译手册](docs/install_guide/源码编译打包手册.md)
+- [单机部署手册](docs/install_guide/单机部署手册.md)
+- [版本升级手册](docs/install_guide/版本升级手册.md)
+- [本地源码启动手册](docs/dev_guide/本地源码启动手册.md)
 
-### Publishing the jar for all version of Scala and for all projects to maven ###
-    ./gradlew uploadArchivesAll
+**`产品相关手册`**
 
-Please note for this to work you should create/update `${GRADLE_USER_HOME}/gradle.properties` (typically, `~/.gradle/gradle.properties`) and assign the following variables
+- [产品使用指南](docs/user_guide/用户使用手册.md)
+- [2.x与3.x新旧对比手册](docs/user_guide/新旧对比手册.md)
+- [FAQ](docs/user_guide/faq.md)
 
-    mavenUrl=
-    mavenUsername=
-    mavenPassword=
-    signing.keyId=
-    signing.password=
-    signing.secretKeyRingFile=
 
-### Publishing the streams quickstart archetype artifact to maven ###
-For the Streams archetype project, one cannot use gradle to upload to maven; instead the `mvn deploy` command needs to be called at the quickstart folder:
+**点击 [这里](https://doc.knowstreaming.com/product)，也可以从官网获取到更多文档**
 
-    cd streams/quickstart
-    mvn deploy
 
-Please note for this to work you should create/update user maven settings (typically, `${USER_HOME}/.m2/settings.xml`) to assign the following variables
 
-    <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                           https://maven.apache.org/xsd/settings-1.0.0.xsd">
-    ...                           
-    <servers>
-       ...
-       <server>
-          <id>apache.snapshots.https</id>
-          <username>${maven_username}</username>
-          <password>${maven_password}</password>
-       </server>
-       <server>
-          <id>apache.releases.https</id>
-          <username>${maven_username}</username>
-          <password>${maven_password}</password>
-        </server>
-        ...
-     </servers>
-     ...
 
 
-### Installing the jars to the local Maven repository ###
-    ./gradlew installAll
+## 成为社区贡献者
 
-### Building the test jar ###
-    ./gradlew testJar
+1. [贡献源码](https://doc.knowstreaming.com/product/10-contribution) 了解如何成为 Know Streaming 的贡献者
+2. [具体贡献流程](https://doc.knowstreaming.com/product/10-contribution#102-贡献流程)
+3. [开源激励计划](https://doc.knowstreaming.com/product/10-contribution#105-开源激励计划)
+4. [贡献者名单](https://doc.knowstreaming.com/product/10-contribution#106-贡献者名单)
 
-### Determining how transitive dependencies are added ###
-    ./gradlew core:dependencies --configuration runtime
 
-### Determining if any dependencies could be updated ###
-    ./gradlew dependencyUpdates
+获取KnowStreaming开源社区证书。
 
-### Running code quality checks ###
-There are two code quality analysis tools that we regularly run, spotbugs and checkstyle.
+## 加入技术交流群
 
-#### Checkstyle ####
-Checkstyle enforces a consistent coding style in Kafka.
-You can run checkstyle using:
+**`1、知识星球`**
 
-    ./gradlew checkstyleMain checkstyleTest
+<p align="left">
+<img src="https://user-images.githubusercontent.com/71620349/185357284-fdff1dad-c5e9-4ddf-9a82-0be1c970980d.JPG"  height = "180" div align=left />
+</p>       
 
-The checkstyle warnings will be found in `reports/checkstyle/reports/main.html` and `reports/checkstyle/reports/test.html` files in the
-subproject build directories. They are also printed to the console. The build will fail if Checkstyle fails.
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
 
-#### Spotbugs ####
-Spotbugs uses static analysis to look for bugs in the code.
-You can run spotbugs using:
+👍 我们正在组建国内最大，最权威的 **[Kafka中文社区](https://z.didi.cn/5gSF9)**
 
-    ./gradlew spotbugsMain spotbugsTest -x test
+在这里你可以结交各大互联网的 Kafka大佬 以及 4000+ Kafka爱好者，一起实现知识共享，实时掌控最新行业资讯，期待 👏 &nbsp; 您的加入中～ https://z.didi.cn/5gSF9
 
-The spotbugs warnings will be found in `reports/spotbugs/main.html` and `reports/spotbugs/test.html` files in the subproject build
-directories.  Use -PxmlSpotBugsReport=true to generate an XML report instead of an HTML one.
+有问必答~！ 互动有礼~！
 
-### Common build options ###
+PS: 提问请尽量把问题一次性描述清楚，并告知环境信息情况～！如使用版本、操作步骤、报错/警告信息等，方便大V们快速解答～
 
-The following options should be set with a `-P` switch, for example `./gradlew -PmaxParallelForks=1 test`.
+&nbsp;
 
-* `commitId`: sets the build commit ID as .git/HEAD might not be correct if there are local commits added for build purposes.
-* `mavenUrl`: sets the URL of the maven deployment repository (`file://path/to/repo` can be used to point to a local repository).
-* `maxParallelForks`: limits the maximum number of processes for each task.
-* `showStandardStreams`: shows standard out and standard error of the test JVM(s) on the console.
-* `skipSigning`: skips signing of artifacts.
-* `testLoggingEvents`: unit test events to be logged, separated by comma. For example `./gradlew -PtestLoggingEvents=started,passed,skipped,failed test`.
-* `xmlSpotBugsReport`: enable XML reports for spotBugs. This also disables HTML reports as only one can be enabled at a time.
+**`2、微信群`**
 
-### Dependency Analysis ###
+微信加群：添加`mike_zhangliang`、`PenceXie` 、`szzdzhp001`的微信号备注KnowStreaming加群。
+<br/>
 
-The gradle [dependency debugging documentation](https://docs.gradle.org/current/userguide/viewing_debugging_dependencies.html) mentions using the `dependencies` or `dependencyInsight` tasks to debug dependencies for the root project or individual subprojects.
+加群之前有劳点一下 star，一个小小的 star 是对KnowStreaming作者们努力建设社区的动力。
 
-Alternatively, use the `allDeps` or `allDepInsight` tasks for recursively iterating through all subprojects:
+感谢感谢！！！
 
-    ./gradlew allDeps
+<img width="116" alt="wx" src="https://user-images.githubusercontent.com/71620349/192257217-c4ebc16c-3ad9-485d-a914-5911d3a4f46b.png">
 
-    ./gradlew allDepInsight --configuration runtime --dependency com.fasterxml.jackson.core:jackson-databind
+## Star History
 
-These take the same arguments as the builtin variants.
-
-### Running system tests ###
-
-See [tests/README.md](tests/README.md).
-
-### Running in Vagrant ###
-
-See [vagrant/README.md](vagrant/README.md).
-
-### Contribution ###
-
-Apache Kafka is interested in building the community; we would welcome any thoughts or [patches](https://issues.apache.org/jira/browse/KAFKA). You can reach us [on the Apache mailing lists](http://kafka.apache.org/contact.html).
-
-To contribute follow the instructions here:
- * https://kafka.apache.org/contributing.html
+[![Star History Chart](https://api.star-history.com/svg?repos=didi/KnowStreaming&type=Date)](https://star-history.com/#didi/KnowStreaming&Date)

Releases_Notes.md

@@ -0,0 +1,572 @@
+
+## v3.3.0
+
+**问题修复**
+- 修复 Connect 的 JMX-Port 配置未生效问题;
+- 修复 不存在 Connector 时，OverView 页面的数据一直处于加载中的问题;
+- 修复 Group 分区信息，分页时展示不全的问题；
+- 修复采集副本指标时，参数传递错误的问题；
+- 修复用户信息修改后，用户列表会抛出空指针异常的问题；
+- 修复 Topic 详情页面，查看消息时，选择分区不生效问题；
+- 修复对 ZK 客户端进行配置后不生效的问题；
+- 修复 connect 模块，指标中缺少健康巡检项通过数的问题；
+- 修复 connect 模块，指标获取方法存在映射错误的问题；
+- 修复 connect 模块，max 纬度指标获取错误的问题；
+- 修复 Topic 指标大盘 TopN 指标显示信息错误的问题；
+- 修复 Broker Similar Config 显示错误的问题；
+- 修复解析 ZK 四字命令时，数据类型设置错误导致空指针的问题；
+- 修复新增 Topic 时，清理策略选项版本控制错误的问题；
+- 修复新接入集群时 Controller-Host 信息不显示的问题；
+- 修复 Connector 和 MM2 列表搜索不生效的问题；
+- 修复 Zookeeper 页面，Leader 显示存在异常的问题；
+- 修复前端打包失败的问题；
+
+
+**产品优化**
+- ZK Overview 页面补充默认展示的指标；
+- 统一初始化 ES 索引模版的脚本为 init_es_template.sh，同时新增缺失的 connect 索引模版初始化脚本，去除多余的 replica 和 zookeper 索引模版初始化脚本；
+- 指标大盘页面，优化指标筛选操作后，无指标数据的指标卡片由不显示改为显示，并增加无数据的兜底；
+- 删除从 ES 读写 replica 指标的相关代码；
+- 优化 Topic 健康巡检的日志，明确错误的原因；
+- 优化无 ZK 模块时，巡检详情忽略对 ZK 的展示；
+- 优化本地缓存大小为可配置；
+- Task 模块中的返回中，补充任务的分组信息；
+- FAQ 补充 Ldap 的配置说明；
+- FAQ 补充接入 Kerberos 认证的 Kafka 集群的配置说明；
+- ks_km_kafka_change_record 表增加时间纬度的索引，优化查询性能；
+- 优化 ZK 健康巡检的日志，便于问题的排查；
+
+**功能新增**
+- 新增基于滴滴 Kafka 的 Topic 复制功能（需使用滴滴 Kafka 才可具备该能力）；
+- Topic 指标大盘，新增 Topic 复制相关的指标；
+- 新增基于 TestContainers 的单测；
+
+
+**Kafka MM2 Beta版 (v3.3.0版本新增发布)**
+- MM2 任务的增删改查；
+- MM2 任务的指标大盘；
+- MM2 任务的健康状态；
+
+---
+
+
+## v3.2.0
+
+**问题修复**
+- 修复健康巡检结果更新至 DB 时，出现死锁问题；
+- 修复 KafkaJMXClient 类中，logger错误的问题；
+- 后端修复 Topic 过期策略在 0.10.1.0 版本能多选的问题，实际应该只能二选一；
+- 修复接入集群时，不填写集群配置会报错的问题；
+- 升级 spring-context 至 5.3.19 版本，修复安全漏洞；
+- 修复 Broker & Topic 修改配置时，多版本兼容配置的版本信息错误的问题；
+- 修复 Topic 列表的健康分为健康状态；
+- 修复 Broker LogSize 指标存储名称错误导致查询不到的问题；
+- 修复 Prometheus 中，缺少 Group 部分指标的问题；
+- 修复因缺少健康状态指标导致集群数错误的问题；
+- 修复后台任务记录操作日志时，因缺少操作用户信息导致出现异常的问题；
+- 修复 Replica 指标查询时，DSL 错误的问题；
+- 关闭 errorLogger，修复错误日志重复输出的问题；
+- 修复系统管理更新用户信息失败的问题；
+- 修复因原AR信息丢失，导致迁移任务一直处于执行中的错误；
+- 修复集群 Topic 列表实时数据查询时，出现失败的问题；
+- 修复集群 Topic 列表，页面白屏问题；
+- 修复副本变更时，因AR数据异常，导致数组访问越界的问题；
+
+
+**产品优化**
+- 优化健康巡检为按照资源维度多线程并发处理；
+- 统一日志输出格式，并优化部分输出的日志；
+- 优化 ZK 四字命令结果解析过程中，容易引起误解的 WARN 日志；
+- 优化 Zookeeper 详情中，目录结构的搜索文案；
+- 优化线程池的名称，方便第三方系统进行相关问题的分析；
+- 去除 ESClient 的并发访问控制，降低 ESClient 创建数及提升利用率；
+- 优化 Topic Messages 抽屉文案；
+- 优化 ZK 健康巡检失败时的错误日志信息；
+- 提高 Offset 信息获取的超时时间，降低并发过高时出现请求超时的概率；
+- 优化 Topic & Partition 元信息的更新策略，降低对 DB 连接的占用；
+- 优化 Sonar 代码扫码问题；
+- 优化分区 Offset 指标的采集；
+- 优化前端图表相关组件逻辑;
+- 优化产品主题色;
+- Consumer 列表刷新按钮新增 hover 提示；
+- 优化配置 Topic 的消息大小时的测试弹框体验；
+- 优化 Overview 页面 TopN 查询的流程；
+
+
+**功能新增**
+- 新增页面无数据排查文档；
+- 增加 ES 索引删除的功能；
+- 支持拆分API服务和Job服务部署；
+
+
+**Kafka Connect Beta版 (v3.2.0版本新增发布)**
+- Connect 集群的纳管；
+- Connector 的增删改查；
+- Connect 集群 & Connector 的指标大盘；
+
+
+---
+
+
+## v3.1.0
+
+**Bug修复**
+- 修复重置 Group Offset 的提示信息中，缺少Dead状态也可进行重置的描述；
+- 修复新建 Topic 后，立即查看 Topic Messages 信息时，会提示 Topic 不存在的问题；
+- 修复副本变更时，优先副本选举未被正常处罚执行的问题；
+- 修复 git 目录不存在时，打包不能正常进行的问题；
+- 修复 KRaft 模式的 Kafka 集群，JMX PORT 显示 -1 的问题；
+
+
+**体验优化**
+- 优化Cluster、Broker、Topic、Group的健康分为健康状态；
+- 去除健康巡检配置中的权重信息；
+- 错误提示页面展示优化；
+- 前端打包编译依赖默认使用 taobao 镜像；
+- 重新设计优化导航栏的 icon ；
+
+
+**新增**
+- 个人头像下拉信息中，新增产品版本信息；
+- 多集群列表页面，新增集群健康状态分布信息；
+
+
+**Kafka ZK 部分 (v3.1.0版本正式发布)**
+- 新增 ZK 集群的指标大盘信息；
+- 新增 ZK 集群的服务状态概览信息；
+- 新增 ZK 集群的服务节点列表信息；
+- 新增 Kafka 在 ZK 的存储数据查看功能；
+- 新增 ZK 的健康巡检及健康状态计算；
+
+
+
+---
+
+
+## v3.0.1
+
+**Bug修复**
+- 修复重置 Group Offset 时，提示信息中缺少 Dead 状态也可进行重置的信息；
+- 修复 Ldap 某个属性不存在时，会直接抛出空指针导致登陆失败的问题；
+- 修复集群 Topic 列表页，健康分详情信息中，检查时间展示错误的问题；
+- 修复更新健康检查结果时，出现死锁的问题；
+- 修复 Replica 索引模版错误的问题；
+- 修复 FAQ 文档中的错误链接；
+- 修复 Broker 的 TopN 指标不存在时，页面数据不展示的问题；
+- 修复 Group 详情页，图表时间范围选择不生效的问题；
+
+
+**体验优化**
+- 集群 Group 列表按照 Group 维度进行展示；
+- 优化避免因 ES 中该指标不存在，导致日志中出现大量空指针的问题；
+- 优化全局 Message & Notification 展示效果；
+- 优化 Topic 扩分区名称 & 描述展示；
+
+
+**新增**
+- Broker 列表页面，新增 JMX 是否成功连接的信息；
+
+
+**ZK 部分(未完全发布)**
+- 后端补充 Kafka ZK 指标采集，Kafka ZK 信息获取相关功能；
+- 增加本地缓存，避免同一采集周期内 ZK 指标重复采集；
+- 增加 ZK 节点采集失败跳过策略，避免不断对存在问题的节点不断尝试；
+- 修复 zkAvgLatency 指标转 Long 时抛出异常问题；
+- 修复 ks_km_zookeeper 表中，role 字段类型错误问题；
+
+---
+
+## v3.0.0
+
+**Bug修复**
+- 修复 Group 指标防重复采集不生效问题
+- 修复自动创建 ES 索引模版失败问题
+- 修复 Group+Topic 列表中存在已删除Topic的问题
+- 修复使用 MySQL-8 ，因兼容问题， start_time 信息为 NULL 时，会导致创建任务失败的问题
+- 修复 Group 信息表更新时，出现死锁的问题
+- 修复图表补点逻辑与图表时间范围不适配的问题
+
+
+**体验优化**
+- 按照资源类别，拆分健康巡检任务
+- 优化 Group 详情页的指标为实时获取
+- 图表拖拽排序支持用户级存储
+- 多集群列表 ZK 信息展示兼容无 ZK 情况
+- Topic 详情消息预览支持复制功能
+- 部分内容大数字支持千位分割符展示
+
+
+**新增**
+- 集群信息中，新增 Zookeeper 客户端配置字段
+- 集群信息中，新增 Kafka 集群运行模式字段
+- 新增 docker-compose 的部署方式
+
+---
+
+## v3.0.0-beta.3
+
+**文档**
+- FAQ 补充权限识别失败问题的说明
+- 同步更新文档，保持与官网一致
+
+
+**Bug修复**
+- Offset 信息获取时，过滤掉无 Leader 的分区
+- 升级 oshi-core 版本至 5.6.1 版本，修复 Windows 系统获取系统指标失败问题
+- 修复 JMX 连接被关闭后，未进行重建的问题
+- 修复因 DB 中 Broker 信息不存在导致 TotalLogSize 指标获取时抛空指针问题
+- 修复 dml-logi.sql 中，SQL 注释错误的问题
+- 修复 startup.sh 中，识别操作系统类型错误的问题
+- 修复配置管理页面删除配置失败的问题
+- 修复系统管理应用文件引用路径
+- 修复 Topic Messages 详情提示信息点击跳转 404 的问题
+- 修复扩副本时，当前副本数不显示问题
+
+
+**体验优化**
+- Topic-Messages 页面，增加返回数据的排序以及按照Earliest/Latest的获取方式
+- 优化 GroupOffsetResetEnum 类名为 OffsetTypeEnum，使得类名含义更准确
+- 移动 KafkaZKDAO 类，及 Kafka Znode 实体类的位置，使得 Kafka Zookeeper DAO 更加内聚及便于识别
+- 后端补充 Overview 页面指标排序的功能
+- 前端 Webpack 配置优化
+- Cluster Overview 图表取消放大展示功能
+- 列表页增加手动刷新功能
+- 接入/编辑集群，优化 JMX-PORT，Version 信息的回显，优化JMX信息的展示
+- 提高登录页面图片展示清晰度
+- 部分样式和文案优化
+
+---
+
+## v3.0.0-beta.2
+
+**文档**
+- 新增登录系统对接文档
+- 优化前端工程打包构建部分文档说明
+- FAQ补充KnowStreaming连接特定JMX IP的说明
+
+
+**Bug修复**
+- 修复logi_security_oplog表字段过短，导致删除Topic等操作无法记录的问题
+- 修复ES查询时，抛java.lang.NumberFormatException: For input string: "{"value":0,"relation":"eq"}" 问题
+- 修复LogStartOffset和LogEndOffset指标单位错误问题
+- 修复进行副本变更时，旧副本数为NULL的问题
+- 修复集群Group列表，在第二页搜索时，搜索时返回的分页信息错误问题
+- 修复重置Offset时，返回的错误信息提示不一致的问题
+- 修复集群查看，系统查看，LoadRebalance等页面权限点缺失问题
+- 修复查询不存在的Topic时，错误信息提示不明显的问题
+- 修复Windows用户打包前端工程报错的问题
+- package-lock.json锁定前端依赖版本号，修复因依赖自动升级导致打包失败等问题
+- 系统管理子应用，补充后端返回的Code码拦截，解决后端接口返回报错不展示的问题
+- 修复用户登出后，依旧可以访问系统的问题
+- 修复巡检任务配置时，数值显示错误的问题
+- 修复Broker/Topic Overview 图表和图表详情问题
+- 修复Job扩缩副本任务明细数据错误的问题
+- 修复重置Offset时，分区ID，Offset数值无限制问题
+- 修复扩缩/迁移副本时，无法选中Kafka系统Topic的问题
+- 修复Topic的Config页面，编辑表单时不能正确回显当前值的问题
+- 修复Broker Card返回数据后依旧展示加载态的问题
+
+
+
+**体验优化**
+- 优化默认用户密码为 admin/admin
+- 缩短新增集群后，集群信息加载的耗时
+- 集群Broker列表，增加Controller角色信息
+- 副本变更任务结束后，增加进行优先副本选举的操作
+- Task模块任务分为Metrics、Common、Metadata三类任务，每类任务配备独立线程池，减少对Job模块的线程池，以及不同类任务之间的相互影响
+- 删除代码中存在的多余无用文件
+- 自动新增ES索引模版及近7天索引，减少用户搭建时需要做的事项
+- 优化前端工程打包流程
+- 优化登录页文案，页面左侧栏内容，单集群详情样式，Topic列表趋势图等
+- 首次进入Broker/Topic图表详情时，进行预缓存数据从而优化体验
+- 优化Topic详情Partition Tab的展示
+- 多集群列表页增加编辑功能
+- 优化副本变更时，迁移时间支持分钟级别粒度
+- logi-security版本升级至2.10.13
+- logi-elasticsearch-client版本升级至1.0.24
+
+
+**能力提升**
+- 支持Ldap登录认证
+
+---
+
+## v3.0.0-beta.1
+
+**文档**
+- 新增Task模块说明文档
+- FAQ补充 `Specified key was too long; max key length is 767 bytes ` 错误说明
+- FAQ补充 `出现ESIndexNotFoundException报错` 错误说明
+
+
+**Bug修复**
+- 修复 Consumer 点击 Stop 未停止检索的问题
+- 修复创建/编辑角色权限报错问题
+- 修复多集群管理/单集群详情均衡卡片状态错误问题
+- 修复版本列表未排序问题
+- 修复Raft集群Controller信息不断记录问题
+- 修复部分版本消费组描述信息获取失败问题
+- 修复分区Offset获取失败的日志中，缺少Topic名称信息问题
+- 修复GitHub图地址错误，及图裂问题
+- 修复Broker默认使用的地址和注释不一致问题
+- 修复 Consumer 列表分页不生效问题
+- 修复操作记录表operation_methods字段缺少默认值问题
+- 修复集群均衡表中move_broker_list字段无效的问题
+- 修复KafkaUser、KafkaACL信息获取时，日志一直重复提示不支持问题
+- 修复指标缺失时，曲线出现掉底的问题
+
+
+**体验优化**
+- 优化前端构建时间和打包体积，增加依赖打包的分包策略
+- 优化产品样式和文案展示
+- 优化ES客户端数为可配置
+- 优化日志中大量出现的MySQL Key冲突日志
+
+
+**能力提升**
+- 增加周期任务，用于主动创建缺少的ES模版及索引的能力，减少额外的脚本操作
+- 增加JMX连接的Broker地址可选择的能力
+
+---
+
+## v3.0.0-beta.0
+
+**1、多集群管理**
+
+- 增加健康监测体系、关键组件&指标 GUI 展示
+- 增加 2.8.x 以上 Kafka 集群接入，覆盖 0.10.x-3.x
+- 删除逻辑集群、共享集群、Region 概念
+
+**2、Cluster 管理**
+
+- 增加集群概览信息、集群配置变更记录
+- 增加 Cluster 健康分，健康检查规则支持自定义配置
+- 增加 Cluster 关键指标统计和 GUI 展示，支持自定义配置
+- 增加 Cluster 层 I/O、Disk 的 Load Reblance 功能，支持定时均衡任务（企业版）
+- 删除限流、鉴权功能
+- 删除 APPID 概念
+
+**3、Broker 管理**
+
+- 增加 Broker 健康分
+- 增加 Broker 关键指标统计和 GUI 展示，支持自定义配置
+- 增加 Broker 参数配置功能，需重启生效
+- 增加 Controller 变更记录
+- 增加 Broker Datalogs 记录
+- 删除 Leader Rebalance 功能
+- 删除 Broker 优先副本选举
+
+**4、Topic 管理**
+
+- 增加 Topic 健康分
+- 增加 Topic 关键指标统计和 GUI 展示，支持自定义配置
+- 增加 Topic 参数配置功能，可实时生效
+- 增加 Topic 批量迁移、Topic 批量扩缩副本功能
+- 增加查看系统 Topic 功能
+- 优化 Partition 分布的 GUI 展示
+- 优化 Topic Message 数据采样
+- 删除 Topic 过期概念
+- 删除 Topic 申请配额功能
+
+**5、Consumer 管理**
+
+- 优化了 ConsumerGroup 展示形式，增加 Consumer Lag 的 GUI 展示
+
+**6、ACL 管理**
+
+- 增加原生 ACL GUI 配置功能，可配置生产、消费、自定义多种组合权限
+- 增加 KafkaUser 功能，可自定义新增 KafkaUser
+
+**7、消息测试（企业版）**
+
+- 增加生产者消息模拟器，支持 Data、Flow、Header、Options 自定义配置（企业版）
+- 增加消费者消息模拟器，支持 Data、Flow、Header、Options 自定义配置（企业版）
+
+**8、Job**
+
+- 优化 Job 模块，支持任务进度管理
+
+**9、系统管理**
+
+- 优化用户、角色管理体系，支持自定义角色配置页面及操作权限
+- 优化审计日志信息
+- 删除多租户体系
+- 删除工单流程
+
+---
+
+## v2.6.0
+
+版本上线时间：2022-01-24
+
+### 能力提升
+- 增加简单回退工具类
+
+### 体验优化
+- 补充周期任务说明文档
+- 补充集群安装部署使用说明文档
+- 升级Swagger、SpringFramework、SpringBoot、EChats版本
+- 优化Task模块的日志输出
+- 优化corn表达式解析失败后退出无任何日志提示问题
+- Ldap用户接入时，增加部门及邮箱信息等
+- 对Jmx模块，增加连接失败后的回退机制及错误日志优化
+- 增加线程池、客户端池可配置
+- 删除无用的jmx_prometheus_javaagent-0.14.0.jar
+- 优化迁移任务名称
+- 优化创建Region时，Region容量信息不能立即被更新问题
+- 引入lombok
+- 更新视频教程
+- 优化kcm_script.sh脚本中的LogiKM地址为可通过程序传入
+- 第三方接口及网关接口，增加是否跳过登录的开关
+- extends模块相关配置调整为非必须在application.yml中配置
+
+### bug修复
+- 修复批量往DB写入空指标数组时报SQL语法异常的问题
+- 修复网关增加配置及修改配置时，version不变化问题
+- 修复集群列表页，提示框遮挡问题
+- 修复对高版本Broker元信息协议解析失败的问题
+- 修复Dockerfile执行时提示缺少application.yml文件的问题
+- 修复逻辑集群更新时，会报空指针的问题
+
+
+## v2.5.0
+
+版本上线时间：2021-07-10
+
+### 体验优化
+- 更改产品名为LogiKM
+- 更新产品图标
+
+
+## v2.4.1+
+
+版本上线时间：2021-05-21
+
+### 能力提升
+- 增加直接增加权限和配额的接口(v2.4.1)
+- 增加接口调用可绕过登录的功能(v2.4.1)
+
+### 体验优化
+- Tomcat 版本提升至8.5.66(v2.4.2)
+- op接口优化，拆分util接口为topic、leader两类接口(v2.4.1)
+- 简化Gateway配置的Key长度(v2.4.1)
+
+### bug修复
+- 修复页面展示版本错误问题(v2.4.2)
+
+
+## v2.4.0
+
+版本上线时间：2021-05-18
+
+
+### 能力提升
+
+- 增加App与Topic自动化审批开关
+- Broker元信息中增加Rack信息
+- 升级MySQL 驱动，支持MySQL 8+
+- 增加操作记录查询界面
+
+### 体验优化
+
+- FAQ告警组说明优化
+- 用户手册共享及 独享集群概念优化
+- 用户管理界面，前端限制用户删除自己
+
+### bug修复
+
+- 修复op-util类中创建Topic失败的接口
+- 周期同步Topic到DB的任务修复，将Topic列表查询从缓存调整为直接查DB
+- 应用下线审批失败的功能修复，将权限为0(无权限)的数据进行过滤
+- 修复登录及权限绕过的漏洞
+- 修复研发角色展示接入集群、暂停监控等按钮的问题
+
+
+## v2.3.0
+
+版本上线时间：2021-02-08
+
+
+### 能力提升
+
+- 新增支持docker化部署
+- 可指定Broker作为候选controller
+- 可新增并管理网关配置
+- 可获取消费组状态
+- 增加集群的JMX认证  
+
+### 体验优化
+
+- 优化编辑用户角色、修改密码的流程
+- 新增consumerID的搜索功能
+- 优化“Topic连接信息”、“消费组重置消费偏移”、“修改Topic保存时间”的文案提示
+- 在相应位置增加《资源申请文档》链接 
+
+### bug修复
+
+- 修复Broker监控图表时间轴展示错误的问题
+- 修复创建夜莺监控告警规则时，使用的告警周期的单位不正确的问题
+
+
+
+## v2.2.0
+
+版本上线时间：2021-01-25
+
+
+
+### 能力提升
+
+- 优化工单批量操作流程 
+- 增加获取Topic75分位/99分位的实时耗时数据
+- 增加定时任务，可将无主未落DB的Topic定期写入DB
+
+### 体验优化
+
+- 在相应位置增加《集群接入文档》链接
+- 优化物理集群、逻辑集群含义
+- 在Topic详情页、Topic扩分区操作弹窗增加展示Topic所属Region的信息
+- 优化Topic审批时，Topic数据保存时间的配置流程
+- 优化Topic/应用申请、审批时的错误提示文案
+- 优化Topic数据采样的操作项文案
+- 优化运维人员删除Topic时的提示文案
+- 优化运维人员删除Region的删除逻辑与提示文案
+- 优化运维人员删除逻辑集群的提示文案
+- 优化上传集群配置文件时的文件类型限制条件
+
+### bug修复
+
+- 修复填写应用名称时校验特殊字符出错的问题
+- 修复普通用户越权访问应用详情的问题
+- 修复由于Kafka版本升级，导致的数据压缩格式无法获取的问题
+- 修复删除逻辑集群或Topic之后，界面依旧展示的问题
+- 修复进行Leader rebalance操作时执行结果重复提示的问题
+
+
+## v2.1.0
+
+版本上线时间：2020-12-19
+
+
+
+### 体验优化
+
+- 优化页面加载时的背景样式
+- 优化普通用户申请Topic权限的流程
+- 优化Topic申请配额、申请分区的权限限制
+- 优化取消Topic权限的文案提示
+- 优化申请配额表单的表单项名称
+- 优化重置消费偏移的操作流程
+- 优化创建Topic迁移任务的表单内容
+- 优化Topic扩分区操作的弹窗界面样式
+- 优化集群Broker监控可视化图表样式
+- 优化创建逻辑集群的表单内容
+- 优化集群安全协议的提示文案
+
+### bug修复
+
+- 修复偶发性重置消费偏移失败的问题
+
+
+
+

TROGDOR.md

@@ -1,189 +0,0 @@
-Trogdor
-========================================
-Trogdor is a test framework for Apache Kafka.
-
-Trogdor can run benchmarks and other workloads.  Trogdor can also inject faults in order to stress test the system.
-
-Quickstart
-=========================================================
-First, we want to start a single-node Kafka cluster with a ZooKeeper and a broker.
-
-Running ZooKeeper:
-
-    > ./bin/zookeeper-server-start.sh ./config/zookeeper.properties &> /tmp/zookeeper.log &
-
-Running Kafka:
-
-    > ./bin/kafka-server-start.sh ./config/server.properties &> /tmp/kafka.log &
-
-Then, we want to run a Trogdor Agent, plus a Trogdor Coordinator.
-
-To run the Trogdor Agent:
-
-    > ./bin/trogdor.sh agent -c ./config/trogdor.conf -n node0 &> /tmp/trogdor-agent.log &
-
-To run the Trogdor Coordinator:
-
-    > ./bin/trogdor.sh coordinator -c ./config/trogdor.conf -n node0 &> /tmp/trogdor-coordinator.log &
-
-Let's confirm that all of the daemons are running:
-
-    > jps
-    116212 Coordinator
-    115188 QuorumPeerMain
-    116571 Jps
-    115420 Kafka
-    115694 Agent
-
-Now, we can submit a test job to Trogdor.
-
-    > ./bin/trogdor.sh client createTask -t localhost:8889 -i produce0 --spec ./tests/spec/simple_produce_bench.json
-    Sent CreateTaskRequest for task produce0.
-
-We can run showTask to see what the task's status is:
-
-    > ./bin/trogdor.sh client showTask -t localhost:8889 -i produce0
-    Task bar of type org.apache.kafka.trogdor.workload.ProduceBenchSpec is DONE. FINISHED at 2019-01-09T20:38:22.039-08:00 after 6s
-
-To see the results, we use showTask with --show-status:
-
-    > ./bin/trogdor.sh client showTask -t localhost:8889 -i produce0 --show-status
-    Task bar of type org.apache.kafka.trogdor.workload.ProduceBenchSpec is DONE. FINISHED at 2019-01-09T20:38:22.039-08:00 after 6s
-    Status: {
-      "totalSent" : 50000,
-      "averageLatencyMs" : 17.83388,
-      "p50LatencyMs" : 12,
-      "p95LatencyMs" : 75,
-      "p99LatencyMs" : 96,
-      "transactionsCommitted" : 0
-    }
-
-Trogdor Architecture
-========================================
-Trogdor has a single coordinator process which manages multiple agent processes.  Each agent process is responsible for a single cluster node.
-
-The Trogdor coordinator manages tasks.  A task is anything we might want to do on a cluster, such as running a benchmark, injecting a fault, or running a workload.  In order to implement each task, the coordinator creates workers on one or more agent nodes.
-
-The Trogdor agent process implements the tasks.  For example, when running a workload, the agent process is the process which produces and consumes messages.
-
-Both the coordinator and the agent expose a REST interface that accepts objects serialized via JSON.  There is also a command-line program which makes it easy to send messages to either one without manually crafting the JSON message body.
-
-All Trogdor RPCs are idempotent except the shutdown requests.  Sending an idempotent RPC twice in a row has the same effect as sending the RPC once.
-
-Tasks
-========================================
-Tasks are described by specifications containing:
-
-* A "class" field describing the task type.  This contains a full Java class name.
-* A "startMs" field describing when the task should start.  This is given in terms of milliseconds since the UNIX epoch.
-* A "durationMs" field describing how long the task should last.  This is given in terms of milliseconds.
-* Other fields which are task-specific.
-
-The task specification is usually written as JSON.  For example, this task specification describes a network partition between nodes 1 and 2, and 3:
-
-    {
-        "class": "org.apache.kafka.trogdor.fault.NetworkPartitionFaultSpec",
-        "startMs": 1000,
-        "durationMs": 30000,
-        "partitions": [["node1", "node2"], ["node3"]]
-    }
-    
-This task runs a simple ProduceBench test on a cluster with one producer node, 5 topics, and 10,000 messages per second. 
-The keys are generated sequentially and the configured partitioner (DefaultPartitioner) is used. 
-
-    {
-        "class": "org.apache.kafka.trogdor.workload.ProduceBenchSpec",
-        "durationMs": 10000000,
-        "producerNode": "node0",
-        "bootstrapServers": "localhost:9092",
-        "targetMessagesPerSec": 10000,
-        "maxMessages": 50000,
-        "activeTopics": {
-            "foo[1-3]": {
-                "numPartitions": 10,
-                "replicationFactor": 1
-            }
-        },
-        "inactiveTopics": {
-             "foo[4-5]": {
-                 "numPartitions": 10,
-                 "replicationFactor": 1
-             }
-        },
-        "keyGenerator": {
-             "type": "sequential",
-             "size": 8,
-             "offset": 1
-        },
-        "useConfiguredPartitioner": true
-     }
-
-Tasks are submitted to the coordinator.  Once the coordinator determines that it is time for the task to start, it creates workers on agent processes.  The workers run until the task is done.
-
-Task specifications are immutable; they do not change after the task has been created.
-
-Tasks can be in several states:
-* PENDING, when task is waiting to execute,
-* RUNNING, when the task is running,
-* STOPPING, when the task is in the process of stopping,
-* DONE, when the task is done.
-
-Tasks that are DONE also have an error field which will be set if the task failed.
-
-Workloads
-========================================
-Trogdor can run several workloads.  Workloads perform operations on the cluster and measure their performance.  Workloads fail when the operations cannot be performed.
-
-### ProduceBench
-ProduceBench starts a Kafka producer on a single agent node, producing to several partitions.  The workload measures the average produce latency, as well as the median, 95th percentile, and 99th percentile latency.
-It can be configured to use a transactional producer which can commit transactions based on a set time interval or number of messages.
-
-### RoundTripWorkload
-RoundTripWorkload tests both production and consumption.  The workload starts a Kafka producer and consumer on a single node.  The consumer will read back the messages that were produced by the producer.
-
-### ConsumeBench
-ConsumeBench starts one or more Kafka consumers on a single agent node. Depending on the passed in configuration (see ConsumeBenchSpec), the consumers either subscribe to a set of topics (leveraging consumer group functionality and dynamic partition assignment) or manually assign partitions to themselves.
-The workload measures the average produce latency, as well as the median, 95th percentile, and 99th percentile latency.
-
-Faults
-========================================
-Trogdor can run several faults which deliberately break something in the cluster.
-
-### ProcessStopFault
-ProcessStopFault stops a process by sending it a SIGSTOP signal.  When the fault ends, the process is resumed with SIGCONT.
-
-### NetworkPartitionFault
-NetworkPartitionFault sets up an artificial network partition between one or more sets of nodes.  Currently, this is implemented using iptables.  The iptables rules are set up on the outbound traffic from the affected nodes.  Therefore, the affected nodes should still be reachable from outside the cluster.
-
-External Processes
-========================================
-Trogdor supports running arbitrary commands in external processes. This is a generic way to run any configurable command in the Trogdor framework - be it a Python program, bash script, docker image, etc.
-
-### ExternalCommandWorker
-ExternalCommandWorker starts an external command defined by the ExternalCommandSpec. It essentially allows you to run any command on any Trogdor agent node.
-The worker communicates with the external process via its stdin, stdout and stderr in a JSON protocol. It uses stdout for any actionable communication and only logs what it sees in stderr.
-On startup the worker will first send a message describing the workload to the external process in this format:
-```
-{"id":<task ID string>, "workload":<configured workload JSON object>}
-```
-and will then listen for messages from the external process, again in a JSON format.
-Said JSON can contain the following fields:
-- status: If the object contains this field, the status of the worker will be set to the given value.
-- error: If the object contains this field, the error of the worker will be set to the given value. Once an error occurs, the external process will be terminated.
-- log: If the object contains this field, a log message will be issued with this text.
-An example:
-```json
-{"log": "Finished successfully.", "status": {"p99ProduceLatency": "100ms", "messagesSent": 10000}}
-```
-
-Exec Mode
-========================================
-Sometimes, you just want to run a test quickly on a single node.  In this case, you can use "exec mode."  This mode allows you to run a single Trogdor Agent without a Coordinator.
-
-When using exec mode, you must pass in a Task specification to use.  The Agent will try to start this task.
-
-For example:
-
-    > ./bin/trogdor.sh agent -n node0 -c ./config/trogdor.conf --exec ./tests/spec/simple_produce_bench.json
-
-When using exec mode, the Agent will exit once the task is complete.

Vagrantfile

@@ -1,199 +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
-#
-#    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.
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-require 'socket'
-
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
-
-# General config
-enable_dns = false
-# Override to false when bringing up a cluster on AWS
-enable_hostmanager = true
-enable_jmx = false
-num_zookeepers = 1
-num_brokers = 3
-num_workers = 0 # Generic workers that get the code, but don't start any services
-ram_megabytes = 1280
-base_box = "ubuntu/trusty64"
-
-# EC2
-ec2_access_key = ENV['AWS_ACCESS_KEY']
-ec2_secret_key = ENV['AWS_SECRET_KEY']
-ec2_session_token = ENV['AWS_SESSION_TOKEN']
-ec2_keypair_name = nil
-ec2_keypair_file = nil
-
-ec2_region = "us-east-1"
-ec2_az = nil # Uses set by AWS
-ec2_ami = "ami-29ebb519"
-ec2_instance_type = "m3.medium"
-ec2_spot_instance = ENV['SPOT_INSTANCE'] ? ENV['SPOT_INSTANCE'] == 'true' : true
-ec2_spot_max_price = "0.113"  # On-demand price for instance type
-ec2_user = "ubuntu"
-ec2_instance_name_prefix = "kafka-vagrant"
-ec2_security_groups = nil
-ec2_subnet_id = nil
-# Only override this by setting it to false if you're running in a VPC and you
-# are running Vagrant from within that VPC as well.
-ec2_associate_public_ip = nil
-
-jdk_major = '8'
-jdk_full = '8u202-linux-x64'
-
-local_config_file = File.join(File.dirname(__FILE__), "Vagrantfile.local")
-if File.exists?(local_config_file) then
-  eval(File.read(local_config_file), binding, "Vagrantfile.local")
-end
-
-# TODO(ksweeney): RAM requirements are not empirical and can probably be significantly lowered.
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.hostmanager.enabled = enable_hostmanager
-  config.hostmanager.manage_host = enable_dns
-  config.hostmanager.include_offline = false
-
-  ## Provider-specific global configs
-  config.vm.provider :virtualbox do |vb,override|
-    override.vm.box = base_box
-
-    override.hostmanager.ignore_private_ip = false
-
-    # Brokers started with the standard script currently set Xms and Xmx to 1G,
-    # plus we need some extra head room.
-    vb.customize ["modifyvm", :id, "--memory", ram_megabytes.to_s]
-
-    if Vagrant.has_plugin?("vagrant-cachier")
-      override.cache.scope = :box
-    end
-  end
-
-  config.vm.provider :aws do |aws,override|
-    # The "box" is specified as an AMI
-    override.vm.box = "dummy"
-    override.vm.box_url = "https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box"
-
-    cached_addresses = {}
-    # Use a custom resolver that SSH's into the machine and finds the IP address
-    # directly. This lets us get at the private IP address directly, avoiding
-    # some issues with using the default IP resolver, which uses the public IP
-    # address.
-    override.hostmanager.ip_resolver = proc do |vm, resolving_vm|
-      if !cached_addresses.has_key?(vm.name)
-        state_id = vm.state.id
-        if state_id != :not_created && state_id != :stopped && vm.communicate.ready?
-          contents = ''
-          vm.communicate.execute("/sbin/ifconfig eth0 | grep 'inet addr' | tail -n 1 | egrep -o '[0-9\.]+' | head -n 1 2>&1") do |type, data|
-            contents << data
-          end
-          cached_addresses[vm.name] = contents.split("\n").first[/(\d+\.\d+\.\d+\.\d+)/, 1]
-        else
-          cached_addresses[vm.name] = nil
-        end
-      end
-      cached_addresses[vm.name]
-    end
-
-    override.ssh.username = ec2_user
-    override.ssh.private_key_path = ec2_keypair_file
-
-    aws.access_key_id = ec2_access_key
-    aws.secret_access_key = ec2_secret_key
-    aws.session_token = ec2_session_token
-    aws.keypair_name = ec2_keypair_name
-
-    aws.region = ec2_region
-    aws.availability_zone = ec2_az
-    aws.instance_type = ec2_instance_type
-    aws.ami = ec2_ami
-    aws.security_groups = ec2_security_groups
-    aws.subnet_id = ec2_subnet_id
-    # If a subnet is specified, default to turning on a public IP unless the
-    # user explicitly specifies the option. Without a public IP, Vagrant won't
-    # be able to SSH into the hosts unless Vagrant is also running in the VPC.
-    if ec2_associate_public_ip.nil?
-      aws.associate_public_ip = true unless ec2_subnet_id.nil?
-    else
-      aws.associate_public_ip = ec2_associate_public_ip
-    end
-    aws.region_config ec2_region do |region|
-      region.spot_instance = ec2_spot_instance
-      region.spot_max_price = ec2_spot_max_price
-    end
-
-    # Exclude some directories that can grow very large from syncing
-    override.vm.synced_folder ".", "/vagrant", type: "rsync", rsync__exclude: ['.git', 'core/data/', 'logs/', 'tests/results/', 'results/']
-  end
-
-  def name_node(node, name, ec2_instance_name_prefix)
-    node.vm.hostname = name
-    node.vm.provider :aws do |aws|
-      aws.tags = {
-        'Name' => ec2_instance_name_prefix + "-" + Socket.gethostname + "-" + name,
-        'JenkinsBuildUrl' => ENV['BUILD_URL']
-      }
-    end
-  end
-
-  def assign_local_ip(node, ip_address)
-    node.vm.provider :virtualbox do |vb,override|
-      override.vm.network :private_network, ip: ip_address
-    end
-  end
-
-  ## Cluster definition
-  zookeepers = []
-  (1..num_zookeepers).each { |i|
-    name = "zk" + i.to_s
-    zookeepers.push(name)
-    config.vm.define name do |zookeeper|
-      name_node(zookeeper, name, ec2_instance_name_prefix)
-      ip_address = "192.168.50." + (10 + i).to_s
-      assign_local_ip(zookeeper, ip_address)
-      zookeeper.vm.provision "shell", path: "vagrant/base.sh", env: {"JDK_MAJOR" => jdk_major, "JDK_FULL" => jdk_full}
-      zk_jmx_port = enable_jmx ? (8000 + i).to_s : ""
-      zookeeper.vm.provision "shell", path: "vagrant/zk.sh", :args => [i.to_s, num_zookeepers, zk_jmx_port]
-    end
-  }
-
-  (1..num_brokers).each { |i|
-    name = "broker" + i.to_s
-    config.vm.define name do |broker|
-      name_node(broker, name, ec2_instance_name_prefix)
-      ip_address = "192.168.50." + (50 + i).to_s
-      assign_local_ip(broker, ip_address)
-      # We need to be careful about what we list as the publicly routable
-      # address since this is registered in ZK and handed out to clients. If
-      # host DNS isn't setup, we shouldn't use hostnames -- IP addresses must be
-      # used to support clients running on the host.
-      zookeeper_connect = zookeepers.map{ |zk_addr| zk_addr + ":2181"}.join(",")
-      broker.vm.provision "shell", path: "vagrant/base.sh", env: {"JDK_MAJOR" => jdk_major, "JDK_FULL" => jdk_full}
-      kafka_jmx_port = enable_jmx ? (9000 + i).to_s : ""
-      broker.vm.provision "shell", path: "vagrant/broker.sh", :args => [i.to_s, enable_dns ? name : ip_address, zookeeper_connect, kafka_jmx_port]
-    end
-  }
-
-  (1..num_workers).each { |i|
-    name = "worker" + i.to_s
-    config.vm.define name do |worker|
-      name_node(worker, name, ec2_instance_name_prefix)
-      ip_address = "192.168.50." + (100 + i).to_s
-      assign_local_ip(worker, ip_address)
-      worker.vm.provision "shell", path: "vagrant/base.sh", env: {"JDK_MAJOR" => jdk_major, "JDK_FULL" => jdk_full}
-    end
-  }
-
-end

bin/connect-distributed.sh

@@ -1,45 +0,0 @@
-#!/bin/sh
-# 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
-#
-#    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.
-
-if [ $# -lt 1 ];
-then
-        echo "USAGE: $0 [-daemon] connect-distributed.properties"
-        exit 1
-fi
-
-base_dir=$(dirname $0)
-
-if [ "x$KAFKA_LOG4J_OPTS" = "x" ]; then
-    export KAFKA_LOG4J_OPTS="-Dlog4j.configuration=file:$base_dir/../config/connect-log4j.properties"
-fi
-
-if [ "x$KAFKA_HEAP_OPTS" = "x" ]; then
-  export KAFKA_HEAP_OPTS="-Xms256M -Xmx2G"
-fi
-
-EXTRA_ARGS=${EXTRA_ARGS-'-name connectDistributed'}
-
-COMMAND=$1
-case $COMMAND in
-  -daemon)
-    EXTRA_ARGS="-daemon "$EXTRA_ARGS
-    shift
-    ;;
-  *)
-    ;;
-esac
-
-exec $(dirname $0)/kafka-run-class.sh $EXTRA_ARGS org.apache.kafka.connect.cli.ConnectDistributed "$@"

bin/connect-mirror-maker.sh

@@ -1,45 +0,0 @@
-#!/bin/sh
-# 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
-#
-#    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.
-
-if [ $# -lt 1 ];
-then
-        echo "USAGE: $0 [-daemon] mm2.properties"
-        exit 1
-fi
-
-base_dir=$(dirname $0)
-
-if [ "x$KAFKA_LOG4J_OPTS" = "x" ]; then
-    export KAFKA_LOG4J_OPTS="-Dlog4j.configuration=file:$base_dir/../config/connect-log4j.properties"
-fi
-
-if [ "x$KAFKA_HEAP_OPTS" = "x" ]; then
-  export KAFKA_HEAP_OPTS="-Xms256M -Xmx2G"
-fi
-
-EXTRA_ARGS=${EXTRA_ARGS-'-name mirrorMaker'}
-
-COMMAND=$1
-case $COMMAND in
-  -daemon)
-    EXTRA_ARGS="-daemon "$EXTRA_ARGS
-    shift
-    ;;
-  *)
-    ;;
-esac
-
-exec $(dirname $0)/kafka-run-class.sh $EXTRA_ARGS org.apache.kafka.connect.mirror.MirrorMaker "$@"

bin/connect-standalone.sh

@@ -1,45 +0,0 @@
-#!/bin/sh
-# 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
-#
-#    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.
-
-if [ $# -lt 1 ];
-then
-        echo "USAGE: $0 [-daemon] connect-standalone.properties"
-        exit 1
-fi
-
-base_dir=$(dirname $0)
-
-if [ "x$KAFKA_LOG4J_OPTS" = "x" ]; then
-    export KAFKA_LOG4J_OPTS="-Dlog4j.configuration=file:$base_dir/../config/connect-log4j.properties"
-fi
-
-if [ "x$KAFKA_HEAP_OPTS" = "x" ]; then
-  export KAFKA_HEAP_OPTS="-Xms256M -Xmx2G"
-fi
-
-EXTRA_ARGS=${EXTRA_ARGS-'-name connectStandalone'}
-
-COMMAND=$1
-case $COMMAND in
-  -daemon)
-    EXTRA_ARGS="-daemon "$EXTRA_ARGS
-    shift
-    ;;
-  *)
-    ;;
-esac
-
-exec $(dirname $0)/kafka-run-class.sh $EXTRA_ARGS org.apache.kafka.connect.cli.ConnectStandalone "$@"

bin/kafka-acls.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-# 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
-# 
-#    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.
-
-exec $(dirname $0)/kafka-run-class.sh kafka.admin.AclCommand "$@"

bin/kafka-broker-api-versions.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-# 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
-#
-#    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.
-
-exec $(dirname $0)/kafka-run-class.sh kafka.admin.BrokerApiVersionsCommand "$@"

bin/kafka-configs.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-# 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
-# 
-#    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.
-
-exec $(dirname $0)/kafka-run-class.sh kafka.admin.ConfigCommand "$@"

bin/kafka-console-consumer.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-# 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
-#
-#    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.
-
-if [ "x$KAFKA_HEAP_OPTS" = "x" ]; then
-    export KAFKA_HEAP_OPTS="-Xmx512M"
-fi
-
-exec $(dirname $0)/kafka-run-class.sh kafka.tools.ConsoleConsumer "$@"

bin/kafka-console-producer.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-# 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
-#
-#    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.
-
-if [ "x$KAFKA_HEAP_OPTS" = "x" ]; then
-    export KAFKA_HEAP_OPTS="-Xmx512M"
-fi
-exec $(dirname $0)/kafka-run-class.sh kafka.tools.ConsoleProducer "$@"

bin/kafka-consumer-groups.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-# 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
-# 
-#    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.
-
-exec $(dirname $0)/kafka-run-class.sh kafka.admin.ConsumerGroupCommand "$@"

bin/kafka-consumer-perf-test.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-# 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
-#
-#    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.
-
-if [ "x$KAFKA_HEAP_OPTS" = "x" ]; then
-    export KAFKA_HEAP_OPTS="-Xmx512M"
-fi
-exec $(dirname $0)/kafka-run-class.sh kafka.tools.ConsumerPerformance "$@"

bin/kafka-delegation-tokens.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-# 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
-#
-#    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.
-
-exec $(dirname $0)/kafka-run-class.sh kafka.admin.DelegationTokenCommand "$@"

bin/kafka-delete-records.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-# 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
-#
-#    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.
-
-exec $(dirname $0)/kafka-run-class.sh kafka.admin.DeleteRecordsCommand "$@"

bin/kafka-diskload-protector.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-# 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
-# 
-#    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.
-
-exec $(dirname $0)/kafka-run-class.sh kafka.admin.DiskLoadProtectorCommand "$@"
-

bin/kafka-dump-log.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-# 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
-# 
-#    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.
-
-exec $(dirname $0)/kafka-run-class.sh kafka.tools.DumpLogSegments "$@"

bin/kafka-exmetrics.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-# 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
-# 
-#    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.
-
-exec $(dirname $0)/kafka-run-class.sh kafka.admin.KafkaExMetricsCommand "$@"
-

bin/kafka-leader-election.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-# 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
-#
-#    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.
-
-exec $(dirname $0)/kafka-run-class.sh kafka.admin.LeaderElectionCommand "$@"

bin/kafka-log-dirs.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-# 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
-#
-#    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.
-
-exec $(dirname $0)/kafka-run-class.sh kafka.admin.LogDirsCommand "$@"

bin/kafka-mirror-maker.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-# 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
-# 
-#    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.
-
-exec $(dirname $0)/kafka-run-class.sh kafka.tools.MirrorMaker "$@"

bin/kafka-preferred-replica-election.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-# 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
-#
-#    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.
-
-exec $(dirname $0)/kafka-run-class.sh kafka.admin.PreferredReplicaLeaderElectionCommand "$@"

bin/kafka-producer-perf-test.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-# 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
-#
-#    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.
-
-if [ "x$KAFKA_HEAP_OPTS" = "x" ]; then
-    export KAFKA_HEAP_OPTS="-Xmx512M"
-fi
-exec $(dirname $0)/kafka-run-class.sh org.apache.kafka.tools.ProducerPerformance "$@"

bin/kafka-reassign-partitions.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-# 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
-#
-#    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.
-
-exec $(dirname $0)/kafka-run-class.sh kafka.admin.ReassignPartitionsCommand "$@"

bin/kafka-replica-verification.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-# 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
-# 
-#    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.
-
-exec $(dirname $0)/kafka-run-class.sh kafka.tools.ReplicaVerificationTool "$@"

bin/kafka-run-class.sh

@@ -1,316 +0,0 @@
-#!/bin/bash
-# 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
-#
-#    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.
-
-if [ $# -lt 1 ];
-then
-  echo "USAGE: $0 [-daemon] [-name servicename] [-loggc] classname [opts]"
-  exit 1
-fi
-
-# CYGWIN == 1 if Cygwin is detected, else 0.
-if [[ $(uname -a) =~ "CYGWIN" ]]; then
-  CYGWIN=1
-else
-  CYGWIN=0
-fi
-
-if [ -z "$INCLUDE_TEST_JARS" ]; then
-  INCLUDE_TEST_JARS=false
-fi
-
-# Exclude jars not necessary for running commands.
-regex="(-(test|test-sources|src|scaladoc|javadoc)\.jar|jar.asc)$"
-should_include_file() {
-  if [ "$INCLUDE_TEST_JARS" = true ]; then
-    return 0
-  fi
-  file=$1
-  if [ -z "$(echo "$file" | egrep "$regex")" ] ; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-base_dir=$(dirname $0)/..
-
-if [ -z "$SCALA_VERSION" ]; then
-  SCALA_VERSION=2.12.10
-fi
-
-if [ -z "$SCALA_BINARY_VERSION" ]; then
-  SCALA_BINARY_VERSION=$(echo $SCALA_VERSION | cut -f 1-2 -d '.')
-fi
-
-# run ./gradlew copyDependantLibs to get all dependant jars in a local dir
-shopt -s nullglob
-if [ -z "$UPGRADE_KAFKA_STREAMS_TEST_VERSION" ]; then
-  for dir in "$base_dir"/core/build/dependant-libs-${SCALA_VERSION}*;
-  do
-    CLASSPATH="$CLASSPATH:$dir/*"
-  done
-fi
-
-for file in "$base_dir"/examples/build/libs/kafka-examples*.jar;
-do
-  if should_include_file "$file"; then
-    CLASSPATH="$CLASSPATH":"$file"
-  fi
-done
-
-if [ -z "$UPGRADE_KAFKA_STREAMS_TEST_VERSION" ]; then
-  clients_lib_dir=$(dirname $0)/../clients/build/libs
-  streams_lib_dir=$(dirname $0)/../streams/build/libs
-  streams_dependant_clients_lib_dir=$(dirname $0)/../streams/build/dependant-libs-${SCALA_VERSION}
-else
-  clients_lib_dir=/opt/kafka-$UPGRADE_KAFKA_STREAMS_TEST_VERSION/libs
-  streams_lib_dir=$clients_lib_dir
-  streams_dependant_clients_lib_dir=$streams_lib_dir
-fi
-
-
-for file in "$clients_lib_dir"/kafka-clients*.jar;
-do
-  if should_include_file "$file"; then
-    CLASSPATH="$CLASSPATH":"$file"
-  fi
-done
-
-for file in "$streams_lib_dir"/kafka-streams*.jar;
-do
-  if should_include_file "$file"; then
-    CLASSPATH="$CLASSPATH":"$file"
-  fi
-done
-
-if [ -z "$UPGRADE_KAFKA_STREAMS_TEST_VERSION" ]; then
-  for file in "$base_dir"/streams/examples/build/libs/kafka-streams-examples*.jar;
-  do
-    if should_include_file "$file"; then
-      CLASSPATH="$CLASSPATH":"$file"
-    fi
-  done
-else
-  VERSION_NO_DOTS=`echo $UPGRADE_KAFKA_STREAMS_TEST_VERSION | sed 's/\.//g'`
-  SHORT_VERSION_NO_DOTS=${VERSION_NO_DOTS:0:((${#VERSION_NO_DOTS} - 1))} # remove last char, ie, bug-fix number
-  for file in "$base_dir"/streams/upgrade-system-tests-$SHORT_VERSION_NO_DOTS/build/libs/kafka-streams-upgrade-system-tests*.jar;
-  do
-    if should_include_file "$file"; then
-      CLASSPATH="$file":"$CLASSPATH"
-    fi
-  done
-  if [ "$SHORT_VERSION_NO_DOTS" = "0100" ]; then
-    CLASSPATH="/opt/kafka-$UPGRADE_KAFKA_STREAMS_TEST_VERSION/libs/zkclient-0.8.jar":"$CLASSPATH"
-    CLASSPATH="/opt/kafka-$UPGRADE_KAFKA_STREAMS_TEST_VERSION/libs/zookeeper-3.4.6.jar":"$CLASSPATH"
-  fi
-  if [ "$SHORT_VERSION_NO_DOTS" = "0101" ]; then
-    CLASSPATH="/opt/kafka-$UPGRADE_KAFKA_STREAMS_TEST_VERSION/libs/zkclient-0.9.jar":"$CLASSPATH"
-    CLASSPATH="/opt/kafka-$UPGRADE_KAFKA_STREAMS_TEST_VERSION/libs/zookeeper-3.4.8.jar":"$CLASSPATH"
-  fi
-fi
-
-for file in "$streams_dependant_clients_lib_dir"/rocksdb*.jar;
-do
-  CLASSPATH="$CLASSPATH":"$file"
-done
-
-for file in "$streams_dependant_clients_lib_dir"/*hamcrest*.jar;
-do
-  CLASSPATH="$CLASSPATH":"$file"
-done
-
-for file in "$base_dir"/tools/build/libs/kafka-tools*.jar;
-do
-  if should_include_file "$file"; then
-    CLASSPATH="$CLASSPATH":"$file"
-  fi
-done
-
-for dir in "$base_dir"/tools/build/dependant-libs-${SCALA_VERSION}*;
-do
-  CLASSPATH="$CLASSPATH:$dir/*"
-done
-
-for cc_pkg in "api" "transforms" "runtime" "file" "mirror" "mirror-client" "json" "tools" "basic-auth-extension"
-do
-  for file in "$base_dir"/connect/${cc_pkg}/build/libs/connect-${cc_pkg}*.jar;
-  do
-    if should_include_file "$file"; then
-      CLASSPATH="$CLASSPATH":"$file"
-    fi
-  done
-  if [ -d "$base_dir/connect/${cc_pkg}/build/dependant-libs" ] ; then
-    CLASSPATH="$CLASSPATH:$base_dir/connect/${cc_pkg}/build/dependant-libs/*"
-  fi
-done
-
-# classpath addition for release
-for file in "$base_dir"/libs/*;
-do
-  if should_include_file "$file"; then
-    CLASSPATH="$CLASSPATH":"$file"
-  fi
-done
-
-for file in "$base_dir"/core/build/libs/kafka_${SCALA_BINARY_VERSION}*.jar;
-do
-  if should_include_file "$file"; then
-    CLASSPATH="$CLASSPATH":"$file"
-  fi
-done
-shopt -u nullglob
-
-if [ -z "$CLASSPATH" ] ; then
-  echo "Classpath is empty. Please build the project first e.g. by running './gradlew jar -PscalaVersion=$SCALA_VERSION'"
-  exit 1
-fi
-
-# JMX settings
-if [ -z "$KAFKA_JMX_OPTS" ]; then
-  KAFKA_JMX_OPTS="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false  -Dcom.sun.management.jmxremote.ssl=false "
-fi
-
-# JMX port to use
-if [  $JMX_PORT ]; then
-  KAFKA_JMX_OPTS="$KAFKA_JMX_OPTS -Dcom.sun.management.jmxremote.port=$JMX_PORT -Dcom.sun.management.jmxremote.rmi.port=$JMX_PORT"
-fi
-
-# Log directory to use
-if [ "x$LOG_DIR" = "x" ]; then
-  LOG_DIR="$base_dir/logs"
-fi
-
-# Log4j settings
-if [ -z "$KAFKA_LOG4J_OPTS" ]; then
-  # Log to console. This is a tool.
-  LOG4J_DIR="$base_dir/config/tools-log4j.properties"
-  # If Cygwin is detected, LOG4J_DIR is converted to Windows format.
-  (( CYGWIN )) && LOG4J_DIR=$(cygpath --path --mixed "${LOG4J_DIR}")
-  KAFKA_LOG4J_OPTS="-Dlog4j.configuration=file:${LOG4J_DIR}"
-else
-  # create logs directory
-  if [ ! -d "$LOG_DIR" ]; then
-    mkdir -p "$LOG_DIR"
-  fi
-fi
-
-# If Cygwin is detected, LOG_DIR is converted to Windows format.
-(( CYGWIN )) && LOG_DIR=$(cygpath --path --mixed "${LOG_DIR}")
-KAFKA_LOG4J_OPTS="-Dkafka.logs.dir=$LOG_DIR $KAFKA_LOG4J_OPTS"
-
-# Generic jvm settings you want to add
-if [ -z "$KAFKA_OPTS" ]; then
-  KAFKA_OPTS=""
-fi
-
-# Set Debug options if enabled
-if [ "x$KAFKA_DEBUG" != "x" ]; then
-
-    # Use default ports
-    DEFAULT_JAVA_DEBUG_PORT="5005"
-
-    if [ -z "$JAVA_DEBUG_PORT" ]; then
-        JAVA_DEBUG_PORT="$DEFAULT_JAVA_DEBUG_PORT"
-    fi
-
-    # Use the defaults if JAVA_DEBUG_OPTS was not set
-    DEFAULT_JAVA_DEBUG_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=${DEBUG_SUSPEND_FLAG:-n},address=0.0.0.0:$JAVA_DEBUG_PORT"
-    if [ -z "$JAVA_DEBUG_OPTS" ]; then
-        JAVA_DEBUG_OPTS="$DEFAULT_JAVA_DEBUG_OPTS"
-    fi
-
-    echo "Enabling Java debug options: $JAVA_DEBUG_OPTS"
-    KAFKA_OPTS="$JAVA_DEBUG_OPTS $KAFKA_OPTS"
-fi
-
-# Which java to use
-if [ -z "$JAVA_HOME" ]; then
-  JAVA="java"
-else
-  JAVA="$JAVA_HOME/bin/java"
-fi
-
-# Memory options
-if [ -z "$KAFKA_HEAP_OPTS" ]; then
-  KAFKA_HEAP_OPTS="-Xmx256M"
-fi
-
-# JVM performance options
-# MaxInlineLevel=15 is the default since JDK 14 and can be removed once older JDKs are no longer supported
-if [ -z "$KAFKA_JVM_PERFORMANCE_OPTS" ]; then
-  KAFKA_JVM_PERFORMANCE_OPTS="-server -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -XX:InitiatingHeapOccupancyPercent=35 -XX:G1HeapRegionSize=16m -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 -Djava.awt.headless=true"
-fi
-
-while [ $# -gt 0 ]; do
-  COMMAND=$1
-  case $COMMAND in
-    -name)
-      DAEMON_NAME=$2
-      CONSOLE_OUTPUT_FILE=$LOG_DIR/$DAEMON_NAME.out
-      shift 2
-      ;;
-    -loggc)
-      if [ -z "$KAFKA_GC_LOG_OPTS" ]; then
-        GC_LOG_ENABLED="true"
-      fi
-      shift
-      ;;
-    -daemon)
-      DAEMON_MODE="true"
-      shift
-      ;;
-    *)
-      break
-      ;;
-  esac
-done
-
-# GC options
-GC_FILE_SUFFIX='-gc.log'
-GC_LOG_FILE_NAME=''
-if [ "x$GC_LOG_ENABLED" = "xtrue" ]; then
-  GC_LOG_FILE_NAME=$DAEMON_NAME$GC_FILE_SUFFIX
-
-  # The first segment of the version number, which is '1' for releases before Java 9
-  # it then becomes '9', '10', ...
-  # Some examples of the first line of `java --version`:
-  # 8 -> java version "1.8.0_152"
-  # 9.0.4 -> java version "9.0.4"
-  # 10 -> java version "10" 2018-03-20
-  # 10.0.1 -> java version "10.0.1" 2018-04-17
-  # We need to match to the end of the line to prevent sed from printing the characters that do not match
-  JAVA_MAJOR_VERSION=$($JAVA -version 2>&1 | sed -E -n 's/.* version "([0-9]*).*$/\1/p')
-  if [[ "$JAVA_MAJOR_VERSION" -ge "9" ]] ; then
-    KAFKA_GC_LOG_OPTS="-Xlog:gc*:file=$LOG_DIR/$GC_LOG_FILE_NAME:time"
-  else
-    KAFKA_GC_LOG_OPTS="-Xloggc:$LOG_DIR/$GC_LOG_FILE_NAME -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M"
-  fi
-fi
-
-# Remove a possible colon prefix from the classpath (happens at lines like `CLASSPATH="$CLASSPATH:$file"` when CLASSPATH is blank)
-# Syntax used on the right side is native Bash string manipulation; for more details see
-# http://tldp.org/LDP/abs/html/string-manipulation.html, specifically the section titled "Substring Removal"
-CLASSPATH=${CLASSPATH#:}
-
-# If Cygwin is detected, classpath is converted to Windows format.
-(( CYGWIN )) && CLASSPATH=$(cygpath --path --mixed "${CLASSPATH}")
-
-# Launch mode
-if [ "x$DAEMON_MODE" = "xtrue" ]; then
-  nohup $JAVA $KAFKA_HEAP_OPTS $KAFKA_JVM_PERFORMANCE_OPTS $KAFKA_GC_LOG_OPTS $KAFKA_JMX_OPTS $KAFKA_LOG4J_OPTS -cp $CLASSPATH $KAFKA_OPTS "$@" > "$CONSOLE_OUTPUT_FILE" 2>&1 < /dev/null &
-else
-  exec $JAVA $KAFKA_HEAP_OPTS $KAFKA_JVM_PERFORMANCE_OPTS $KAFKA_GC_LOG_OPTS $KAFKA_JMX_OPTS $KAFKA_LOG4J_OPTS -cp $CLASSPATH $KAFKA_OPTS "$@"
-fi

bin/kafka-server-start.sh

@@ -1,51 +0,0 @@
-#!/bin/bash
-# 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
-#
-#    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.
-
-if [ $# -lt 1 ];
-then
-	echo "USAGE: $0 [-daemon] server.properties [--override property=value]*"
-	exit 1
-fi
-base_dir=$(dirname $0)
-
-if [ "x$KAFKA_LOG4J_OPTS" = "x" ]; then
-    export KAFKA_LOG4J_OPTS="-Dlog4j.configuration=file:$base_dir/../config/log4j.properties"
-fi
-
-if [ "x$KAFKA_HEAP_OPTS" = "x" ]; then
-    export KAFKA_HEAP_OPTS="-Xmx8G -Xms8G"
-    export JMX_PORT=8099
-    #export KAFKA_DEBUG=debug
-    #export DAEMON_MODE=true
-    export KAFKA_OPTS="-Djava.security.auth.login.config=$base_dir/../config/kafka_server_jaas.conf"
-    export DEBUG_SUSPEND_FLAG="n"
-    export JAVA_DEBUG_PORT="8096"
-    export GC_LOG_ENABLED=true
-fi
-
-EXTRA_ARGS=${EXTRA_ARGS-'-name kafkaServer -loggc'}
-
-COMMAND=$1
-case $COMMAND in
-  -daemon)
-    EXTRA_ARGS="-daemon "$EXTRA_ARGS
-    shift
-    ;;
-  *)
-    ;;
-esac
-
-exec $base_dir/kafka-run-class.sh $EXTRA_ARGS kafka.Kafka "$@"

bin/kafka-server-stop.sh

@@ -1,24 +0,0 @@
-#!/bin/sh
-# 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
-#
-#    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.
-SIGNAL=${SIGNAL:-TERM}
-PIDS=$(ps ax | grep -i 'kafka\.Kafka' | grep java | grep -v grep | awk '{print $1}')
-
-if [ -z "$PIDS" ]; then
-  echo "No kafka server to stop"
-  exit 1
-else
-  kill -s $SIGNAL $PIDS
-fi

bin/kafka-streams-application-reset.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-# 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
-#
-#    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.
-
-if [ "x$KAFKA_HEAP_OPTS" = "x" ]; then
-    export KAFKA_HEAP_OPTS="-Xmx512M"
-fi
-
-exec $(dirname $0)/kafka-run-class.sh kafka.tools.StreamsResetter "$@"

bin/kafka-topics.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-# 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
-# 
-#    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.
-
-exec $(dirname $0)/kafka-run-class.sh kafka.admin.TopicCommand "$@"

bin/kafka-verifiable-consumer.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-# 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
-#
-#    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.
-
-if [ "x$KAFKA_HEAP_OPTS" = "x" ]; then
-    export KAFKA_HEAP_OPTS="-Xmx512M"
-fi
-exec $(dirname $0)/kafka-run-class.sh org.apache.kafka.tools.VerifiableConsumer "$@"

bin/kafka-verifiable-producer.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-# 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
-#
-#    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.
-
-if [ "x$KAFKA_HEAP_OPTS" = "x" ]; then
-    export KAFKA_HEAP_OPTS="-Xmx512M"
-fi
-exec $(dirname $0)/kafka-run-class.sh org.apache.kafka.tools.VerifiableProducer "$@"

bin/shutdown.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+cd `dirname $0`/../libs
+target_dir=`pwd`
+
+pid=`ps ax | grep -i 'ks-km' | grep ${target_dir} | grep java | grep -v grep | awk '{print $1}'`
+if [ -z "$pid" ] ; then
+        echo "No ks-km running."
+        exit -1;
+fi
+
+echo "The ks-km (${pid}) is running..."
+
+kill ${pid}
+
+echo "Send shutdown request to ks-km (${pid}) OK"

bin/startup.sh

@@ -0,0 +1,82 @@
+error_exit ()
+{
+    echo "ERROR: $1 !!"
+    exit 1
+}
+
+[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=$HOME/jdk/java
+[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=/usr/java
+[ ! -e "$JAVA_HOME/bin/java" ] && unset JAVA_HOME
+
+if [ -z "$JAVA_HOME" ]; then
+  if [ "Darwin" = "$(uname -s)" ]; then
+
+    if [ -x '/usr/libexec/java_home' ] ; then
+      export JAVA_HOME=`/usr/libexec/java_home`
+
+    elif [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" ]; then
+      export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home"
+    fi
+  else
+    JAVA_PATH=`dirname $(readlink -f $(which javac))`
+    if [ "x$JAVA_PATH" != "x" ]; then
+      export JAVA_HOME=`dirname $JAVA_PATH 2>/dev/null`
+    fi
+  fi
+  if [ -z "$JAVA_HOME" ]; then
+        error_exit "Please set the JAVA_HOME variable in your environment, We need java(x64)! jdk8 or later is better!"
+  fi
+fi
+
+
+
+
+export WEB_SERVER="ks-km"
+export JAVA_HOME
+export JAVA="$JAVA_HOME/bin/java"
+export BASE_DIR=`cd $(dirname $0)/..; pwd`
+export CUSTOM_SEARCH_LOCATIONS=file:${BASE_DIR}/conf/
+
+
+#===========================================================================================
+# JVM Configuration
+#===========================================================================================
+
+JAVA_OPT="${JAVA_OPT} -server -Xms2g -Xmx2g -Xmn1g -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=320m"
+JAVA_OPT="${JAVA_OPT} -XX:-OmitStackTraceInFastThrow -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${BASE_DIR}/logs/java_heapdump.hprof"
+
+## jdk版本高的情况 有些 参数废弃了
+JAVA_MAJOR_VERSION=$($JAVA -version 2>&1 | sed -E -n 's/.* version "([0-9]*).*$/\1/p')
+if [[ "$JAVA_MAJOR_VERSION" -ge "9" ]] ; then
+  JAVA_OPT="${JAVA_OPT} -Xlog:gc*:file=${BASE_DIR}/logs/km_gc.log:time,tags:filecount=10,filesize=102400"
+else
+  JAVA_OPT="${JAVA_OPT} -Djava.ext.dirs=${JAVA_HOME}/jre/lib/ext:${JAVA_HOME}/lib/ext"
+  JAVA_OPT="${JAVA_OPT} -Xloggc:${BASE_DIR}/logs/km_gc.log -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M"
+
+fi
+
+JAVA_OPT="${JAVA_OPT} -jar ${BASE_DIR}/libs/${WEB_SERVER}.jar"
+JAVA_OPT="${JAVA_OPT} --spring.config.additional-location=${CUSTOM_SEARCH_LOCATIONS}"
+JAVA_OPT="${JAVA_OPT} --logging.config=${BASE_DIR}/conf/logback-spring.xml"
+JAVA_OPT="${JAVA_OPT} --server.max-http-header-size=524288"
+
+
+
+if [ ! -d "${BASE_DIR}/logs" ]; then
+  mkdir ${BASE_DIR}/logs
+fi
+
+echo "$JAVA ${JAVA_OPT}"
+
+# check the start.out log output file
+if [ ! -f "${BASE_DIR}/logs/start.out" ]; then
+  touch "${BASE_DIR}/logs/start.out"
+fi
+
+# start
+echo -e "---- 启动脚本 ------\n $JAVA ${JAVA_OPT}" > ${BASE_DIR}/logs/start.out 2>&1 &
+
+
+nohup $JAVA ${JAVA_OPT} >> ${BASE_DIR}/logs/start.out 2>&1 &
+
+echo "${WEB_SERVER} is starting，you can check the ${BASE_DIR}/logs/start.out"

bin/trogdor.sh

@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-# 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
-#
-#    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.
-
-usage() {
-    cat <<EOF
-The Trogdor fault injector.
-
-Usage:
-  $0 [action] [options]
-
-Actions:
-  agent: Run the trogdor agent.
-  coordinator: Run the trogdor coordinator.
-  client: Run the client which communicates with the trogdor coordinator.
-  agent-client: Run the client which communicates with the trogdor agent.
-  help: This help message.
-EOF
-}
-
-if [[ $# -lt 1 ]]; then
-    usage
-    exit 0
-fi
-action="${1}"
-shift
-CLASS=""
-case ${action} in
-    agent) CLASS="org.apache.kafka.trogdor.agent.Agent";;
-    coordinator) CLASS="org.apache.kafka.trogdor.coordinator.Coordinator";;
-    client) CLASS="org.apache.kafka.trogdor.coordinator.CoordinatorClient";;
-    agent-client) CLASS="org.apache.kafka.trogdor.agent.AgentClient";;
-    help) usage; exit 0;;
-    *)  echo "Unknown action '${action}'.  Type '$0 help' for help."; exit 1;;
-esac
-
-export INCLUDE_TEST_JARS=1
-exec $(dirname $0)/kafka-run-class.sh "${CLASS}" "$@"

bin/windows/connect-distributed.bat

@@ -1,34 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-IF [%1] EQU [] (
-	echo USAGE: %0 connect-distributed.properties
-	EXIT /B 1
-)
-
-SetLocal
-rem Using pushd popd to set BASE_DIR to the absolute path
-pushd %~dp0..\..
-set BASE_DIR=%CD%
-popd
-
-rem Log4j settings
-IF ["%KAFKA_LOG4J_OPTS%"] EQU [""] (
-	set KAFKA_LOG4J_OPTS=-Dlog4j.configuration=file:%BASE_DIR%/config/tools-log4j.properties
-)
-
-"%~dp0kafka-run-class.bat" org.apache.kafka.connect.cli.ConnectDistributed %*
-EndLocal

bin/windows/connect-standalone.bat

@@ -1,34 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-IF [%1] EQU [] (
-	echo USAGE: %0 connect-standalone.properties
-	EXIT /B 1
-)
-
-SetLocal
-rem Using pushd popd to set BASE_DIR to the absolute path
-pushd %~dp0..\..
-set BASE_DIR=%CD%
-popd
-
-rem Log4j settings
-IF ["%KAFKA_LOG4J_OPTS%"] EQU [""] (
-	set KAFKA_LOG4J_OPTS=-Dlog4j.configuration=file:%BASE_DIR%/config/tools-log4j.properties
-)
-
-"%~dp0kafka-run-class.bat" org.apache.kafka.connect.cli.ConnectStandalone %*
-EndLocal

bin/windows/kafka-acls.bat

@@ -1,17 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-"%~dp0kafka-run-class.bat" kafka.admin.AclCommand %*

bin/windows/kafka-broker-api-versions.bat

@@ -1,17 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-%~dp0kafka-run-class.bat kafka.admin.BrokerApiVersionsCommand %*

bin/windows/kafka-configs.bat

@@ -1,17 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-"%~dp0kafka-run-class.bat" kafka.admin.ConfigCommand %*

bin/windows/kafka-console-consumer.bat

@@ -1,20 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-SetLocal
-set KAFKA_HEAP_OPTS=-Xmx512M
-"%~dp0kafka-run-class.bat" kafka.tools.ConsoleConsumer %*
-EndLocal

bin/windows/kafka-console-producer.bat

@@ -1,20 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-SetLocal
-set KAFKA_HEAP_OPTS=-Xmx512M
-"%~dp0kafka-run-class.bat" kafka.tools.ConsoleProducer %*
-EndLocal

bin/windows/kafka-consumer-groups.bat

@@ -1,17 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-"%~dp0kafka-run-class.bat" kafka.admin.ConsumerGroupCommand %*

bin/windows/kafka-consumer-perf-test.bat

@@ -1,20 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-SetLocal
-set KAFKA_HEAP_OPTS=-Xmx512M -Xms512M
-"%~dp0kafka-run-class.bat" kafka.tools.ConsumerPerformance %*
-EndLocal

bin/windows/kafka-delegation-tokens.bat

@@ -1,17 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-"%~dp0kafka-run-class.bat" kafka.admin.DelegationTokenCommand %*

bin/windows/kafka-delete-records.bat

@@ -1,17 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-"%~dp0kafka-run-class.bat" kafka.admin.DeleteRecordsCommand %*

bin/windows/kafka-dump-log.bat

@@ -1,17 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-"%~dp0kafka-run-class.bat" kafka.tools.DumpLogSegments %*

bin/windows/kafka-leader-election.bat

@@ -1,17 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-"%~dp0kafka-run-class.bat" kafka.admin.LeaderElectionCommand %*

bin/windows/kafka-log-dirs.bat

@@ -1,17 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-"%~dp0kafka-run-class.bat" kafka.admin.LogDirsCommand %*

bin/windows/kafka-mirror-maker.bat

@@ -1,17 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-"%~dp0kafka-run-class.bat" kafka.tools.MirrorMaker %*

bin/windows/kafka-preferred-replica-election.bat

@@ -1,17 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-"%~dp0kafka-run-class.bat" kafka.admin.PreferredReplicaLeaderElectionCommand %*

bin/windows/kafka-producer-perf-test.bat

@@ -1,20 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-SetLocal
-set KAFKA_HEAP_OPTS=-Xmx512M
-"%~dp0kafka-run-class.bat" org.apache.kafka.tools.ProducerPerformance %*
-EndLocal

bin/windows/kafka-reassign-partitions.bat

@@ -1,17 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-"%~dp0kafka-run-class.bat" kafka.admin.ReassignPartitionsCommand %*

bin/windows/kafka-replica-verification.bat

@@ -1,17 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-"%~dp0kafka-run-class.bat" kafka.tools.ReplicaVerificationTool %*

bin/windows/kafka-run-class.bat

@@ -1,191 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-setlocal enabledelayedexpansion
-
-IF [%1] EQU [] (
-	echo USAGE: %0 classname [opts]
-	EXIT /B 1
-)
-
-rem Using pushd popd to set BASE_DIR to the absolute path
-pushd %~dp0..\..
-set BASE_DIR=%CD%
-popd
-
-IF ["%SCALA_VERSION%"] EQU [""] (
-  set SCALA_VERSION=2.12.10
-)
-
-IF ["%SCALA_BINARY_VERSION%"] EQU [""] (
-  for /f "tokens=1,2 delims=." %%a in ("%SCALA_VERSION%") do (
-    set FIRST=%%a
-    set SECOND=%%b
-    if ["!SECOND!"] EQU [""] (
-      set SCALA_BINARY_VERSION=!FIRST!
-    ) else (
-      set SCALA_BINARY_VERSION=!FIRST!.!SECOND!
-    )
-  )
-)
-
-rem Classpath addition for kafka-core dependencies
-for %%i in ("%BASE_DIR%\core\build\dependant-libs-%SCALA_VERSION%\*.jar") do (
-	call :concat "%%i"
-)
-
-rem Classpath addition for kafka-examples
-for %%i in ("%BASE_DIR%\examples\build\libs\kafka-examples*.jar") do (
-	call :concat "%%i"
-)
-
-rem Classpath addition for kafka-clients
-for %%i in ("%BASE_DIR%\clients\build\libs\kafka-clients*.jar") do (
-	call :concat "%%i"
-)
-
-rem Classpath addition for kafka-streams
-for %%i in ("%BASE_DIR%\streams\build\libs\kafka-streams*.jar") do (
-	call :concat "%%i"
-)
-
-rem Classpath addition for kafka-streams-examples
-for %%i in ("%BASE_DIR%\streams\examples\build\libs\kafka-streams-examples*.jar") do (
-	call :concat "%%i"
-)
-
-for %%i in ("%BASE_DIR%\streams\build\dependant-libs-%SCALA_VERSION%\rocksdb*.jar") do (
-	call :concat "%%i"
-)
-
-rem Classpath addition for kafka tools
-for %%i in ("%BASE_DIR%\tools\build\libs\kafka-tools*.jar") do (
-	call :concat "%%i"
-)
-
-for %%i in ("%BASE_DIR%\tools\build\dependant-libs-%SCALA_VERSION%\*.jar") do (
-	call :concat "%%i"
-)
-
-for %%p in (api runtime file json tools) do (
-	for %%i in ("%BASE_DIR%\connect\%%p\build\libs\connect-%%p*.jar") do (
-		call :concat "%%i"
-	)
-	if exist "%BASE_DIR%\connect\%%p\build\dependant-libs\*" (
-		call :concat "%BASE_DIR%\connect\%%p\build\dependant-libs\*"
-	)
-)
-
-rem Classpath addition for release
-for %%i in ("%BASE_DIR%\libs\*") do (
-	call :concat "%%i"
-)
-
-rem Classpath addition for core
-for %%i in ("%BASE_DIR%\core\build\libs\kafka_%SCALA_BINARY_VERSION%*.jar") do (
-	call :concat "%%i"
-)
-
-rem JMX settings
-IF ["%KAFKA_JMX_OPTS%"] EQU [""] (
-	set KAFKA_JMX_OPTS=-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false  -Dcom.sun.management.jmxremote.ssl=false
-)
-
-rem JMX port to use
-IF ["%JMX_PORT%"] NEQ [""] (
-	set KAFKA_JMX_OPTS=%KAFKA_JMX_OPTS% -Dcom.sun.management.jmxremote.port=%JMX_PORT%
-)
-
-rem Log directory to use
-IF ["%LOG_DIR%"] EQU [""] (
-    set LOG_DIR=%BASE_DIR%/logs
-)
-
-rem Log4j settings
-IF ["%KAFKA_LOG4J_OPTS%"] EQU [""] (
-	set KAFKA_LOG4J_OPTS=-Dlog4j.configuration=file:%BASE_DIR%/config/tools-log4j.properties
-) ELSE (
-  rem create logs directory
-  IF not exist "%LOG_DIR%" (
-      mkdir "%LOG_DIR%"
-  )
-)
-
-set KAFKA_LOG4J_OPTS=-Dkafka.logs.dir="%LOG_DIR%" "%KAFKA_LOG4J_OPTS%"
-
-rem Generic jvm settings you want to add
-IF ["%KAFKA_OPTS%"] EQU [""] (
-	set KAFKA_OPTS=
-)
-
-set DEFAULT_JAVA_DEBUG_PORT=5005
-set DEFAULT_DEBUG_SUSPEND_FLAG=n
-rem Set Debug options if enabled
-IF ["%KAFKA_DEBUG%"] NEQ [""] (
-
-
-	IF ["%JAVA_DEBUG_PORT%"] EQU [""] (
-		set JAVA_DEBUG_PORT=%DEFAULT_JAVA_DEBUG_PORT%
-	)
-
-	IF ["%DEBUG_SUSPEND_FLAG%"] EQU [""] (
-		set DEBUG_SUSPEND_FLAG=%DEFAULT_DEBUG_SUSPEND_FLAG%
-	)
-	set DEFAULT_JAVA_DEBUG_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=!DEBUG_SUSPEND_FLAG!,address=!JAVA_DEBUG_PORT!
-
-	IF ["%JAVA_DEBUG_OPTS%"] EQU [""] (
-		set JAVA_DEBUG_OPTS=!DEFAULT_JAVA_DEBUG_OPTS!
-	)
-
-	echo Enabling Java debug options: !JAVA_DEBUG_OPTS!
-	set KAFKA_OPTS=!JAVA_DEBUG_OPTS! !KAFKA_OPTS!
-)
-
-rem Which java to use
-IF ["%JAVA_HOME%"] EQU [""] (
-	set JAVA=java
-) ELSE (
-	set JAVA="%JAVA_HOME%/bin/java"
-)
-
-rem Memory options
-IF ["%KAFKA_HEAP_OPTS%"] EQU [""] (
-	set KAFKA_HEAP_OPTS=-Xmx256M
-)
-
-rem JVM performance options
-IF ["%KAFKA_JVM_PERFORMANCE_OPTS%"] EQU [""] (
-	set KAFKA_JVM_PERFORMANCE_OPTS=-server -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -Djava.awt.headless=true
-)
-
-IF not defined CLASSPATH (
-	echo Classpath is empty. Please build the project first e.g. by running 'gradlew jarAll'
-	EXIT /B 2
-)
-
-set COMMAND=%JAVA% %KAFKA_HEAP_OPTS% %KAFKA_JVM_PERFORMANCE_OPTS% %KAFKA_JMX_OPTS% %KAFKA_LOG4J_OPTS% -cp "%CLASSPATH%" %KAFKA_OPTS% %*
-rem echo.
-rem echo %COMMAND%
-rem echo.
-%COMMAND%
-
-goto :eof
-:concat
-IF not defined CLASSPATH (
-  set CLASSPATH="%~1"
-) ELSE (
-  set CLASSPATH=%CLASSPATH%;"%~1"
-)

bin/windows/kafka-server-start.bat

@@ -1,38 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-IF [%1] EQU [] (
-	echo USAGE: %0 server.properties
-	EXIT /B 1
-)
-
-SetLocal
-IF ["%KAFKA_LOG4J_OPTS%"] EQU [""] (
-    set KAFKA_LOG4J_OPTS=-Dlog4j.configuration=file:%~dp0../../config/log4j.properties
-)
-IF ["%KAFKA_HEAP_OPTS%"] EQU [""] (
-    rem detect OS architecture
-    wmic os get osarchitecture | find /i "32-bit" >nul 2>&1
-    IF NOT ERRORLEVEL 1 (
-        rem 32-bit OS
-        set KAFKA_HEAP_OPTS=-Xmx512M -Xms512M
-    ) ELSE (
-        rem 64-bit OS
-        set KAFKA_HEAP_OPTS=-Xmx1G -Xms1G
-    )
-)
-"%~dp0kafka-run-class.bat" kafka.Kafka %*
-EndLocal

bin/windows/kafka-server-stop.bat

@@ -1,18 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-wmic process where (commandline like "%%kafka.Kafka%%" and not name="wmic.exe") delete
-rem ps ax | grep -i 'kafka.Kafka' | grep -v grep | awk '{print $1}' | xargs kill -SIGTERM

bin/windows/kafka-streams-application-reset.bat

@@ -1,23 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-SetLocal
-IF ["%KAFKA_HEAP_OPTS%"] EQU [""] (
-        set KAFKA_HEAP_OPTS=-Xmx512M
-)
-
-"%~dp0kafka-run-class.bat" kafka.tools.StreamsResetter %*
-EndLocal

bin/windows/kafka-topics.bat

@@ -1,17 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-"%~dp0kafka-run-class.bat" kafka.admin.TopicCommand %*

bin/windows/zookeeper-server-start.bat

@@ -1,30 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-IF [%1] EQU [] (
-	echo USAGE: %0 zookeeper.properties
-	EXIT /B 1
-)
-
-SetLocal
-IF ["%KAFKA_LOG4J_OPTS%"] EQU [""] (
-    set KAFKA_LOG4J_OPTS=-Dlog4j.configuration=file:%~dp0../../config/log4j.properties
-)
-IF ["%KAFKA_HEAP_OPTS%"] EQU [""] (
-    set KAFKA_HEAP_OPTS=-Xmx512M -Xms512M
-)
-"%~dp0kafka-run-class.bat" org.apache.zookeeper.server.quorum.QuorumPeerMain %*
-EndLocal

bin/windows/zookeeper-server-stop.bat

@@ -1,17 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-wmic process where (commandline like "%%zookeeper%%" and not name="wmic.exe") delete

bin/windows/zookeeper-shell.bat

@@ -1,22 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements.  See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem 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, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-IF [%1] EQU [] (
-	echo USAGE: %0 zookeeper_host:port[/path] [-zk-tls-config-file file] [args...]
-	EXIT /B 1
-)
-
-"%~dp0kafka-run-class.bat" org.apache.zookeeper.ZooKeeperMainWithTlsSupportForKafka -server %*

bin/zookeeper-security-migration.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-# 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
-#
-#    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.
-
-exec $(dirname $0)/kafka-run-class.sh kafka.admin.ZkSecurityMigrator "$@"

bin/zookeeper-server-start.sh

@@ -1,44 +0,0 @@
-#!/bin/bash
-# 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
-#
-#    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.
-
-if [ $# -lt 1 ];
-then
-	echo "USAGE: $0 [-daemon] zookeeper.properties"
-	exit 1
-fi
-base_dir=$(dirname $0)
-
-if [ "x$KAFKA_LOG4J_OPTS" = "x" ]; then
-    export KAFKA_LOG4J_OPTS="-Dlog4j.configuration=file:$base_dir/../config/log4j.properties"
-fi
-
-if [ "x$KAFKA_HEAP_OPTS" = "x" ]; then
-    export KAFKA_HEAP_OPTS="-Xmx512M -Xms512M"
-fi
-
-EXTRA_ARGS=${EXTRA_ARGS-'-name zookeeper -loggc'}
-
-COMMAND=$1
-case $COMMAND in
-  -daemon)
-     EXTRA_ARGS="-daemon "$EXTRA_ARGS
-     shift
-     ;;
- *)
-     ;;
-esac
-
-exec $base_dir/kafka-run-class.sh $EXTRA_ARGS org.apache.zookeeper.server.quorum.QuorumPeerMain "$@"

bin/zookeeper-server-stop.sh

@@ -1,24 +0,0 @@
-#!/bin/sh
-# 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
-#
-#    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.
-SIGNAL=${SIGNAL:-TERM}
-PIDS=$(ps ax | grep java | grep -i QuorumPeerMain | grep -v grep | awk '{print $1}')
-
-if [ -z "$PIDS" ]; then
-  echo "No zookeeper server to stop"
-  exit 1
-else
-  kill -s $SIGNAL $PIDS
-fi

bin/zookeeper-shell.sh

@@ -1,23 +0,0 @@
-#!/bin/sh
-# 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
-# 
-#    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.
-
-if [ $# -lt 1 ];
-then
-	echo "USAGE: $0 zookeeper_host:port[/path] [-zk-tls-config-file file] [args...]"
-	exit 1
-fi
-
-exec $(dirname $0)/kafka-run-class.sh org.apache.zookeeper.ZooKeeperMainWithTlsSupportForKafka -server "$@"

checkstyle/.scalafmt.conf

@@ -1,20 +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
-//
-//    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.
-docstrings = JavaDoc
-maxColumn = 120
-continuationIndent.defnSite = 2
-assumeStandardLibraryStripMargin = true
-danglingParentheses = true
-rewrite.rules = [SortImports, RedundantBraces, RedundantParens, SortModifiers]

checkstyle/checkstyle.xml

@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-     "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-<!--
-// 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
-//
-//    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.
--->
-<module name="Checker">
-  <property name="localeLanguage" value="en"/>
-
-  <module name="FileTabCharacter"/>
-
-  <!-- header -->
-  <module name="Header">
-    <property name="headerFile" value="${headerFile}" />
-  </module>
-
-  <module name="TreeWalker">
-
-    <!-- code cleanup -->
-    <module name="UnusedImports">
-      <property name="processJavadoc" value="true" />
-    </module>
-    <module name="RedundantImport"/>
-    <module name="IllegalImport" />
-    <module name="EqualsHashCode"/>
-    <module name="SimplifyBooleanExpression"/>
-    <module name="OneStatementPerLine"/>
-    <module name="UnnecessaryParentheses" />
-    <module name="SimplifyBooleanReturn"/>
-
-    <!-- style -->
-    <module name="DefaultComesLast"/>
-    <module name="EmptyStatement"/>
-    <module name="ArrayTypeStyle"/>
-    <module name="UpperEll"/>
-    <module name="LeftCurly"/>
-    <module name="RightCurly"/>
-    <module name="EmptyStatement"/>
-    <module name="ConstantName">
-      <property name="format" value="(^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$)|(^log$)"/>
-    </module>
-    <module name="LocalVariableName"/>
-    <module name="LocalFinalVariableName"/>
-    <module name="MemberName"/>
-    <module name="ClassTypeParameterName">
-      <property name="format" value="^[A-Z][a-zA-Z0-9]*$$"/>
-    </module>
-    <module name="MethodTypeParameterName">
-      <property name="format" value="^[A-Z][a-zA-Z0-9]*$$"/>
-    </module>
-    <module name="InterfaceTypeParameterName">
-      <property name="format" value="^[A-Z][a-zA-Z0-9]*$$"/>
-    </module>
-    <module name="PackageName"/>
-    <module name="ParameterName"/>
-    <module name="StaticVariableName"/>
-    <module name="TypeName"/>
-    <module name="AvoidStarImport"/>
-
-    <!-- variables that can be final should be final (suppressed except for Streams) -->
-    <module name="FinalLocalVariable">
-      <property name="tokens" value="VARIABLE_DEF,PARAMETER_DEF"/>
-      <property name="validateEnhancedForLoopVariable" value="true"/>
-    </module>
-
-    <!-- dependencies -->
-    <module name="ImportControl">
-      <property name="file" value="${importControlFile}"/>
-    </module>
-
-    <!-- whitespace -->
-    <module name="GenericWhitespace"/>
-    <module name="NoWhitespaceBefore"/>
-    <module name="WhitespaceAfter" />
-    <module name="NoWhitespaceAfter"/>
-    <module name="WhitespaceAround">
-      <property name="allowEmptyConstructors" value="true"/>
-      <property name="allowEmptyMethods" value="true"/>
-    </module>
-    <module name="Indentation"/>
-    <module name="MethodParamPad"/>
-    <module name="ParenPad"/>
-    <module name="TypecastParenPad"/>
-
-    <!-- locale-sensitive methods should specify locale -->
-    <module name="Regexp">
-      <property name="format" value="\.to(Lower|Upper)Case\(\)"/>
-      <property name="illegalPattern" value="true"/>
-      <property name="ignoreComments" value="true"/>
-    </module>
-
-    <!-- code quality -->
-    <module name="MethodLength"/>
-    <module name="ParameterNumber">
-      <!-- default is 8 -->
-      <property name="max" value="13"/>
-    </module>
-    <module name="ClassDataAbstractionCoupling">
-      <!-- default is 7 -->
-      <property name="max" value="25"/>
-    </module>
-    <module name="BooleanExpressionComplexity">
-      <!-- default is 3 -->
-      <property name="max" value="5"/>
-    </module>
-
-    <module name="ClassFanOutComplexity">
-      <!-- default is 20 -->
-      <property name="max" value="50"/>
-    </module>
-    <module name="CyclomaticComplexity">
-      <!-- default is 10-->
-      <property name="max" value="16"/>
-    </module>
-    <module name="JavaNCSS">
-      <!-- default is 50 -->
-      <property name="methodMaximum" value="100"/>
-    </module>
-    <module name="NPathComplexity">
-      <!-- default is 200 -->
-      <property name="max" value="500"/>
-    </module>
-  </module>
-
-  <module name="SuppressionFilter">
-    <property name="file" value="${suppressionsFile}"/>
-  </module>
-</module>

checkstyle/import-control-core.xml

@@ -1,57 +0,0 @@
-<!DOCTYPE import-control PUBLIC
-"-//Puppy Crawl//DTD Import Control 1.1//EN"
-"http://www.puppycrawl.com/dtds/import_control_1_1.dtd">
-<!--
-// 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
-//
-//    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.
--->
-
-<import-control pkg="kafka">
-
-  <!-- THINK HARD ABOUT THE LAYERING OF THE PROJECT BEFORE CHANGING THIS FILE -->
-
-  <!-- common library dependencies -->
-  <allow pkg="java" />
-  <allow pkg="scala" />
-  <allow pkg="javax.management" />
-  <allow pkg="org.slf4j" />
-  <allow pkg="org.junit" />
-  <allow pkg="org.easymock" />
-  <allow pkg="java.security" />
-  <allow pkg="javax.net.ssl" />
-  <allow pkg="javax.security" />
-  <allow pkg="com.didichuxing.datachannel.kafka" />
-
-  <allow pkg="kafka.common" />
-  <allow pkg="kafka.utils" />
-  <allow pkg="kafka.serializer" />
-  <allow pkg="org.apache.kafka.common" />
-
-  <subpackage name="tools">
-    <allow pkg="org.apache.kafka.clients.admin" />
-    <allow pkg="kafka.admin" />
-    <allow pkg="joptsimple" />
-    <allow pkg="org.apache.kafka.clients.consumer" />
-  </subpackage>
-
-  <subpackage name="coordinator">
-    <allow class="kafka.server.MetadataCache" />
-  </subpackage>
-
-  <subpackage name="examples">
-    <allow pkg="org.apache.kafka.clients" />
-  </subpackage>
-
-</import-control>

checkstyle/import-control-jmh-benchmarks.xml

@@ -1,47 +0,0 @@
-<!DOCTYPE import-control PUBLIC
-        "-//Puppy Crawl//DTD Import Control 1.1//EN"
-        "http://www.puppycrawl.com/dtds/import_control_1_1.dtd">
-<!--
-// 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
-//
-//    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.
--->
-
-<import-control pkg="org.apache.kafka.jmh">
-
-    <allow pkg="java"/>
-    <allow pkg="scala"/>
-    <allow pkg="javax.management"/>
-    <allow pkg="org.slf4j"/>
-    <allow pkg="org.openjdk.jmh.annotations"/>
-    <allow pkg="org.openjdk.jmh.runner"/>
-    <allow pkg="org.openjdk.jmh.infra"/>
-    <allow pkg="java.security"/>
-    <allow pkg="javax.net.ssl"/>
-    <allow pkg="javax.security"/>
-    <allow pkg="org.apache.kafka.common"/>
-    <allow pkg="org.apache.kafka.clients.producer"/>
-    <allow pkg="kafka.cluster"/>
-    <allow pkg="kafka.log"/>
-    <allow pkg="kafka.server"/>
-    <allow pkg="kafka.api"/>
-    <allow class="kafka.utils.Pool"/>
-    <allow class="kafka.utils.KafkaScheduler"/>
-    <allow class="org.apache.kafka.clients.FetchSessionHandler"/>
-    <allow pkg="org.mockito"/>
-
-
-    <subpackage name="cache">
-    </subpackage>
-</import-control>

checkstyle/import-control.xml

@@ -1,457 +0,0 @@
-<!DOCTYPE import-control PUBLIC
-"-//Puppy Crawl//DTD Import Control 1.1//EN"
-"http://www.puppycrawl.com/dtds/import_control_1_1.dtd">
-<!--
-// 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
-//
-//    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.
--->
-
-<import-control pkg="org.apache.kafka">
-
-  <!-- THINK HARD ABOUT THE LAYERING OF THE PROJECT BEFORE CHANGING THIS FILE -->
-
-  <!-- common library dependencies -->
-  <allow pkg="java" />
-  <allow pkg="javax.management" />
-  <allow pkg="org.slf4j" />
-  <allow pkg="org.junit" />
-  <allow pkg="org.hamcrest" />
-  <allow pkg="org.mockito" />
-  <allow pkg="org.easymock" />
-  <allow pkg="org.powermock" />
-  <allow pkg="java.security" />
-  <allow pkg="javax.net.ssl" />
-  <allow pkg="javax.security" />
-  <allow pkg="org.ietf.jgss" />
-
-  <!-- no one depends on the server -->
-  <disallow pkg="kafka" />
-
-  <!-- anyone can use public classes -->
-  <allow pkg="org.apache.kafka.common" exact-match="true" />
-  <allow pkg="org.apache.kafka.common.security" />
-  <allow pkg="org.apache.kafka.common.serialization" />
-  <allow pkg="org.apache.kafka.common.utils" />
-  <allow pkg="org.apache.kafka.common.errors" exact-match="true" />
-  <allow pkg="org.apache.kafka.common.memory" />
-
-  <subpackage name="common">
-    <disallow pkg="org.apache.kafka.clients" />
-    <allow pkg="org.apache.kafka.common" exact-match="true" />
-    <allow pkg="org.apache.kafka.common.annotation" />
-    <allow pkg="org.apache.kafka.common.config" exact-match="true" />
-    <allow pkg="org.apache.kafka.common.internals" exact-match="true" />
-    <allow pkg="org.apache.kafka.test" />
-
-    <subpackage name="acl">
-      <allow pkg="org.apache.kafka.common.annotation" />
-      <allow pkg="org.apache.kafka.common.acl" />
-      <allow pkg="org.apache.kafka.common.resource" />
-    </subpackage>
-
-    <subpackage name="config">
-      <allow pkg="org.apache.kafka.common.config" />
-      <!-- for testing -->
-      <allow pkg="org.apache.kafka.common.metrics" />
-    </subpackage>
-
-    <subpackage name="message">
-      <allow pkg="com.fasterxml.jackson" />
-      <allow pkg="org.apache.kafka.common.protocol" />
-      <allow pkg="org.apache.kafka.common.protocol.types" />
-      <allow pkg="org.apache.kafka.common.message" />
-    </subpackage>
-
-    <subpackage name="metrics">
-      <allow pkg="org.apache.kafka.common.metrics" />
-    </subpackage>
-
-    <subpackage name="memory">
-      <allow pkg="org.apache.kafka.common.metrics" />
-    </subpackage>
-
-    <subpackage name="network">
-      <allow pkg="org.apache.kafka.common.security.auth" />
-      <allow pkg="org.apache.kafka.common.protocol" />
-      <allow pkg="org.apache.kafka.common.config" />
-      <allow pkg="org.apache.kafka.common.metrics" />
-      <allow pkg="org.apache.kafka.common.security" />
-    </subpackage>
-
-    <subpackage name="resource">
-      <allow pkg="org.apache.kafka.common.annotation" />
-      <allow pkg="org.apache.kafka.common.resource" />
-    </subpackage>
-
-    <subpackage name="security">
-      <allow pkg="org.apache.kafka.common.annotation" />
-      <allow pkg="org.apache.kafka.common.network" />
-      <allow pkg="org.apache.kafka.common.config" />
-      <allow pkg="org.apache.kafka.common.protocol" />
-      <allow pkg="org.apache.kafka.common.errors" />
-      <subpackage name="authenticator">
-        <allow pkg="org.apache.kafka.common.message" />
-        <allow pkg="org.apache.kafka.common.protocol.types" />
-        <allow pkg="org.apache.kafka.common.requests" />
-        <allow pkg="org.apache.kafka.clients" />
-      </subpackage>
-      <subpackage name="scram">
-        <allow pkg="javax.crypto" />
-      </subpackage>
-      <subpackage name="oauthbearer">
-        <allow pkg="com.fasterxml.jackson.databind" />
-      </subpackage>
-    </subpackage>
-
-    <subpackage name="protocol">
-      <allow pkg="org.apache.kafka.common.errors" />
-      <allow pkg="org.apache.kafka.common.message" />
-      <allow pkg="org.apache.kafka.common.protocol" />
-      <allow pkg="org.apache.kafka.common.protocol.types" />
-      <allow pkg="org.apache.kafka.common.record" />
-      <allow pkg="org.apache.kafka.common.requests" />
-      <allow pkg="org.apache.kafka.common.resource" />
-    </subpackage>
-
-    <subpackage name="record">
-      <allow pkg="net.jpountz" />
-      <allow pkg="org.apache.kafka.common.header" />
-      <allow pkg="org.apache.kafka.common.record" />
-      <allow pkg="org.apache.kafka.common.network" />
-      <allow pkg="org.apache.kafka.common.protocol" />
-      <allow pkg="org.apache.kafka.common.protocol.types" />
-      <allow pkg="org.apache.kafka.common.errors" />
-    </subpackage>
-
-    <subpackage name="header">
-      <allow pkg="org.apache.kafka.common.header" />
-      <allow pkg="org.apache.kafka.common.record" />
-    </subpackage>
-
-    <subpackage name="requests">
-      <allow pkg="org.apache.kafka.common.acl" />
-      <allow pkg="org.apache.kafka.common.protocol" />
-      <allow pkg="org.apache.kafka.common.message" />
-      <allow pkg="org.apache.kafka.common.network" />
-      <allow pkg="org.apache.kafka.common.requests" />
-      <allow pkg="org.apache.kafka.common.resource" />
-      <allow pkg="org.apache.kafka.common.record" />
-      <!-- for AuthorizableRequestContext interface -->
-      <allow pkg="org.apache.kafka.server.authorizer" />
-      <!-- for testing -->
-      <allow pkg="org.apache.kafka.common.errors" />
-    </subpackage>
-
-    <subpackage name="serialization">
-      <allow class="org.apache.kafka.common.errors.SerializationException" />
-      <allow class="org.apache.kafka.common.header.Headers" />
-    </subpackage>
-
-    <subpackage name="utils">
-      <allow pkg="org.apache.kafka.common" />
-    </subpackage>
-  </subpackage>
-
-  <subpackage name="clients">
-    <allow pkg="org.slf4j" />
-    <allow pkg="org.apache.kafka.common" />
-    <allow pkg="org.apache.kafka.clients" exact-match="true"/>
-    <allow pkg="org.apache.kafka.test" />
-
-    <subpackage name="consumer">
-      <allow pkg="org.apache.kafka.clients.consumer" />
-    </subpackage>
-
-    <subpackage name="producer">
-      <allow pkg="org.apache.kafka.clients.consumer" />
-      <allow pkg="org.apache.kafka.clients.producer" />
-    </subpackage>
-
-    <subpackage name="admin">
-      <allow pkg="org.apache.kafka.clients.admin" />
-      <allow pkg="org.apache.kafka.clients.consumer.internals" />
-      <allow pkg="org.apache.kafka.clients.consumer" />
-    </subpackage>
-  </subpackage>
-
-  <subpackage name="server">
-    <allow pkg="org.slf4j" />
-    <allow pkg="org.apache.kafka.common" />
-    <allow pkg="org.apache.kafka.test" />
-  </subpackage>
-
-  <subpackage name="tools">
-    <allow pkg="org.apache.kafka.common"/>
-    <allow pkg="org.apache.kafka.clients.admin" />
-    <allow pkg="org.apache.kafka.clients.producer" />
-    <allow pkg="org.apache.kafka.clients.consumer" />
-    <allow pkg="com.fasterxml.jackson" />
-    <allow pkg="net.sourceforge.argparse4j" />
-    <allow pkg="org.apache.log4j" />
-  </subpackage>
-
-  <subpackage name="trogdor">
-    <allow pkg="com.fasterxml.jackson" />
-    <allow pkg="javax.servlet" />
-    <allow pkg="javax.ws.rs" />
-    <allow pkg="net.sourceforge.argparse4j" />
-    <allow pkg="org.apache.kafka.clients" />
-    <allow pkg="org.apache.kafka.clients.admin" />
-    <allow pkg="org.apache.kafka.clients.consumer" exact-match="true"/>
-    <allow pkg="org.apache.kafka.clients.producer" exact-match="true"/>
-    <allow pkg="org.apache.kafka.common" />
-    <allow pkg="org.apache.kafka.test"/>
-    <allow pkg="org.apache.kafka.trogdor" />
-    <allow pkg="org.apache.log4j" />
-    <allow pkg="org.eclipse.jetty" />
-    <allow pkg="org.glassfish.jersey" />
-  </subpackage>
-
-  <subpackage name="message">
-    <allow pkg="com.fasterxml.jackson" />
-    <allow pkg="com.fasterxml.jackson.annotation" />
-  </subpackage>
-
-  <subpackage name="streams">
-    <allow pkg="org.apache.kafka.common"/>
-    <allow pkg="org.apache.kafka.test"/>
-    <allow pkg="org.apache.kafka.clients"/>
-    <allow pkg="org.apache.kafka.clients.producer" exact-match="true"/>
-    <allow pkg="org.apache.kafka.clients.consumer" exact-match="true"/>
-
-    <allow pkg="org.apache.kafka.streams"/>
-
-    <subpackage name="examples">
-      <allow pkg="com.fasterxml.jackson" />
-      <allow pkg="org.apache.kafka.connect.json" />
-    </subpackage>
-
-    <subpackage name="perf">
-      <allow pkg="com.fasterxml.jackson.databind" />
-    </subpackage>
-    
-    <subpackage name="integration">
-      <allow pkg="kafka.admin" />
-      <allow pkg="kafka.api" />
-      <allow pkg="kafka.server" />
-      <allow pkg="kafka.tools" />
-      <allow pkg="kafka.utils" />
-      <allow pkg="kafka.log" />
-      <allow pkg="scala" />
-      <allow class="kafka.zk.EmbeddedZookeeper"/>
-      <allow pkg="com.fasterxml.jackson" />
-    </subpackage>
-
-    <subpackage name="test">
-      <allow pkg="kafka.admin" />
-    </subpackage>
-
-    <subpackage name="tools">
-      <allow pkg="kafka.tools" />
-    </subpackage>
-
-    <subpackage name="state">
-      <allow pkg="org.rocksdb" />
-    </subpackage>
-
-    <subpackage name="processor">
-      <subpackage name="internals">
-        <allow pkg="com.fasterxml.jackson" />
-        <allow pkg="kafka.utils" />
-        <allow pkg="org.apache.zookeeper" />
-        <allow pkg="org.apache.zookeeper" />
-        <allow pkg="org.apache.log4j" />
-        <subpackage name="testutil">
-          <allow pkg="org.apache.log4j" />
-        </subpackage>
-      </subpackage>
-    </subpackage>
-  </subpackage>
-
-  <subpackage name="jmh">
-    <allow pkg="org.openjdk.jmh.annotations" />
-    <allow pkg="org.openjdk.jmh.runner" />
-    <allow pkg="org.openjdk.jmh.runner.options" />
-    <allow pkg="org.openjdk.jmh.infra" />
-    <allow pkg="org.apache.kafka.common" />
-    <allow pkg="org.apache.kafka.clients" />
-    <allow pkg="org.apache.kafka.streams" />
-    <allow pkg="org.github.jamm" />
-  </subpackage>
-
-  <subpackage name="log4jappender">
-    <allow pkg="org.apache.log4j" />
-    <allow pkg="org.apache.kafka.clients" />
-    <allow pkg="org.apache.kafka.common" />
-    <allow pkg="org.apache.kafka.test" />
-  </subpackage>
-
-  <subpackage name="test">
-    <allow pkg="org.apache.kafka" />
-    <allow pkg="org.bouncycastle" />
-  </subpackage>
-
-  <subpackage name="connect">
-    <allow pkg="org.apache.kafka.common" />
-    <allow pkg="org.apache.kafka.connect.data" />
-    <allow pkg="org.apache.kafka.connect.errors" />
-    <allow pkg="org.apache.kafka.connect.header" />
-    <allow pkg="org.apache.kafka.connect.components"/>
-    <allow pkg="org.apache.kafka.clients" />
-    <allow pkg="org.apache.kafka.test"/>
-
-    <subpackage name="source">
-      <allow pkg="org.apache.kafka.connect.connector" />
-      <allow pkg="org.apache.kafka.connect.storage" />
-    </subpackage>
-
-    <subpackage name="sink">
-      <allow pkg="org.apache.kafka.clients.consumer" />
-      <allow pkg="org.apache.kafka.connect.connector" />
-      <allow pkg="org.apache.kafka.connect.storage" />
-    </subpackage>
-
-    <subpackage name="converters">
-      <allow pkg="org.apache.kafka.connect.storage" />
-    </subpackage>
-
-    <subpackage name="connector.policy">
-      <allow pkg="org.apache.kafka.connect.health" />
-      <allow pkg="org.apache.kafka.connect.connector" />
-      <!-- for testing -->
-      <allow pkg="org.apache.kafka.connect.runtime" />
-    </subpackage>
-
-    <subpackage name="rest">
-      <allow pkg="org.apache.kafka.connect.health" />
-      <allow pkg="javax.ws.rs" />
-      <allow pkg= "javax.security.auth"/>
-      <subpackage name="basic">
-        <allow pkg="org.apache.kafka.connect.rest"/>
-      </subpackage>
-    </subpackage>
-
-    <subpackage name="mirror">
-      <allow pkg="org.apache.kafka.clients.consumer" />
-      <allow pkg="org.apache.kafka.connect.source" />
-      <allow pkg="org.apache.kafka.connect.sink" />
-      <allow pkg="org.apache.kafka.connect.storage" />
-      <allow pkg="org.apache.kafka.connect.connector" />
-      <allow pkg="org.apache.kafka.connect.runtime" />
-      <allow pkg="org.apache.kafka.connect.runtime.distributed" />
-      <allow pkg="org.apache.kafka.connect.util" />
-      <allow pkg="org.apache.kafka.connect.converters" />
-      <allow pkg="net.sourceforge.argparse4j" />
-      <!-- for tests -->
-      <allow pkg="org.apache.kafka.connect.integration" />
-      <allow pkg="org.apache.kafka.connect.mirror" />
-    </subpackage>
-
-    <subpackage name="runtime">
-      <allow pkg="org.apache.kafka.connect" />
-      <allow pkg="org.reflections"/>
-      <allow pkg="org.reflections.util"/>
-      <allow pkg="javax.crypto"/>
-
-      <subpackage name="rest">
-        <allow pkg="org.eclipse.jetty" />
-        <allow pkg="javax.ws.rs" />
-        <allow pkg="javax.servlet" />
-        <allow pkg="org.glassfish.jersey" />
-        <allow pkg="com.fasterxml.jackson" />
-        <allow pkg="org.apache.http"/>
-        <subpackage name="resources">
-          <allow pkg="org.apache.log4j" />
-        </subpackage>
-      </subpackage>
-
-      <subpackage name="isolation">
-        <allow pkg="com.fasterxml.jackson" />
-        <allow pkg="org.apache.maven.artifact.versioning" />
-        <allow pkg="javax.tools" />
-      </subpackage>
-
-      <subpackage name="distributed">
-        <allow pkg="javax.ws.rs.core" />
-      </subpackage>
-    </subpackage>
-
-    <subpackage name="cli">
-      <allow pkg="org.apache.kafka.connect.runtime" />
-      <allow pkg="org.apache.kafka.connect.storage" />
-      <allow pkg="org.apache.kafka.connect.util" />
-      <allow pkg="org.apache.kafka.common" />
-      <allow pkg="org.apache.kafka.connect.connector.policy" />
-    </subpackage>
-
-    <subpackage name="storage">
-      <allow pkg="org.apache.kafka.connect" />
-      <allow pkg="org.apache.kafka.common.serialization" />
-      <allow pkg="javax.crypto.spec"/>
-    </subpackage>
-
-    <subpackage name="util">
-      <allow pkg="org.apache.kafka.connect" />
-      <allow pkg="org.reflections.vfs" />
-      <!-- for annotations to avoid code duplication -->
-      <allow pkg="com.fasterxml.jackson.annotation" />
-      <allow pkg="com.fasterxml.jackson.databind" />
-      <subpackage name="clusters">
-        <allow pkg="kafka.server" />
-        <allow pkg="kafka.zk" />
-        <allow pkg="kafka.utils" />
-        <allow class="javax.servlet.http.HttpServletResponse" />
-        <allow class="javax.ws.rs.core.Response" />
-        <allow pkg="com.fasterxml.jackson.core.type" />
-      </subpackage>
-    </subpackage>
-
-    <subpackage name="integration">
-      <allow pkg="org.apache.kafka.connect.util.clusters" />
-      <allow pkg="org.apache.kafka.connect" />
-      <allow pkg="org.apache.kafka.tools" />
-      <allow pkg="javax.ws.rs" />
-    </subpackage>
-
-    <subpackage name="json">
-      <allow pkg="com.fasterxml.jackson" />
-      <allow pkg="org.apache.kafka.common.serialization" />
-      <allow pkg="org.apache.kafka.common.errors" />
-      <allow pkg="org.apache.kafka.connect.storage" />
-    </subpackage>
-
-    <subpackage name="file">
-      <allow pkg="org.apache.kafka.connect" />
-      <allow pkg="org.apache.kafka.clients.consumer" />
-      <!-- for tests -->
-      <allow pkg="org.easymock" />
-      <allow pkg="org.powermock" />
-    </subpackage>
-
-    <subpackage name="tools">
-      <allow pkg="org.apache.kafka.connect" />
-      <allow pkg="org.apache.kafka.tools" />
-      <allow pkg="com.fasterxml.jackson" />
-    </subpackage>
-
-    <subpackage name="transforms">
-      <allow class="org.apache.kafka.connect.connector.ConnectRecord" />
-      <allow class="org.apache.kafka.connect.source.SourceRecord" />
-      <allow class="org.apache.kafka.connect.sink.SinkRecord" />
-      <allow pkg="org.apache.kafka.connect.transforms.util" />
-    </subpackage>
-  </subpackage>
-
-</import-control>

checkstyle/java.header

@@ -1,16 +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
- *
- *    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.
- */

checkstyle/suppressions.xml

@@ -1,265 +0,0 @@
-
-
-<!DOCTYPE suppressions PUBLIC
-        "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-        "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
-
-<suppressions>
-
-    <!-- Note that [/\\] must be used as the path separator for cross-platform support -->
-
-    <!-- Generator -->
-    <suppress checks="CyclomaticComplexity|BooleanExpressionComplexity"
-              files="(SchemaGenerator|MessageDataGenerator|FieldSpec).java"/>
-    <suppress checks="NPathComplexity"
-              files="(MessageDataGenerator|FieldSpec).java"/>
-    <suppress checks="JavaNCSS"
-              files="(ApiMessageType).java|MessageDataGenerator.java"/>
-    <suppress checks="MethodLength"
-              files="MessageDataGenerator.java"/>
-
-    <!-- Clients -->
-    <suppress checks="ClassFanOutComplexity"
-              files="(Fetcher|Sender|SenderTest|ConsumerCoordinator|KafkaConsumer|KafkaProducer|Utils|TransactionManager|TransactionManagerTest|KafkaAdminClient|NetworkClient|Admin).java"/>
-    <suppress checks="ClassFanOutComplexity"
-              files="(SaslServerAuthenticator|SaslAuthenticatorTest).java"/>
-    <suppress checks="ClassFanOutComplexity"
-              files="Errors.java"/>
-    <suppress checks="ClassFanOutComplexity"
-              files="Utils.java"/>
-    <suppress checks="ClassFanOutComplexity"
-              files="AbstractRequest.java"/>
-    <suppress checks="ClassFanOutComplexity"
-              files="AbstractResponse.java"/>
-
-    <suppress checks="MethodLength"
-              files="KerberosLogin.java|RequestResponseTest.java|ConnectMetricsRegistry.java|KafkaConsumer.java"/>
-
-    <suppress checks="ParameterNumber"
-              files="NetworkClient.java|FieldSpec.java"/>
-    <suppress checks="ParameterNumber"
-              files="KafkaConsumer.java"/>
-    <suppress checks="ParameterNumber"
-              files="Fetcher.java"/>
-    <suppress checks="ParameterNumber"
-              files="Sender.java"/>
-    <suppress checks="ParameterNumber"
-              files="ConfigDef.java"/>
-    <suppress checks="ParameterNumber"
-              files="DefaultRecordBatch.java"/>
-    <suppress checks="ParameterNumber"
-              files="Sender.java"/>
-
-    <suppress checks="ClassDataAbstractionCoupling"
-              files="(KafkaConsumer|ConsumerCoordinator|Fetcher|KafkaProducer|AbstractRequest|AbstractResponse|TransactionManager|Admin|KafkaAdminClient).java"/>
-    <suppress checks="ClassDataAbstractionCoupling"
-              files="(Errors|SaslAuthenticatorTest|AgentTest|CoordinatorTest).java"/>
-
-    <suppress checks="BooleanExpressionComplexity"
-              files="(Utils|Topic|KafkaLZ4BlockOutputStream|AclData|JoinGroupRequest).java"/>
-
-    <suppress checks="CyclomaticComplexity"
-              files="(ConsumerCoordinator|Fetcher|Sender|KafkaProducer|BufferPool|ConfigDef|RecordAccumulator|KerberosLogin|AbstractRequest|AbstractResponse|Selector|SslFactory|SslTransportLayer|SaslClientAuthenticator|SaslClientCallbackHandler|SaslServerAuthenticator|AbstractCoordinator|TransactionManager|AbstractStickyAssignor).java"/>
-
-    <suppress checks="JavaNCSS"
-              files="(AbstractRequest|KerberosLogin|WorkerSinkTaskTest|TransactionManagerTest|SenderTest|KafkaAdminClient|ConsumerCoordinatorTest).java"/>
-
-    <suppress checks="NPathComplexity"
-              files="(ConsumerCoordinator|BufferPool|Fetcher|MetricName|Node|ConfigDef|RecordBatch|SslFactory|SslTransportLayer|MetadataResponse|KerberosLogin|Selector|Sender|Serdes|TokenInformation|Agent|Values|PluginUtils|MiniTrogdorCluster|TasksRequest|KafkaProducer|AbstractStickyAssignor).java"/>
-
-    <suppress checks="(JavaNCSS|CyclomaticComplexity|MethodLength)"
-              files="CoordinatorClient.java"/>
-    <suppress checks="(UnnecessaryParentheses|BooleanExpressionComplexity|CyclomaticComplexity|WhitespaceAfter|LocalVariableName)"
-              files="Murmur3.java"/>
-
-    <suppress checks="(NPathComplexity|ClassFanOutComplexity|CyclomaticComplexity|ClassDataAbstractionCoupling|LocalVariableName|MemberName|ParameterName|MethodLength|JavaNCSS)"
-            files="clients[\\/]src[\\/](generated|generated-test)[\\/].+.java$"/>
-
-    <suppress checks="NPathComplexity"
-            files="MessageTest.java"/>
-
-    <!-- clients tests -->
-    <suppress checks="ClassDataAbstractionCoupling"
-              files="(Sender|Fetcher|KafkaConsumer|Metrics|RequestResponse|TransactionManager|KafkaAdminClient|Message|KafkaProducer)Test.java"/>
-
-    <suppress checks="ClassFanOutComplexity"
-              files="(ConsumerCoordinator|KafkaConsumer|RequestResponse|Fetcher|KafkaAdminClient|Message|KafkaProducer)Test.java"/>
-
-    <suppress checks="ClassFanOutComplexity"
-              files="MockAdminClient.java"/>
-
-    <suppress checks="JavaNCSS"
-              files="RequestResponseTest.java|FetcherTest.java"/>
-
-    <suppress checks="NPathComplexity"
-              files="MemoryRecordsTest|MetricsTest"/>
-
-    <suppress checks="(WhitespaceAround|LocalVariableName|ImportControl|AvoidStarImport)"
-              files="Murmur3Test.java"/>
-
-    <!-- Connect -->
-    <suppress checks="ClassFanOutComplexity"
-              files="DistributedHerder(|Test).java"/>
-    <suppress checks="ClassFanOutComplexity"
-              files="Worker.java"/>
-    <suppress checks="MethodLength"
-              files="(KafkaConfigBackingStore|IncrementalCooperativeAssignor|RequestResponseTest|WorkerSinkTaskTest).java"/>
-
-    <suppress checks="ParameterNumber"
-              files="Worker(SinkTask|SourceTask|Coordinator).java"/>
-    <suppress checks="ParameterNumber"
-              files="ConfigKeyInfo.java"/>
-
-    <suppress checks="ClassDataAbstractionCoupling"
-              files="(RestServer|AbstractHerder|DistributedHerder).java"/>
-
-    <suppress checks="BooleanExpressionComplexity"
-              files="JsonConverter.java"/>
-
-    <suppress checks="CyclomaticComplexity"
-              files="ConnectRecord.java"/>
-    <suppress checks="CyclomaticComplexity"
-              files="JsonConverter.java"/>
-    <suppress checks="CyclomaticComplexity"
-              files="FileStreamSourceTask.java"/>
-    <suppress checks="CyclomaticComplexity"
-              files="DistributedHerder.java"/>
-    <suppress checks="CyclomaticComplexity"
-              files="KafkaConfigBackingStore.java"/>
-    <suppress checks="CyclomaticComplexity"
-              files="(Values|ConnectHeader|ConnectHeaders).java"/>
-    <suppress checks="CyclomaticComplexity"
-              files="RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapterTest.java"/>
-
-    <suppress checks="JavaNCSS"
-              files="KafkaConfigBackingStore.java"/>
-    <suppress checks="JavaNCSS"
-              files="Values.java"/>
-
-    <suppress checks="NPathComplexity"
-              files="(DistributedHerder|RestClient|JsonConverter|KafkaConfigBackingStore|FileStreamSourceTask).java"/>
-
-    <suppress checks="MethodLength"
-              files="Values.java"/>
-
-    <!-- connect tests-->
-    <suppress checks="ClassDataAbstractionCoupling"
-              files="(DistributedHerder|KafkaBasedLog)Test.java"/>
-
-    <suppress checks="ClassFanOutComplexity"
-              files="(WorkerSinkTask|WorkerSourceTask)Test.java"/>
-
-    <!-- Streams -->
-    <suppress checks="ClassFanOutComplexity"
-              files="(TopologyBuilder|KafkaStreams|KStreamImpl|KTableImpl|StreamThread|StreamTask).java"/>
-
-    <suppress checks="MethodLength"
-              files="(KTableImpl|StreamsPartitionAssignor.java)"/>
-
-    <suppress checks="ParameterNumber"
-              files="StreamTask.java"/>
-    <suppress checks="ParameterNumber"
-              files="RocksDBWindowStoreSupplier.java"/>
-
-    <suppress checks="ClassDataAbstractionCoupling"
-              files="(TopologyBuilder|KStreamImpl|StreamsPartitionAssignor|KafkaStreams|KTableImpl).java"/>
-
-    <suppress checks="CyclomaticComplexity"
-              files="TopologyBuilder.java"/>
-    <suppress checks="CyclomaticComplexity"
-              files="StreamsPartitionAssignor.java"/>
-    <suppress checks="CyclomaticComplexity"
-              files="StreamThread.java"/>
-
-    <suppress checks="JavaNCSS"
-              files="StreamsPartitionAssignor.java"/>
-
-    <suppress checks="NPathComplexity"
-              files="(AssignorConfiguration|InternalTopologyBuilder|KafkaStreams|ProcessorStateManager|StreamsPartitionAssignor|StreamThread|TaskManager).java"/>
-
-    <suppress checks="(FinalLocalVariable|UnnecessaryParentheses|BooleanExpressionComplexity|CyclomaticComplexity|WhitespaceAfter|LocalVariableName)"
-              files="Murmur3.java"/>
-
-    <!-- suppress FinalLocalVariable outside of the streams package. -->
-    <suppress checks="FinalLocalVariable"
-              files="^(?!.*[\\/]org[\\/]apache[\\/]kafka[\\/]streams[\\/].*$)"/>
-
-    <!-- generated code -->
-    <suppress checks="(NPathComplexity|ClassFanOutComplexity|CyclomaticComplexity|ClassDataAbstractionCoupling|FinalLocalVariable|LocalVariableName|MemberName|ParameterName|MethodLength|JavaNCSS)"
-              files="streams[\\/]src[\\/](generated|generated-test)[\\/].+.java$"/>
-
-
-    <!-- Streams tests -->
-    <suppress checks="ClassFanOutComplexity"
-              files="(StreamThreadTest|StreamTaskTest|ProcessorTopologyTestDriver).java"/>
-
-    <suppress checks="MethodLength"
-              files="KStreamKTableJoinIntegrationTest.java"/>
-    <suppress checks="MethodLength"
-              files="KStreamKStreamJoinTest.java"/>
-    <suppress checks="MethodLength"
-              files="KStreamWindowAggregateTest.java"/>
-    <suppress checks="MethodLength"
-              files="RocksDBWindowStoreTest.java"/>
-
-    <suppress checks="MemberName"
-              files="StreamsPartitionAssignorTest.java"/>
-
-    <suppress checks="ClassDataAbstractionCoupling"
-              files=".*[/\\]streams[/\\].*test[/\\].*.java"/>
-
-    <suppress checks="BooleanExpressionComplexity"
-              files="SmokeTestDriver.java"/>
-
-    <suppress checks="CyclomaticComplexity"
-              files="KStreamKStreamJoinTest.java|KTableKTableForeignKeyJoinIntegrationTest.java"/>
-    <suppress checks="CyclomaticComplexity"
-              files="RelationalSmokeTest.java|SmokeTestDriver.java"/>
-
-    <suppress checks="JavaNCSS"
-              files="KStreamKStreamJoinTest.java"/>
-    <suppress checks="JavaNCSS"
-              files="SmokeTestDriver.java"/>
-
-    <suppress checks="NPathComplexity"
-              files="EosTestDriver|KStreamKStreamJoinTest.java|RelationalSmokeTest.java|SmokeTestDriver.java|KStreamKStreamLeftJoinTest.java|KTableKTableForeignKeyJoinIntegrationTest.java"/>
-
-    <suppress checks="(FinalLocalVariable|WhitespaceAround|LocalVariableName|ImportControl|AvoidStarImport)"
-              files="Murmur3Test.java"/>
-
-
-    <!-- Streams Test-Utils -->
-    <suppress checks="ClassFanOutComplexity"
-              files="TopologyTestDriver.java"/>
-    <suppress checks="ClassDataAbstractionCoupling"
-              files="TopologyTestDriver.java"/>
-
-    <!-- Tools -->
-    <suppress checks="ClassDataAbstractionCoupling"
-              files="VerifiableConsumer.java"/>
-
-    <suppress checks="CyclomaticComplexity"
-              files="(StreamsResetter|ProducerPerformance|Agent).java"/>
-    <suppress checks="BooleanExpressionComplexity"
-              files="StreamsResetter.java"/>
-    <suppress checks="NPathComplexity"
-              files="(ProducerPerformance|StreamsResetter|Agent|TransactionalMessageCopier).java"/>
-    <suppress checks="ImportControl"
-              files="SignalLogger.java"/>
-    <suppress checks="IllegalImport"
-              files="SignalLogger.java"/>
-    <suppress checks="ParameterNumber"
-              files="ProduceBenchSpec.java"/>
-    <suppress checks="ParameterNumber"
-              files="SustainedConnectionSpec.java"/>
-
-    <!-- Log4J-Appender -->
-    <suppress checks="CyclomaticComplexity"
-              files="KafkaLog4jAppender.java"/>
-
-    <suppress checks="NPathComplexity"
-              files="KafkaLog4jAppender.java"/>
-    <suppress checks="JavaNCSS"
-              files="RequestResponseTest.java"/>
-
-</suppressions>

clients/.gitignore

@@ -1 +0,0 @@
-/bin/

clients/src/main/java/org/apache/kafka/clients/ApiVersion.java

@@ -1,56 +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
- *
- *    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.apache.kafka.clients;
-
-import org.apache.kafka.common.message.ApiVersionsResponseData.ApiVersionsResponseKey;
-import org.apache.kafka.common.protocol.ApiKeys;
-
-/**
- * Represents the min version and max version of an api key.
- *
- * NOTE: This class is intended for INTERNAL usage only within Kafka.
- */
-public class ApiVersion {
-    public final short apiKey;
-    public final short minVersion;
-    public final short maxVersion;
-
-    public ApiVersion(ApiKeys apiKey) {
-        this(apiKey.id, apiKey.oldestVersion(), apiKey.latestVersion());
-    }
-
-    public ApiVersion(short apiKey, short minVersion, short maxVersion) {
-        this.apiKey = apiKey;
-        this.minVersion = minVersion;
-        this.maxVersion = maxVersion;
-    }
-
-    public ApiVersion(ApiVersionsResponseKey apiVersionsResponseKey) {
-        this.apiKey = apiVersionsResponseKey.apiKey();
-        this.minVersion = apiVersionsResponseKey.minVersion();
-        this.maxVersion = apiVersionsResponseKey.maxVersion();
-    }
-
-    @Override
-    public String toString() {
-        return "ApiVersion(" +
-            "apiKey=" + apiKey +
-            ", minVersion=" + minVersion +
-            ", maxVersion= " + maxVersion +
-            ")";
-    }
-}

clients/src/main/java/org/apache/kafka/clients/ApiVersions.java

@@ -1,66 +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
- *
- *    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.apache.kafka.clients;
-
-import org.apache.kafka.common.protocol.ApiKeys;
-import org.apache.kafka.common.record.RecordBatch;
-import org.apache.kafka.common.requests.ProduceRequest;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Maintains node api versions for access outside of NetworkClient (which is where the information is derived).
- * The pattern is akin to the use of {@link Metadata} for topic metadata.
- *
- * NOTE: This class is intended for INTERNAL usage only within Kafka.
- */
-public class ApiVersions {
-
-    private final Map<String, NodeApiVersions> nodeApiVersions = new HashMap<>();
-    private byte maxUsableProduceMagic = RecordBatch.CURRENT_MAGIC_VALUE;
-
-    public synchronized void update(String nodeId, NodeApiVersions nodeApiVersions) {
-        this.nodeApiVersions.put(nodeId, nodeApiVersions);
-        this.maxUsableProduceMagic = computeMaxUsableProduceMagic();
-    }
-
-    public synchronized void remove(String nodeId) {
-        this.nodeApiVersions.remove(nodeId);
-        this.maxUsableProduceMagic = computeMaxUsableProduceMagic();
-    }
-
-    public synchronized NodeApiVersions get(String nodeId) {
-        return this.nodeApiVersions.get(nodeId);
-    }
-
-    private byte computeMaxUsableProduceMagic() {
-        // use a magic version which is supported by all brokers to reduce the chance that
-        // we will need to convert the messages when they are ready to be sent.
-        byte maxUsableMagic = RecordBatch.CURRENT_MAGIC_VALUE;
-        for (NodeApiVersions versions : this.nodeApiVersions.values()) {
-            byte nodeMaxUsableMagic = ProduceRequest.requiredMagicForVersion(versions.latestUsableVersion(ApiKeys.PRODUCE));
-            maxUsableMagic = (byte) Math.min(nodeMaxUsableMagic, maxUsableMagic);
-        }
-        return maxUsableMagic;
-    }
-
-    public synchronized byte maxUsableProduceMagic() {
-        return maxUsableProduceMagic;
-    }
-
-}

clients/src/main/java/org/apache/kafka/clients/ClientDnsLookup.java

@@ -1,41 +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
- *
- *    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.apache.kafka.clients;
-
-import java.util.Locale;
-
-public enum ClientDnsLookup {
-
-    DEFAULT("default"),
-    USE_ALL_DNS_IPS("use_all_dns_ips"),
-    RESOLVE_CANONICAL_BOOTSTRAP_SERVERS_ONLY("resolve_canonical_bootstrap_servers_only");
-
-    private String clientDnsLookup;
-
-    ClientDnsLookup(String clientDnsLookup) {
-        this.clientDnsLookup = clientDnsLookup;
-    }
-
-    @Override
-    public String toString() {
-        return clientDnsLookup;
-    }
-
-    public static ClientDnsLookup forConfig(String config) {
-        return ClientDnsLookup.valueOf(config.toUpperCase(Locale.ROOT));
-    }
-}

clients/src/main/java/org/apache/kafka/clients/ClientRequest.java

@@ -1,119 +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
- *
- *    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.apache.kafka.clients;
-
-import org.apache.kafka.common.message.RequestHeaderData;
-import org.apache.kafka.common.protocol.ApiKeys;
-import org.apache.kafka.common.requests.AbstractRequest;
-import org.apache.kafka.common.requests.RequestHeader;
-
-/**
- * A request being sent to the server. This holds both the network send as well as the client-level metadata.
- */
-public final class ClientRequest {
-
-    private final String destination;
-    private final AbstractRequest.Builder<?> requestBuilder;
-    private final int correlationId;
-    private final String clientId;
-    private final long createdTimeMs;
-    private final boolean expectResponse;
-    private final int requestTimeoutMs;
-    private final RequestCompletionHandler callback;
-
-    /**
-     * @param destination The brokerId to send the request to
-     * @param requestBuilder The builder for the request to make
-     * @param correlationId The correlation id for this client request
-     * @param clientId The client ID to use for the header
-     * @param createdTimeMs The unix timestamp in milliseconds for the time at which this request was created.
-     * @param expectResponse Should we expect a response message or is this request complete once it is sent?
-     * @param callback A callback to execute when the response has been received (or null if no callback is necessary)
-     */
-    public ClientRequest(String destination,
-                         AbstractRequest.Builder<?> requestBuilder,
-                         int correlationId,
-                         String clientId,
-                         long createdTimeMs,
-                         boolean expectResponse,
-                         int requestTimeoutMs,
-                         RequestCompletionHandler callback) {
-        this.destination = destination;
-        this.requestBuilder = requestBuilder;
-        this.correlationId = correlationId;
-        this.clientId = clientId;
-        this.createdTimeMs = createdTimeMs;
-        this.expectResponse = expectResponse;
-        this.requestTimeoutMs = requestTimeoutMs;
-        this.callback = callback;
-    }
-
-    @Override
-    public String toString() {
-        return "ClientRequest(expectResponse=" + expectResponse +
-            ", callback=" + callback +
-            ", destination=" + destination +
-            ", correlationId=" + correlationId +
-            ", clientId=" + clientId +
-            ", createdTimeMs=" + createdTimeMs +
-            ", requestBuilder=" + requestBuilder +
-            ")";
-    }
-
-    public boolean expectResponse() {
-        return expectResponse;
-    }
-
-    public ApiKeys apiKey() {
-        return requestBuilder.apiKey();
-    }
-
-    public RequestHeader makeHeader(short version) {
-        short requestApiKey = requestBuilder.apiKey().id;
-        return new RequestHeader(
-            new RequestHeaderData().
-                setRequestApiKey(requestApiKey).
-                setRequestApiVersion(version).
-                setClientId(clientId).
-                setCorrelationId(correlationId),
-            ApiKeys.forId(requestApiKey).requestHeaderVersion(version));
-    }
-
-    public AbstractRequest.Builder<?> requestBuilder() {
-        return requestBuilder;
-    }
-
-    public String destination() {
-        return destination;
-    }
-
-    public RequestCompletionHandler callback() {
-        return callback;
-    }
-
-    public long createdTimeMs() {
-        return createdTimeMs;
-    }
-
-    public int correlationId() {
-        return correlationId;
-    }
-
-    public int requestTimeoutMs() {
-        return requestTimeoutMs;
-    }
-}

clients/src/main/java/org/apache/kafka/clients/ClientResponse.java

@@ -1,126 +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
- *
- *    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.apache.kafka.clients;
-
-import org.apache.kafka.common.errors.AuthenticationException;
-import org.apache.kafka.common.errors.UnsupportedVersionException;
-import org.apache.kafka.common.requests.AbstractResponse;
-import org.apache.kafka.common.requests.RequestHeader;
-
-/**
- * A response from the server. Contains both the body of the response as well as the correlated request
- * metadata that was originally sent.
- */
-public class ClientResponse {
-
-    private final RequestHeader requestHeader;
-    private final RequestCompletionHandler callback;
-    private final String destination;
-    private final long receivedTimeMs;
-    private final long latencyMs;
-    private final boolean disconnected;
-    private final UnsupportedVersionException versionMismatch;
-    private final AuthenticationException authenticationException;
-    private final AbstractResponse responseBody;
-
-    /**
-     * @param requestHeader The header of the corresponding request
-     * @param callback The callback to be invoked
-     * @param createdTimeMs The unix timestamp when the corresponding request was created
-     * @param destination The node the corresponding request was sent to
-     * @param receivedTimeMs The unix timestamp when this response was received
-     * @param disconnected Whether the client disconnected before fully reading a response
-     * @param versionMismatch Whether there was a version mismatch that prevented sending the request.
-     * @param responseBody The response contents (or null) if we disconnected, no response was expected,
-     *                     or if there was a version mismatch.
-     */
-    public ClientResponse(RequestHeader requestHeader,
-                          RequestCompletionHandler callback,
-                          String destination,
-                          long createdTimeMs,
-                          long receivedTimeMs,
-                          boolean disconnected,
-                          UnsupportedVersionException versionMismatch,
-                          AuthenticationException authenticationException,
-                          AbstractResponse responseBody) {
-        this.requestHeader = requestHeader;
-        this.callback = callback;
-        this.destination = destination;
-        this.receivedTimeMs = receivedTimeMs;
-        this.latencyMs = receivedTimeMs - createdTimeMs;
-        this.disconnected = disconnected;
-        this.versionMismatch = versionMismatch;
-        this.authenticationException = authenticationException;
-        this.responseBody = responseBody;
-    }
-
-    public long receivedTimeMs() {
-        return receivedTimeMs;
-    }
-
-    public boolean wasDisconnected() {
-        return disconnected;
-    }
-
-    public UnsupportedVersionException versionMismatch() {
-        return versionMismatch;
-    }
-
-    public AuthenticationException authenticationException() {
-        return authenticationException;
-    }
-
-    public RequestHeader requestHeader() {
-        return requestHeader;
-    }
-
-    public String destination() {
-        return destination;
-    }
-
-    public AbstractResponse responseBody() {
-        return responseBody;
-    }
-
-    public boolean hasResponse() {
-        return responseBody != null;
-    }
-
-    public long requestLatencyMs() {
-        return latencyMs;
-    }
-
-    public void onComplete() {
-        if (callback != null)
-            callback.onComplete(this);
-    }
-
-    @Override
-    public String toString() {
-        return "ClientResponse(receivedTimeMs=" + receivedTimeMs +
-               ", latencyMs=" +
-               latencyMs +
-               ", disconnected=" +
-               disconnected +
-               ", requestHeader=" +
-               requestHeader +
-               ", responseBody=" +
-               responseBody +
-               ")";
-    }
-
-}

clients/src/main/java/org/apache/kafka/clients/ClientUtils.java

@@ -1,131 +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
- *
- *    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.apache.kafka.clients;
-
-import org.apache.kafka.common.config.AbstractConfig;
-import org.apache.kafka.common.config.ConfigException;
-import org.apache.kafka.common.config.SaslConfigs;
-import org.apache.kafka.common.network.ChannelBuilder;
-import org.apache.kafka.common.network.ChannelBuilders;
-import org.apache.kafka.common.security.JaasContext;
-import org.apache.kafka.common.security.auth.SecurityProtocol;
-import org.apache.kafka.common.utils.LogContext;
-import org.apache.kafka.common.utils.Time;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static org.apache.kafka.common.utils.Utils.getHost;
-import static org.apache.kafka.common.utils.Utils.getPort;
-
-public final class ClientUtils {
-    private static final Logger log = LoggerFactory.getLogger(ClientUtils.class);
-
-    private ClientUtils() {
-    }
-
-    public static List<InetSocketAddress> parseAndValidateAddresses(List<String> urls, String clientDnsLookupConfig) {
-        return parseAndValidateAddresses(urls, ClientDnsLookup.forConfig(clientDnsLookupConfig));
-    }
-
-    public static List<InetSocketAddress> parseAndValidateAddresses(List<String> urls, ClientDnsLookup clientDnsLookup) {
-        List<InetSocketAddress> addresses = new ArrayList<>();
-        for (String url : urls) {
-            if (url != null && !url.isEmpty()) {
-                try {
-                    String host = getHost(url);
-                    Integer port = getPort(url);
-                    if (host == null || port == null)
-                        throw new ConfigException("Invalid url in " + CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG + ": " + url);
-
-                    if (clientDnsLookup == ClientDnsLookup.RESOLVE_CANONICAL_BOOTSTRAP_SERVERS_ONLY) {
-                        InetAddress[] inetAddresses = InetAddress.getAllByName(host);
-                        for (InetAddress inetAddress : inetAddresses) {
-                            String resolvedCanonicalName = inetAddress.getCanonicalHostName();
-                            InetSocketAddress address = new InetSocketAddress(resolvedCanonicalName, port);
-                            if (address.isUnresolved()) {
-                                log.warn("Couldn't resolve server {} from {} as DNS resolution of the canonical hostname {} failed for {}", url, CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG, resolvedCanonicalName, host);
-                            } else {
-                                addresses.add(address);
-                            }
-                        }
-                    } else {
-                        InetSocketAddress address = new InetSocketAddress(host, port);
-                        if (address.isUnresolved()) {
-                            log.warn("Couldn't resolve server {} from {} as DNS resolution failed for {}", url, CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG, host);
-                        } else {
-                            addresses.add(address);
-                        }
-                    }
-
-                } catch (IllegalArgumentException e) {
-                    throw new ConfigException("Invalid port in " + CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG + ": " + url);
-                } catch (UnknownHostException e) {
-                    throw new ConfigException("Unknown host in " + CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG + ": " + url);
-                }
-            }
-        }
-        if (addresses.isEmpty())
-            throw new ConfigException("No resolvable bootstrap urls given in " + CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG);
-        return addresses;
-    }
-
-    /**
-     * Create a new channel builder from the provided configuration.
-     *
-     * @param config client configs
-     * @param time the time implementation
-     * @param logContext the logging context
-     *
-     * @return configured ChannelBuilder based on the configs.
-     */
-    public static ChannelBuilder createChannelBuilder(AbstractConfig config, Time time, LogContext logContext) {
-        SecurityProtocol securityProtocol = SecurityProtocol.forName(config.getString(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG));
-        String clientSaslMechanism = config.getString(SaslConfigs.SASL_MECHANISM);
-        return ChannelBuilders.clientChannelBuilder(securityProtocol, JaasContext.Type.CLIENT, config, null,
-                clientSaslMechanism, time, true, logContext);
-    }
-
-    static List<InetAddress> resolve(String host, ClientDnsLookup clientDnsLookup) throws UnknownHostException {
-        InetAddress[] addresses = InetAddress.getAllByName(host);
-        if (ClientDnsLookup.USE_ALL_DNS_IPS == clientDnsLookup) {
-            return filterPreferredAddresses(addresses);
-        } else {
-            return Collections.singletonList(addresses[0]);
-        }
-    }
-
-    static List<InetAddress> filterPreferredAddresses(InetAddress[] allAddresses) {
-        List<InetAddress> preferredAddresses = new ArrayList<>();
-        Class<? extends InetAddress> clazz = null;
-        for (InetAddress address : allAddresses) {
-            if (clazz == null) {
-                clazz = address.getClass();
-            }
-            if (clazz.isInstance(address)) {
-                preferredAddresses.add(address);
-            }
-        }
-        return preferredAddresses;
-    }
-}

clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java

@@ -1,427 +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
- *
- *    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.apache.kafka.clients;
-
-import java.util.concurrent.ThreadLocalRandom;
-
-import org.apache.kafka.common.errors.AuthenticationException;
-import org.apache.kafka.common.utils.LogContext;
-import org.slf4j.Logger;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * The state of our connection to each node in the cluster.
- *
- */
-final class ClusterConnectionStates {
-    private final long reconnectBackoffInitMs;
-    private final long reconnectBackoffMaxMs;
-    private final static int RECONNECT_BACKOFF_EXP_BASE = 2;
-    private final double reconnectBackoffMaxExp;
-    private final Map<String, NodeConnectionState> nodeState;
-    private final Logger log;
-
-    public ClusterConnectionStates(long reconnectBackoffMs, long reconnectBackoffMaxMs, LogContext logContext) {
-        this.log = logContext.logger(ClusterConnectionStates.class);
-        this.reconnectBackoffInitMs = reconnectBackoffMs;
-        this.reconnectBackoffMaxMs = reconnectBackoffMaxMs;
-        this.reconnectBackoffMaxExp = Math.log(this.reconnectBackoffMaxMs / (double) Math.max(reconnectBackoffMs, 1)) / Math.log(RECONNECT_BACKOFF_EXP_BASE);
-        this.nodeState = new HashMap<>();
-    }
-
-    /**
-     * Return true iff we can currently initiate a new connection. This will be the case if we are not
-     * connected and haven't been connected for at least the minimum reconnection backoff period.
-     * @param id the connection id to check
-     * @param now the current time in ms
-     * @return true if we can initiate a new connection
-     */
-    public boolean canConnect(String id, long now) {
-        NodeConnectionState state = nodeState.get(id);
-        if (state == null)
-            return true;
-        else
-            return state.state.isDisconnected() &&
-                   now - state.lastConnectAttemptMs >= state.reconnectBackoffMs;
-    }
-
-    /**
-     * Return true if we are disconnected from the given node and can't re-establish a connection yet.
-     * @param id the connection to check
-     * @param now the current time in ms
-     */
-    public boolean isBlackedOut(String id, long now) {
-        NodeConnectionState state = nodeState.get(id);
-        return state != null
-                && state.state.isDisconnected()
-                && now - state.lastConnectAttemptMs < state.reconnectBackoffMs;
-    }
-
-    /**
-     * Returns the number of milliseconds to wait, based on the connection state, before attempting to send data. When
-     * disconnected, this respects the reconnect backoff time. When connecting or connected, this handles slow/stalled
-     * connections.
-     * @param id the connection to check
-     * @param now the current time in ms
-     */
-    public long connectionDelay(String id, long now) {
-        NodeConnectionState state = nodeState.get(id);
-        if (state == null) return 0;
-        if (state.state.isDisconnected()) {
-            long timeWaited = now - state.lastConnectAttemptMs;
-            return Math.max(state.reconnectBackoffMs - timeWaited, 0);
-        } else {
-            // When connecting or connected, we should be able to delay indefinitely since other events (connection or
-            // data acked) will cause a wakeup once data can be sent.
-            return Long.MAX_VALUE;
-        }
-    }
-
-    /**
-     * Return true if a specific connection establishment is currently underway
-     * @param id The id of the node to check
-     */
-    public boolean isConnecting(String id) {
-        NodeConnectionState state = nodeState.get(id);
-        return state != null && state.state == ConnectionState.CONNECTING;
-    }
-
-    /**
-     * Check whether a connection is either being established or awaiting API version information.
-     * @param id The id of the node to check
-     * @return true if the node is either connecting or has connected and is awaiting API versions, false otherwise
-     */
-    public boolean isPreparingConnection(String id) {
-        NodeConnectionState state = nodeState.get(id);
-        return state != null &&
-                (state.state == ConnectionState.CONNECTING || state.state == ConnectionState.CHECKING_API_VERSIONS);
-    }
-
-    /**
-     * Enter the connecting state for the given connection, moving to a new resolved address if necessary.
-     * @param id the id of the connection
-     * @param now the current time in ms
-     * @param host the host of the connection, to be resolved internally if needed
-     * @param clientDnsLookup the mode of DNS lookup to use when resolving the {@code host}
-     */
-    public void connecting(String id, long now, String host, ClientDnsLookup clientDnsLookup) {
-        NodeConnectionState connectionState = nodeState.get(id);
-        if (connectionState != null && connectionState.host().equals(host)) {
-            connectionState.lastConnectAttemptMs = now;
-            connectionState.state = ConnectionState.CONNECTING;
-            // Move to next resolved address, or if addresses are exhausted, mark node to be re-resolved
-            connectionState.moveToNextAddress();
-            return;
-        } else if (connectionState != null) {
-            log.info("Hostname for node {} changed from {} to {}.", id, connectionState.host(), host);
-        }
-
-        // Create a new NodeConnectionState if nodeState does not already contain one
-        // for the specified id or if the hostname associated with the node id changed.
-        nodeState.put(id, new NodeConnectionState(ConnectionState.CONNECTING, now,
-            this.reconnectBackoffInitMs, host, clientDnsLookup));
-    }
-
-    /**
-     * Returns a resolved address for the given connection, resolving it if necessary.
-     * @param id the id of the connection
-     * @throws UnknownHostException if the address was not resolvable
-     */
-    public InetAddress currentAddress(String id) throws UnknownHostException {
-        return nodeState(id).currentAddress();
-    }
-
-    /**
-     * Enter the disconnected state for the given node.
-     * @param id the connection we have disconnected
-     * @param now the current time in ms
-     */
-    public void disconnected(String id, long now) {
-        NodeConnectionState nodeState = nodeState(id);
-        nodeState.state = ConnectionState.DISCONNECTED;
-        nodeState.lastConnectAttemptMs = now;
-        updateReconnectBackoff(nodeState);
-    }
-
-    /**
-     * Indicate that the connection is throttled until the specified deadline.
-     * @param id the connection to be throttled
-     * @param throttleUntilTimeMs the throttle deadline in milliseconds
-     */
-    public void throttle(String id, long throttleUntilTimeMs) {
-        NodeConnectionState state = nodeState.get(id);
-        // The throttle deadline should never regress.
-        if (state != null && state.throttleUntilTimeMs < throttleUntilTimeMs) {
-            state.throttleUntilTimeMs = throttleUntilTimeMs;
-        }
-    }
-
-    /**
-     * Return the remaining throttling delay in milliseconds if throttling is in progress. Return 0, otherwise.
-     * @param id the connection to check
-     * @param now the current time in ms
-     */
-    public long throttleDelayMs(String id, long now) {
-        NodeConnectionState state = nodeState.get(id);
-        if (state != null && state.throttleUntilTimeMs > now) {
-            return state.throttleUntilTimeMs - now;
-        } else {
-            return 0;
-        }
-    }
-
-    /**
-     * Return the number of milliseconds to wait, based on the connection state and the throttle time, before
-     * attempting to send data. If the connection has been established but being throttled, return throttle delay.
-     * Otherwise, return connection delay.
-     * @param id the connection to check
-     * @param now the current time in ms
-     */
-    public long pollDelayMs(String id, long now) {
-        long throttleDelayMs = throttleDelayMs(id, now);
-        if (isConnected(id) && throttleDelayMs > 0) {
-            return throttleDelayMs;
-        } else {
-            return connectionDelay(id, now);
-        }
-    }
-
-    /**
-     * Enter the checking_api_versions state for the given node.
-     * @param id the connection identifier
-     */
-    public void checkingApiVersions(String id) {
-        NodeConnectionState nodeState = nodeState(id);
-        nodeState.state = ConnectionState.CHECKING_API_VERSIONS;
-    }
-
-    /**
-     * Enter the ready state for the given node.
-     * @param id the connection identifier
-     */
-    public void ready(String id) {
-        NodeConnectionState nodeState = nodeState(id);
-        nodeState.state = ConnectionState.READY;
-        nodeState.authenticationException = null;
-        resetReconnectBackoff(nodeState);
-    }
-
-    /**
-     * Enter the authentication failed state for the given node.
-     * @param id the connection identifier
-     * @param now the current time in ms
-     * @param exception the authentication exception
-     */
-    public void authenticationFailed(String id, long now, AuthenticationException exception) {
-        NodeConnectionState nodeState = nodeState(id);
-        nodeState.authenticationException = exception;
-        nodeState.state = ConnectionState.AUTHENTICATION_FAILED;
-        nodeState.lastConnectAttemptMs = now;
-        updateReconnectBackoff(nodeState);
-    }
-
-    /**
-     * Return true if the connection is in the READY state and currently not throttled.
-     *
-     * @param id the connection identifier
-     * @param now the current time in ms
-     */
-    public boolean isReady(String id, long now) {
-        return isReady(nodeState.get(id), now);
-    }
-
-    private boolean isReady(NodeConnectionState state, long now) {
-        return state != null && state.state == ConnectionState.READY && state.throttleUntilTimeMs <= now;
-    }
-
-    /**
-     * Return true if there is at least one node with connection in the READY state and not throttled. Returns false
-     * otherwise.
-     *
-     * @param now the current time in ms
-     */
-    public boolean hasReadyNodes(long now) {
-        for (Map.Entry<String, NodeConnectionState> entry : nodeState.entrySet()) {
-            if (isReady(entry.getValue(), now)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Return true if the connection has been established
-     * @param id The id of the node to check
-     */
-    public boolean isConnected(String id) {
-        NodeConnectionState state = nodeState.get(id);
-        return state != null && state.state.isConnected();
-    }
-
-    /**
-     * Return true if the connection has been disconnected
-     * @param id The id of the node to check
-     */
-    public boolean isDisconnected(String id) {
-        NodeConnectionState state = nodeState.get(id);
-        return state != null && state.state.isDisconnected();
-    }
-
-    /**
-     * Return authentication exception if an authentication error occurred
-     * @param id The id of the node to check
-     */
-    public AuthenticationException authenticationException(String id) {
-        NodeConnectionState state = nodeState.get(id);
-        return state != null ? state.authenticationException : null;
-    }
-
-    /**
-     * Resets the failure count for a node and sets the reconnect backoff to the base
-     * value configured via reconnect.backoff.ms
-     *
-     * @param nodeState The node state object to update
-     */
-    private void resetReconnectBackoff(NodeConnectionState nodeState) {
-        nodeState.failedAttempts = 0;
-        nodeState.reconnectBackoffMs = this.reconnectBackoffInitMs;
-    }
-
-    /**
-     * Update the node reconnect backoff exponentially.
-     * The delay is reconnect.backoff.ms * 2**(failures - 1) * (+/- 20% random jitter)
-     * Up to a (pre-jitter) maximum of reconnect.backoff.max.ms
-     *
-     * @param nodeState The node state object to update
-     */
-    private void updateReconnectBackoff(NodeConnectionState nodeState) {
-        if (this.reconnectBackoffMaxMs > this.reconnectBackoffInitMs) {
-            nodeState.failedAttempts += 1;
-            double backoffExp = Math.min(nodeState.failedAttempts - 1, this.reconnectBackoffMaxExp);
-            double backoffFactor = Math.pow(RECONNECT_BACKOFF_EXP_BASE, backoffExp);
-            long reconnectBackoffMs = (long) (this.reconnectBackoffInitMs * backoffFactor);
-            // Actual backoff is randomized to avoid connection storms.
-            double randomFactor = ThreadLocalRandom.current().nextDouble(0.8, 1.2);
-            nodeState.reconnectBackoffMs = (long) (randomFactor * reconnectBackoffMs);
-        }
-    }
-
-    /**
-     * Remove the given node from the tracked connection states. The main difference between this and `disconnected`
-     * is the impact on `connectionDelay`: it will be 0 after this call whereas `reconnectBackoffMs` will be taken
-     * into account after `disconnected` is called.
-     *
-     * @param id the connection to remove
-     */
-    public void remove(String id) {
-        nodeState.remove(id);
-    }
-
-    /**
-     * Get the state of a given connection.
-     * @param id the id of the connection
-     * @return the state of our connection
-     */
-    public ConnectionState connectionState(String id) {
-        return nodeState(id).state;
-    }
-
-    /**
-     * Get the state of a given node.
-     * @param id the connection to fetch the state for
-     */
-    private NodeConnectionState nodeState(String id) {
-        NodeConnectionState state = this.nodeState.get(id);
-        if (state == null)
-            throw new IllegalStateException("No entry found for connection " + id);
-        return state;
-    }
-
-    /**
-     * The state of our connection to a node.
-     */
-    private static class NodeConnectionState {
-
-        ConnectionState state;
-        AuthenticationException authenticationException;
-        long lastConnectAttemptMs;
-        long failedAttempts;
-        long reconnectBackoffMs;
-        // Connection is being throttled if current time < throttleUntilTimeMs.
-        long throttleUntilTimeMs;
-        private List<InetAddress> addresses;
-        private int addressIndex;
-        private final String host;
-        private final ClientDnsLookup clientDnsLookup;
-
-        private NodeConnectionState(ConnectionState state, long lastConnectAttempt, long reconnectBackoffMs,
-                String host, ClientDnsLookup clientDnsLookup) {
-            this.state = state;
-            this.addresses = Collections.emptyList();
-            this.addressIndex = -1;
-            this.authenticationException = null;
-            this.lastConnectAttemptMs = lastConnectAttempt;
-            this.failedAttempts = 0;
-            this.reconnectBackoffMs = reconnectBackoffMs;
-            this.throttleUntilTimeMs = 0;
-            this.host = host;
-            this.clientDnsLookup = clientDnsLookup;
-        }
-
-        public String host() {
-            return host;
-        }
-
-        /**
-         * Fetches the current selected IP address for this node, resolving {@link #host()} if necessary.
-         * @return the selected address
-         * @throws UnknownHostException if resolving {@link #host()} fails
-         */
-        private InetAddress currentAddress() throws UnknownHostException {
-            if (addresses.isEmpty()) {
-                // (Re-)initialize list
-                addresses = ClientUtils.resolve(host, clientDnsLookup);
-                addressIndex = 0;
-            }
-
-            return addresses.get(addressIndex);
-        }
-
-        /**
-         * Jumps to the next available resolved address for this node. If no other addresses are available, marks the
-         * list to be refreshed on the next {@link #currentAddress()} call.
-         */
-        private void moveToNextAddress() {
-            if (addresses.isEmpty())
-                return; // Avoid div0. List will initialize on next currentAddress() call
-
-            addressIndex = (addressIndex + 1) % addresses.size();
-            if (addressIndex == 0)
-                addresses = Collections.emptyList(); // Exhausted list. Re-resolve on next currentAddress() call
-        }
-
-        public String toString() {
-            return "NodeState(" + state + ", " + lastConnectAttemptMs + ", " + failedAttempts + ", " + throttleUntilTimeMs + ")";
-        }
-    }
-}

clients/src/main/java/org/apache/kafka/clients/CommonClientConfigs.java

@@ -1,168 +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
- *
- *    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.apache.kafka.clients;
-
-import org.apache.kafka.common.config.AbstractConfig;
-import org.apache.kafka.common.security.auth.SecurityProtocol;
-import org.apache.kafka.common.utils.Utils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Configurations shared by Kafka client applications: producer, consumer, connect, etc.
- */
-public class CommonClientConfigs {
-    private static final Logger log = LoggerFactory.getLogger(CommonClientConfigs.class);
-
-    /*
-     * NOTE: DO NOT CHANGE EITHER CONFIG NAMES AS THESE ARE PART OF THE PUBLIC API AND CHANGE WILL BREAK USER CODE.
-     */
-
-    public static final String BOOTSTRAP_SERVERS_CONFIG = "bootstrap.servers";
-    public static final String BOOTSTRAP_SERVERS_DOC = "A list of host/port pairs to use for establishing the initial connection to the Kafka cluster. The client will make use of all servers irrespective of which servers are specified here for bootstrapping—this list only impacts the initial hosts used to discover the full set of servers. This list should be in the form "
-                                                       + "<code>host1:port1,host2:port2,...</code>. Since these servers are just used for the initial connection to "
-                                                       + "discover the full cluster membership (which may change dynamically), this list need not contain the full set of "
-                                                       + "servers (you may want more than one, though, in case a server is down).";
-
-    public static final String CLIENT_DNS_LOOKUP_CONFIG = "client.dns.lookup";
-    public static final String CLIENT_DNS_LOOKUP_DOC = "Controls how the client uses DNS lookups. If set to <code>use_all_dns_ips</code> then, when the lookup returns multiple IP addresses for a hostname,"
-                                                       + " they will all be attempted to connect to before failing the connection. Applies to both bootstrap and advertised servers."
-                                                       + " If the value is <code>resolve_canonical_bootstrap_servers_only</code> each entry will be resolved and expanded into a list of canonical names.";
-
-    public static final String METADATA_MAX_AGE_CONFIG = "metadata.max.age.ms";
-    public static final String METADATA_MAX_AGE_DOC = "The period of time in milliseconds after which we force a refresh of metadata even if we haven't seen any partition leadership changes to proactively discover any new brokers or partitions.";
-
-    public static final String SEND_BUFFER_CONFIG = "send.buffer.bytes";
-    public static final String SEND_BUFFER_DOC = "The size of the TCP send buffer (SO_SNDBUF) to use when sending data. If the value is -1, the OS default will be used.";
-    public static final int SEND_BUFFER_LOWER_BOUND = -1;
-
-    public static final String RECEIVE_BUFFER_CONFIG = "receive.buffer.bytes";
-    public static final String RECEIVE_BUFFER_DOC = "The size of the TCP receive buffer (SO_RCVBUF) to use when reading data. If the value is -1, the OS default will be used.";
-    public static final int RECEIVE_BUFFER_LOWER_BOUND = -1;
-
-    public static final String CLIENT_ID_CONFIG = "client.id";
-    public static final String CLIENT_ID_DOC = "An id string to pass to the server when making requests. The purpose of this is to be able to track the source of requests beyond just ip/port by allowing a logical application name to be included in server-side request logging.";
-
-    public static final String CLIENT_RACK_CONFIG = "client.rack";
-    public static final String CLIENT_RACK_DOC = "A rack identifier for this client. This can be any string value which indicates where this client is physically located. It corresponds with the broker config 'broker.rack'";
-
-    public static final String RECONNECT_BACKOFF_MS_CONFIG = "reconnect.backoff.ms";
-    public static final String RECONNECT_BACKOFF_MS_DOC = "The base amount of time to wait before attempting to reconnect to a given host. This avoids repeatedly connecting to a host in a tight loop. This backoff applies to all connection attempts by the client to a broker.";
-
-    public static final String RECONNECT_BACKOFF_MAX_MS_CONFIG = "reconnect.backoff.max.ms";
-    public static final String RECONNECT_BACKOFF_MAX_MS_DOC = "The maximum amount of time in milliseconds to wait when reconnecting to a broker that has repeatedly failed to connect. If provided, the backoff per host will increase exponentially for each consecutive connection failure, up to this maximum. After calculating the backoff increase, 20% random jitter is added to avoid connection storms.";
-
-    public static final String RETRIES_CONFIG = "retries";
-    public static final String RETRIES_DOC = "Setting a value greater than zero will cause the client to resend any request that fails with a potentially transient error.";
-
-    public static final String RETRY_BACKOFF_MS_CONFIG = "retry.backoff.ms";
-    public static final String RETRY_BACKOFF_MS_DOC = "The amount of time to wait before attempting to retry a failed request to a given topic partition. This avoids repeatedly sending requests in a tight loop under some failure scenarios.";
-
-    public static final String METRICS_SAMPLE_WINDOW_MS_CONFIG = "metrics.sample.window.ms";
-    public static final String METRICS_SAMPLE_WINDOW_MS_DOC = "The window of time a metrics sample is computed over.";
-
-    public static final String METRICS_NUM_SAMPLES_CONFIG = "metrics.num.samples";
-    public static final String METRICS_NUM_SAMPLES_DOC = "The number of samples maintained to compute metrics.";
-
-    public static final String METRICS_RECORDING_LEVEL_CONFIG = "metrics.recording.level";
-    public static final String METRICS_RECORDING_LEVEL_DOC = "The highest recording level for metrics.";
-
-    public static final String METRIC_REPORTER_CLASSES_CONFIG = "metric.reporters";
-    public static final String METRIC_REPORTER_CLASSES_DOC = "A list of classes to use as metrics reporters. Implementing the <code>org.apache.kafka.common.metrics.MetricsReporter</code> interface allows plugging in classes that will be notified of new metric creation. The JmxReporter is always included to register JMX statistics.";
-
-    public static final String SECURITY_PROTOCOL_CONFIG = "security.protocol";
-    public static final String SECURITY_PROTOCOL_DOC = "Protocol used to communicate with brokers. Valid values are: " +
-        Utils.join(SecurityProtocol.names(), ", ") + ".";
-    public static final String DEFAULT_SECURITY_PROTOCOL = "PLAINTEXT";
-
-    public static final String CONNECTIONS_MAX_IDLE_MS_CONFIG = "connections.max.idle.ms";
-    public static final String CONNECTIONS_MAX_IDLE_MS_DOC = "Close idle connections after the number of milliseconds specified by this config.";
-
-    public static final String REQUEST_TIMEOUT_MS_CONFIG = "request.timeout.ms";
-    public static final String REQUEST_TIMEOUT_MS_DOC = "The configuration controls the maximum amount of time the client will wait "
-                                                         + "for the response of a request. If the response is not received before the timeout "
-                                                         + "elapses the client will resend the request if necessary or fail the request if "
-                                                         + "retries are exhausted.";
-
-    public static final String GROUP_ID_CONFIG = "group.id";
-    public static final String GROUP_ID_DOC = "A unique string that identifies the consumer group this consumer belongs to. This property is required if the consumer uses either the group management functionality by using <code>subscribe(topic)</code> or the Kafka-based offset management strategy.";
-
-    public static final String GROUP_INSTANCE_ID_CONFIG = "group.instance.id";
-    public static final String GROUP_INSTANCE_ID_DOC = "A unique identifier of the consumer instance provided by the end user. "
-                                                       + "Only non-empty strings are permitted. If set, the consumer is treated as a static member, "
-                                                       + "which means that only one instance with this ID is allowed in the consumer group at any time. "
-                                                       + "This can be used in combination with a larger session timeout to avoid group rebalances caused by transient unavailability "
-                                                       + "(e.g. process restarts). If not set, the consumer will join the group as a dynamic member, which is the traditional behavior.";
-
-    public static final String MAX_POLL_INTERVAL_MS_CONFIG = "max.poll.interval.ms";
-    public static final String MAX_POLL_INTERVAL_MS_DOC = "The maximum delay between invocations of poll() when using "
-                                                          + "consumer group management. This places an upper bound on the amount of time that the consumer can be idle "
-                                                          + "before fetching more records. If poll() is not called before expiration of this timeout, then the consumer "
-                                                          + "is considered failed and the group will rebalance in order to reassign the partitions to another member. "
-                                                          + "For consumers using a non-null <code>group.instance.id</code> which reach this timeout, partitions will not be immediately reassigned. "
-                                                          + "Instead, the consumer will stop sending heartbeats and partitions will be reassigned "
-                                                          + "after expiration of <code>session.timeout.ms</code>. This mirrors the behavior of a static consumer which has shutdown.";
-
-    public static final String REBALANCE_TIMEOUT_MS_CONFIG = "rebalance.timeout.ms";
-    public static final String REBALANCE_TIMEOUT_MS_DOC = "The maximum allowed time for each worker to join the group "
-                                                          + "once a rebalance has begun. This is basically a limit on the amount of time needed for all tasks to "
-                                                          + "flush any pending data and commit offsets. If the timeout is exceeded, then the worker will be removed "
-                                                          + "from the group, which will cause offset commit failures.";
-
-    public static final String SESSION_TIMEOUT_MS_CONFIG = "session.timeout.ms";
-    public static final String SESSION_TIMEOUT_MS_DOC = "The timeout used to detect client failures when using "
-                                                        + "Kafka's group management facility. The client sends periodic heartbeats to indicate its liveness "
-                                                        + "to the broker. If no heartbeats are received by the broker before the expiration of this session timeout, "
-                                                        + "then the broker will remove this client from the group and initiate a rebalance. Note that the value "
-                                                        + "must be in the allowable range as configured in the broker configuration by <code>group.min.session.timeout.ms</code> "
-                                                        + "and <code>group.max.session.timeout.ms</code>.";
-
-    public static final String HEARTBEAT_INTERVAL_MS_CONFIG = "heartbeat.interval.ms";
-    public static final String HEARTBEAT_INTERVAL_MS_DOC = "The expected time between heartbeats to the consumer "
-                                                           + "coordinator when using Kafka's group management facilities. Heartbeats are used to ensure that the "
-                                                           + "consumer's session stays active and to facilitate rebalancing when new consumers join or leave the group. "
-                                                           + "The value must be set lower than <code>session.timeout.ms</code>, but typically should be set no higher "
-                                                           + "than 1/3 of that value. It can be adjusted even lower to control the expected time for normal rebalances.";
-
-    public static final String DEFAULT_API_TIMEOUT_MS_CONFIG = "default.api.timeout.ms";
-    public static final String DEFAULT_API_TIMEOUT_MS_DOC = "Specifies the timeout (in milliseconds) for client APIs. " +
-            "This configuration is used as the default timeout for all client operations that do not specify a <code>timeout</code> parameter.";
-
-    /**
-     * Postprocess the configuration so that exponential backoff is disabled when reconnect backoff
-     * is explicitly configured but the maximum reconnect backoff is not explicitly configured.
-     *
-     * @param config                    The config object.
-     * @param parsedValues              The parsedValues as provided to postProcessParsedConfig.
-     *
-     * @return                          The new values which have been set as described in postProcessParsedConfig.
-     */
-    public static Map<String, Object> postProcessReconnectBackoffConfigs(AbstractConfig config,
-                                                    Map<String, Object> parsedValues) {
-        HashMap<String, Object> rval = new HashMap<>();
-        if ((!config.originals().containsKey(RECONNECT_BACKOFF_MAX_MS_CONFIG)) &&
-                config.originals().containsKey(RECONNECT_BACKOFF_MS_CONFIG)) {
-            log.debug("Disabling exponential reconnect backoff because {} is set, but {} is not.",
-                    RECONNECT_BACKOFF_MS_CONFIG, RECONNECT_BACKOFF_MAX_MS_CONFIG);
-            rval.put(RECONNECT_BACKOFF_MAX_MS_CONFIG, parsedValues.get(RECONNECT_BACKOFF_MS_CONFIG));
-        }
-        return rval;
-    }
-}

clients/src/main/java/org/apache/kafka/clients/ConnectionState.java

@@ -1,38 +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
- *
- *    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.apache.kafka.clients;
-
-/**
- * The states of a node connection
- *
- * DISCONNECTED: connection has not been successfully established yet
- * CONNECTING: connection is under progress
- * CHECKING_API_VERSIONS: connection has been established and api versions check is in progress. Failure of this check will cause connection to close
- * READY: connection is ready to send requests
- * AUTHENTICATION_FAILED: connection failed due to an authentication error
- */
-public enum ConnectionState {
-    DISCONNECTED, CONNECTING, CHECKING_API_VERSIONS, READY, AUTHENTICATION_FAILED;
-
-    public boolean isDisconnected() {
-        return this == AUTHENTICATION_FAILED || this == DISCONNECTED;
-    }
-
-    public boolean isConnected() {
-        return this == CHECKING_API_VERSIONS || this == READY;
-    }
-}

clients/src/main/java/org/apache/kafka/clients/FetchSessionHandler.java

@@ -1,484 +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
- *
- *    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.apache.kafka.clients;
-
-import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.protocol.Errors;
-import org.apache.kafka.common.requests.FetchMetadata;
-import org.apache.kafka.common.requests.FetchRequest.PartitionData;
-import org.apache.kafka.common.requests.FetchResponse;
-import org.apache.kafka.common.utils.LogContext;
-import org.apache.kafka.common.utils.Utils;
-import org.slf4j.Logger;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import static org.apache.kafka.common.requests.FetchMetadata.INVALID_SESSION_ID;
-
-/**
- * FetchSessionHandler maintains the fetch session state for connecting to a broker.
- *
- * Using the protocol outlined by KIP-227, clients can create incremental fetch sessions.
- * These sessions allow the client to fetch information about a set of partition over
- * and over, without explicitly enumerating all the partitions in the request and the
- * response.
- *
- * FetchSessionHandler tracks the partitions which are in the session.  It also
- * determines which partitions need to be included in each fetch request, and what
- * the attached fetch session metadata should be for each request.  The corresponding
- * class on the receiving broker side is FetchManager.
- */
-public class FetchSessionHandler {
-    private final Logger log;
-
-    private final int node;
-
-    /**
-     * The metadata for the next fetch request.
-     */
-    private FetchMetadata nextMetadata = FetchMetadata.INITIAL;
-
-    public FetchSessionHandler(LogContext logContext, int node) {
-        this.log = logContext.logger(FetchSessionHandler.class);
-        this.node = node;
-    }
-
-    /**
-     * All of the partitions which exist in the fetch request session.
-     */
-    private LinkedHashMap<TopicPartition, PartitionData> sessionPartitions =
-        new LinkedHashMap<>(0);
-
-    public static class FetchRequestData {
-        /**
-         * The partitions to send in the fetch request.
-         */
-        private final Map<TopicPartition, PartitionData> toSend;
-
-        /**
-         * The partitions to send in the request's "forget" list.
-         */
-        private final List<TopicPartition> toForget;
-
-        /**
-         * All of the partitions which exist in the fetch request session.
-         */
-        private final Map<TopicPartition, PartitionData> sessionPartitions;
-
-        /**
-         * The metadata to use in this fetch request.
-         */
-        private final FetchMetadata metadata;
-
-        FetchRequestData(Map<TopicPartition, PartitionData> toSend,
-                         List<TopicPartition> toForget,
-                         Map<TopicPartition, PartitionData> sessionPartitions,
-                         FetchMetadata metadata) {
-            this.toSend = toSend;
-            this.toForget = toForget;
-            this.sessionPartitions = sessionPartitions;
-            this.metadata = metadata;
-        }
-
-        /**
-         * Get the set of partitions to send in this fetch request.
-         */
-        public Map<TopicPartition, PartitionData> toSend() {
-            return toSend;
-        }
-
-        /**
-         * Get a list of partitions to forget in this fetch request.
-         */
-        public List<TopicPartition> toForget() {
-            return toForget;
-        }
-
-        /**
-         * Get the full set of partitions involved in this fetch request.
-         */
-        public Map<TopicPartition, PartitionData> sessionPartitions() {
-            return sessionPartitions;
-        }
-
-        public FetchMetadata metadata() {
-            return metadata;
-        }
-
-        @Override
-        public String toString() {
-            if (metadata.isFull()) {
-                StringBuilder bld = new StringBuilder("FullFetchRequest(");
-                String prefix = "";
-                for (TopicPartition partition : toSend.keySet()) {
-                    bld.append(prefix);
-                    bld.append(partition);
-                    prefix = ", ";
-                }
-                bld.append(")");
-                return bld.toString();
-            } else {
-                StringBuilder bld = new StringBuilder("IncrementalFetchRequest(toSend=(");
-                String prefix = "";
-                for (TopicPartition partition : toSend.keySet()) {
-                    bld.append(prefix);
-                    bld.append(partition);
-                    prefix = ", ";
-                }
-                bld.append("), toForget=(");
-                prefix = "";
-                for (TopicPartition partition : toForget) {
-                    bld.append(prefix);
-                    bld.append(partition);
-                    prefix = ", ";
-                }
-                bld.append("), implied=(");
-                prefix = "";
-                for (TopicPartition partition : sessionPartitions.keySet()) {
-                    if (!toSend.containsKey(partition)) {
-                        bld.append(prefix);
-                        bld.append(partition);
-                        prefix = ", ";
-                    }
-                }
-                bld.append("))");
-                return bld.toString();
-            }
-        }
-    }
-
-    public class Builder {
-        /**
-         * The next partitions which we want to fetch.
-         *
-         * It is important to maintain the insertion order of this list by using a LinkedHashMap rather
-         * than a regular Map.
-         *
-         * One reason is that when dealing with FULL fetch requests, if there is not enough response
-         * space to return data from all partitions, the server will only return data from partitions
-         * early in this list.
-         *
-         * Another reason is because we make use of the list ordering to optimize the preparation of
-         * incremental fetch requests (see below).
-         */
-        private LinkedHashMap<TopicPartition, PartitionData> next;
-        private final boolean copySessionPartitions;
-
-        Builder() {
-            this.next = new LinkedHashMap<>();
-            this.copySessionPartitions = true;
-        }
-
-        Builder(int initialSize, boolean copySessionPartitions) {
-            this.next = new LinkedHashMap<>(initialSize);
-            this.copySessionPartitions = copySessionPartitions;
-        }
-
-        /**
-         * Mark that we want data from this partition in the upcoming fetch.
-         */
-        public void add(TopicPartition topicPartition, PartitionData data) {
-            next.put(topicPartition, data);
-        }
-
-        public FetchRequestData build() {
-            if (nextMetadata.isFull()) {
-                if (log.isDebugEnabled()) {
-                    log.debug("Built full fetch {} for node {} with {}.",
-                              nextMetadata, node, partitionsToLogString(next.keySet()));
-                }
-                sessionPartitions = next;
-                next = null;
-                Map<TopicPartition, PartitionData> toSend =
-                    Collections.unmodifiableMap(new LinkedHashMap<>(sessionPartitions));
-                return new FetchRequestData(toSend, Collections.emptyList(), toSend, nextMetadata);
-            }
-
-            List<TopicPartition> added = new ArrayList<>();
-            List<TopicPartition> removed = new ArrayList<>();
-            List<TopicPartition> altered = new ArrayList<>();
-            for (Iterator<Entry<TopicPartition, PartitionData>> iter =
-                     sessionPartitions.entrySet().iterator(); iter.hasNext(); ) {
-                Entry<TopicPartition, PartitionData> entry = iter.next();
-                TopicPartition topicPartition = entry.getKey();
-                PartitionData prevData = entry.getValue();
-                PartitionData nextData = next.remove(topicPartition);
-                if (nextData != null) {
-                    if (!prevData.equals(nextData)) {
-                        // Re-add the altered partition to the end of 'next'
-                        next.put(topicPartition, nextData);
-                        entry.setValue(nextData);
-                        altered.add(topicPartition);
-                    }
-                } else {
-                    // Remove this partition from the session.
-                    iter.remove();
-                    // Indicate that we no longer want to listen to this partition.
-                    removed.add(topicPartition);
-                }
-            }
-            // Add any new partitions to the session.
-            for (Entry<TopicPartition, PartitionData> entry : next.entrySet()) {
-                TopicPartition topicPartition = entry.getKey();
-                PartitionData nextData = entry.getValue();
-                if (sessionPartitions.containsKey(topicPartition)) {
-                    // In the previous loop, all the partitions which existed in both sessionPartitions
-                    // and next were moved to the end of next, or removed from next.  Therefore,
-                    // once we hit one of them, we know there are no more unseen entries to look
-                    // at in next.
-                    break;
-                }
-                sessionPartitions.put(topicPartition, nextData);
-                added.add(topicPartition);
-            }
-            if (log.isDebugEnabled()) {
-                log.debug("Built incremental fetch {} for node {}. Added {}, altered {}, removed {} " +
-                          "out of {}", nextMetadata, node, partitionsToLogString(added),
-                          partitionsToLogString(altered), partitionsToLogString(removed),
-                          partitionsToLogString(sessionPartitions.keySet()));
-            }
-            Map<TopicPartition, PartitionData> toSend = Collections.unmodifiableMap(next);
-            Map<TopicPartition, PartitionData> curSessionPartitions = copySessionPartitions
-                    ? Collections.unmodifiableMap(new LinkedHashMap<>(sessionPartitions))
-                    : Collections.unmodifiableMap(sessionPartitions);
-            next = null;
-            return new FetchRequestData(toSend, Collections.unmodifiableList(removed),
-                curSessionPartitions, nextMetadata);
-        }
-    }
-
-    public Builder newBuilder() {
-        return new Builder();
-    }
-
-
-    /** A builder that allows for presizing the PartitionData hashmap, and avoiding making a
-     *  secondary copy of the sessionPartitions, in cases where this is not necessarily.
-     *  This builder is primarily for use by the Replica Fetcher
-     * @param size the initial size of the PartitionData hashmap
-     * @param copySessionPartitions boolean denoting whether the builder should make a deep copy of
-     *                              session partitions
-     */
-    public Builder newBuilder(int size, boolean copySessionPartitions) {
-        return new Builder(size, copySessionPartitions);
-    }
-
-    private String partitionsToLogString(Collection<TopicPartition> partitions) {
-        if (!log.isTraceEnabled()) {
-            return String.format("%d partition(s)", partitions.size());
-        }
-        return "(" + Utils.join(partitions, ", ") + ")";
-    }
-
-    /**
-     * Return some partitions which are expected to be in a particular set, but which are not.
-     *
-     * @param toFind    The partitions to look for.
-     * @param toSearch  The set of partitions to search.
-     * @return          null if all partitions were found; some of the missing ones
-     *                  in string form, if not.
-     */
-    static Set<TopicPartition> findMissing(Set<TopicPartition> toFind, Set<TopicPartition> toSearch) {
-        Set<TopicPartition> ret = new LinkedHashSet<>();
-        for (TopicPartition partition : toFind) {
-            if (!toSearch.contains(partition)) {
-                ret.add(partition);
-            }
-        }
-        return ret;
-    }
-
-    /**
-     * Verify that a full fetch response contains all the partitions in the fetch session.
-     *
-     * @param response  The response.
-     * @return          True if the full fetch response partitions are valid.
-     */
-    String verifyFullFetchResponsePartitions(FetchResponse<?> response) {
-        StringBuilder bld = new StringBuilder();
-        Set<TopicPartition> extra =
-            findMissing(response.responseData().keySet(), sessionPartitions.keySet());
-        Set<TopicPartition> omitted =
-            findMissing(sessionPartitions.keySet(), response.responseData().keySet());
-        if (!omitted.isEmpty()) {
-            bld.append("omitted=(").append(Utils.join(omitted, ", ")).append(", ");
-        }
-        if (!extra.isEmpty()) {
-            bld.append("extra=(").append(Utils.join(extra, ", ")).append(", ");
-        }
-        if ((!omitted.isEmpty()) || (!extra.isEmpty())) {
-            bld.append("response=(").append(Utils.join(response.responseData().keySet(), ", ")).append(")");
-            return bld.toString();
-        }
-        return null;
-    }
-
-    /**
-     * Verify that the partitions in an incremental fetch response are contained in the session.
-     *
-     * @param response  The response.
-     * @return          True if the incremental fetch response partitions are valid.
-     */
-    String verifyIncrementalFetchResponsePartitions(FetchResponse<?> response) {
-        Set<TopicPartition> extra =
-            findMissing(response.responseData().keySet(), sessionPartitions.keySet());
-        if (!extra.isEmpty()) {
-            StringBuilder bld = new StringBuilder();
-            bld.append("extra=(").append(Utils.join(extra, ", ")).append("), ");
-            bld.append("response=(").append(
-                Utils.join(response.responseData().keySet(), ", ")).append("), ");
-            return bld.toString();
-        }
-        return null;
-    }
-
-    /**
-     * Create a string describing the partitions in a FetchResponse.
-     *
-     * @param response  The FetchResponse.
-     * @return          The string to log.
-     */
-    private String responseDataToLogString(FetchResponse<?> response) {
-        if (!log.isTraceEnabled()) {
-            int implied = sessionPartitions.size() - response.responseData().size();
-            if (implied > 0) {
-                return String.format(" with %d response partition(s), %d implied partition(s)",
-                    response.responseData().size(), implied);
-            } else {
-                return String.format(" with %d response partition(s)",
-                    response.responseData().size());
-            }
-        }
-        StringBuilder bld = new StringBuilder();
-        bld.append(" with response=(").
-            append(Utils.join(response.responseData().keySet(), ", ")).
-            append(")");
-        String prefix = ", implied=(";
-        String suffix = "";
-        for (TopicPartition partition : sessionPartitions.keySet()) {
-            if (!response.responseData().containsKey(partition)) {
-                bld.append(prefix);
-                bld.append(partition);
-                prefix = ", ";
-                suffix = ")";
-            }
-        }
-        bld.append(suffix);
-        return bld.toString();
-    }
-
-    /**
-     * Handle the fetch response.
-     *
-     * @param response  The response.
-     * @return          True if the response is well-formed; false if it can't be processed
-     *                  because of missing or unexpected partitions.
-     */
-    public boolean handleResponse(FetchResponse<?> response) {
-        if (response.error() != Errors.NONE) {
-            log.info("Node {} was unable to process the fetch request with {}: {}.",
-                node, nextMetadata, response.error());
-            if (response.error() == Errors.FETCH_SESSION_ID_NOT_FOUND) {
-                nextMetadata = FetchMetadata.INITIAL;
-            } else {
-                nextMetadata = nextMetadata.nextCloseExisting();
-            }
-            return false;
-        }
-        if (nextMetadata.isFull()) {
-            if (response.responseData().isEmpty() && response.throttleTimeMs() > 0) {
-                // Normally, an empty full fetch response would be invalid.  However, KIP-219
-                // specifies that if the broker wants to throttle the client, it will respond
-                // to a full fetch request with an empty response and a throttleTimeMs
-                // value set.  We don't want to log this with a warning, since it's not an error.
-                // However, the empty full fetch response can't be processed, so it's still appropriate
-                // to return false here.
-                if (log.isDebugEnabled()) {
-                    log.debug("Node {} sent a empty full fetch response to indicate that this " +
-                        "client should be throttled for {} ms.", node, response.throttleTimeMs());
-                }
-                nextMetadata = FetchMetadata.INITIAL;
-                return false;
-            }
-            String problem = verifyFullFetchResponsePartitions(response);
-            if (problem != null) {
-                log.info("Node {} sent an invalid full fetch response with {}", node, problem);
-                nextMetadata = FetchMetadata.INITIAL;
-                return false;
-            } else if (response.sessionId() == INVALID_SESSION_ID) {
-                if (log.isDebugEnabled())
-                    log.debug("Node {} sent a full fetch response{}", node, responseDataToLogString(response));
-                nextMetadata = FetchMetadata.INITIAL;
-                return true;
-            } else {
-                // The server created a new incremental fetch session.
-                if (log.isDebugEnabled())
-                    log.debug("Node {} sent a full fetch response that created a new incremental " +
-                            "fetch session {}{}", node, response.sessionId(), responseDataToLogString(response));
-                nextMetadata = FetchMetadata.newIncremental(response.sessionId());
-                return true;
-            }
-        } else {
-            String problem = verifyIncrementalFetchResponsePartitions(response);
-            if (problem != null) {
-                log.info("Node {} sent an invalid incremental fetch response with {}", node, problem);
-                nextMetadata = nextMetadata.nextCloseExisting();
-                return false;
-            } else if (response.sessionId() == INVALID_SESSION_ID) {
-                // The incremental fetch session was closed by the server.
-                if (log.isDebugEnabled())
-                    log.debug("Node {} sent an incremental fetch response closing session {}{}",
-                            node, nextMetadata.sessionId(), responseDataToLogString(response));
-                nextMetadata = FetchMetadata.INITIAL;
-                return true;
-            } else {
-                // The incremental fetch session was continued by the server.
-                // We don't have to do anything special here to support KIP-219, since an empty incremental
-                // fetch request is perfectly valid.
-                if (log.isDebugEnabled())
-                    log.debug("Node {} sent an incremental fetch response with throttleTimeMs = {} " +
-                        "for session {}{}", response.throttleTimeMs(), node, response.sessionId(),
-                        responseDataToLogString(response));
-                nextMetadata = nextMetadata.nextIncremental();
-                return true;
-            }
-        }
-    }
-
-    /**
-     * Handle an error sending the prepared request.
-     *
-     * When a network error occurs, we close any existing fetch session on our next request,
-     * and try to create a new session.
-     *
-     * @param t     The exception.
-     */
-    public void handleError(Throwable t) {
-        log.info("Error sending fetch request {} to node {}: {}.", nextMetadata, node, t);
-        nextMetadata = nextMetadata.nextCloseExisting();
-    }
-}