[kafka] branch trunk updated: MINOR: fix html generation syntax errors (#12094)
This is an automated email from the ASF dual-hosted git repository.
guozhang pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6d7723f073 MINOR: fix html generation syntax errors (#12094)
6d7723f073 is described below
commit 6d7723f073ad0b935b02792be9aa4fd49b581b50
Author: Mike Tobola
AuthorDate: Tue Apr 26 16:51:12 2022 -0700
MINOR: fix html generation syntax errors (#12094)
The html document generation has some errors in it, specifically related to
protocols. The two issues identified and resolved are:
* Missing closing tags added
* Invalid usage of a tag as a wrapper element for elements.
Changed the tag to be a .
Tested by running ./gradlew siteDocsTar and observing that the output was
properly formed.
Reviewers: Guozhang Wang
---
.../main/java/org/apache/kafka/common/protocol/ApiKeys.java| 2 +-
.../src/main/java/org/apache/kafka/common/protocol/Errors.java | 2 +-
.../main/java/org/apache/kafka/common/protocol/Protocol.java | 10 +-
.../main/java/org/apache/kafka/common/protocol/types/Type.java | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/clients/src/main/java/org/apache/kafka/common/protocol/ApiKeys.java
b/clients/src/main/java/org/apache/kafka/common/protocol/ApiKeys.java
index 399b631d76..628c9407cc 100644
--- a/clients/src/main/java/org/apache/kafka/common/protocol/ApiKeys.java
+++ b/clients/src/main/java/org/apache/kafka/common/protocol/ApiKeys.java
@@ -241,7 +241,7 @@ public enum ApiKeys {
b.append("");
b.append("\n");
}
-b.append("\n");
+b.append("\n");
return b.toString();
}
diff --git a/clients/src/main/java/org/apache/kafka/common/protocol/Errors.java
b/clients/src/main/java/org/apache/kafka/common/protocol/Errors.java
index f48ae6c233..5db9717906 100644
--- a/clients/src/main/java/org/apache/kafka/common/protocol/Errors.java
+++ b/clients/src/main/java/org/apache/kafka/common/protocol/Errors.java
@@ -500,7 +500,7 @@ public enum Errors {
b.append("");
b.append("\n");
}
-b.append("\n");
+b.append("\n");
return b.toString();
}
diff --git
a/clients/src/main/java/org/apache/kafka/common/protocol/Protocol.java
b/clients/src/main/java/org/apache/kafka/common/protocol/Protocol.java
index d455b26eb2..a75eb0661d 100644
--- a/clients/src/main/java/org/apache/kafka/common/protocol/Protocol.java
+++ b/clients/src/main/java/org/apache/kafka/common/protocol/Protocol.java
@@ -112,7 +112,7 @@ public class Protocol {
b.append("");
b.append("\n");
}
-b.append("\n");
+b.append("\n");
}
public static String toHtml() {
@@ -148,7 +148,7 @@ public class Protocol {
Schema schema = requests[i];
// Schema
if (schema != null) {
-b.append("");
+b.append("");
// Version header
b.append("");
b.append(key.name);
@@ -159,7 +159,7 @@ public class Protocol {
b.append("");
schemaToFieldTableHtml(requests[i], b);
}
-b.append("\n");
+b.append("\n");
}
// Responses
@@ -169,7 +169,7 @@ public class Protocol {
Schema schema = responses[i];
// Schema
if (schema != null) {
-b.append("");
+b.append("");
// Version header
b.append("");
b.append(key.name);
@@ -180,7 +180,7 @@ public class Protocol {
b.append("");
schemaToFieldTableHtml(responses[i], b);
}
-b.append("\n");
+b.append("\n");
}
}
diff --git
a/clients/src/main/java/org/apache/kafka/common/protocol/types/Type.java
b/clients/src/main/java/org/apache/kafka/common/protocol/types/Type.java
index 46a59bd082..4af74dbf4c 100644
--- a/clients/src/main/java/org/apache/kafka/common/protocol/types/Type.java
+++ b/clients/src/main/java/org/apache/kafka/common/protocol/types/Type.java
@@ -1120,7 +1120,7 @@ public abstract class Type {
b.append("");
b.append("\n");
}
-b.append("\n");
+b.append("\n");
return b.toString();
}
[kafka] branch trunk updated: MINOR: Rename `AlterIsrManager` to `AlterPartitionManager` (#12089)
This is an automated email from the ASF dual-hosted git repository.
jgus pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new f2a782a4d7 MINOR: Rename `AlterIsrManager` to `AlterPartitionManager`
(#12089)
f2a782a4d7 is described below
commit f2a782a4d7c71dabf79861f18c4bb14d2b2776ae
Author: Jason Gustafson
AuthorDate: Tue Apr 26 09:34:18 2022 -0700
MINOR: Rename `AlterIsrManager` to `AlterPartitionManager` (#12089)
Since we have changed the `AlterIsr` API to `AlterPartition`, it makes
sense to rename `AlterIsrManager` as well and some of the associated classes.
Reviewers: dengziming , David Jacot
---
.../apache/kafka/common/protocol/ApiKeysTest.java | 2 +-
.../server/builders/ReplicaManagerBuilder.java | 12 ++--
core/src/main/scala/kafka/cluster/Partition.scala | 32 +--
...srManager.scala => AlterPartitionManager.scala} | 64 +++---
.../src/main/scala/kafka/server/BrokerServer.scala | 6 +-
core/src/main/scala/kafka/server/KafkaServer.scala | 8 +--
.../main/scala/kafka/server/ReplicaManager.scala | 2 +-
...Manager.scala => ZkAlterPartitionManager.scala} | 6 +-
.../admin/ReassignPartitionsIntegrationTest.scala | 4 +-
.../unit/kafka/cluster/AbstractPartitionTest.scala | 6 +-
.../unit/kafka/cluster/PartitionLockTest.scala | 4 +-
.../scala/unit/kafka/cluster/PartitionTest.scala | 6 +-
...rTest.scala => AlterPartitionManagerTest.scala} | 24
.../server/HighwatermarkPersistenceTest.scala | 4 +-
.../unit/kafka/server/IsrExpirationTest.scala | 6 +-
.../scala/unit/kafka/server/KafkaServerTest.scala | 8 +--
.../server/ReplicaManagerConcurrencyTest.scala | 4 +-
.../kafka/server/ReplicaManagerQuotasTest.scala| 4 +-
.../unit/kafka/server/ReplicaManagerTest.scala | 22
.../server/epoch/OffsetsForLeaderEpochTest.scala | 6 +-
.../test/scala/unit/kafka/utils/TestUtils.scala| 22
.../jmh/fetcher/ReplicaFetcherThreadBenchmark.java | 12 ++--
.../partition/PartitionMakeFollowerBenchmark.java | 12 ++--
.../UpdateFollowerFetchStateBenchmark.java | 12 ++--
.../apache/kafka/jmh/server/CheckpointBench.java | 8 +--
.../kafka/jmh/server/PartitionCreationBench.java | 8 +--
26 files changed, 153 insertions(+), 151 deletions(-)
diff --git
a/clients/src/test/java/org/apache/kafka/common/protocol/ApiKeysTest.java
b/clients/src/test/java/org/apache/kafka/common/protocol/ApiKeysTest.java
index 7e0a6e438e..1aa420b36f 100644
--- a/clients/src/test/java/org/apache/kafka/common/protocol/ApiKeysTest.java
+++ b/clients/src/test/java/org/apache/kafka/common/protocol/ApiKeysTest.java
@@ -44,7 +44,7 @@ public class ApiKeysTest {
}
@Test
-public void testAlterIsrIsClusterAction() {
+public void testAlterPartitionIsClusterAction() {
assertTrue(ApiKeys.ALTER_PARTITION.clusterAction);
}
diff --git
a/core/src/main/java/kafka/server/builders/ReplicaManagerBuilder.java
b/core/src/main/java/kafka/server/builders/ReplicaManagerBuilder.java
index a0051784b4..a1339264bf 100644
--- a/core/src/main/java/kafka/server/builders/ReplicaManagerBuilder.java
+++ b/core/src/main/java/kafka/server/builders/ReplicaManagerBuilder.java
@@ -18,7 +18,7 @@
package kafka.server.builders;
import kafka.log.LogManager;
-import kafka.server.AlterIsrManager;
+import kafka.server.AlterPartitionManager;
import kafka.server.BrokerTopicStats;
import kafka.server.DelayedDeleteRecords;
import kafka.server.DelayedElectLeader;
@@ -50,7 +50,7 @@ public class ReplicaManagerBuilder {
private QuotaManagers quotaManagers = null;
private MetadataCache metadataCache = null;
private LogDirFailureChannel logDirFailureChannel = null;
-private AlterIsrManager alterIsrManager = null;
+private AlterPartitionManager alterPartitionManager = null;
private BrokerTopicStats brokerTopicStats = new BrokerTopicStats();
private AtomicBoolean isShuttingDown = new AtomicBoolean(false);
private Optional zkClient = Optional.empty();
@@ -100,8 +100,8 @@ public class ReplicaManagerBuilder {
return this;
}
-public ReplicaManagerBuilder setAlterIsrManager(AlterIsrManager
alterIsrManager) {
-this.alterIsrManager = alterIsrManager;
+public ReplicaManagerBuilder
setAlterPartitionManager(AlterPartitionManager alterPartitionManager) {
+this.alterPartitionManager = alterPartitionManager;
return this;
}
@@ -151,7 +151,7 @@ public class ReplicaManagerBuilder {
if (logManager == null) throw new RuntimeException("You must set
logManager");
if (metadataCache == null) throw new RuntimeException("You must set
metadataCache");
if (logDirFailureChannel == null) throw new RuntimeException("You must
set logDirFailureChannel");
-if (alterIsrManager == null) throw new
