Switch a few more old->new kafka.protocol imports (#2771)

Author: dpkp

kafka/admin/client.py

@@ -23,9 +23,8 @@
     CreateTopicsRequest, DeleteTopicsRequest, DescribeConfigsRequest, AlterConfigsRequest, CreatePartitionsRequest,
     ListGroupsRequest, DescribeGroupsRequest, DescribeAclsRequest, CreateAclsRequest, DeleteAclsRequest,
     DeleteGroupsRequest, DeleteRecordsRequest, DescribeLogDirsRequest, ElectLeadersRequest, ElectionType)
-from kafka.protocol.commit import OffsetFetchRequest
+from kafka.protocol.new.consumer import OffsetFetchRequest
 from kafka.protocol.new.metadata import MetadataRequest, FindCoordinatorRequest
-from kafka.protocol.types import Array
 from kafka.structs import TopicPartition, OffsetAndMetadata, MemberInformation, GroupInformation
 from kafka.version import __version__
 

test/conftest.py

@@ -17,7 +17,7 @@ def conn(mocker):
     """Return a connection mocker fixture"""
     from kafka.conn import ConnectionStates
     from kafka.future import Future
-    from kafka.protocol.metadata import MetadataResponse
+    from kafka.protocol.new.metadata import MetadataResponse
     conn = mocker.patch('kafka.client_async.BrokerConnection')
     conn.return_value = conn
     conn.state = ConnectionStates.CONNECTED

test/integration/fixtures.py

@@ -13,8 +13,8 @@
 
 from kafka import errors, KafkaAdminClient, KafkaClient, KafkaConsumer, KafkaProducer
 from kafka.errors import InvalidReplicationFactorError, KafkaTimeoutError
-from kafka.protocol.admin import CreateTopicsRequest
-from kafka.protocol.metadata import MetadataRequest
+from kafka.protocol.new.admin import CreateTopicsRequest
+from kafka.protocol.new.metadata import MetadataRequest
 from test.testutil import env_kafka_version, random_string
 from test.service import ExternalService, SpawnedService
 

test/integration/test_sasl_integration.py

@@ -5,7 +5,7 @@
 import pytest
 
 from kafka.admin import NewTopic
-from kafka.protocol.metadata import MetadataRequest_v1
+from kafka.protocol.new.metadata import MetadataRequest
 from test.testutil import assert_message_count, env_kafka_version, random_string, special_to_underscore
 
 
@@ -69,7 +69,7 @@ def test_client(request, sasl_kafka):
     sasl_kafka.create_topics([topic_name], num_partitions=1)
 
     client, = sasl_kafka.get_clients(1)
-    request = MetadataRequest_v1(None)
+    request = MetadataRequest(topics=None, version=1)
     timeout_at = time.time() + 1
     while not client.is_ready(0):
         client.maybe_connect(0)