Derive all api classes from Request / Response base classesrequest_response_classes

1 files changed, 15 insertions, 15 deletions

diff --git a/kafka/protocol/commit.py b/kafka/protocol/commit.py
index 5645372..bcffe67 100644
--- a/kafka/protocol/commit.py
+++ b/kafka/protocol/commit.py
@@ -1,10 +1,10 @@
 from __future__ import absolute_import
 
-from .struct import Struct
+from .api import Request, Response
 from .types import Array, Int16, Int32, Int64, Schema, String
 
 
-class OffsetCommitResponse_v0(Struct):
+class OffsetCommitResponse_v0(Response):
     API_KEY = 8
     API_VERSION = 0
     SCHEMA = Schema(
@@ -16,19 +16,19 @@ class OffsetCommitResponse_v0(Struct):
     )
 
 
-class OffsetCommitResponse_v1(Struct):
+class OffsetCommitResponse_v1(Response):
     API_KEY = 8
     API_VERSION = 1
     SCHEMA = OffsetCommitResponse_v0.SCHEMA
 
 
-class OffsetCommitResponse_v2(Struct):
+class OffsetCommitResponse_v2(Response):
     API_KEY = 8
     API_VERSION = 2
     SCHEMA = OffsetCommitResponse_v1.SCHEMA
 
 
-class OffsetCommitRequest_v0(Struct):
+class OffsetCommitRequest_v0(Request):
     API_KEY = 8
     API_VERSION = 0  # Zookeeper-backed storage
     RESPONSE_TYPE = OffsetCommitResponse_v0
@@ -43,7 +43,7 @@ class OffsetCommitRequest_v0(Struct):
     )
 
 
-class OffsetCommitRequest_v1(Struct):
+class OffsetCommitRequest_v1(Request):
     API_KEY = 8
     API_VERSION = 1  # Kafka-backed storage
     RESPONSE_TYPE = OffsetCommitResponse_v1
@@ -61,7 +61,7 @@ class OffsetCommitRequest_v1(Struct):
     )
 
 
-class OffsetCommitRequest_v2(Struct):
+class OffsetCommitRequest_v2(Request):
     API_KEY = 8
     API_VERSION = 2  # added retention_time, dropped timestamp
     RESPONSE_TYPE = OffsetCommitResponse_v2
@@ -87,7 +87,7 @@ OffsetCommitResponse = [OffsetCommitResponse_v0, OffsetCommitResponse_v1,
                         OffsetCommitResponse_v2]
 
 
-class OffsetFetchResponse_v0(Struct):
+class OffsetFetchResponse_v0(Response):
     API_KEY = 9
     API_VERSION = 0
     SCHEMA = Schema(
@@ -101,13 +101,13 @@ class OffsetFetchResponse_v0(Struct):
     )
 
 
-class OffsetFetchResponse_v1(Struct):
+class OffsetFetchResponse_v1(Response):
     API_KEY = 9
     API_VERSION = 1
     SCHEMA = OffsetFetchResponse_v0.SCHEMA
 
 
-class OffsetFetchResponse_v2(Struct):
+class OffsetFetchResponse_v2(Response):
     # Added in KIP-88
     API_KEY = 9
     API_VERSION = 2
@@ -123,7 +123,7 @@ class OffsetFetchResponse_v2(Struct):
     )
 
 
-class OffsetFetchRequest_v0(Struct):
+class OffsetFetchRequest_v0(Request):
     API_KEY = 9
     API_VERSION = 0  # zookeeper-backed storage
     RESPONSE_TYPE = OffsetFetchResponse_v0
@@ -135,14 +135,14 @@ class OffsetFetchRequest_v0(Struct):
     )
 
 
-class OffsetFetchRequest_v1(Struct):
+class OffsetFetchRequest_v1(Request):
     API_KEY = 9
     API_VERSION = 1  # kafka-backed storage
     RESPONSE_TYPE = OffsetFetchResponse_v1
     SCHEMA = OffsetFetchRequest_v0.SCHEMA
 
 
-class OffsetFetchRequest_v2(Struct):
+class OffsetFetchRequest_v2(Request):
     # KIP-88: Allows passing null topics to return offsets for all partitions
     # that the consumer group has a stored offset for, even if no consumer in
     # the group is currently consuming that partition.
@@ -158,7 +158,7 @@ OffsetFetchResponse = [OffsetFetchResponse_v0, OffsetFetchResponse_v1,
     OffsetFetchResponse_v2]
 
 
-class GroupCoordinatorResponse_v0(Struct):
+class GroupCoordinatorResponse_v0(Response):
     API_KEY = 10
     API_VERSION = 0
     SCHEMA = Schema(
@@ -169,7 +169,7 @@ class GroupCoordinatorResponse_v0(Struct):
     )
 
 
-class GroupCoordinatorRequest_v0(Struct):
+class GroupCoordinatorRequest_v0(Request):
     API_KEY = 10
     API_VERSION = 0
     RESPONSE_TYPE = GroupCoordinatorResponse_v0