From bc5b627ebb8b8bb59b42beb4dce3ba4f878b3e1f Mon Sep 17 00:00:00 2001 From: David Jacot Date: Tue, 17 Dec 2024 20:02:23 +0100 Subject: [PATCH] MINOR: Mark KIP-848's public apis as stable (#18235) KIP-848 will be release as GA in Apache Kafka 4.0. Hence we need to mark all the related public apis as stable. Reviewers: Jeff Kim --- .../group/api/assignor/ConsumerGroupPartitionAssignor.java | 6 ------ .../coordinator/group/api/assignor/GroupAssignment.java | 3 --- .../kafka/coordinator/group/api/assignor/GroupSpec.java | 2 -- .../coordinator/group/api/assignor/MemberAssignment.java | 2 -- .../coordinator/group/api/assignor/MemberSubscription.java | 2 -- .../coordinator/group/api/assignor/PartitionAssignor.java | 6 ------ .../group/api/assignor/SubscribedTopicDescriber.java | 5 ----- .../coordinator/group/api/assignor/SubscriptionType.java | 3 --- .../message/ConsumerGroupCurrentMemberAssignmentKey.json | 1 - .../message/ConsumerGroupCurrentMemberAssignmentValue.json | 1 - .../common/message/ConsumerGroupMemberMetadataKey.json | 1 - .../common/message/ConsumerGroupMemberMetadataValue.json | 1 - .../resources/common/message/ConsumerGroupMetadataKey.json | 1 - .../common/message/ConsumerGroupMetadataValue.json | 1 - .../common/message/ConsumerGroupPartitionMetadataKey.json | 1 - .../common/message/ConsumerGroupPartitionMetadataValue.json | 1 - .../common/message/ConsumerGroupRegularExpressionKey.json | 1 - .../common/message/ConsumerGroupRegularExpressionValue.json | 1 - .../message/ConsumerGroupTargetAssignmentMemberKey.json | 1 - .../message/ConsumerGroupTargetAssignmentMemberValue.json | 1 - .../message/ConsumerGroupTargetAssignmentMetadataKey.json | 1 - .../message/ConsumerGroupTargetAssignmentMetadataValue.json | 1 - 22 files changed, 43 deletions(-) diff --git a/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/ConsumerGroupPartitionAssignor.java b/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/ConsumerGroupPartitionAssignor.java index f46860f33a5..b0febdfcff3 100644 --- a/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/ConsumerGroupPartitionAssignor.java +++ b/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/ConsumerGroupPartitionAssignor.java @@ -16,14 +16,8 @@ */ package org.apache.kafka.coordinator.group.api.assignor; -import org.apache.kafka.common.annotation.InterfaceStability; - /** * Server-side partition assignor for consumer groups used by the GroupCoordinator. - * - * The new consumer group protocol is in preview so this interface is considered - * unstable until Apache Kafka 4.0. */ -@InterfaceStability.Unstable public interface ConsumerGroupPartitionAssignor extends PartitionAssignor { } diff --git a/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/GroupAssignment.java b/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/GroupAssignment.java index bf126334a17..4464ddded42 100644 --- a/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/GroupAssignment.java +++ b/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/GroupAssignment.java @@ -16,15 +16,12 @@ */ package org.apache.kafka.coordinator.group.api.assignor; -import org.apache.kafka.common.annotation.InterfaceStability; - import java.util.Map; import java.util.Objects; /** * The partition assignment for a consumer group. */ -@InterfaceStability.Unstable public class GroupAssignment { /** * The member assignments keyed by member id. diff --git a/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/GroupSpec.java b/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/GroupSpec.java index ec417099629..54b5690d74d 100644 --- a/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/GroupSpec.java +++ b/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/GroupSpec.java @@ -17,14 +17,12 @@ package org.apache.kafka.coordinator.group.api.assignor; import org.apache.kafka.common.Uuid; -import org.apache.kafka.common.annotation.InterfaceStability; import java.util.Collection; /** * The group metadata specifications required to compute the target assignment. */ -@InterfaceStability.Unstable public interface GroupSpec { /** * @return All the member Ids of the consumer group. diff --git a/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/MemberAssignment.java b/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/MemberAssignment.java index 52b5c564e7d..07f48649d72 100644 --- a/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/MemberAssignment.java +++ b/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/MemberAssignment.java @@ -17,7 +17,6 @@ package org.apache.kafka.coordinator.group.api.assignor; import org.apache.kafka.common.Uuid; -import org.apache.kafka.common.annotation.InterfaceStability; import java.util.Map; import java.util.Set; @@ -25,7 +24,6 @@ import java.util.Set; /** * The partition assignment for a consumer group member. */ -@InterfaceStability.Unstable public interface MemberAssignment { /** * @return The assigned partitions keyed by topic Ids. diff --git a/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/MemberSubscription.java b/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/MemberSubscription.java index fcf7b84baf0..9de2b14cfea 100644 --- a/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/MemberSubscription.java +++ b/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/MemberSubscription.java @@ -17,7 +17,6 @@ package org.apache.kafka.coordinator.group.api.assignor; import org.apache.kafka.common.Uuid; -import org.apache.kafka.common.annotation.InterfaceStability; import java.util.Optional; import java.util.Set; @@ -25,7 +24,6 @@ import java.util.Set; /** * Interface representing the subscription metadata for a group member. */ -@InterfaceStability.Unstable public interface MemberSubscription { /** * Gets the rack Id if present. diff --git a/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/PartitionAssignor.java b/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/PartitionAssignor.java index 3d4f8efbaa6..10e7ecdd6cf 100644 --- a/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/PartitionAssignor.java +++ b/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/PartitionAssignor.java @@ -16,15 +16,9 @@ */ package org.apache.kafka.coordinator.group.api.assignor; -import org.apache.kafka.common.annotation.InterfaceStability; - /** * Server-side partition assignor used by the GroupCoordinator. - * - * The new consumer group protocol is in preview so this interface is considered - * unstable until Apache Kafka 4.0. */ -@InterfaceStability.Unstable public interface PartitionAssignor { /** * Unique name for this assignor. diff --git a/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/SubscribedTopicDescriber.java b/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/SubscribedTopicDescriber.java index ca1e5a514b8..b677384a915 100644 --- a/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/SubscribedTopicDescriber.java +++ b/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/SubscribedTopicDescriber.java @@ -17,18 +17,13 @@ package org.apache.kafka.coordinator.group.api.assignor; import org.apache.kafka.common.Uuid; -import org.apache.kafka.common.annotation.InterfaceStability; import java.util.Set; /** * The subscribed topic describer is used by the {@link PartitionAssignor} * to obtain topic and partition metadata of the subscribed topics. - * - * The interface is kept in an internal module until KIP-848 is fully - * implemented and ready to be released. */ -@InterfaceStability.Unstable public interface SubscribedTopicDescriber { /** * The number of partitions for the given topic Id. diff --git a/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/SubscriptionType.java b/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/SubscriptionType.java index eb80e3eacbb..bd429eb9d15 100644 --- a/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/SubscriptionType.java +++ b/group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/SubscriptionType.java @@ -16,12 +16,9 @@ */ package org.apache.kafka.coordinator.group.api.assignor; -import org.apache.kafka.common.annotation.InterfaceStability; - /** * The subscription type followed by a consumer group. */ -@InterfaceStability.Unstable public enum SubscriptionType { /** * A homogeneous subscription type means that all the members diff --git a/group-coordinator/src/main/resources/common/message/ConsumerGroupCurrentMemberAssignmentKey.json b/group-coordinator/src/main/resources/common/message/ConsumerGroupCurrentMemberAssignmentKey.json index c89ba9ab30c..5be2615802a 100644 --- a/group-coordinator/src/main/resources/common/message/ConsumerGroupCurrentMemberAssignmentKey.json +++ b/group-coordinator/src/main/resources/common/message/ConsumerGroupCurrentMemberAssignmentKey.json @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// KIP-848 is in development. This schema is subject to non-backwards-compatible changes. { "type": "data", "name": "ConsumerGroupCurrentMemberAssignmentKey", diff --git a/group-coordinator/src/main/resources/common/message/ConsumerGroupCurrentMemberAssignmentValue.json b/group-coordinator/src/main/resources/common/message/ConsumerGroupCurrentMemberAssignmentValue.json index 3af09b3edc8..8e1bec2196b 100644 --- a/group-coordinator/src/main/resources/common/message/ConsumerGroupCurrentMemberAssignmentValue.json +++ b/group-coordinator/src/main/resources/common/message/ConsumerGroupCurrentMemberAssignmentValue.json @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// KIP-848 is in development. This schema is subject to non-backwards-compatible changes. { "type": "data", "name": "ConsumerGroupCurrentMemberAssignmentValue", diff --git a/group-coordinator/src/main/resources/common/message/ConsumerGroupMemberMetadataKey.json b/group-coordinator/src/main/resources/common/message/ConsumerGroupMemberMetadataKey.json index 2c27192af2e..dd230d7797d 100644 --- a/group-coordinator/src/main/resources/common/message/ConsumerGroupMemberMetadataKey.json +++ b/group-coordinator/src/main/resources/common/message/ConsumerGroupMemberMetadataKey.json @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// KIP-848 is in development. This schema is subject to non-backwards-compatible changes. { "type": "data", "name": "ConsumerGroupMemberMetadataKey", diff --git a/group-coordinator/src/main/resources/common/message/ConsumerGroupMemberMetadataValue.json b/group-coordinator/src/main/resources/common/message/ConsumerGroupMemberMetadataValue.json index 3d8861c530e..eb404513b8f 100644 --- a/group-coordinator/src/main/resources/common/message/ConsumerGroupMemberMetadataValue.json +++ b/group-coordinator/src/main/resources/common/message/ConsumerGroupMemberMetadataValue.json @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// KIP-848 is in development. This schema is subject to non-backwards-compatible changes. { "type": "data", "name": "ConsumerGroupMemberMetadataValue", diff --git a/group-coordinator/src/main/resources/common/message/ConsumerGroupMetadataKey.json b/group-coordinator/src/main/resources/common/message/ConsumerGroupMetadataKey.json index a1bfb0d0502..3938f511c01 100644 --- a/group-coordinator/src/main/resources/common/message/ConsumerGroupMetadataKey.json +++ b/group-coordinator/src/main/resources/common/message/ConsumerGroupMetadataKey.json @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// KIP-848 is in development. This schema is subject to non-backwards-compatible changes. { "type": "data", "name": "ConsumerGroupMetadataKey", diff --git a/group-coordinator/src/main/resources/common/message/ConsumerGroupMetadataValue.json b/group-coordinator/src/main/resources/common/message/ConsumerGroupMetadataValue.json index 035919eeffa..6c058cad982 100644 --- a/group-coordinator/src/main/resources/common/message/ConsumerGroupMetadataValue.json +++ b/group-coordinator/src/main/resources/common/message/ConsumerGroupMetadataValue.json @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// KIP-848 is in development. This schema is subject to non-backwards-compatible changes. { "type": "data", "name": "ConsumerGroupMetadataValue", diff --git a/group-coordinator/src/main/resources/common/message/ConsumerGroupPartitionMetadataKey.json b/group-coordinator/src/main/resources/common/message/ConsumerGroupPartitionMetadataKey.json index c6866bd34b7..1e7253ae78d 100644 --- a/group-coordinator/src/main/resources/common/message/ConsumerGroupPartitionMetadataKey.json +++ b/group-coordinator/src/main/resources/common/message/ConsumerGroupPartitionMetadataKey.json @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// KIP-848 is in development. This schema is subject to non-backwards-compatible changes. { "type": "data", "name": "ConsumerGroupPartitionMetadataKey", diff --git a/group-coordinator/src/main/resources/common/message/ConsumerGroupPartitionMetadataValue.json b/group-coordinator/src/main/resources/common/message/ConsumerGroupPartitionMetadataValue.json index 9283db83815..cff3af124e4 100644 --- a/group-coordinator/src/main/resources/common/message/ConsumerGroupPartitionMetadataValue.json +++ b/group-coordinator/src/main/resources/common/message/ConsumerGroupPartitionMetadataValue.json @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// KIP-848 is in development. This schema is subject to non-backwards-compatible changes. { "type": "data", "name": "ConsumerGroupPartitionMetadataValue", diff --git a/group-coordinator/src/main/resources/common/message/ConsumerGroupRegularExpressionKey.json b/group-coordinator/src/main/resources/common/message/ConsumerGroupRegularExpressionKey.json index 3f761b694e4..2efe257b821 100644 --- a/group-coordinator/src/main/resources/common/message/ConsumerGroupRegularExpressionKey.json +++ b/group-coordinator/src/main/resources/common/message/ConsumerGroupRegularExpressionKey.json @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// KIP-848 is in development. This schema is subject to non-backwards-compatible changes. { "type": "data", "name": "ConsumerGroupRegularExpressionKey", diff --git a/group-coordinator/src/main/resources/common/message/ConsumerGroupRegularExpressionValue.json b/group-coordinator/src/main/resources/common/message/ConsumerGroupRegularExpressionValue.json index ff0d1d624a3..8c4262379e3 100644 --- a/group-coordinator/src/main/resources/common/message/ConsumerGroupRegularExpressionValue.json +++ b/group-coordinator/src/main/resources/common/message/ConsumerGroupRegularExpressionValue.json @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// KIP-848 is in development. This schema is subject to non-backwards-compatible changes. { "type": "data", "name": "ConsumerGroupRegularExpressionValue", diff --git a/group-coordinator/src/main/resources/common/message/ConsumerGroupTargetAssignmentMemberKey.json b/group-coordinator/src/main/resources/common/message/ConsumerGroupTargetAssignmentMemberKey.json index 10b94f26e6d..838567dcec7 100644 --- a/group-coordinator/src/main/resources/common/message/ConsumerGroupTargetAssignmentMemberKey.json +++ b/group-coordinator/src/main/resources/common/message/ConsumerGroupTargetAssignmentMemberKey.json @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// KIP-848 is in development. This schema is subject to non-backwards-compatible changes. { "type": "data", "name": "ConsumerGroupTargetAssignmentMemberKey", diff --git a/group-coordinator/src/main/resources/common/message/ConsumerGroupTargetAssignmentMemberValue.json b/group-coordinator/src/main/resources/common/message/ConsumerGroupTargetAssignmentMemberValue.json index 5e9bf977212..04a7a09aa8a 100644 --- a/group-coordinator/src/main/resources/common/message/ConsumerGroupTargetAssignmentMemberValue.json +++ b/group-coordinator/src/main/resources/common/message/ConsumerGroupTargetAssignmentMemberValue.json @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// KIP-848 is in development. This schema is subject to non-backwards-compatible changes. { "type": "data", "name": "ConsumerGroupTargetAssignmentMemberValue", diff --git a/group-coordinator/src/main/resources/common/message/ConsumerGroupTargetAssignmentMetadataKey.json b/group-coordinator/src/main/resources/common/message/ConsumerGroupTargetAssignmentMetadataKey.json index e78d557fb61..a358b5c8e90 100644 --- a/group-coordinator/src/main/resources/common/message/ConsumerGroupTargetAssignmentMetadataKey.json +++ b/group-coordinator/src/main/resources/common/message/ConsumerGroupTargetAssignmentMetadataKey.json @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// KIP-848 is in development. This schema is subject to non-backwards-compatible changes. { "type": "data", "name": "ConsumerGroupTargetAssignmentMetadataKey", diff --git a/group-coordinator/src/main/resources/common/message/ConsumerGroupTargetAssignmentMetadataValue.json b/group-coordinator/src/main/resources/common/message/ConsumerGroupTargetAssignmentMetadataValue.json index 6c73971b3ea..26625416253 100644 --- a/group-coordinator/src/main/resources/common/message/ConsumerGroupTargetAssignmentMetadataValue.json +++ b/group-coordinator/src/main/resources/common/message/ConsumerGroupTargetAssignmentMetadataValue.json @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// KIP-848 is in development. This schema is subject to non-backwards-compatible changes. { "type": "data", "name": "ConsumerGroupTargetAssignmentMetadataValue",