Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

KAFKA-17337: ConsumerConfig should default to CONSUMER for group.protocol #17107

Draft
wants to merge 16 commits into
base: trunk
Choose a base branch
from
+4 −3
Draft

KAFKA-17337: ConsumerConfig should default to CONSUMER for group.protocol #17107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
31b3623
KAFKA-17337: ConsumerConfig should default to CONSUMER for group.prot…
kirktrue Sep 5, 2024
1b590f9
Fixed issue with missing Locale in toLowerCase()
kirktrue Sep 6, 2024
5155d55
Merge branch 'trunk' into KAFKA-17337-default-to-CONSUMER-group-protocol
kirktrue Sep 6, 2024
5684d13
Fixed StackOverflowError
kirktrue Sep 6, 2024
297e5dc
Update ConsumerConfig.java
kirktrue Sep 6, 2024
aafd023
Merge remote-tracking branch 'origin/trunk' into KAFKA-17337-default-…
kirktrue Sep 13, 2024
0fb7b52
Merge branch 'trunk' into KAFKA-17337-default-to-CONSUMER-group-protocol
kirktrue Oct 2, 2024
1294d4b
Updates to parameterize test methods to ensure compatible combinations
kirktrue Oct 3, 2024
d336840
Merge branch 'trunk' into KAFKA-17337-default-to-CONSUMER-group-protocol
kirktrue Oct 4, 2024
fd257ab
Merge branch 'trunk' into KAFKA-17337-default-to-CONSUMER-group-protocol
kirktrue Oct 7, 2024
fcb3b19
Merge branch 'trunk' into KAFKA-17337-default-to-CONSUMER-group-protocol
kirktrue Oct 17, 2024
2b413ef
Merge branch 'trunk' into KAFKA-17337-default-to-CONSUMER-group-protocol
kirktrue Oct 29, 2024
26d1d30
Reverting tests
kirktrue Oct 29, 2024
5ba1e71
Merge branch 'trunk' into KAFKA-17337-default-to-CONSUMER-group-protocol
kirktrue Nov 7, 2024
ebd7434
Reverting refactoring that obfuscate the core change
kirktrue Nov 7, 2024
ee64336
Merge branch 'trunk' into KAFKA-17337-default-to-CONSUMER-group-protocol
kirktrue Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public class ConsumerConfig extends AbstractConfig {
* <code>group.protocol</code>
*/
public static final String GROUP_PROTOCOL_CONFIG = "group.protocol";
public static final String DEFAULT_GROUP_PROTOCOL = GroupProtocol.CLASSIC.name().toLowerCase(Locale.ROOT);
public static final String DEFAULT_GROUP_PROTOCOL = GroupProtocol.CONSUMER.name().toLowerCase(Locale.ROOT);
public static final String GROUP_PROTOCOL_DOC = "The group protocol consumer should use. We currently " +
"support \"classic\" or \"consumer\". If \"consumer\" is specified, then the consumer group protocol will be " +
"used. Otherwise, the classic group protocol will be used.";
Expand Down
5 changes: 3 additions & 2 deletions clients/src/test/java/org/apache/kafka/clients/consumer/ConsumerConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,12 +170,12 @@ public void testCaseInsensitiveSecurityProtocol() {
}

@Test
public void testDefaultConsumerGroupConfig() {
public void testDefaultGroupProtocol() {
final Map<String, Object> configs = new HashMap<>();
configs.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, keyDeserializerClass);
configs.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, valueDeserializerClass);
final ConsumerConfig consumerConfig = new ConsumerConfig(configs);
assertEquals("classic", consumerConfig.getString(ConsumerConfig.GROUP_PROTOCOL_CONFIG));
assertEquals(ConsumerConfig.DEFAULT_GROUP_PROTOCOL, consumerConfig.getString(ConsumerConfig.GROUP_PROTOCOL_CONFIG));
assertNull(consumerConfig.getString(ConsumerConfig.GROUP_REMOTE_ASSIGNOR_CONFIG));
}

Expand All @@ -199,6 +199,7 @@ public void testRemoteAssignorWithClassicGroupProtocol() {
final Map<String, Object> configs = new HashMap<>();
configs.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, keyDeserializerClass);
configs.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, valueDeserializerClass);
configs.put(ConsumerConfig.GROUP_PROTOCOL_CONFIG, GroupProtocol.CLASSIC.name());
configs.put(ConsumerConfig.GROUP_REMOTE_ASSIGNOR_CONFIG, remoteAssignorName);
ConfigException exception = assertThrows(ConfigException.class, () -> new ConsumerConfig(configs));
assertTrue(exception.getMessage().contains(ConsumerConfig.GROUP_REMOTE_ASSIGNOR_CONFIG + " cannot be set when " + ConsumerConfig.GROUP_PROTOCOL_CONFIG + "=" + GroupProtocol.CLASSIC.name()));
Expand Down