You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ma...@apache.org on 2020/02/10 19:13:03 UTC
[kafka] branch 2.5 updated: MINOR: Update schema field names in
DescribeAcls Request/Response
This is an automated email from the ASF dual-hosted git repository.
manikumar pushed a commit to branch 2.5
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/2.5 by this push:
new 873acf6 MINOR: Update schema field names in DescribeAcls Request/Response
873acf6 is described below
commit 873acf62a333d70499bc9402d22a1d33bd57978a
Author: Manikumar Reddy <ma...@gmail.com>
AuthorDate: Tue Feb 11 00:41:48 2020 +0530
MINOR: Update schema field names in DescribeAcls Request/Response
Author: Manikumar Reddy <ma...@gmail.com>
Reviewers: Ismael Juma <is...@juma.me.uk>, Colin Patrick McCabe <cm...@apache.org>
Closes #8075 from omkreddy/KAFKA-9026-Fix
(cherry picked from commit 41fdae35df6f3913b6f92841aa9cc743d9f01c6d)
Signed-off-by: Manikumar Reddy <ma...@confluent.io>
---
.../kafka/common/requests/DescribeAclsRequest.java | 16 ++++++++--------
.../kafka/common/requests/DescribeAclsResponse.java | 10 +++++-----
.../resources/common/message/DescribeAclsRequest.json | 4 ++--
.../resources/common/message/DescribeAclsResponse.json | 4 ++--
.../org/apache/kafka/common/message/MessageTest.java | 4 ++--
.../kafka/common/requests/DescribeAclsResponseTest.java | 4 ++--
.../kafka/common/requests/RequestResponseTest.java | 4 ++--
7 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/clients/src/main/java/org/apache/kafka/common/requests/DescribeAclsRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/DescribeAclsRequest.java
index 153001d..98059cf 100644
--- a/clients/src/main/java/org/apache/kafka/common/requests/DescribeAclsRequest.java
+++ b/clients/src/main/java/org/apache/kafka/common/requests/DescribeAclsRequest.java
@@ -46,8 +46,8 @@ public class DescribeAclsRequest extends AbstractRequest {
.setPermissionType(entryFilter.permissionType().code())
.setPrincipalFilter(entryFilter.principal())
.setResourceNameFilter(patternFilter.name())
- .setResourcePatternType(patternFilter.patternType().code())
- .setResourceType(patternFilter.resourceType().code());
+ .setPatternTypeFilter(patternFilter.patternType().code())
+ .setResourceTypeFilter(patternFilter.resourceType().code());
}
@Override
@@ -71,18 +71,18 @@ public class DescribeAclsRequest extends AbstractRequest {
private void normalizeAndValidate(short version) {
if (version == 0) {
- PatternType patternType = PatternType.fromCode(data.resourcePatternType());
+ PatternType patternType = PatternType.fromCode(data.patternTypeFilter());
// On older brokers, no pattern types existed except LITERAL (effectively). So even though ANY is not
// directly supported on those brokers, we can get the same effect as ANY by setting the pattern type
// to LITERAL. Note that the wildcard `*` is considered `LITERAL` for compatibility reasons.
if (patternType == PatternType.ANY)
- data.setResourcePatternType(PatternType.LITERAL.code());
+ data.setPatternTypeFilter(PatternType.LITERAL.code());
else if (patternType != PatternType.LITERAL)
throw new UnsupportedVersionException("Version 0 only supports literal resource pattern types");
}
- if (data.resourcePatternType() == PatternType.UNKNOWN.code()
- || data.resourceType() == ResourceType.UNKNOWN.code()
+ if (data.patternTypeFilter() == PatternType.UNKNOWN.code()
+ || data.resourceTypeFilter() == ResourceType.UNKNOWN.code()
|| data.permissionType() == AclPermissionType.UNKNOWN.code()
|| data.operation() == AclOperation.UNKNOWN.code()) {
throw new IllegalArgumentException("DescribeAclsRequest contains UNKNOWN elements: " + data);
@@ -119,9 +119,9 @@ public class DescribeAclsRequest extends AbstractRequest {
public AclBindingFilter filter() {
ResourcePatternFilter rpf = new ResourcePatternFilter(
- ResourceType.fromCode(data.resourceType()),
+ ResourceType.fromCode(data.resourceTypeFilter()),
data.resourceNameFilter(),
- PatternType.fromCode(data.resourcePatternType()));
+ PatternType.fromCode(data.patternTypeFilter()));
AccessControlEntryFilter acef = new AccessControlEntryFilter(
data.principalFilter(),
data.hostFilter(),
diff --git a/clients/src/main/java/org/apache/kafka/common/requests/DescribeAclsResponse.java b/clients/src/main/java/org/apache/kafka/common/requests/DescribeAclsResponse.java
index cb1bc43..3a41cb3 100644
--- a/clients/src/main/java/org/apache/kafka/common/requests/DescribeAclsResponse.java
+++ b/clients/src/main/java/org/apache/kafka/common/requests/DescribeAclsResponse.java
@@ -97,7 +97,7 @@ public class DescribeAclsResponse extends AbstractResponse {
}
for (DescribeAclsResource resource : acls()) {
- if (resource.patternType() == PatternType.UNKNOWN.code() || resource.type() == ResourceType.UNKNOWN.code())
+ if (resource.patternType() == PatternType.UNKNOWN.code() || resource.resourceType() == ResourceType.UNKNOWN.code())
throw new IllegalArgumentException("Contain UNKNOWN elements");
for (AclDescription acl : resource.acls()) {
if (acl.operation() == AclOperation.UNKNOWN.code() || acl.permissionType() == AclPermissionType.UNKNOWN.code()) {
@@ -110,8 +110,8 @@ public class DescribeAclsResponse extends AbstractResponse {
private static Stream<AclBinding> aclBindings(DescribeAclsResource resource) {
return resource.acls().stream().map(acl -> {
ResourcePattern pattern = new ResourcePattern(
- ResourceType.fromCode(resource.type()),
- resource.name(),
+ ResourceType.fromCode(resource.resourceType()),
+ resource.resourceName(),
PatternType.fromCode(resource.patternType()));
AccessControlEntry entry = new AccessControlEntry(
acl.principal(),
@@ -144,9 +144,9 @@ public class DescribeAclsResponse extends AbstractResponse {
aclDescriptions.add(ad);
}
DescribeAclsResource dar = new DescribeAclsResource()
- .setName(key.name())
+ .setResourceName(key.name())
.setPatternType(key.patternType().code())
- .setType(key.resourceType().code())
+ .setResourceType(key.resourceType().code())
.setAcls(aclDescriptions);
resources.add(dar);
}
diff --git a/clients/src/main/resources/common/message/DescribeAclsRequest.json b/clients/src/main/resources/common/message/DescribeAclsRequest.json
index 5cb4f00..a9c3676 100644
--- a/clients/src/main/resources/common/message/DescribeAclsRequest.json
+++ b/clients/src/main/resources/common/message/DescribeAclsRequest.json
@@ -22,11 +22,11 @@
"validVersions": "0-2",
"flexibleVersions": "2+",
"fields": [
- { "name": "ResourceType", "type": "int8", "versions": "0+",
+ { "name": "ResourceTypeFilter", "type": "int8", "versions": "0+",
"about": "The resource type." },
{ "name": "ResourceNameFilter", "type": "string", "versions": "0+", "nullableVersions": "0+",
"about": "The resource name, or null to match any resource name." },
- { "name": "ResourcePatternType", "type": "int8", "versions": "1+", "default": "3", "ignorable": false,
+ { "name": "PatternTypeFilter", "type": "int8", "versions": "1+", "default": "3", "ignorable": false,
"about": "The resource pattern to match." },
{ "name": "PrincipalFilter", "type": "string", "versions": "0+", "nullableVersions": "0+",
"about": "The principal to match, or null to match any principal." },
diff --git a/clients/src/main/resources/common/message/DescribeAclsResponse.json b/clients/src/main/resources/common/message/DescribeAclsResponse.json
index d3c6269..0ae72d6 100644
--- a/clients/src/main/resources/common/message/DescribeAclsResponse.json
+++ b/clients/src/main/resources/common/message/DescribeAclsResponse.json
@@ -31,9 +31,9 @@
"about": "The error message, or null if there was no error." },
{ "name": "Resources", "type": "[]DescribeAclsResource", "versions": "0+",
"about": "Each Resource that is referenced in an ACL.", "fields": [
- { "name": "Type", "type": "int8", "versions": "0+",
+ { "name": "ResourceType", "type": "int8", "versions": "0+",
"about": "The resource type." },
- { "name": "Name", "type": "string", "versions": "0+",
+ { "name": "ResourceName", "type": "string", "versions": "0+",
"about": "The resource name." },
{ "name": "PatternType", "type": "int8", "versions": "1+", "default": "3", "ignorable": false,
"about": "The resource pattern type." },
diff --git a/clients/src/test/java/org/apache/kafka/common/message/MessageTest.java b/clients/src/test/java/org/apache/kafka/common/message/MessageTest.java
index f243bc7..e8826a5 100644
--- a/clients/src/test/java/org/apache/kafka/common/message/MessageTest.java
+++ b/clients/src/test/java/org/apache/kafka/common/message/MessageTest.java
@@ -104,9 +104,9 @@ public final class MessageTest {
@Test
public void testDescribeAclsRequest() throws Exception {
testAllMessageRoundTrips(new DescribeAclsRequestData().
- setResourceType((byte) 42).
+ setResourceTypeFilter((byte) 42).
setResourceNameFilter(null).
- setResourcePatternType((byte) 3).
+ setPatternTypeFilter((byte) 3).
setPrincipalFilter("abc").
setHostFilter(null).
setOperation((byte) 0).
diff --git a/clients/src/test/java/org/apache/kafka/common/requests/DescribeAclsResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/DescribeAclsResponseTest.java
index 77ecd18..8450065 100644
--- a/clients/src/test/java/org/apache/kafka/common/requests/DescribeAclsResponseTest.java
+++ b/clients/src/test/java/org/apache/kafka/common/requests/DescribeAclsResponseTest.java
@@ -145,8 +145,8 @@ public class DescribeAclsResponseTest {
private static DescribeAclsResource buildResource(String name, ResourceType type, PatternType patternType, List<AclDescription> acls) {
return new DescribeAclsResource()
- .setName(name)
- .setType(type.code())
+ .setResourceName(name)
+ .setResourceType(type.code())
.setPatternType(patternType.code())
.setAcls(acls);
}
diff --git a/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java
index 487eabf..aedb94e 100644
--- a/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java
+++ b/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java
@@ -1721,8 +1721,8 @@ public class RequestResponseTest {
.setErrorMessage(Errors.NONE.message())
.setThrottleTimeMs(0)
.setResources(Collections.singletonList(new DescribeAclsResource()
- .setType(ResourceType.TOPIC.code())
- .setName("mytopic")
+ .setResourceType(ResourceType.TOPIC.code())
+ .setResourceName("mytopic")
.setPatternType(PatternType.LITERAL.code())
.setAcls(Collections.singletonList(new AclDescription()
.setHost("*")