From 61bda9c82af07b1731ba194642f7ea4802adbf36 Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Mon, 26 Jun 2023 00:53:31 -0700 Subject: [PATCH 01/19] Speed up CI test and fix flaky test --- .github/workflows/pr-tests.yml | 64 ++++++++++++++++++++++++++++++++-- 1 file changed, 61 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml index 651edad9c0..3a5f01cc81 100644 --- a/.github/workflows/pr-tests.yml +++ b/.github/workflows/pr-tests.yml @@ -15,10 +15,8 @@ concurrency: cancel-in-progress: true jobs: - build: - + check-style: runs-on: ubuntu-latest - steps: - uses: actions/checkout@v1 - name: Set up JDK 17 @@ -41,15 +39,51 @@ jobs: - name: Spotbugs check run: mvn -ntp -B spotbugs:check + kafka-impl-test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 17 + uses: actions/setup-java@v1 + with: + java-version: 17 + + - name: Build with Maven skipTests + run: mvn clean install -ntp -B -DskipTests + - name: kafka-impl test after build run: mvn test -ntp -B -DfailIfNoTests=false -pl kafka-impl + schema-registry-test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 17 + uses: actions/setup-java@v1 + with: + java-version: 17 + + - name: Build with Maven skipTests + run: mvn clean install -ntp -B -DskipTests + - name: schema registry test after build run: mvn test -ntp -B -DfailIfNoTests=false -pl schema-registry - name: kafka-payload-processor test after build run: mvn test -ntp -B -DfailIfNoTests=false -pl kafka-payload-processor-shaded-tests + oauth-client-test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 17 + uses: actions/setup-java@v1 + with: + java-version: 17 + + - name: Build with Maven skipTests + run: mvn clean install -ntp -B -DskipTests + - name: Start and init the oauth server run: ./ci/init_hydra_oauth_server.sh timeout-minutes: 5 @@ -57,10 +91,34 @@ jobs: - name: oauth-client test after build run: mvn test -ntp -B -DfailIfNoTests=false -pl oauth-client + module-test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 17 + uses: actions/setup-java@v1 + with: + java-version: 17 + + - name: Build with Maven skipTests + run: mvn clean install -ntp -B -DskipTests + - name: tests module run: mvn test -ntp -B -DfailIfNoTests=false '-Dtest=!KafkaIntegration*Test' -pl tests timeout-minutes: 60 + code-coverge-test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 17 + uses: actions/setup-java@v1 + with: + java-version: 17 + + - name: Build with Maven skipTests + run: mvn clean install -ntp -B -DskipTests + - name: Upload to Codecov uses: codecov/codecov-action@v3 From f7d7b96eb975e5194e5c6ebfdbd966e7d54e1d3d Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Mon, 26 Jun 2023 00:57:05 -0700 Subject: [PATCH 02/19] Fix flaky tests --- .../pulsar/handlers/kop/MetricsProviderTest.java | 2 +- .../pulsar/handlers/kop/TransactionTest.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderTest.java index 72f25d8a66..ab358c8e09 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderTest.java @@ -314,7 +314,7 @@ public void testUpdateGroupId() { }); } - @Test(timeOut = 20000, expectedExceptions = KeeperException.NoNodeException.class) + @Test(timeOut = 60000, expectedExceptions = KeeperException.NoNodeException.class) public void testFindTransactionCoordinatorShouldNotStoreGroupId() throws Exception { String kafkaServer = "localhost:" + getKafkaBrokerPort(); diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/TransactionTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/TransactionTest.java index b7e1c55c08..6ea7eab9bd 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/TransactionTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/TransactionTest.java @@ -93,17 +93,17 @@ protected static Object[][] produceConfigProvider() { }; } - @Test(timeOut = 1000 * 10, dataProvider = "produceConfigProvider") + @Test(timeOut = 1000 * 30, dataProvider = "produceConfigProvider") public void readCommittedTest(boolean isBatch) throws Exception { basicProduceAndConsumeTest("read-committed-test", "txn-11", "read_committed", isBatch); } - @Test(timeOut = 1000 * 10, dataProvider = "produceConfigProvider") + @Test(timeOut = 1000 * 30, dataProvider = "produceConfigProvider") public void readUncommittedTest(boolean isBatch) throws Exception { basicProduceAndConsumeTest("read-uncommitted-test", "txn-12", "read_uncommitted", isBatch); } - @Test(timeOut = 1000 * 10) + @Test(timeOut = 1000 * 30) public void testInitTransaction() { final KafkaProducer producer = buildTransactionProducer("prod-1"); @@ -111,7 +111,7 @@ public void testInitTransaction() { producer.close(); } - @Test(timeOut = 1000 * 10) + @Test(timeOut = 1000 * 30) public void testMultiCommits() throws Exception { final String topic = "test-multi-commits"; final KafkaProducer producer1 = buildTransactionProducer("X1"); @@ -234,7 +234,7 @@ public void offsetCommitTest() throws Exception { txnOffsetTest("txn-offset-commit-test", 10, true); } - @Test(timeOut = 1000 * 10) + @Test(timeOut = 3000 * 10) public void offsetAbortTest() throws Exception { txnOffsetTest("txn-offset-abort-test", 10, false); } From 5b3ed543106671935a967ebcd83dd6ece2f514b7 Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Mon, 26 Jun 2023 08:18:33 -0700 Subject: [PATCH 03/19] Add oauth server and fix another flaky test --- .github/workflows/pr-tests.yml | 4 ++++ .../io/streamnative/pulsar/handlers/kop/MultiLedgerTest.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml index 3a5f01cc81..f5bc227898 100644 --- a/.github/workflows/pr-tests.yml +++ b/.github/workflows/pr-tests.yml @@ -103,6 +103,10 @@ jobs: - name: Build with Maven skipTests run: mvn clean install -ntp -B -DskipTests + - name: Start and init the oauth server + run: ./ci/init_hydra_oauth_server.sh + timeout-minutes: 5 + - name: tests module run: mvn test -ntp -B -DfailIfNoTests=false '-Dtest=!KafkaIntegration*Test' -pl tests timeout-minutes: 60 diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MultiLedgerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MultiLedgerTest.java index 3f7fe76e2c..dab46882e9 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MultiLedgerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MultiLedgerTest.java @@ -190,7 +190,7 @@ public void testProduceConsumeMultiLedger() throws Exception { assertEquals(i, totalMsgs); } - @Test + @Test(timeOut = 30000) public void testListOffsetForEmptyRolloverLedger() throws Exception { final String topic = "test-list-offset-for-empty-rollover-ledger"; final String partitionName = TopicName.get(topic).getPartition(0).toString(); From 79f82ea961d9b24812b7cf693e8a2b20128d4ac6 Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Mon, 3 Jul 2023 11:49:27 -0700 Subject: [PATCH 04/19] Refactor the structure of tests module --- .github/workflows/pr-tests.yml | 201 ++++++++---------- ...PreciselyMessagePublishThrottlingTest.java | 2 + .../kop/{ => admin}/KafkaAdminTest.java | 5 +- .../KopBrokerLookupManagerTest.java | 6 +- .../kop/{ => admin}/OffsetResetTest.java | 3 +- .../transaction}/TransactionTest.java | 3 +- .../TransactionWithOAuthBearerAuthTest.java | 5 +- .../kop/{ => e2e}/BasicEndToEndKafkaTest.java | 17 +- .../{ => e2e}/BasicEndToEndPulsarTest.java | 2 +- .../kop/{ => e2e}/BasicEndToEndTestBase.java | 4 +- .../kop/{ => e2e}/DistributedClusterTest.java | 6 +- .../{ => e2e}/KafkaMessageOrderKafkaTest.java | 2 +- .../KafkaMessageOrderPulsarTest.java | 2 +- .../{ => e2e}/KafkaMessageOrderTestBase.java | 4 +- .../KafkaNonPartitionedTopicTest.java | 4 +- .../kop/{ => e2e}/MultiLedgerTest.java | 4 +- .../{ => e2e}/PerTopicConfigurationTest.java | 4 +- .../DifferentNamespaceTest.java | 4 +- .../kop/{ => metadata}/MetadataInitTest.java | 5 +- .../IdempotentProducerTest.java | 4 +- .../InnerTopicProtectionTest.java | 5 +- ...MessagePublishBufferThrottleKafkaTest.java | 2 +- ...essagePublishBufferThrottlePulsarTest.java | 2 +- .../MessagePublishBufferThrottleTestBase.java | 7 +- .../MessagePublishThrottlingTest.java | 4 +- .../{ => producer}/PublishRateLimitTest.java | 3 +- .../model/impl}/SchemaRegistryTest.java | 4 +- .../model/impl}/SchemaRestApiTest.java | 3 +- .../{ => security}/KafkaSSLChannelTest.java | 4 +- .../KafkaSSLChannelWithClientAuthTest.java | 5 +- .../{ => security}/SaslPlainKafkaTest.java | 2 +- .../{ => security}/SaslPlainPulsarTest.java | 2 +- .../kop/{ => security}/SaslPlainTestBase.java | 5 +- .../DelayAuthorizationFailedCloseTest.java | 4 +- ...ionKafkaMultitenantTenantMetadataTest.java | 2 +- .../auth}/KafkaAuthorizationMockTest.java | 3 +- .../auth}/KafkaAuthorizationPulsarTest.java | 2 +- .../auth}/KafkaAuthorizationTestBase.java | 4 +- .../CustomOAuthBearerCallbackHandlerTest.java | 3 +- .../{ => security/oauth}/HydraOAuthUtils.java | 2 +- .../oauth}/SaslOAuthBearerTestBase.java | 4 +- .../oauth}/SaslOAuthDefaultHandlersTest.java | 2 +- .../oauth}/SaslOAuthKopHandlersTest.java | 6 +- ...slOAuthKopHandlersWithMultiTenantTest.java | 5 +- 44 files changed, 211 insertions(+), 161 deletions(-) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => admin}/KafkaAdminTest.java (99%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => admin}/KopBrokerLookupManagerTest.java (91%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => admin}/OffsetResetTest.java (99%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => coordinator/transaction}/TransactionTest.java (99%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => coordinator/transaction}/TransactionWithOAuthBearerAuthTest.java (95%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => e2e}/BasicEndToEndKafkaTest.java (95%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => e2e}/BasicEndToEndPulsarTest.java (99%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => e2e}/BasicEndToEndTestBase.java (99%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => e2e}/DistributedClusterTest.java (99%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => e2e}/KafkaMessageOrderKafkaTest.java (94%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => e2e}/KafkaMessageOrderPulsarTest.java (94%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => e2e}/KafkaMessageOrderTestBase.java (98%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => e2e}/KafkaNonPartitionedTopicTest.java (96%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => e2e}/MultiLedgerTest.java (99%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => e2e}/PerTopicConfigurationTest.java (97%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => metadata}/DifferentNamespaceTest.java (99%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => metadata}/MetadataInitTest.java (96%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => producer}/IdempotentProducerTest.java (97%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => producer}/InnerTopicProtectionTest.java (97%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => producer}/MessagePublishBufferThrottleKafkaTest.java (93%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => producer}/MessagePublishBufferThrottlePulsarTest.java (93%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => producer}/MessagePublishBufferThrottleTestBase.java (96%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => producer}/MessagePublishThrottlingTest.java (98%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => producer}/PublishRateLimitTest.java (97%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => schemaregistry/model/impl}/SchemaRegistryTest.java (98%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => schemaregistry/model/impl}/SchemaRestApiTest.java (97%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => security}/KafkaSSLChannelTest.java (99%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => security}/KafkaSSLChannelWithClientAuthTest.java (97%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => security}/SaslPlainKafkaTest.java (93%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => security}/SaslPlainPulsarTest.java (93%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => security}/SaslPlainTestBase.java (98%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => security/auth}/DelayAuthorizationFailedCloseTest.java (98%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => security/auth}/KafkaAuthorizationKafkaMultitenantTenantMetadataTest.java (96%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => security/auth}/KafkaAuthorizationMockTest.java (97%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => security/auth}/KafkaAuthorizationPulsarTest.java (93%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => security/auth}/KafkaAuthorizationTestBase.java (99%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => security/oauth}/CustomOAuthBearerCallbackHandlerTest.java (98%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => security/oauth}/HydraOAuthUtils.java (98%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => security/oauth}/SaslOAuthBearerTestBase.java (96%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => security/oauth}/SaslOAuthDefaultHandlersTest.java (98%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => security/oauth}/SaslOAuthKopHandlersTest.java (97%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => security/oauth}/SaslOAuthKopHandlersWithMultiTenantTest.java (97%) diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml index f5bc227898..95d29bcaed 100644 --- a/.github/workflows/pr-tests.yml +++ b/.github/workflows/pr-tests.yml @@ -15,128 +15,115 @@ concurrency: cancel-in-progress: true jobs: - check-style: + basic-test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - name: Set up JDK 17 - uses: actions/setup-java@v1 - with: - java-version: 17 + - uses: actions/checkout@v1 + - name: Set up JDK 17 + uses: actions/setup-java@v1 + with: + java-version: 17 - - name: License check - run: mvn -ntp -B license:check + - name: License check + run: mvn -ntp -B license:check - - name: Style check - run: mvn -ntp -B checkstyle:check + - name: Style check + run: mvn -ntp -B checkstyle:check - - name: Build with Maven skipTests - run: mvn clean install -ntp -B -DskipTests + - name: Build with Maven skipTests + run: mvn clean install -ntp -B -DskipTests - - name: Building JavaDocs - run: mvn -ntp -B javadoc:jar + - name: Building JavaDocs + run: mvn -ntp -B javadoc:jar - - name: Spotbugs check - run: mvn -ntp -B spotbugs:check + - name: Spotbugs check + run: mvn -ntp -B spotbugs:check - kafka-impl-test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: Set up JDK 17 - uses: actions/setup-java@v1 - with: - java-version: 17 - - - name: Build with Maven skipTests - run: mvn clean install -ntp -B -DskipTests - - - name: kafka-impl test after build - run: mvn test -ntp -B -DfailIfNoTests=false -pl kafka-impl + - name: kafka-impl test after build + run: mvn test -ntp -B -DfailIfNoTests=false -pl kafka-impl - schema-registry-test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: Set up JDK 17 - uses: actions/setup-java@v1 - with: - java-version: 17 + - name: schema registry test after build + run: mvn test -ntp -B -DfailIfNoTests=false -pl schema-registry - - name: Build with Maven skipTests - run: mvn clean install -ntp -B -DskipTests + - name: kafka-payload-processor test after build + run: mvn test -ntp -B -DfailIfNoTests=false -pl kafka-payload-processor-shaded-tests - - name: schema registry test after build - run: mvn test -ntp -B -DfailIfNoTests=false -pl schema-registry + - name: Start and init the oauth server + run: ./ci/init_hydra_oauth_server.sh + timeout-minutes: 5 - - name: kafka-payload-processor test after build - run: mvn test -ntp -B -DfailIfNoTests=false -pl kafka-payload-processor-shaded-tests - - oauth-client-test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: Set up JDK 17 - uses: actions/setup-java@v1 - with: - java-version: 17 - - - name: Build with Maven skipTests - run: mvn clean install -ntp -B -DskipTests - - - name: Start and init the oauth server - run: ./ci/init_hydra_oauth_server.sh - timeout-minutes: 5 - - - name: oauth-client test after build - run: mvn test -ntp -B -DfailIfNoTests=false -pl oauth-client - - module-test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: Set up JDK 17 - uses: actions/setup-java@v1 - with: - java-version: 17 + - name: oauth-client test after build + run: mvn test -ntp -B -DfailIfNoTests=false -pl oauth-client - - name: Build with Maven skipTests - run: mvn clean install -ntp -B -DskipTests + - name: Upload to Codecov + uses: codecov/codecov-action@v3 - - name: Start and init the oauth server - run: ./ci/init_hydra_oauth_server.sh - timeout-minutes: 5 + - name: package surefire artifacts + if: failure() + run: | + rm -rf artifacts + mkdir artifacts + find . -type d -name "*surefire*" -exec cp --parents -R {} artifacts/ \; + zip -r artifacts.zip artifacts - - name: tests module - run: mvn test -ntp -B -DfailIfNoTests=false '-Dtest=!KafkaIntegration*Test' -pl tests - timeout-minutes: 60 + - uses: actions/upload-artifact@master + name: upload surefire-artifacts + if: failure() + with: + name: surefire-artifacts + path: artifacts.zip - code-coverge-test: + kop-module-tests: runs-on: ubuntu-latest + timeout-minutes: 60 + strategy: + # other jobs should run even if one integration test fails + fail-fast: false + matrix: + test: [ + { + name: "admin test", + script: [ + "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.admin.*Test' -pl tests" + ] + }, + { + name: "compatibility test", + script: [ + "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.compatibility.*Test' -pl tests" + "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.compatibility..*.*Test' -pl tests" + ] + }, + ] steps: - - uses: actions/checkout@v1 - - name: Set up JDK 17 - uses: actions/setup-java@v1 - with: - java-version: 17 - - - name: Build with Maven skipTests - run: mvn clean install -ntp -B -DskipTests - - - name: Upload to Codecov - uses: codecov/codecov-action@v3 - - - name: package surefire artifacts - if: failure() - run: | - rm -rf artifacts - mkdir artifacts - find . -type d -name "*surefire*" -exec cp --parents -R {} artifacts/ \; - zip -r artifacts.zip artifacts - - - uses: actions/upload-artifact@master - name: upload surefire-artifacts - if: failure() - with: - name: surefire-artifacts - path: artifacts.zip + - uses: actions/checkout@v3 + + - name: Set up JDK 17 + uses: actions/setup-java@v1 + with: + java-version: 17 + + - uses: actions/setup-python@v4 + with: + python-version: '3.10' + + - name: Install jq + run: sudo apt-get install -y jq + + - name: Build with Maven skipTests + run: mvn clean install -ntp -B -DskipTests + + - name: Start and init the oauth server + run: ./ci/init_hydra_oauth_server.sh + timeout-minutes: 5 + + - name: ${{ matrix.test.name }} + run: | + scripts=$(echo '${{ toJson(matrix.test.scripts) }}' | jq -r '.[]') + IFS=$'\n' # change the internal field separator to newline + echo $scripts + for script in $scripts + do + bash -c "${script}" + done + unset IFS # revert the internal field separator back to default diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/PreciselyMessagePublishThrottlingTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/PreciselyMessagePublishThrottlingTest.java index b302daa62f..9304804759 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/PreciselyMessagePublishThrottlingTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/PreciselyMessagePublishThrottlingTest.java @@ -13,6 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop; +import io.streamnative.pulsar.handlers.kop.producer.MessagePublishThrottlingTest; + /** * Test KoP precisely messages publish throttling. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaAdminTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KafkaAdminTest.java similarity index 99% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaAdminTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KafkaAdminTest.java index 7e5a88c028..e530adb147 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaAdminTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KafkaAdminTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.admin; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; @@ -34,6 +34,9 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; + +import io.streamnative.pulsar.handlers.kop.KafkaLogConfig; +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.admin.AdminClient; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopBrokerLookupManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KopBrokerLookupManagerTest.java similarity index 91% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopBrokerLookupManagerTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KopBrokerLookupManagerTest.java index 4120cd7c80..70ba229f17 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopBrokerLookupManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KopBrokerLookupManagerTest.java @@ -11,12 +11,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.admin; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; import java.util.Collections; + +import io.streamnative.pulsar.handlers.kop.KopBrokerLookupManager; +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import io.streamnative.pulsar.handlers.kop.LookupClient; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.common.policies.data.TenantInfo; import org.testng.annotations.AfterClass; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/OffsetResetTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/OffsetResetTest.java similarity index 99% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/OffsetResetTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/OffsetResetTest.java index 6085fb10f5..7c4e7f5fbf 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/OffsetResetTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/OffsetResetTest.java @@ -11,12 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.admin; import static org.apache.pulsar.common.naming.TopicName.PARTITIONED_TOPIC_SUFFIX; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadataConstants; import io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadataManager.BaseKey; import io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadataManager.OffsetKey; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/TransactionTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionTest.java similarity index 99% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/TransactionTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionTest.java index 6ea7eab9bd..e16a331fce 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/TransactionTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.coordinator.transaction; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; @@ -21,6 +21,7 @@ import static org.testng.Assert.expectThrows; import com.google.common.collect.ImmutableMap; +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.coordinator.transaction.TransactionState; import io.streamnative.pulsar.handlers.kop.coordinator.transaction.TransactionStateManager; import java.time.Duration; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/TransactionWithOAuthBearerAuthTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionWithOAuthBearerAuthTest.java similarity index 95% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/TransactionWithOAuthBearerAuthTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionWithOAuthBearerAuthTest.java index bf46f34d36..aea75b7ad6 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/TransactionWithOAuthBearerAuthTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionWithOAuthBearerAuthTest.java @@ -11,13 +11,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.coordinator.transaction; import com.google.common.collect.Sets; +import io.streamnative.pulsar.handlers.kop.security.oauth.HydraOAuthUtils; import io.streamnative.pulsar.handlers.kop.security.oauth.OauthLoginCallbackHandler; import io.streamnative.pulsar.handlers.kop.security.oauth.OauthValidatorCallbackHandler; import java.net.URL; import java.util.Properties; + +import io.streamnative.pulsar.handlers.kop.security.oauth.SaslOAuthKopHandlersTest; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.broker.authentication.AuthenticationProviderToken; import org.apache.pulsar.client.admin.PulsarAdmin; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/BasicEndToEndKafkaTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java similarity index 95% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/BasicEndToEndKafkaTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java index 4ec924384b..6493a405aa 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/BasicEndToEndKafkaTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.e2e; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; @@ -28,6 +28,9 @@ import java.util.concurrent.Future; import java.util.stream.Collectors; import java.util.stream.IntStream; + +import io.streamnative.pulsar.handlers.kop.KafkaPayloadProcessor; +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecord; @@ -143,19 +146,19 @@ public void testPollEmptyTopic() throws Exception { String msgStrPrefix = "Message_kop_KafkaProduceAndConsume_" + partitionNumber + "_"; @Cleanup - KProducer kProducer = new KProducer(kafkaTopic, false, getKafkaBrokerPort(), true); + KopProtocolHandlerTestBase.KProducer kProducer = new KopProtocolHandlerTestBase.KProducer(kafkaTopic, false, getKafkaBrokerPort(), true); kafkaPublishMessage(kProducer, totalMsg, msgStrPrefix); @Cleanup - KConsumer kConsumer1 = new KConsumer(kafkaTopic, getKafkaBrokerPort(), "consumer-group-1"); + KopProtocolHandlerTestBase.KConsumer kConsumer1 = new KopProtocolHandlerTestBase.KConsumer(kafkaTopic, getKafkaBrokerPort(), "consumer-group-1"); @Cleanup - KConsumer kConsumer2 = new KConsumer(kafkaTopic, getKafkaBrokerPort(), "consumer-group-2"); + KopProtocolHandlerTestBase.KConsumer kConsumer2 = new KopProtocolHandlerTestBase.KConsumer(kafkaTopic, getKafkaBrokerPort(), "consumer-group-2"); @Cleanup - KConsumer kConsumer3 = new KConsumer(kafkaTopic, getKafkaBrokerPort(), "consumer-group-3"); + KopProtocolHandlerTestBase.KConsumer kConsumer3 = new KopProtocolHandlerTestBase.KConsumer(kafkaTopic, getKafkaBrokerPort(), "consumer-group-3"); @Cleanup - KConsumer kConsumer4 = new KConsumer(kafkaTopic, getKafkaBrokerPort(), "consumer-group-4"); + KopProtocolHandlerTestBase.KConsumer kConsumer4 = new KopProtocolHandlerTestBase.KConsumer(kafkaTopic, getKafkaBrokerPort(), "consumer-group-4"); @Cleanup - KConsumer kConsumer5 = new KConsumer(kafkaTopic, getKafkaBrokerPort(), "consumer-group-5"); + KopProtocolHandlerTestBase.KConsumer kConsumer5 = new KopProtocolHandlerTestBase.KConsumer(kafkaTopic, getKafkaBrokerPort(), "consumer-group-5"); List topicPartitions = IntStream.range(0, partitionNumber) .mapToObj(i -> new TopicPartition(kafkaTopic, i)).collect(Collectors.toList()); diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/BasicEndToEndPulsarTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndPulsarTest.java similarity index 99% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/BasicEndToEndPulsarTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndPulsarTest.java index d612865b68..62ae9d6668 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/BasicEndToEndPulsarTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndPulsarTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.e2e; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/BasicEndToEndTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndTestBase.java similarity index 99% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/BasicEndToEndTestBase.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndTestBase.java index 46c8062daf..d2428a1a07 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/BasicEndToEndTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndTestBase.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.e2e; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -29,6 +29,8 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; + +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/DistributedClusterTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/DistributedClusterTest.java similarity index 99% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/DistributedClusterTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/DistributedClusterTest.java index 5c11d517bf..e0adfb4b32 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/DistributedClusterTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/DistributedClusterTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.e2e; import static org.apache.kafka.common.internals.Topic.GROUP_METADATA_TOPIC_NAME; import static org.apache.pulsar.common.naming.TopicName.PARTITIONED_TOPIC_SUFFIX; @@ -33,6 +33,10 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; import java.util.stream.IntStream; + +import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import io.streamnative.pulsar.handlers.kop.PortManager; import lombok.Cleanup; import org.apache.kafka.clients.admin.AdminClient; import org.apache.kafka.clients.admin.DescribeClusterResult; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaMessageOrderKafkaTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderKafkaTest.java similarity index 94% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaMessageOrderKafkaTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderKafkaTest.java index e3fb37fea4..4266d8c997 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaMessageOrderKafkaTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderKafkaTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.e2e; /** * Unit test for Different kafka produce messages with `entryFormat=kafka`. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaMessageOrderPulsarTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderPulsarTest.java similarity index 94% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaMessageOrderPulsarTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderPulsarTest.java index 6ed3ee2539..374c82dc3e 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaMessageOrderPulsarTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderPulsarTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.e2e; /** * Unit test for Different kafka produce messages with `entryFormat=pulsar`. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaMessageOrderTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderTestBase.java similarity index 98% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaMessageOrderTestBase.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderTestBase.java index 898e2fa464..d22992b3ab 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaMessageOrderTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderTestBase.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.e2e; import static org.testng.Assert.assertEquals; @@ -28,6 +28,8 @@ import java.util.Properties; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; + +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecord; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaNonPartitionedTopicTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaNonPartitionedTopicTest.java similarity index 96% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaNonPartitionedTopicTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaNonPartitionedTopicTest.java index 465e55d1b0..8023d8a75a 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaNonPartitionedTopicTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaNonPartitionedTopicTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.e2e; import static org.testng.Assert.assertEquals; @@ -21,6 +21,8 @@ import java.util.Collections; import java.util.List; import java.util.Map; + +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MultiLedgerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java similarity index 99% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/MultiLedgerTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java index dab46882e9..062d851641 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MultiLedgerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.e2e; import static org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedLedgerInfo.LedgerInfo; @@ -31,6 +31,8 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.IntStream; + +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.mledger.impl.ManagedLedgerImpl; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/PerTopicConfigurationTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/PerTopicConfigurationTest.java similarity index 97% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/PerTopicConfigurationTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/PerTopicConfigurationTest.java index 3c1dd67a61..de8675bb25 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/PerTopicConfigurationTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/PerTopicConfigurationTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.e2e; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; @@ -24,6 +24,8 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.IntStream; + +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecord; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/DifferentNamespaceTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/DifferentNamespaceTest.java similarity index 99% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/DifferentNamespaceTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/DifferentNamespaceTest.java index fdae5c9f79..cb609fb908 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/DifferentNamespaceTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/DifferentNamespaceTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.metadata; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; @@ -29,6 +29,8 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.IntStream; + +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.admin.AdminClient; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetadataInitTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/MetadataInitTest.java similarity index 96% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetadataInitTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/MetadataInitTest.java index 8a6d8bd3f1..35af8d5b9b 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetadataInitTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/MetadataInitTest.java @@ -11,12 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.metadata; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertThrows; +import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import io.streamnative.pulsar.handlers.kop.PortManager; import io.streamnative.pulsar.handlers.kop.utils.MetadataUtils; import java.net.URISyntaxException; import java.net.URL; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/IdempotentProducerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/IdempotentProducerTest.java similarity index 97% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/IdempotentProducerTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/IdempotentProducerTest.java index ef08a17e91..9f0607d260 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/IdempotentProducerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/IdempotentProducerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.producer; import static org.testng.Assert.assertEquals; @@ -19,6 +19,8 @@ import java.util.Collections; import java.util.Properties; import java.util.concurrent.ExecutionException; + +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.KafkaConsumer; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/InnerTopicProtectionTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/InnerTopicProtectionTest.java similarity index 97% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/InnerTopicProtectionTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/InnerTopicProtectionTest.java index 23f73c8f1a..f2d542e7cf 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/InnerTopicProtectionTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/InnerTopicProtectionTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.producer; import com.google.common.collect.Sets; import java.net.URL; @@ -19,6 +19,9 @@ import java.nio.file.Paths; import java.util.Optional; import java.util.Properties; + +import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.producer.KafkaProducer; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MessagePublishBufferThrottleKafkaTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishBufferThrottleKafkaTest.java similarity index 93% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/MessagePublishBufferThrottleKafkaTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishBufferThrottleKafkaTest.java index 88143bfa7b..cfa56ac5b2 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MessagePublishBufferThrottleKafkaTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishBufferThrottleKafkaTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.producer; /** * {@link MessagePublishBufferThrottleTestBase} with `entryFormat=kafka`. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MessagePublishBufferThrottlePulsarTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishBufferThrottlePulsarTest.java similarity index 93% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/MessagePublishBufferThrottlePulsarTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishBufferThrottlePulsarTest.java index dac09c1d48..c439b5a328 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MessagePublishBufferThrottlePulsarTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishBufferThrottlePulsarTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.producer; /** * {@link MessagePublishBufferThrottleTestBase} with `entryFormat=kafka`. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MessagePublishBufferThrottleTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishBufferThrottleTestBase.java similarity index 96% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/MessagePublishBufferThrottleTestBase.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishBufferThrottleTestBase.java index 07b6d81951..56ff5326e0 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MessagePublishBufferThrottleTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishBufferThrottleTestBase.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.producer; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -21,6 +21,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; + +import io.streamnative.pulsar.handlers.kop.KafkaRequestHandler; +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerConfig; @@ -37,7 +40,7 @@ * */ @Slf4j -public abstract class MessagePublishBufferThrottleTestBase extends KopProtocolHandlerTestBase{ +public abstract class MessagePublishBufferThrottleTestBase extends KopProtocolHandlerTestBase { public MessagePublishBufferThrottleTestBase(final String entryFormat) { super(entryFormat); diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MessagePublishThrottlingTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishThrottlingTest.java similarity index 98% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/MessagePublishThrottlingTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishThrottlingTest.java index 37b0ea4414..132237e5f7 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MessagePublishThrottlingTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishThrottlingTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.producer; import static org.testng.Assert.assertEquals; @@ -26,6 +26,8 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; + +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.producer.KafkaProducer; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/PublishRateLimitTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/PublishRateLimitTest.java similarity index 97% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/PublishRateLimitTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/PublishRateLimitTest.java index e6c3dda1c9..b95ea501b1 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/PublishRateLimitTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/PublishRateLimitTest.java @@ -11,9 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.producer; +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.producer.ProducerRecord; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/SchemaRegistryTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRegistryTest.java similarity index 98% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/SchemaRegistryTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRegistryTest.java index 9f81950f72..b75646c13a 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/SchemaRegistryTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRegistryTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.schemaregistry.model.impl; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; @@ -30,6 +30,8 @@ import java.util.Map; import java.util.Properties; import java.util.concurrent.TimeUnit; + +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.avro.Schema; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/SchemaRestApiTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRestApiTest.java similarity index 97% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/SchemaRestApiTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRestApiTest.java index b768c46f58..6dfe672f58 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/SchemaRestApiTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRestApiTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.schemaregistry.model.impl; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; @@ -19,6 +19,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.schemaregistry.model.Schema; import io.streamnative.pulsar.handlers.kop.schemaregistry.resources.SubjectResource; import java.io.BufferedReader; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaSSLChannelTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelTest.java similarity index 99% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaSSLChannelTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelTest.java index 13e7b42ca6..feaaf8504c 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaSSLChannelTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.security; import static java.nio.charset.StandardCharsets.UTF_8; import static org.testng.AssertJUnit.assertFalse; @@ -23,6 +23,8 @@ import java.util.Properties; import java.util.concurrent.atomic.AtomicInteger; import javax.net.ssl.HostnameVerifier; + +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaSSLChannelWithClientAuthTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelWithClientAuthTest.java similarity index 97% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaSSLChannelWithClientAuthTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelWithClientAuthTest.java index f22b7c275d..37ee221de2 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaSSLChannelWithClientAuthTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelWithClientAuthTest.java @@ -11,13 +11,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.security; import static java.nio.charset.StandardCharsets.UTF_8; import java.io.Closeable; import java.util.Properties; import javax.net.ssl.HostnameVerifier; + +import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/SaslPlainKafkaTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainKafkaTest.java similarity index 93% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/SaslPlainKafkaTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainKafkaTest.java index 4389f160a3..9c28900043 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/SaslPlainKafkaTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainKafkaTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.security; /** * Testing the SASL-PLAIN features on KoP with `entry.format=kafka`. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/SaslPlainPulsarTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainPulsarTest.java similarity index 93% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/SaslPlainPulsarTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainPulsarTest.java index 15ab454916..db0e503d1f 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/SaslPlainPulsarTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainPulsarTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.security; /** * Testing the SASL-PLAIN features on KoP with `entry.format=pulsar`. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/SaslPlainTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainTestBase.java similarity index 98% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/SaslPlainTestBase.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainTestBase.java index a3dbc4368a..2582bc8dc0 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/SaslPlainTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainTestBase.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.security; import static org.mockito.Mockito.spy; import static org.testng.Assert.assertEquals; @@ -31,6 +31,9 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicInteger; import javax.crypto.SecretKey; + +import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecord; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/DelayAuthorizationFailedCloseTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/DelayAuthorizationFailedCloseTest.java similarity index 98% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/DelayAuthorizationFailedCloseTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/DelayAuthorizationFailedCloseTest.java index 777b3771a9..92c8dae2fb 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/DelayAuthorizationFailedCloseTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/DelayAuthorizationFailedCloseTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.security.auth; import static org.mockito.Mockito.spy; import static org.testng.Assert.assertTrue; @@ -26,6 +26,8 @@ import java.util.Optional; import java.util.Properties; import javax.crypto.SecretKey; + +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.ClientUtils; import org.apache.kafka.clients.producer.ProducerConfig; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaAuthorizationKafkaMultitenantTenantMetadataTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationKafkaMultitenantTenantMetadataTest.java similarity index 96% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaAuthorizationKafkaMultitenantTenantMetadataTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationKafkaMultitenantTenantMetadataTest.java index a2101116c6..ebb18d256d 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaAuthorizationKafkaMultitenantTenantMetadataTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationKafkaMultitenantTenantMetadataTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.security.auth; import static org.testng.Assert.assertFalse; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaAuthorizationMockTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationMockTest.java similarity index 97% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaAuthorizationMockTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationMockTest.java index 3a3a735f87..4f14de7b54 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaAuthorizationMockTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationMockTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.security.auth; import static org.mockito.Mockito.spy; import static org.testng.Assert.assertEquals; @@ -19,6 +19,7 @@ import com.google.common.collect.Sets; import io.jsonwebtoken.SignatureAlgorithm; +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.security.auth.KafkaMockAuthorizationProvider; import java.time.Duration; import java.util.Collections; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaAuthorizationPulsarTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationPulsarTest.java similarity index 93% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaAuthorizationPulsarTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationPulsarTest.java index 35b4ff0e28..a725603798 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaAuthorizationPulsarTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationPulsarTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.security.auth; /** * Unit test for Authorization with `entryFormat=pulsar`. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaAuthorizationTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationTestBase.java similarity index 99% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaAuthorizationTestBase.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationTestBase.java index 98f2fc645a..adf5811387 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaAuthorizationTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationTestBase.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.security.auth; import static org.mockito.Mockito.spy; import static org.testng.Assert.assertEquals; @@ -36,6 +36,8 @@ import java.util.Set; import java.util.concurrent.ExecutionException; import javax.crypto.SecretKey; + +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.avro.Schema; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/CustomOAuthBearerCallbackHandlerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/CustomOAuthBearerCallbackHandlerTest.java similarity index 98% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/CustomOAuthBearerCallbackHandlerTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/CustomOAuthBearerCallbackHandlerTest.java index 6c27876775..9ae1ed5ab0 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/CustomOAuthBearerCallbackHandlerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/CustomOAuthBearerCallbackHandlerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.security.oauth; import static org.mockito.Mockito.spy; import static org.testng.Assert.assertEquals; @@ -19,6 +19,7 @@ import com.google.common.collect.Sets; import io.jsonwebtoken.SignatureAlgorithm; +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.security.oauth.KopOAuthBearerToken; import io.streamnative.pulsar.handlers.kop.security.oauth.KopOAuthBearerValidatorCallback; import java.util.HashSet; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/HydraOAuthUtils.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/HydraOAuthUtils.java similarity index 98% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/HydraOAuthUtils.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/HydraOAuthUtils.java index b95dfd813a..02bd8e1330 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/HydraOAuthUtils.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/HydraOAuthUtils.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.security.oauth; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/SaslOAuthBearerTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthBearerTestBase.java similarity index 96% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/SaslOAuthBearerTestBase.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthBearerTestBase.java index 2e9f268a86..976d62ef17 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/SaslOAuthBearerTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthBearerTestBase.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.security.oauth; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; @@ -23,6 +23,8 @@ import java.util.List; import java.util.Properties; import java.util.concurrent.ExecutionException; + +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecord; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/SaslOAuthDefaultHandlersTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthDefaultHandlersTest.java similarity index 98% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/SaslOAuthDefaultHandlersTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthDefaultHandlersTest.java index 5bae4d7440..8c36cf4f91 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/SaslOAuthDefaultHandlersTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthDefaultHandlersTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.security.oauth; import static org.mockito.Mockito.spy; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/SaslOAuthKopHandlersTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersTest.java similarity index 97% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/SaslOAuthKopHandlersTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersTest.java index c0f3a5048e..6c9a1e19de 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/SaslOAuthKopHandlersTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.security.oauth; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; @@ -21,9 +21,7 @@ import static org.testng.Assert.assertTrue; import com.google.common.collect.Sets; -import io.streamnative.pulsar.handlers.kop.security.oauth.OauthLoginCallbackHandler; -import io.streamnative.pulsar.handlers.kop.security.oauth.OauthValidatorCallbackHandler; -import io.streamnative.pulsar.handlers.kop.security.oauth.ServerConfig; + import java.io.IOException; import java.net.URL; import java.time.Duration; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/SaslOAuthKopHandlersWithMultiTenantTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersWithMultiTenantTest.java similarity index 97% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/SaslOAuthKopHandlersWithMultiTenantTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersWithMultiTenantTest.java index 4497a6abf9..a291706309 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/SaslOAuthKopHandlersWithMultiTenantTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersWithMultiTenantTest.java @@ -11,15 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.security.oauth; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; import com.google.common.collect.Sets; -import io.streamnative.pulsar.handlers.kop.security.oauth.OauthLoginCallbackHandler; -import io.streamnative.pulsar.handlers.kop.security.oauth.OauthValidatorCallbackHandler; + import java.net.URL; import java.time.Duration; import java.util.Collections; From 3c67f1cea31a0c3941e555d8448fc1a4ebadfdfe Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Mon, 3 Jul 2023 11:56:48 -0700 Subject: [PATCH 05/19] Fix syntax error --- .github/workflows/pr-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml index 95d29bcaed..2370622cad 100644 --- a/.github/workflows/pr-tests.yml +++ b/.github/workflows/pr-tests.yml @@ -90,7 +90,7 @@ jobs: { name: "compatibility test", script: [ - "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.compatibility.*Test' -pl tests" + "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.compatibility.*Test' -pl tests", "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.compatibility..*.*Test' -pl tests" ] }, From 157806d3700eee86c66f9c0c5eb9ba79ef23e6ac Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Mon, 3 Jul 2023 11:59:23 -0700 Subject: [PATCH 06/19] Fix test names --- .github/workflows/pr-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml index 2370622cad..b67600d2c1 100644 --- a/.github/workflows/pr-tests.yml +++ b/.github/workflows/pr-tests.yml @@ -74,6 +74,7 @@ jobs: path: artifacts.zip kop-module-tests: + name: Unit Test (${{ matrix.test.name }}) runs-on: ubuntu-latest timeout-minutes: 60 strategy: From e589c2f24908af03a1cd16c2fd7f2219d6736005 Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Mon, 3 Jul 2023 12:04:52 -0700 Subject: [PATCH 07/19] test to json --- .github/workflows/pr-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml index b67600d2c1..a9eeb752cb 100644 --- a/.github/workflows/pr-tests.yml +++ b/.github/workflows/pr-tests.yml @@ -120,6 +120,7 @@ jobs: - name: ${{ matrix.test.name }} run: | + echo ${{ matrix.test.scripts }} scripts=$(echo '${{ toJson(matrix.test.scripts) }}' | jq -r '.[]') IFS=$'\n' # change the internal field separator to newline echo $scripts From 10c479534493e1536be51dc583446e1350d6b323 Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Mon, 3 Jul 2023 12:10:03 -0700 Subject: [PATCH 08/19] Fix matrix --- .github/workflows/pr-tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml index a9eeb752cb..4e8e6f3e8b 100644 --- a/.github/workflows/pr-tests.yml +++ b/.github/workflows/pr-tests.yml @@ -84,13 +84,13 @@ jobs: test: [ { name: "admin test", - script: [ + scripts: [ "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.admin.*Test' -pl tests" ] }, { name: "compatibility test", - script: [ + scripts: [ "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.compatibility.*Test' -pl tests", "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.compatibility..*.*Test' -pl tests" ] @@ -120,7 +120,7 @@ jobs: - name: ${{ matrix.test.name }} run: | - echo ${{ matrix.test.scripts }} + echo '${{ matrix.test.scripts }}' scripts=$(echo '${{ toJson(matrix.test.scripts) }}' | jq -r '.[]') IFS=$'\n' # change the internal field separator to newline echo $scripts From 78201cf4f2b3b35917c01d791c3ad625eabadcd9 Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Mon, 3 Jul 2023 12:17:20 -0700 Subject: [PATCH 09/19] Optimize import --- .../handlers/kop/CacheInvalidatorTest.java | 22 ++--- .../kop/EntryPublishTimeKafkaFormatTest.java | 13 +-- .../kop/EntryPublishTimePulsarFormatTest.java | 7 +- .../handlers/kop/EntryPublishTimeTest.java | 11 +-- .../pulsar/handlers/kop/KafkaApisTest.java | 88 ++++++------------- .../handlers/kop/KafkaCommonTestUtils.java | 19 ++-- .../handlers/kop/KafkaIdleConnectionTest.java | 13 +-- .../handlers/kop/KafkaListenerNameTest.java | 27 +++--- .../handlers/kop/KafkaProducerStatsTest.java | 9 +- .../handlers/kop/KafkaRequestHandlerTest.java | 75 +++++----------- ...kaRequestHandlerWithAuthorizationTest.java | 62 ++++--------- .../kop/KafkaTopicConsumerManagerTest.java | 43 ++++----- .../handlers/kop/KopEventManagerTest.java | 19 ++-- .../kop/KopProtocolHandlerTestBase.java | 38 ++++---- .../handlers/kop/MetricsProviderTest.java | 30 +++---- .../kop/OffsetTopicWriteTimeoutTest.java | 34 +++---- .../pulsar/handlers/kop/UpgradeTest.java | 13 ++- .../handlers/kop/admin/KafkaAdminTest.java | 47 +++------- .../kop/admin/KopBrokerLookupManagerTest.java | 10 +-- .../handlers/kop/admin/OffsetResetTest.java | 27 +++--- .../BasicEndToEndPulsarTest.java | 21 ++--- .../compatibility/BasicEndToEndTestBase.java | 28 ++---- .../DefaultKafkaClientFactory.java | 23 ++--- .../saslplain/SaslPlainEndToEndTest.java | 46 +++------- .../CompactedPartitionedTopicTest.java | 24 ++--- .../group/GroupCoordinatorTest.java | 32 +++---- .../group/GroupMetadataManagerTest.java | 74 +++++----------- .../ProducerIdManagerImplTest.java | 11 +-- ...ulsarStorageProducerIdManagerImplTest.java | 17 ++-- .../TransactionCoordinatorTest.java | 40 ++++----- .../transaction/TransactionLogTest.java | 13 ++- .../TransactionMarkerChannelManagerTest.java | 17 ++-- .../TransactionStateManagerTest.java | 37 +++----- .../TransactionWithOAuthBearerAuthTest.java | 6 +- .../kop/e2e/BasicEndToEndKafkaTest.java | 33 +++---- .../kop/e2e/BasicEndToEndPulsarTest.java | 23 ++--- .../kop/e2e/BasicEndToEndTestBase.java | 38 ++++---- .../kop/e2e/DistributedClusterTest.java | 34 ++++--- .../kop/e2e/KafkaMessageOrderTestBase.java | 21 ++--- .../kop/e2e/KafkaNonPartitionedTopicTest.java | 16 ++-- .../handlers/kop/e2e/MultiLedgerTest.java | 28 +++--- .../kop/e2e/PerTopicConfigurationTest.java | 24 ++--- .../kop/format/EntryFormatterTestBase.java | 5 +- .../kop/metadata/DifferentNamespaceTest.java | 37 +++----- .../kop/metadata/MetadataInitTest.java | 17 ++-- .../kop/producer/IdempotentProducerTest.java | 14 +-- .../producer/InnerTopicProtectionTest.java | 12 +-- .../MessagePublishBufferThrottleTestBase.java | 18 ++-- .../MessagePublishThrottlingTest.java | 22 +++-- .../model/impl/PulsarSchemaStorageTest.java | 11 +-- .../model/impl/SchemaRegistryTest.java | 22 +++-- .../model/impl/SchemaRestApiTest.java | 15 ++-- .../model/impl/SchemaStorageTestsBase.java | 13 ++- .../kop/security/KafkaSSLChannelTest.java | 22 ++--- .../KafkaSSLChannelWithClientAuthTest.java | 12 +-- .../kop/security/SaslPlainTestBase.java | 27 +++--- .../DelayAuthorizationFailedCloseTest.java | 20 ++--- ...ionKafkaMultitenantTenantMetadataTest.java | 4 +- .../auth/KafkaAuthorizationMockTest.java | 20 ++--- .../auth/KafkaAuthorizationTestBase.java | 35 +++----- .../auth/KafkaMockAuthorizationProvider.java | 13 +-- .../auth/SimpleAclAuthorizerTest.java | 19 ++-- .../CustomOAuthBearerCallbackHandlerTest.java | 28 +++--- .../kop/security/oauth/HydraOAuthUtils.java | 9 +- .../OauthValidatorCallbackHandlerTest.java | 21 +++-- .../oauth/SaslOAuthBearerTestBase.java | 20 ++--- .../oauth/SaslOAuthDefaultHandlersTest.java | 11 +-- .../oauth/SaslOAuthKopHandlersTest.java | 36 +++----- ...slOAuthKopHandlersWithMultiTenantTest.java | 18 ++-- .../kop/storage/PartitionLogTest.java | 17 ++-- ...cerStateManagerSnapshotBufferTestBase.java | 11 +-- .../kop/storage/ProducerStateManagerTest.java | 17 ++-- ...roducerStateManagerSnapshotBufferTest.java | 9 +- .../kop/streams/GlobalKTableTest.java | 21 ++--- .../kop/streams/KStreamAggregationTest.java | 59 +++---------- .../handlers/kop/streams/KTableTest.java | 9 +- .../kop/streams/KafkaStreamsTestBase.java | 5 +- .../handlers/kop/streams/TestUtils.java | 38 +++----- .../handlers/kop/utils/timer/MockTime.java | 5 +- .../handlers/kop/utils/timer/MockTimer.java | 5 +- .../kop/utils/timer/TimerTaskListTest.java | 7 +- .../handlers/kop/utils/timer/TimerTest.java | 19 ++-- 82 files changed, 735 insertions(+), 1201 deletions(-) diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/CacheInvalidatorTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/CacheInvalidatorTest.java index 4a4f2cb660..14538975f1 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/CacheInvalidatorTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/CacheInvalidatorTest.java @@ -14,20 +14,6 @@ package io.streamnative.pulsar.handlers.kop; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; - -import java.time.Duration; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; @@ -45,6 +31,14 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.TimeUnit; + +import static org.testng.Assert.*; + /** * Validate CacheInvalidator. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimeKafkaFormatTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimeKafkaFormatTest.java index 35efa41895..ca346d535b 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimeKafkaFormatTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimeKafkaFormatTest.java @@ -13,12 +13,6 @@ */ package io.streamnative.pulsar.handlers.kop; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - -import java.time.Duration; -import java.util.Collections; -import java.util.concurrent.CompletableFuture; import lombok.Cleanup; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; @@ -35,6 +29,13 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.Test; +import java.time.Duration; +import java.util.Collections; +import java.util.concurrent.CompletableFuture; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + /** * Test for publish time when entry format is kafka. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimePulsarFormatTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimePulsarFormatTest.java index 053c16f501..dc6a1c5e51 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimePulsarFormatTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimePulsarFormatTest.java @@ -13,9 +13,6 @@ */ package io.streamnative.pulsar.handlers.kop; -import static org.testng.Assert.assertTrue; - -import java.util.concurrent.TimeUnit; import lombok.Cleanup; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.TopicPartition; @@ -26,6 +23,10 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.Test; +import java.util.concurrent.TimeUnit; + +import static org.testng.Assert.assertTrue; + /** * Test for publish time when entry format is pulsar. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimeTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimeTest.java index 227df6f62c..5204296799 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimeTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimeTest.java @@ -13,16 +13,17 @@ */ package io.streamnative.pulsar.handlers.kop; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; - import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; -import java.net.InetSocketAddress; -import java.net.SocketAddress; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; +import java.net.InetSocketAddress; +import java.net.SocketAddress; + +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; + /** * Test for entry publish time. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaApisTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaApisTest.java index 056a7cc0ce..8ec4d45f3b 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaApisTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaApisTest.java @@ -13,25 +13,6 @@ */ package io.streamnative.pulsar.handlers.kop; -import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.getListOffsetsPartitionResponse; -import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.newOffsetCommitRequestPartitionData; -import static org.apache.kafka.clients.consumer.ConsumerConfig.DEFAULT_FETCH_MAX_BYTES; -import static org.apache.kafka.clients.consumer.ConsumerConfig.DEFAULT_MAX_PARTITION_FETCH_BYTES; -import static org.apache.kafka.common.requests.ListOffsetsRequest.EARLIEST_TIMESTAMP; -import static org.apache.pulsar.common.naming.TopicName.PARTITIONED_TOPIC_SUFFIX; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; - import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -41,26 +22,6 @@ import io.netty.channel.EventLoopGroup; import io.netty.util.concurrent.DefaultThreadFactory; import io.streamnative.pulsar.handlers.kop.KafkaCommandDecoder.KafkaHeaderAndRequest; -import java.net.InetSocketAddress; -import java.net.SocketAddress; -import java.nio.ByteBuffer; -import java.nio.charset.StandardCharsets; -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Properties; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Function; -import java.util.stream.Collectors; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.tuple.Pair; @@ -79,29 +40,9 @@ import org.apache.kafka.common.message.ProduceRequestData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; -import org.apache.kafka.common.record.CompressionType; -import org.apache.kafka.common.record.ControlRecordType; -import org.apache.kafka.common.record.EndTransactionMarker; -import org.apache.kafka.common.record.MemoryRecords; -import org.apache.kafka.common.record.MemoryRecordsBuilder; -import org.apache.kafka.common.record.MutableRecordBatch; -import org.apache.kafka.common.record.RecordBatch; -import org.apache.kafka.common.record.TimestampType; -import org.apache.kafka.common.requests.AbstractRequest; -import org.apache.kafka.common.requests.AbstractResponse; -import org.apache.kafka.common.requests.FetchRequest; -import org.apache.kafka.common.requests.FetchResponse; -import org.apache.kafka.common.requests.FindCoordinatorRequest; -import org.apache.kafka.common.requests.ListOffsetsRequest; -import org.apache.kafka.common.requests.ListOffsetsResponse; -import org.apache.kafka.common.requests.MetadataRequest; -import org.apache.kafka.common.requests.MetadataResponse; +import org.apache.kafka.common.record.*; +import org.apache.kafka.common.requests.*; import org.apache.kafka.common.requests.MetadataResponse.TopicMetadata; -import org.apache.kafka.common.requests.OffsetCommitRequest; -import org.apache.kafka.common.requests.OffsetCommitResponse; -import org.apache.kafka.common.requests.ProduceRequest; -import org.apache.kafka.common.requests.ProduceResponse; -import org.apache.kafka.common.requests.ResponseCallbackWrapper; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; import org.apache.pulsar.broker.service.Topic; @@ -114,6 +55,31 @@ import org.testng.annotations.Ignore; import org.testng.annotations.Test; +import java.net.InetSocketAddress; +import java.net.SocketAddress; +import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Function; +import java.util.stream.Collectors; + +import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.getListOffsetsPartitionResponse; +import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.newOffsetCommitRequestPartitionData; +import static org.apache.kafka.clients.consumer.ConsumerConfig.DEFAULT_FETCH_MAX_BYTES; +import static org.apache.kafka.clients.consumer.ConsumerConfig.DEFAULT_MAX_PARTITION_FETCH_BYTES; +import static org.apache.kafka.common.requests.ListOffsetsRequest.EARLIEST_TIMESTAMP; +import static org.apache.pulsar.common.naming.TopicName.PARTITIONED_TOPIC_SUFFIX; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; +import static org.testng.Assert.*; + /** * Validate KafkaApisTest. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaCommonTestUtils.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaCommonTestUtils.java index 129a5928d4..9a7a1064b4 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaCommonTestUtils.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaCommonTestUtils.java @@ -14,23 +14,20 @@ package io.streamnative.pulsar.handlers.kop; import io.netty.buffer.ByteBuf; -import java.net.SocketAddress; -import java.nio.ByteBuffer; -import java.util.Collections; -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.message.CreatePartitionsRequestData; import org.apache.kafka.common.message.ListOffsetsRequestData; import org.apache.kafka.common.message.ListOffsetsResponseData; import org.apache.kafka.common.message.OffsetCommitRequestData; import org.apache.kafka.common.protocol.ApiKeys; -import org.apache.kafka.common.requests.AbstractRequest; -import org.apache.kafka.common.requests.FetchRequest; -import org.apache.kafka.common.requests.KopResponseUtils; -import org.apache.kafka.common.requests.RequestHeader; -import org.apache.kafka.common.requests.TxnOffsetCommitRequest; +import org.apache.kafka.common.requests.*; + +import java.net.SocketAddress; +import java.nio.ByteBuffer; +import java.util.Collections; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; public class KafkaCommonTestUtils { diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaIdleConnectionTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaIdleConnectionTest.java index db66bc741b..a2493fd953 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaIdleConnectionTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaIdleConnectionTest.java @@ -13,14 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop; -import static org.testng.Assert.fail; -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertTrue; - import io.streamnative.kafka.client.api.KafkaVersion; import io.streamnative.kafka.client.api.ProducerConfiguration; -import java.io.IOException; -import java.net.InetSocketAddress; import org.apache.kafka.clients.ClientUtils; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.metrics.Metrics; @@ -34,6 +28,13 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import java.io.IOException; +import java.net.InetSocketAddress; + +import static org.testng.Assert.fail; +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertTrue; + /** * Unit test for KoP Idle connection close. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaListenerNameTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaListenerNameTest.java index db245d7e0d..e9eb2181bc 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaListenerNameTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaListenerNameTest.java @@ -13,24 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop; -import static io.streamnative.pulsar.handlers.kop.KafkaCommandDecoder.KafkaHeaderAndRequest; -import static org.apache.kafka.common.requests.MetadataResponse.PartitionMetadata; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; - import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerConfig; @@ -46,6 +30,17 @@ import org.testng.Assert; import org.testng.annotations.Test; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +import static io.streamnative.pulsar.handlers.kop.KafkaCommandDecoder.KafkaHeaderAndRequest; +import static org.apache.kafka.common.requests.MetadataResponse.PartitionMetadata; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; + /** * Test for kafkaListenerName config. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaProducerStatsTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaProducerStatsTest.java index 96b63e54da..96ffa3316a 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaProducerStatsTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaProducerStatsTest.java @@ -13,11 +13,7 @@ */ package io.streamnative.pulsar.handlers.kop; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotEquals; - import com.google.common.collect.Sets; -import java.util.Properties; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -33,6 +29,11 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +import java.util.Properties; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotEquals; + /** * Unit test for producer stats. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerTest.java index 6ded463c1c..9890bf1e80 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerTest.java @@ -14,17 +14,6 @@ package io.streamnative.pulsar.handlers.kop; -import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.getListOffsetsPartitionResponse; -import static io.streamnative.pulsar.handlers.kop.utils.TopicNameUtils.getPartitionedTopicNameWithoutPartitions; -import static org.apache.pulsar.common.naming.TopicName.PARTITIONED_TOPIC_SUFFIX; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -40,33 +29,9 @@ import io.streamnative.pulsar.handlers.kop.offset.OffsetAndMetadata; import io.streamnative.pulsar.handlers.kop.utils.KafkaResponseUtils; import io.streamnative.pulsar.handlers.kop.utils.TopicNameUtils; -import java.net.InetSocketAddress; -import java.net.SocketAddress; -import java.nio.ByteBuffer; -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.stream.Collectors; -import java.util.stream.LongStream; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; -import org.apache.kafka.clients.admin.AdminClient; -import org.apache.kafka.clients.admin.AdminClientConfig; -import org.apache.kafka.clients.admin.NewPartitions; -import org.apache.kafka.clients.admin.NewTopic; -import org.apache.kafka.clients.admin.TopicDescription; +import org.apache.kafka.clients.admin.*; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.clients.producer.KafkaProducer; @@ -77,31 +42,14 @@ import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.Node; import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.errors.InvalidPartitionsException; -import org.apache.kafka.common.errors.InvalidRequestException; -import org.apache.kafka.common.errors.RecordTooLargeException; -import org.apache.kafka.common.errors.TopicExistsException; -import org.apache.kafka.common.errors.UnknownServerException; -import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; +import org.apache.kafka.common.errors.*; import org.apache.kafka.common.message.ApiMessageType; import org.apache.kafka.common.message.ListOffsetsResponseData; import org.apache.kafka.common.message.MetadataRequestData; import org.apache.kafka.common.message.OffsetCommitRequestData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; -import org.apache.kafka.common.requests.AbstractRequest; -import org.apache.kafka.common.requests.AbstractResponse; -import org.apache.kafka.common.requests.ApiVersionsRequest; -import org.apache.kafka.common.requests.ApiVersionsResponse; -import org.apache.kafka.common.requests.CreateTopicsRequest; -import org.apache.kafka.common.requests.KopResponseUtils; -import org.apache.kafka.common.requests.ListOffsetsRequest; -import org.apache.kafka.common.requests.ListOffsetsResponse; -import org.apache.kafka.common.requests.MetadataRequest; -import org.apache.kafka.common.requests.MetadataResponse; -import org.apache.kafka.common.requests.OffsetCommitRequest; -import org.apache.kafka.common.requests.RequestHeader; -import org.apache.kafka.common.requests.ResponseHeader; +import org.apache.kafka.common.requests.*; import org.apache.kafka.common.serialization.ByteArraySerializer; import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.StringSerializer; @@ -120,6 +68,23 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +import java.net.InetSocketAddress; +import java.net.SocketAddress; +import java.nio.ByteBuffer; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.stream.Collectors; +import java.util.stream.LongStream; + +import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.getListOffsetsPartitionResponse; +import static io.streamnative.pulsar.handlers.kop.utils.TopicNameUtils.getPartitionedTopicNameWithoutPartitions; +import static org.apache.pulsar.common.naming.TopicName.PARTITIONED_TOPIC_SUFFIX; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.testng.Assert.*; + /** * Unit test for {@link KafkaRequestHandler}. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerWithAuthorizationTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerWithAuthorizationTest.java index c10026058a..0cb46265e4 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerWithAuthorizationTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerWithAuthorizationTest.java @@ -13,16 +13,6 @@ */ package io.streamnative.pulsar.handlers.kop; -import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.getListOffsetsPartitionResponse; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; - import com.google.common.collect.Maps; import com.google.common.collect.Sets; import io.jsonwebtoken.SignatureAlgorithm; @@ -35,54 +25,19 @@ import io.streamnative.pulsar.handlers.kop.security.auth.Resource; import io.streamnative.pulsar.handlers.kop.security.auth.ResourceType; import io.streamnative.pulsar.handlers.kop.utils.KopTopic; -import java.net.InetSocketAddress; -import java.net.SocketAddress; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Properties; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; -import java.util.stream.Collectors; -import javax.crypto.SecretKey; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.IsolationLevel; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.acl.AclOperation; -import org.apache.kafka.common.message.CreatePartitionsResponseData; -import org.apache.kafka.common.message.ListOffsetsResponseData; -import org.apache.kafka.common.message.MetadataRequestData; -import org.apache.kafka.common.message.OffsetCommitRequestData; -import org.apache.kafka.common.message.ProduceRequestData; +import org.apache.kafka.common.message.*; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.record.CompressionType; import org.apache.kafka.common.record.MemoryRecords; import org.apache.kafka.common.record.SimpleRecord; -import org.apache.kafka.common.requests.AbstractRequest; -import org.apache.kafka.common.requests.AbstractResponse; -import org.apache.kafka.common.requests.AddPartitionsToTxnRequest; -import org.apache.kafka.common.requests.AddPartitionsToTxnResponse; -import org.apache.kafka.common.requests.CreatePartitionsRequest; -import org.apache.kafka.common.requests.CreatePartitionsResponse; -import org.apache.kafka.common.requests.ListOffsetsRequest; -import org.apache.kafka.common.requests.ListOffsetsResponse; -import org.apache.kafka.common.requests.MetadataRequest; -import org.apache.kafka.common.requests.MetadataResponse; -import org.apache.kafka.common.requests.OffsetCommitRequest; -import org.apache.kafka.common.requests.OffsetCommitResponse; -import org.apache.kafka.common.requests.OffsetFetchRequest; -import org.apache.kafka.common.requests.OffsetFetchResponse; -import org.apache.kafka.common.requests.ProduceRequest; -import org.apache.kafka.common.requests.ProduceResponse; -import org.apache.kafka.common.requests.RequestHeader; -import org.apache.kafka.common.requests.TxnOffsetCommitRequest; -import org.apache.kafka.common.requests.TxnOffsetCommitResponse; +import org.apache.kafka.common.requests.*; import org.apache.pulsar.broker.ServiceConfiguration; import org.apache.pulsar.broker.authentication.AuthenticationProviderToken; import org.apache.pulsar.broker.authentication.utils.AuthTokenUtils; @@ -98,6 +53,19 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +import javax.crypto.SecretKey; +import java.net.InetSocketAddress; +import java.net.SocketAddress; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import java.util.stream.Collectors; + +import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.getListOffsetsPartitionResponse; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.*; +import static org.testng.Assert.*; + /** * Unit test for {@link KafkaRequestHandler} with authorization enabled. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaTopicConsumerManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaTopicConsumerManagerTest.java index 4fa30ff5fb..fc738a7e48 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaTopicConsumerManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaTopicConsumerManagerTest.java @@ -13,36 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNotEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertSame; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; - import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.streamnative.pulsar.handlers.kop.utils.KopTopic; -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Properties; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.IntStream; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.mledger.ManagedCursor; @@ -64,6 +37,22 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Properties; +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.testng.Assert.*; + /** * Pulsar service configuration object. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopEventManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopEventManagerTest.java index 6f3f952582..b880c9ba55 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopEventManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopEventManagerTest.java @@ -13,18 +13,7 @@ */ package io.streamnative.pulsar.handlers.kop; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - import com.google.common.collect.Lists; -import java.time.Duration; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; import org.apache.kafka.clients.admin.AdminClient; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.ConsumerGroupDescription; @@ -43,6 +32,14 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + public class KopEventManagerTest extends KopProtocolHandlerTestBase { private AdminClient adminClient; private KafkaProducer kafkaProducer; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopProtocolHandlerTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopProtocolHandlerTestBase.java index e022552681..3dc4bc7e3b 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopProtocolHandlerTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopProtocolHandlerTestBase.java @@ -13,11 +13,6 @@ */ package io.streamnative.pulsar.handlers.kop; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.spy; -import static org.testng.Assert.assertTrue; - import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.google.common.collect.Sets; @@ -26,24 +21,6 @@ import io.streamnative.pulsar.handlers.kop.coordinator.group.GroupCoordinator; import io.streamnative.pulsar.handlers.kop.coordinator.transaction.TransactionCoordinator; import io.streamnative.pulsar.handlers.kop.utils.MetadataUtils; -import java.io.Closeable; -import java.lang.reflect.Field; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.TimeUnit; -import java.util.function.Predicate; -import java.util.function.Supplier; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.client.BookKeeper; @@ -88,6 +65,21 @@ import org.awaitility.Awaitility; import org.testng.Assert; +import java.io.Closeable; +import java.lang.reflect.Field; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; +import java.util.function.Predicate; +import java.util.function.Supplier; + +import static org.mockito.Mockito.*; +import static org.testng.Assert.assertTrue; + /** * Unit test to test KoP handler. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderTest.java index ab358c8e09..660386e7c7 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderTest.java @@ -13,23 +13,6 @@ */ package io.streamnative.pulsar.handlers.kop; -import static org.testng.AssertJUnit.fail; - -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; -import java.time.Duration; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Properties; -import java.util.Set; -import java.util.TreeSet; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; -import java.util.stream.IntStream; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpResponse; @@ -54,6 +37,19 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.time.Duration; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +import static org.testng.AssertJUnit.fail; + /** * test for kop prometheus metrics. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/OffsetTopicWriteTimeoutTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/OffsetTopicWriteTimeoutTest.java index 32c47a9d7b..90b31cfe53 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/OffsetTopicWriteTimeoutTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/OffsetTopicWriteTimeoutTest.java @@ -13,23 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop; -import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.buildRequest; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; - import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; -import java.net.InetSocketAddress; -import java.time.Duration; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.function.Supplier; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRebalanceListener; import org.apache.kafka.clients.consumer.KafkaConsumer; @@ -38,18 +23,23 @@ import org.apache.kafka.common.message.OffsetCommitRequestData; import org.apache.kafka.common.message.SyncGroupRequestData; import org.apache.kafka.common.protocol.Errors; -import org.apache.kafka.common.requests.AbstractResponse; -import org.apache.kafka.common.requests.JoinGroupRequest; -import org.apache.kafka.common.requests.JoinGroupResponse; -import org.apache.kafka.common.requests.OffsetCommitRequest; -import org.apache.kafka.common.requests.OffsetCommitResponse; -import org.apache.kafka.common.requests.SyncGroupRequest; -import org.apache.kafka.common.requests.SyncGroupResponse; +import org.apache.kafka.common.requests.*; import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import java.net.InetSocketAddress; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.function.Supplier; + +import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.buildRequest; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; + @Slf4j public class OffsetTopicWriteTimeoutTest extends KopProtocolHandlerTestBase { diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/UpgradeTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/UpgradeTest.java index 83849a9b9c..165385e133 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/UpgradeTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/UpgradeTest.java @@ -13,14 +13,6 @@ */ package io.streamnative.pulsar.handlers.kop; -import java.time.Duration; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.tuple.Pair; @@ -41,6 +33,11 @@ import org.testng.annotations.Test; import org.testng.collections.Lists; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; + /** * Test upgrade from older version that doesn't support BrokerEntryMetadata. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KafkaAdminTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KafkaAdminTest.java index e530adb147..a2d907b665 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KafkaAdminTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KafkaAdminTest.java @@ -13,49 +13,13 @@ */ package io.streamnative.pulsar.handlers.kop.admin; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; - import com.google.common.collect.Sets; import io.jsonwebtoken.lang.Maps; -import java.nio.charset.StandardCharsets; -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; - import io.streamnative.pulsar.handlers.kop.KafkaLogConfig; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; -import org.apache.kafka.clients.admin.AdminClient; -import org.apache.kafka.clients.admin.AdminClientConfig; -import org.apache.kafka.clients.admin.Config; -import org.apache.kafka.clients.admin.ConsumerGroupDescription; -import org.apache.kafka.clients.admin.ConsumerGroupListing; -import org.apache.kafka.clients.admin.CreatePartitionsResult; -import org.apache.kafka.clients.admin.DeleteConsumerGroupOffsetsResult; -import org.apache.kafka.clients.admin.DescribeClientQuotasResult; -import org.apache.kafka.clients.admin.DescribeClusterResult; -import org.apache.kafka.clients.admin.ListConsumerGroupsResult; -import org.apache.kafka.clients.admin.ListTopicsResult; -import org.apache.kafka.clients.admin.NewPartitions; -import org.apache.kafka.clients.admin.NewTopic; -import org.apache.kafka.clients.admin.OffsetSpec; -import org.apache.kafka.clients.admin.RecordsToDelete; -import org.apache.kafka.clients.admin.TopicDescription; -import org.apache.kafka.clients.admin.TopicListing; +import org.apache.kafka.clients.admin.*; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.clients.producer.KafkaProducer; @@ -79,6 +43,15 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import java.nio.charset.StandardCharsets; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; + +import static org.testng.Assert.*; + /** * Test Kafka admin operations. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KopBrokerLookupManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KopBrokerLookupManagerTest.java index 70ba229f17..493055e7b4 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KopBrokerLookupManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KopBrokerLookupManagerTest.java @@ -13,11 +13,6 @@ */ package io.streamnative.pulsar.handlers.kop.admin; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; - -import java.util.Collections; - import io.streamnative.pulsar.handlers.kop.KopBrokerLookupManager; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.LookupClient; @@ -27,6 +22,11 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import java.util.Collections; + +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; + @Slf4j public class KopBrokerLookupManagerTest extends KopProtocolHandlerTestBase { diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/OffsetResetTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/OffsetResetTest.java index 7c4e7f5fbf..2192bc03c1 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/OffsetResetTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/OffsetResetTest.java @@ -13,24 +13,11 @@ */ package io.streamnative.pulsar.handlers.kop.admin; -import static org.apache.pulsar.common.naming.TopicName.PARTITIONED_TOPIC_SUFFIX; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadataConstants; import io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadataManager.BaseKey; import io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadataManager.OffsetKey; import io.streamnative.pulsar.handlers.kop.utils.CoreUtils; -import java.lang.reflect.Method; -import java.nio.ByteBuffer; -import java.time.Duration; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.mledger.ManagedLedgerConfig; @@ -57,6 +44,20 @@ import org.testng.annotations.Ignore; import org.testng.annotations.Test; +import java.lang.reflect.Method; +import java.nio.ByteBuffer; +import java.time.Duration; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; + +import static org.apache.pulsar.common.naming.TopicName.PARTITIONED_TOPIC_SUFFIX; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + /** * Tests for handling out-of-range cases. **/ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/BasicEndToEndPulsarTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/BasicEndToEndPulsarTest.java index 922f849b39..577111bbc1 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/BasicEndToEndPulsarTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/BasicEndToEndPulsarTest.java @@ -13,21 +13,7 @@ */ package io.streamnative.pulsar.handlers.kop.compatibility; -import io.streamnative.kafka.client.api.Consumer; -import io.streamnative.kafka.client.api.ConsumerRecord; -import io.streamnative.kafka.client.api.Header; -import io.streamnative.kafka.client.api.KafkaVersion; -import io.streamnative.kafka.client.api.ProduceContext; -import io.streamnative.kafka.client.api.Producer; -import io.streamnative.kafka.client.api.RecordMetadata; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; +import io.streamnative.kafka.client.api.*; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.util.MathUtils; import org.apache.pulsar.client.api.Message; @@ -39,6 +25,11 @@ import org.testng.annotations.Test; import org.testng.collections.Maps; +import java.nio.charset.StandardCharsets; +import java.util.*; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; + /** * Basic end-to-end test for different versions of Kafka clients with `entryFormat=kafka`. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/BasicEndToEndTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/BasicEndToEndTestBase.java index c20a3b8cd3..53c0ff50ba 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/BasicEndToEndTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/BasicEndToEndTestBase.java @@ -13,35 +13,19 @@ */ package io.streamnative.pulsar.handlers.kop.compatibility; -import io.streamnative.kafka.client.api.Consumer; -import io.streamnative.kafka.client.api.ConsumerConfiguration; -import io.streamnative.kafka.client.api.ConsumerRecord; -import io.streamnative.kafka.client.api.Header; -import io.streamnative.kafka.client.api.KafkaClientFactory; -import io.streamnative.kafka.client.api.KafkaClientFactoryImpl; -import io.streamnative.kafka.client.api.KafkaVersion; -import io.streamnative.kafka.client.api.Producer; -import io.streamnative.kafka.client.api.ProducerConfiguration; -import io.streamnative.kafka.client.api.RecordMetadata; -import io.streamnative.kafka.client.api.TopicOffsetAndMetadata; +import io.streamnative.kafka.client.api.*; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; -import java.io.IOException; -import java.time.Duration; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.TreeMap; -import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.collections.Maps; +import java.io.IOException; +import java.time.Duration; +import java.util.*; +import java.util.stream.Collectors; + /** * Basic end-to-end test for different versions of Kafka clients. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/DefaultKafkaClientFactory.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/DefaultKafkaClientFactory.java index 41a7edb692..8f69b43dcb 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/DefaultKafkaClientFactory.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/DefaultKafkaClientFactory.java @@ -14,21 +14,7 @@ package io.streamnative.pulsar.handlers.kop.compatibility; import com.google.common.collect.Maps; -import io.streamnative.kafka.client.api.Consumer; -import io.streamnative.kafka.client.api.ConsumerConfiguration; -import io.streamnative.kafka.client.api.ConsumerRecord; -import io.streamnative.kafka.client.api.KafkaClientFactory; -import io.streamnative.kafka.client.api.ProduceContext; -import io.streamnative.kafka.client.api.Producer; -import io.streamnative.kafka.client.api.ProducerConfiguration; -import io.streamnative.kafka.client.api.RecordMetadata; -import io.streamnative.kafka.client.api.TopicOffsetAndMetadata; -import java.time.Duration; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Future; +import io.streamnative.kafka.client.api.*; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.clients.consumer.OffsetAndMetadata; import org.apache.kafka.clients.producer.KafkaProducer; @@ -37,6 +23,13 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.header.internals.RecordHeader; +import java.time.Duration; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Future; + /** * Kafka client factory for the default version of Kafka client. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/saslplain/SaslPlainEndToEndTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/saslplain/SaslPlainEndToEndTest.java index 381efe9c06..718ace62ac 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/saslplain/SaslPlainEndToEndTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/saslplain/SaslPlainEndToEndTest.java @@ -13,43 +13,12 @@ */ package io.streamnative.pulsar.handlers.kop.compatibility.saslplain; -import static org.mockito.Mockito.spy; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; - import com.google.common.collect.Sets; import io.jsonwebtoken.SignatureAlgorithm; -import io.streamnative.kafka.client.api.Consumer; -import io.streamnative.kafka.client.api.ConsumerConfiguration; -import io.streamnative.kafka.client.api.ConsumerRecord; -import io.streamnative.kafka.client.api.Header; -import io.streamnative.kafka.client.api.KafkaClientFactory; -import io.streamnative.kafka.client.api.KafkaClientFactoryImpl; -import io.streamnative.kafka.client.api.KafkaVersion; -import io.streamnative.kafka.client.api.Producer; -import io.streamnative.kafka.client.api.ProducerConfiguration; -import io.streamnative.kafka.client.api.RecordMetadata; +import io.streamnative.kafka.client.api.*; import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.compatibility.DefaultKafkaClientFactory; -import java.io.File; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Properties; -import java.util.TreeMap; -import java.util.concurrent.ExecutionException; -import java.util.stream.Collectors; -import javax.crypto.SecretKey; -import javax.security.auth.login.Configuration; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.common.PartitionInfo; @@ -65,6 +34,19 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import javax.crypto.SecretKey; +import javax.security.auth.login.Configuration; +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.*; +import java.util.concurrent.ExecutionException; +import java.util.stream.Collectors; + +import static org.mockito.Mockito.spy; +import static org.testng.Assert.*; + @Slf4j public class SaslPlainEndToEndTest extends KopProtocolHandlerTestBase { private static final String SIMPLE_USER = "muggle_user"; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/CompactedPartitionedTopicTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/CompactedPartitionedTopicTest.java index 6afdaf5080..3e8ae862b5 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/CompactedPartitionedTopicTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/CompactedPartitionedTopicTest.java @@ -17,23 +17,6 @@ import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.coordinator.group.OffsetConfig; import io.streamnative.pulsar.handlers.kop.utils.CoreUtils; -import java.nio.ByteBuffer; -import java.time.Duration; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Callable; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.IntStream; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.admin.LongRunningProcessStatus; @@ -46,6 +29,13 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import java.nio.ByteBuffer; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.IntStream; + @Slf4j public class CompactedPartitionedTopicTest extends KopProtocolHandlerTestBase { diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupCoordinatorTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupCoordinatorTest.java index 105958975d..6121986bc1 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupCoordinatorTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupCoordinatorTest.java @@ -13,12 +13,6 @@ */ package io.streamnative.pulsar.handlers.kop.coordinator.group; -import static org.mockito.Mockito.spy; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotEquals; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -30,16 +24,6 @@ import io.streamnative.pulsar.handlers.kop.offset.OffsetAndMetadata; import io.streamnative.pulsar.handlers.kop.utils.delayed.DelayedOperationPurgatory; import io.streamnative.pulsar.handlers.kop.utils.timer.MockTimer; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import java.util.stream.Collectors; import org.apache.bookkeeper.common.util.OrderedScheduler; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.internals.Topic; @@ -51,11 +35,17 @@ import org.apache.kafka.common.requests.TransactionResult; import org.apache.pulsar.client.api.PulsarClientException; import org.apache.pulsar.common.schema.KeyValue; -import org.testng.annotations.AfterClass; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; +import org.testng.annotations.*; + +import java.util.Optional; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.stream.Collectors; + +import static org.mockito.Mockito.spy; +import static org.testng.Assert.*; /** * Unit test {@link GroupCoordinator}. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupMetadataManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupMetadataManagerTest.java index aadfb3322a..6fc19fe3db 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupMetadataManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupMetadataManagerTest.java @@ -13,25 +13,6 @@ */ package io.streamnative.pulsar.handlers.kop.coordinator.group; -import static io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadataConstants.groupMetadataKey; -import static io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadataConstants.groupMetadataValue; -import static io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadataConstants.offsetCommitKey; -import static io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadataConstants.offsetCommitValue; -import static io.streamnative.pulsar.handlers.kop.coordinator.group.GroupState.Empty; -import static io.streamnative.pulsar.handlers.kop.coordinator.group.GroupState.PreparingRebalance; -import static io.streamnative.pulsar.handlers.kop.coordinator.group.GroupState.Stable; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.spy; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertSame; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -46,52 +27,39 @@ import io.streamnative.pulsar.handlers.kop.offset.OffsetAndMetadata; import io.streamnative.pulsar.handlers.kop.utils.KopTopic; import io.streamnative.pulsar.handlers.kop.utils.timer.MockTime; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicReference; -import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.common.util.MathUtils; import org.apache.bookkeeper.common.util.OrderedScheduler; import org.apache.bookkeeper.mledger.impl.PositionImpl; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.protocol.Errors; -import org.apache.kafka.common.record.AbstractRecords; import org.apache.kafka.common.record.CompressionType; -import org.apache.kafka.common.record.ControlRecordType; -import org.apache.kafka.common.record.EndTransactionMarker; -import org.apache.kafka.common.record.MemoryRecords; -import org.apache.kafka.common.record.MemoryRecordsBuilder; import org.apache.kafka.common.record.Record; -import org.apache.kafka.common.record.RecordBatch; -import org.apache.kafka.common.record.SimpleRecord; -import org.apache.kafka.common.record.TimestampType; +import org.apache.kafka.common.record.*; import org.apache.kafka.common.requests.OffsetFetchResponse; import org.apache.kafka.common.requests.OffsetFetchResponse.PartitionData; import org.apache.kafka.common.utils.Time; import org.apache.pulsar.client.admin.PulsarAdminException; -import org.apache.pulsar.client.api.Consumer; -import org.apache.pulsar.client.api.Message; -import org.apache.pulsar.client.api.MessageId; -import org.apache.pulsar.client.api.ProducerBuilder; -import org.apache.pulsar.client.api.PulsarClientException; -import org.apache.pulsar.client.api.ReaderBuilder; -import org.apache.pulsar.client.api.Schema; -import org.apache.pulsar.client.api.SubscriptionInitialPosition; -import org.testng.annotations.AfterClass; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; +import org.apache.pulsar.client.api.*; +import org.testng.annotations.*; + +import java.nio.ByteBuffer; +import java.util.Optional; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; + +import static io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadataConstants.*; +import static io.streamnative.pulsar.handlers.kop.coordinator.group.GroupState.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.spy; +import static org.testng.Assert.*; /** * Unit test {@link GroupMetadataManager}. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/ProducerIdManagerImplTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/ProducerIdManagerImplTest.java index 3f7a3ddca5..6aeca63186 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/ProducerIdManagerImplTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/ProducerIdManagerImplTest.java @@ -13,12 +13,7 @@ */ package io.streamnative.pulsar.handlers.kop.coordinator.transaction; -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.fail; - import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; -import java.util.Optional; -import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; import org.testng.Assert; import org.testng.annotations.AfterClass; @@ -26,6 +21,12 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import java.util.Optional; +import java.util.concurrent.TimeUnit; + +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.fail; + /** * Producer id manager test. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/PulsarStorageProducerIdManagerImplTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/PulsarStorageProducerIdManagerImplTest.java index 6c2bef215e..8ec9dc5949 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/PulsarStorageProducerIdManagerImplTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/PulsarStorageProducerIdManagerImplTest.java @@ -13,15 +13,7 @@ */ package io.streamnative.pulsar.handlers.kop.coordinator.transaction; -import static org.testng.Assert.assertTrue; -import static org.testng.AssertJUnit.assertEquals; - import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; -import java.util.HashSet; -import java.util.List; -import java.util.Random; -import java.util.Set; -import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.reflect.MethodUtils; import org.apache.pulsar.common.policies.data.InactiveTopicDeleteMode; @@ -33,6 +25,15 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import java.util.HashSet; +import java.util.List; +import java.util.Random; +import java.util.Set; +import java.util.concurrent.TimeUnit; + +import static org.testng.Assert.assertTrue; +import static org.testng.AssertJUnit.assertEquals; + /** * Producer id manager test. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionCoordinatorTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionCoordinatorTest.java index a9652d7330..3b5f78fb7f 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionCoordinatorTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionCoordinatorTest.java @@ -13,21 +13,6 @@ */ package io.streamnative.pulsar.handlers.kop.coordinator.transaction; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.internal.verification.VerificationModeFactory.atLeastOnce; -import static org.testng.Assert.assertNotEquals; -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertFalse; -import static org.testng.AssertJUnit.assertNotNull; -import static org.testng.AssertJUnit.assertTrue; - import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import io.streamnative.pulsar.handlers.kop.KafkaProtocolHandler; @@ -36,15 +21,6 @@ import io.streamnative.pulsar.handlers.kop.storage.MemoryProducerStateManagerSnapshotBuffer; import io.streamnative.pulsar.handlers.kop.utils.ProducerIdAndEpoch; import io.streamnative.pulsar.handlers.kop.utils.timer.MockTime; -import java.util.Collections; -import java.util.Optional; -import java.util.Set; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; -import java.util.function.Consumer; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.common.util.OrderedScheduler; import org.apache.curator.shaded.com.google.common.collect.Lists; @@ -59,6 +35,22 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import java.util.Collections; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import java.util.function.Consumer; + +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; +import static org.mockito.internal.verification.VerificationModeFactory.atLeastOnce; +import static org.testng.Assert.assertNotEquals; +import static org.testng.AssertJUnit.*; + /** * Unit test {@link TransactionCoordinator}. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionLogTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionLogTest.java index 0833728dca..8d071f2de1 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionLogTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionLogTest.java @@ -13,15 +13,7 @@ */ package io.streamnative.pulsar.handlers.kop.coordinator.transaction; -import static org.testng.AssertJUnit.assertEquals; - import com.google.common.collect.Lists; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.record.RecordBatch; import org.apache.pulsar.client.api.Message; @@ -33,6 +25,11 @@ import org.testng.annotations.Test; import org.testng.collections.Maps; +import java.nio.ByteBuffer; +import java.util.*; + +import static org.testng.AssertJUnit.assertEquals; + /** * Transaction log test. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionMarkerChannelManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionMarkerChannelManagerTest.java index e26268f5a9..827ce5443e 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionMarkerChannelManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionMarkerChannelManagerTest.java @@ -13,21 +13,12 @@ */ package io.streamnative.pulsar.handlers.kop.coordinator.transaction; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; -import static org.testng.Assert.assertEquals; - import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; import io.streamnative.pulsar.handlers.kop.KopBrokerLookupManager; import io.streamnative.pulsar.handlers.kop.scala.Either; import io.streamnative.pulsar.handlers.kop.utils.timer.MockTime; -import java.util.Optional; -import java.util.Set; -import java.util.concurrent.CompletableFuture; import org.apache.bookkeeper.common.util.OrderedScheduler; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.record.RecordBatch; @@ -37,6 +28,14 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.CompletableFuture; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; +import static org.testng.Assert.assertEquals; + /** * Unit test {@link TransactionMarkerChannelManager}. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionStateManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionStateManagerTest.java index 8feaeb5d52..a8f7ac0fcf 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionStateManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionStateManagerTest.java @@ -13,49 +13,36 @@ */ package io.streamnative.pulsar.handlers.kop.coordinator.transaction; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.spy; -import static org.testng.Assert.assertNotNull; -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertFalse; -import static org.testng.AssertJUnit.assertTrue; -import static org.testng.AssertJUnit.fail; - import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.SystemTopicClient; import io.streamnative.pulsar.handlers.kop.utils.MetadataUtils; import io.streamnative.pulsar.handlers.kop.utils.timer.MockTime; -import java.nio.ByteBuffer; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.CompletableFuture; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.common.util.OrderedScheduler; import org.apache.kafka.common.protocol.Errors; import org.apache.pulsar.client.admin.LongRunningProcessStatus; import org.apache.pulsar.client.admin.PulsarAdminException; -import org.apache.pulsar.client.api.Message; -import org.apache.pulsar.client.api.MessageId; -import org.apache.pulsar.client.api.Producer; -import org.apache.pulsar.client.api.Reader; -import org.apache.pulsar.client.api.Schema; +import org.apache.pulsar.client.api.*; import org.apache.pulsar.common.naming.TopicName; import org.awaitility.Awaitility; import org.mockito.ArgumentCaptor; import org.testng.Assert; -import org.testng.annotations.AfterClass; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; +import org.testng.annotations.*; import org.testng.collections.Maps; +import java.nio.ByteBuffer; +import java.util.Optional; +import java.util.*; +import java.util.concurrent.CompletableFuture; + +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.spy; +import static org.testng.Assert.assertNotNull; +import static org.testng.AssertJUnit.*; + /** * Unit test {@link TransactionStateManager}. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionWithOAuthBearerAuthTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionWithOAuthBearerAuthTest.java index 1f625638b1..029fd06c52 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionWithOAuthBearerAuthTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionWithOAuthBearerAuthTest.java @@ -17,9 +17,6 @@ import io.streamnative.pulsar.handlers.kop.security.oauth.HydraOAuthUtils; import io.streamnative.pulsar.handlers.kop.security.oauth.OauthLoginCallbackHandler; import io.streamnative.pulsar.handlers.kop.security.oauth.OauthValidatorCallbackHandler; -import java.net.URL; -import java.util.Properties; - import io.streamnative.pulsar.handlers.kop.security.oauth.SaslOAuthKopHandlersTest; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.broker.authentication.AuthenticationProviderToken; @@ -30,6 +27,9 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import java.net.URL; +import java.util.Properties; + @Slf4j public class TransactionWithOAuthBearerAuthTest extends TransactionTest { diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java index 6493a405aa..cf97c42e80 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java @@ -13,22 +13,7 @@ */ package io.streamnative.pulsar.handlers.kop.e2e; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; - import io.streamnative.kafka.client.api.Header; -import java.nio.charset.StandardCharsets; -import java.time.Duration; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.Future; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - import io.streamnative.pulsar.handlers.kop.KafkaPayloadProcessor; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; @@ -42,15 +27,23 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.header.internals.RecordHeader; import org.apache.pulsar.client.admin.PulsarAdminException; -import org.apache.pulsar.client.api.Consumer; -import org.apache.pulsar.client.api.Message; -import org.apache.pulsar.client.api.MessageId; -import org.apache.pulsar.client.api.Producer; -import org.apache.pulsar.client.api.TypedMessageBuilder; +import org.apache.pulsar.client.api.*; import org.awaitility.Awaitility; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +import java.nio.charset.StandardCharsets; +import java.time.Duration; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Future; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +import static org.testng.Assert.*; + /** * Basic end-to-end test with `entryFormat=kafka`. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndPulsarTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndPulsarTest.java index 62ae9d6668..4e5cc37ad6 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndPulsarTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndPulsarTest.java @@ -13,22 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop.e2e; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - import io.netty.buffer.ByteBuf; import io.streamnative.pulsar.handlers.kop.utils.KopTopic; -import java.time.Duration; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Properties; -import java.util.TreeMap; -import java.util.concurrent.CompletableFuture; -import java.util.stream.Collectors; -import java.util.stream.IntStream; import lombok.Cleanup; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.KafkaConsumer; @@ -41,6 +27,15 @@ import org.apache.pulsar.common.protocol.Markers; import org.testng.annotations.Test; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + /** * Basic end-to-end test with `entryFormat=pulsar`. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndTestBase.java index d2428a1a07..0dcaa727e8 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndTestBase.java @@ -13,23 +13,7 @@ */ package io.streamnative.pulsar.handlers.kop.e2e; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; - import io.streamnative.kafka.client.api.Header; -import java.nio.charset.StandardCharsets; -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Properties; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -43,17 +27,25 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; -import org.apache.pulsar.client.api.Consumer; -import org.apache.pulsar.client.api.Message; -import org.apache.pulsar.client.api.MessageId; -import org.apache.pulsar.client.api.MessagePayloadProcessor; -import org.apache.pulsar.client.api.Producer; -import org.apache.pulsar.client.api.PulsarClientException; -import org.apache.pulsar.client.api.SubscriptionInitialPosition; +import org.apache.pulsar.client.api.*; import org.apache.pulsar.client.impl.MessageIdImpl; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; +import java.nio.charset.StandardCharsets; +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Properties; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; + +import static org.testng.Assert.*; + /** * Basic end-to-end test. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/DistributedClusterTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/DistributedClusterTest.java index e0adfb4b32..d6eaf7e441 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/DistributedClusterTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/DistributedClusterTest.java @@ -13,27 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop.e2e; -import static org.apache.kafka.common.internals.Topic.GROUP_METADATA_TOPIC_NAME; -import static org.apache.pulsar.common.naming.TopicName.PARTITIONED_TOPIC_SUFFIX; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; - import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import java.net.URL; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.time.Duration; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.PortManager; @@ -54,6 +36,22 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import java.net.URL; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.time.Duration; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +import static org.apache.kafka.common.internals.Topic.GROUP_METADATA_TOPIC_NAME; +import static org.apache.pulsar.common.naming.TopicName.PARTITIONED_TOPIC_SUFFIX; +import static org.testng.Assert.*; + /** * Test KoP cluster mode. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderTestBase.java index af5fdd51e9..88dba91c0e 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderTestBase.java @@ -14,21 +14,7 @@ package io.streamnative.pulsar.handlers.kop.e2e; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; - import com.google.common.collect.Sets; -import java.time.Duration; -import java.util.ArrayList; -import java.util.Base64; -import java.util.Collections; -import java.util.List; -import java.util.Properties; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.TimeUnit; - import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; @@ -50,6 +36,13 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; + +import static org.testng.Assert.*; + /** * Unit test for Different kafka produce messages. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaNonPartitionedTopicTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaNonPartitionedTopicTest.java index 8023d8a75a..5f8718b028 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaNonPartitionedTopicTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaNonPartitionedTopicTest.java @@ -14,14 +14,6 @@ package io.streamnative.pulsar.handlers.kop.e2e; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - -import java.time.Duration; -import java.util.Collections; -import java.util.List; -import java.util.Map; - import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import org.apache.kafka.clients.consumer.ConsumerRecord; @@ -33,6 +25,14 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import java.time.Duration; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + /** * Test unit for non-partitioned topic. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java index 062d851641..3b1fff0045 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java @@ -14,24 +14,6 @@ package io.streamnative.pulsar.handlers.kop.e2e; -import static org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedLedgerInfo.LedgerInfo; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; - -import java.lang.reflect.Field; -import java.time.Duration; -import java.util.ArrayList; -import java.util.Base64; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; @@ -56,6 +38,16 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import java.lang.reflect.Field; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +import static org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedLedgerInfo.LedgerInfo; +import static org.testng.Assert.*; + /** * Unit test for Different kafka produce messages. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/PerTopicConfigurationTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/PerTopicConfigurationTest.java index de8675bb25..d1733c5354 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/PerTopicConfigurationTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/PerTopicConfigurationTest.java @@ -13,18 +13,6 @@ */ package io.streamnative.pulsar.handlers.kop.e2e; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNull; - -import java.time.Duration; -import java.util.Base64; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; @@ -40,6 +28,18 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +import java.time.Duration; +import java.util.Base64; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; + /** * Unit test for custom topic configuration. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/format/EntryFormatterTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/format/EntryFormatterTestBase.java index 278e1865f9..cf328be947 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/format/EntryFormatterTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/format/EntryFormatterTestBase.java @@ -14,8 +14,6 @@ package io.streamnative.pulsar.handlers.kop.format; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; -import java.time.Duration; -import java.util.Collections; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.clients.producer.KafkaProducer; @@ -24,6 +22,9 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; +import java.time.Duration; +import java.util.Collections; + public class EntryFormatterTestBase extends KopProtocolHandlerTestBase { private static final String group1 = "test-format-group1"; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/DifferentNamespaceTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/DifferentNamespaceTest.java index cb609fb908..8a7a597ea5 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/DifferentNamespaceTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/DifferentNamespaceTest.java @@ -13,42 +13,25 @@ */ package io.streamnative.pulsar.handlers.kop.metadata; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - import com.google.common.collect.Sets; -import java.time.Duration; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; -import org.apache.kafka.clients.admin.AdminClient; -import org.apache.kafka.clients.admin.AdminClientConfig; -import org.apache.kafka.clients.admin.ListTopicsOptions; -import org.apache.kafka.clients.admin.ListTopicsResult; -import org.apache.kafka.clients.admin.NewTopic; -import org.apache.kafka.clients.admin.TopicListing; +import org.apache.kafka.clients.admin.*; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.internals.Topic; import org.apache.pulsar.common.policies.data.TenantInfo; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; +import org.testng.annotations.*; + +import java.time.Duration; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; /** * test topics in different namespaces. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/MetadataInitTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/MetadataInitTest.java index 35af8d5b9b..308f3e1f58 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/MetadataInitTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/MetadataInitTest.java @@ -13,19 +13,10 @@ */ package io.streamnative.pulsar.handlers.kop.metadata; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertThrows; - import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.PortManager; import io.streamnative.pulsar.handlers.kop.utils.MetadataUtils; -import java.net.URISyntaxException; -import java.net.URL; -import java.nio.file.Paths; -import java.util.Collections; -import java.util.Optional; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.broker.PulsarService; import org.apache.pulsar.client.admin.PulsarAdmin; @@ -36,6 +27,14 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.file.Paths; +import java.util.Collections; +import java.util.Optional; + +import static org.testng.Assert.*; + @Slf4j public class MetadataInitTest extends KopProtocolHandlerTestBase { diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/IdempotentProducerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/IdempotentProducerTest.java index 9f0607d260..34d011e424 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/IdempotentProducerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/IdempotentProducerTest.java @@ -13,13 +13,6 @@ */ package io.streamnative.pulsar.handlers.kop.producer; -import static org.testng.Assert.assertEquals; - -import java.time.Duration; -import java.util.Collections; -import java.util.Properties; -import java.util.concurrent.ExecutionException; - import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecords; @@ -34,6 +27,13 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +import java.time.Duration; +import java.util.Collections; +import java.util.Properties; +import java.util.concurrent.ExecutionException; + +import static org.testng.Assert.assertEquals; + /** * Idempotent producer test. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/InnerTopicProtectionTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/InnerTopicProtectionTest.java index f2d542e7cf..5208c79fcc 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/InnerTopicProtectionTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/InnerTopicProtectionTest.java @@ -14,12 +14,6 @@ package io.streamnative.pulsar.handlers.kop.producer; import com.google.common.collect.Sets; -import java.net.URL; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Optional; -import java.util.Properties; - import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; @@ -36,6 +30,12 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import java.net.URL; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Optional; +import java.util.Properties; + /** * Inner topic protection test. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishBufferThrottleTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishBufferThrottleTestBase.java index 56ff5326e0..2a67fcc81d 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishBufferThrottleTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishBufferThrottleTestBase.java @@ -13,15 +13,6 @@ */ package io.streamnative.pulsar.handlers.kop.producer; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Mockito.mockStatic; - -import java.util.Properties; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; - import io.streamnative.pulsar.handlers.kop.KafkaRequestHandler; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.extern.slf4j.Slf4j; @@ -35,6 +26,15 @@ import org.testng.Assert; import org.testng.annotations.Test; +import java.util.Properties; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.mockStatic; + /** * Test class for message publish buffer throttle from kop side. * */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishThrottlingTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishThrottlingTest.java index 132237e5f7..a062e7883c 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishThrottlingTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishThrottlingTest.java @@ -14,19 +14,7 @@ package io.streamnative.pulsar.handlers.kop.producer; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotEquals; -import static org.testng.Assert.assertTrue; - import com.google.common.collect.Sets; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; @@ -47,6 +35,16 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +import static org.testng.Assert.*; + /** * Test KoP message publish throttling. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/PulsarSchemaStorageTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/PulsarSchemaStorageTest.java index 0b70ab9cd4..940c002cb5 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/PulsarSchemaStorageTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/PulsarSchemaStorageTest.java @@ -13,21 +13,22 @@ */ package io.streamnative.pulsar.handlers.kop.schemaregistry.model.impl; -import static org.testng.Assert.assertEquals; - import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.schemaregistry.model.CompatibilityChecker; import io.streamnative.pulsar.handlers.kop.schemaregistry.model.Schema; import io.streamnative.pulsar.handlers.kop.schemaregistry.model.SchemaStorage; import io.streamnative.pulsar.handlers.kop.schemaregistry.model.SchemaStorageAccessor; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.CompletableFuture; import lombok.extern.slf4j.Slf4j; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.CompletableFuture; + +import static org.testng.Assert.assertEquals; + @Slf4j public class PulsarSchemaStorageTest extends KopProtocolHandlerTestBase { diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRegistryTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRegistryTest.java index b75646c13a..27e0f62e76 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRegistryTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRegistryTest.java @@ -13,24 +13,12 @@ */ package io.streamnative.pulsar.handlers.kop.schemaregistry.model.impl; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; - import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient; import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException; import io.confluent.kafka.serializers.AbstractKafkaAvroSerDe; import io.confluent.kafka.serializers.KafkaAvroDeserializer; import io.confluent.kafka.serializers.KafkaAvroSerializer; import io.confluent.kafka.serializers.KafkaAvroSerializerConfig; -import java.lang.reflect.Field; -import java.time.Duration; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; -import java.util.concurrent.TimeUnit; - import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; @@ -50,6 +38,16 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import java.lang.reflect.Field; +import java.time.Duration; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; +import java.util.concurrent.TimeUnit; + +import static org.testng.Assert.*; + /** * Test for KoP with Confluent Schema Registry. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRestApiTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRestApiTest.java index 6dfe672f58..5ef4a93250 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRestApiTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRestApiTest.java @@ -13,15 +13,16 @@ */ package io.streamnative.pulsar.handlers.kop.schemaregistry.model.impl; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; - import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.schemaregistry.model.Schema; import io.streamnative.pulsar.handlers.kop.schemaregistry.resources.SubjectResource; +import lombok.Cleanup; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -31,10 +32,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import lombok.Cleanup; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; + +import static org.testng.Assert.*; /** * Test the Schema related REST APIs. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaStorageTestsBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaStorageTestsBase.java index a1e0ac7871..87aaf12a72 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaStorageTestsBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaStorageTestsBase.java @@ -13,22 +13,19 @@ */ package io.streamnative.pulsar.handlers.kop.schemaregistry.model.impl; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotEquals; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.expectThrows; - import io.streamnative.pulsar.handlers.kop.schemaregistry.model.CompatibilityChecker; import io.streamnative.pulsar.handlers.kop.schemaregistry.model.Schema; import io.streamnative.pulsar.handlers.kop.schemaregistry.model.SchemaStorage; import io.streamnative.pulsar.handlers.kop.schemaregistry.model.SchemaStorageAccessor; -import java.util.List; -import java.util.concurrent.ExecutionException; import lombok.AllArgsConstructor; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; +import java.util.List; +import java.util.concurrent.ExecutionException; + +import static org.testng.Assert.*; + @AllArgsConstructor public class SchemaStorageTestsBase { private SchemaStorageAccessor storageAccessor; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelTest.java index feaaf8504c..7da8f13475 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelTest.java @@ -13,17 +13,6 @@ */ package io.streamnative.pulsar.handlers.kop.security; -import static java.nio.charset.StandardCharsets.UTF_8; -import static org.testng.AssertJUnit.assertFalse; - -import java.io.Closeable; -import java.time.Duration; -import java.time.temporal.ChronoUnit; -import java.util.Collections; -import java.util.Properties; -import java.util.concurrent.atomic.AtomicInteger; -import javax.net.ssl.HostnameVerifier; - import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.Getter; @@ -45,6 +34,17 @@ import org.testng.annotations.Factory; import org.testng.annotations.Test; +import javax.net.ssl.HostnameVerifier; +import java.io.Closeable; +import java.time.Duration; +import java.time.temporal.ChronoUnit; +import java.util.Collections; +import java.util.Properties; +import java.util.concurrent.atomic.AtomicInteger; + +import static java.nio.charset.StandardCharsets.UTF_8; +import static org.testng.AssertJUnit.assertFalse; + /** * Validate Kafka SSL channel config. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelWithClientAuthTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelWithClientAuthTest.java index 37ee221de2..6211b2ba33 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelWithClientAuthTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelWithClientAuthTest.java @@ -13,12 +13,6 @@ */ package io.streamnative.pulsar.handlers.kop.security; -import static java.nio.charset.StandardCharsets.UTF_8; - -import java.io.Closeable; -import java.util.Properties; -import javax.net.ssl.HostnameVerifier; - import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; @@ -34,6 +28,12 @@ import org.testng.annotations.Factory; import org.testng.annotations.Test; +import javax.net.ssl.HostnameVerifier; +import java.io.Closeable; +import java.util.Properties; + +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Validate Kafka SSL channel config. * Similar to KafkaSSLChannelTest, except the setKopSslClientAuth is set as required. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainTestBase.java index 2582bc8dc0..8325acfe1c 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainTestBase.java @@ -13,25 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop.security; -import static org.mockito.Mockito.spy; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; - import com.google.common.collect.Sets; import io.jsonwebtoken.SignatureAlgorithm; -import java.time.Duration; -import java.time.temporal.ChronoUnit; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Properties; -import java.util.UUID; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.atomic.AtomicInteger; -import javax.crypto.SecretKey; - import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; @@ -58,6 +41,16 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import javax.crypto.SecretKey; +import java.time.Duration; +import java.time.temporal.ChronoUnit; +import java.util.*; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.atomic.AtomicInteger; + +import static org.mockito.Mockito.spy; +import static org.testng.Assert.*; + /** * Testing the SASL-PLAIN features on KoP. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/DelayAuthorizationFailedCloseTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/DelayAuthorizationFailedCloseTest.java index 92c8dae2fb..cac3e24c33 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/DelayAuthorizationFailedCloseTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/DelayAuthorizationFailedCloseTest.java @@ -13,20 +13,10 @@ */ package io.streamnative.pulsar.handlers.kop.security.auth; -import static org.mockito.Mockito.spy; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; - import com.google.common.collect.Sets; import io.jsonwebtoken.SignatureAlgorithm; import io.streamnative.kafka.client.api.KafkaVersion; import io.streamnative.kafka.client.api.ProducerConfiguration; -import java.io.IOException; -import java.net.InetSocketAddress; -import java.util.Optional; -import java.util.Properties; -import javax.crypto.SecretKey; - import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.ClientUtils; @@ -52,6 +42,16 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import javax.crypto.SecretKey; +import java.io.IOException; +import java.net.InetSocketAddress; +import java.util.Optional; +import java.util.Properties; + +import static org.mockito.Mockito.spy; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; + /** * Test delay close handler when authorization failed. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationKafkaMultitenantTenantMetadataTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationKafkaMultitenantTenantMetadataTest.java index ebb18d256d..1c00eac477 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationKafkaMultitenantTenantMetadataTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationKafkaMultitenantTenantMetadataTest.java @@ -13,11 +13,11 @@ */ package io.streamnative.pulsar.handlers.kop.security.auth; -import static org.testng.Assert.assertFalse; - import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import static org.testng.Assert.assertFalse; + /** * Unit test for Authorization with `KafkaEnableMultiTenantMetadata` = false. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationMockTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationMockTest.java index 4f14de7b54..e3f510e4d0 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationMockTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationMockTest.java @@ -13,21 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop.security.auth; -import static org.mockito.Mockito.spy; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - import com.google.common.collect.Sets; import io.jsonwebtoken.SignatureAlgorithm; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; -import io.streamnative.pulsar.handlers.kop.security.auth.KafkaMockAuthorizationProvider; -import java.time.Duration; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Properties; -import javax.crypto.SecretKey; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.producer.ProducerRecord; @@ -41,6 +29,14 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import javax.crypto.SecretKey; +import java.time.Duration; +import java.util.*; + +import static org.mockito.Mockito.spy; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + /** * Unit test for Authorization with `entryFormat=pulsar`. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationTestBase.java index adf5811387..b6433f69b3 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationTestBase.java @@ -13,13 +13,6 @@ */ package io.streamnative.pulsar.handlers.kop.security.auth; -import static org.mockito.Mockito.spy; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; -import static org.testng.AssertJUnit.fail; - import com.google.common.collect.Sets; import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException; import io.confluent.kafka.serializers.KafkaAvroDeserializer; @@ -27,16 +20,6 @@ import io.confluent.kafka.serializers.KafkaAvroSerializerConfig; import io.jsonwebtoken.SignatureAlgorithm; import io.netty.handler.codec.http.HttpResponseStatus; -import java.time.Duration; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.ExecutionException; -import javax.crypto.SecretKey; - import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; @@ -44,14 +27,7 @@ import org.apache.avro.generic.GenericData; import org.apache.avro.generic.GenericRecord; import org.apache.avro.generic.IndexedRecord; -import org.apache.kafka.clients.admin.AdminClient; -import org.apache.kafka.clients.admin.AdminClientConfig; -import org.apache.kafka.clients.admin.Config; -import org.apache.kafka.clients.admin.CreateTopicsResult; -import org.apache.kafka.clients.admin.DeleteTopicsResult; -import org.apache.kafka.clients.admin.DescribeConfigsResult; -import org.apache.kafka.clients.admin.ListTopicsResult; -import org.apache.kafka.clients.admin.NewTopic; +import org.apache.kafka.clients.admin.*; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; @@ -77,6 +53,15 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +import javax.crypto.SecretKey; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.ExecutionException; + +import static org.mockito.Mockito.spy; +import static org.testng.Assert.*; +import static org.testng.AssertJUnit.fail; + /** * Unit test for KoP enable authorization. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaMockAuthorizationProvider.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaMockAuthorizationProvider.java index 574bf352ac..6d2b122635 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaMockAuthorizationProvider.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaMockAuthorizationProvider.java @@ -13,23 +13,18 @@ */ package io.streamnative.pulsar.handlers.kop.security.auth; -import java.util.Set; -import java.util.concurrent.CompletableFuture; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.broker.ServiceConfiguration; import org.apache.pulsar.broker.authentication.AuthenticationDataSource; import org.apache.pulsar.broker.authorization.AuthorizationProvider; import org.apache.pulsar.common.naming.NamespaceName; import org.apache.pulsar.common.naming.TopicName; -import org.apache.pulsar.common.policies.data.AuthAction; -import org.apache.pulsar.common.policies.data.NamespaceOperation; -import org.apache.pulsar.common.policies.data.PolicyName; -import org.apache.pulsar.common.policies.data.PolicyOperation; -import org.apache.pulsar.common.policies.data.TenantInfo; -import org.apache.pulsar.common.policies.data.TenantOperation; -import org.apache.pulsar.common.policies.data.TopicOperation; +import org.apache.pulsar.common.policies.data.*; import org.testng.Assert; +import java.util.Set; +import java.util.concurrent.CompletableFuture; + @Slf4j public class KafkaMockAuthorizationProvider implements AuthorizationProvider { diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/SimpleAclAuthorizerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/SimpleAclAuthorizerTest.java index 593e1e0596..ee6c703579 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/SimpleAclAuthorizerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/SimpleAclAuthorizerTest.java @@ -14,19 +14,10 @@ package io.streamnative.pulsar.handlers.kop.security.auth; -import static org.mockito.Mockito.spy; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; - import com.google.common.collect.Sets; import io.jsonwebtoken.SignatureAlgorithm; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.security.KafkaPrincipal; -import java.util.Collections; -import java.util.Optional; -import java.util.Properties; -import java.util.concurrent.ExecutionException; -import javax.crypto.SecretKey; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.broker.ServiceConfiguration; import org.apache.pulsar.broker.authentication.AuthenticationDataCommand; @@ -41,6 +32,16 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import javax.crypto.SecretKey; +import java.util.Collections; +import java.util.Optional; +import java.util.Properties; +import java.util.concurrent.ExecutionException; + +import static org.mockito.Mockito.spy; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; + /** * Test SimpleAclAuthorizer. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/CustomOAuthBearerCallbackHandlerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/CustomOAuthBearerCallbackHandlerTest.java index 9ae1ed5ab0..83274f9f4f 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/CustomOAuthBearerCallbackHandlerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/CustomOAuthBearerCallbackHandlerTest.java @@ -13,26 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop.security.oauth; -import static org.mockito.Mockito.spy; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - import com.google.common.collect.Sets; import io.jsonwebtoken.SignatureAlgorithm; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; -import io.streamnative.pulsar.handlers.kop.security.oauth.KopOAuthBearerToken; -import io.streamnative.pulsar.handlers.kop.security.oauth.KopOAuthBearerValidatorCallback; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import javax.crypto.SecretKey; -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.UnsupportedCallbackException; -import javax.security.auth.login.AppConfigurationEntry; import lombok.Cleanup; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerRecord; @@ -49,6 +32,17 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import javax.crypto.SecretKey; +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.UnsupportedCallbackException; +import javax.security.auth.login.AppConfigurationEntry; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; + +import static org.mockito.Mockito.spy; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + /** * Test custom AuthenticateCallbackHandler for OAUTHBEARER. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/HydraOAuthUtils.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/HydraOAuthUtils.java index 02bd8e1330..80e3f70813 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/HydraOAuthUtils.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/HydraOAuthUtils.java @@ -20,6 +20,11 @@ import io.fusionauth.jwks.domain.JSONWebKey; import io.jsonwebtoken.SignatureAlgorithm; import io.jsonwebtoken.security.Keys; +import sh.ory.hydra.ApiException; +import sh.ory.hydra.api.AdminApi; +import sh.ory.hydra.model.JSONWebKeySet; +import sh.ory.hydra.model.OAuth2Client; + import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -28,10 +33,6 @@ import java.util.Arrays; import java.util.Base64; import java.util.Collections; -import sh.ory.hydra.ApiException; -import sh.ory.hydra.api.AdminApi; -import sh.ory.hydra.model.JSONWebKeySet; -import sh.ory.hydra.model.OAuth2Client; /** * The Hydra OAuth utils. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/OauthValidatorCallbackHandlerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/OauthValidatorCallbackHandlerTest.java index 85becdcd1c..31cc537cd2 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/OauthValidatorCallbackHandlerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/OauthValidatorCallbackHandlerTest.java @@ -13,22 +13,21 @@ */ package io.streamnative.pulsar.handlers.kop.security.oauth; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNull; - -import java.util.HashMap; -import java.util.concurrent.CompletableFuture; -import javax.naming.AuthenticationException; import org.apache.pulsar.broker.authentication.AuthenticationProvider; import org.apache.pulsar.broker.authentication.AuthenticationService; import org.apache.pulsar.broker.authentication.AuthenticationState; import org.testng.annotations.Test; +import javax.naming.AuthenticationException; +import java.util.HashMap; +import java.util.concurrent.CompletableFuture; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; + /** * Unit test for {@link OauthValidatorCallbackHandler}. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthBearerTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthBearerTestBase.java index 976d62ef17..7d666dbe9c 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthBearerTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthBearerTestBase.java @@ -13,17 +13,6 @@ */ package io.streamnative.pulsar.handlers.kop.security.oauth; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Properties; -import java.util.concurrent.ExecutionException; - import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; @@ -35,6 +24,15 @@ import org.apache.kafka.clients.producer.RecordMetadata; import org.apache.kafka.common.errors.TimeoutException; +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Properties; +import java.util.concurrent.ExecutionException; + +import static org.testng.Assert.*; + /** * Base class for SASL-OAUTHBEARER tests. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthDefaultHandlersTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthDefaultHandlersTest.java index 8c36cf4f91..2612ed60ec 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthDefaultHandlersTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthDefaultHandlersTest.java @@ -13,13 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop.security.oauth; -import static org.mockito.Mockito.spy; - import com.google.common.collect.Sets; import io.jsonwebtoken.SignatureAlgorithm; -import java.util.Optional; -import java.util.Properties; -import javax.crypto.SecretKey; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.broker.authentication.AuthenticationProviderToken; import org.apache.pulsar.broker.authentication.utils.AuthTokenUtils; @@ -30,6 +25,12 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import javax.crypto.SecretKey; +import java.util.Optional; +import java.util.Properties; + +import static org.mockito.Mockito.spy; + /** * Testing the SASL-OAUTHBEARER features on KoP with default login and validate callback handlers. * diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersTest.java index 6c9a1e19de..ec7f6ee60b 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersTest.java @@ -13,29 +13,7 @@ */ package io.streamnative.pulsar.handlers.kop.security.oauth; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.when; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotEquals; -import static org.testng.Assert.assertTrue; - import com.google.common.collect.Sets; - -import java.io.IOException; -import java.net.URL; -import java.time.Duration; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Properties; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; -import javax.naming.AuthenticationException; -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.UnsupportedCallbackException; -import javax.security.auth.login.LoginException; import lombok.Cleanup; import lombok.SneakyThrows; import org.apache.kafka.clients.consumer.ConsumerRecords; @@ -64,6 +42,20 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import javax.naming.AuthenticationException; +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.UnsupportedCallbackException; +import javax.security.auth.login.LoginException; +import java.io.IOException; +import java.net.URL; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; + +import static org.mockito.Mockito.*; +import static org.testng.Assert.*; + /** * Testing the SASL-OAUTHBEARER features on KoP with KoP's own login callback handler and server callback handler. * diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersWithMultiTenantTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersWithMultiTenantTest.java index a291706309..f38b666058 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersWithMultiTenantTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersWithMultiTenantTest.java @@ -13,17 +13,7 @@ */ package io.streamnative.pulsar.handlers.kop.security.oauth; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; - import com.google.common.collect.Sets; - -import java.net.URL; -import java.time.Duration; -import java.util.Collections; -import java.util.Properties; -import java.util.concurrent.ExecutionException; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.KafkaConsumer; @@ -42,6 +32,14 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import java.net.URL; +import java.time.Duration; +import java.util.Collections; +import java.util.Properties; +import java.util.concurrent.ExecutionException; + +import static org.testng.Assert.*; + @Slf4j public class SaslOAuthKopHandlersWithMultiTenantTest extends SaslOAuthBearerTestBase { diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PartitionLogTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PartitionLogTest.java index cce3aac4cb..c4f4eeca51 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PartitionLogTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PartitionLogTest.java @@ -13,28 +13,23 @@ */ package io.streamnative.pulsar.handlers.kop.storage; -import static org.mockito.Mockito.mock; - import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; import io.streamnative.pulsar.handlers.kop.KafkaTopicLookupService; -import java.nio.ByteBuffer; -import java.util.Arrays; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.common.util.OrderedExecutor; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.RecordTooLargeException; -import org.apache.kafka.common.record.CompressionType; -import org.apache.kafka.common.record.ControlRecordType; -import org.apache.kafka.common.record.EndTransactionMarker; -import org.apache.kafka.common.record.MemoryRecords; -import org.apache.kafka.common.record.MemoryRecordsBuilder; -import org.apache.kafka.common.record.RecordBatch; -import org.apache.kafka.common.record.TimestampType; +import org.apache.kafka.common.record.*; import org.apache.kafka.common.utils.Time; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +import java.nio.ByteBuffer; +import java.util.Arrays; + +import static org.mockito.Mockito.mock; + /** * Unit test {@link PartitionLog}. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerSnapshotBufferTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerSnapshotBufferTestBase.java index c77cd45e4b..9fb3985e92 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerSnapshotBufferTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerSnapshotBufferTestBase.java @@ -13,17 +13,10 @@ */ package io.streamnative.pulsar.handlers.kop.storage; -import static org.testng.Assert.assertEquals; - import com.google.common.collect.Lists; import com.google.common.collect.Maps; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.SystemTopicClient; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.TreeMap; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.admin.PulsarAdminException; import org.apache.pulsar.common.naming.TopicName; @@ -31,6 +24,10 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import java.util.*; + +import static org.testng.Assert.assertEquals; + @Slf4j public abstract class ProducerStateManagerSnapshotBufferTestBase extends KopProtocolHandlerTestBase { diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerTest.java index 4459742f13..2772859263 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerTest.java @@ -13,14 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop.storage; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; - import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.utils.timer.MockTime; -import java.util.Collections; -import java.util.Optional; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.InvalidTxnStateException; @@ -29,11 +23,12 @@ import org.apache.kafka.common.record.EndTransactionMarker; import org.apache.kafka.common.record.RecordBatch; import org.mockito.Mockito; -import org.testng.annotations.AfterClass; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; +import org.testng.annotations.*; + +import java.util.Collections; +import java.util.Optional; + +import static org.testng.Assert.*; /** * Producer state manager test. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PulsarTopicProducerStateManagerSnapshotBufferTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PulsarTopicProducerStateManagerSnapshotBufferTest.java index 0a6ee94041..f03cb8ee41 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PulsarTopicProducerStateManagerSnapshotBufferTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PulsarTopicProducerStateManagerSnapshotBufferTest.java @@ -13,17 +13,18 @@ */ package io.streamnative.pulsar.handlers.kop.storage; -import static org.testng.Assert.assertEquals; - import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import lombok.extern.slf4j.Slf4j; +import org.testng.annotations.Test; + import java.nio.ByteBuffer; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.TreeMap; -import lombok.extern.slf4j.Slf4j; -import org.testng.annotations.Test; + +import static org.testng.Assert.assertEquals; /** * Unit test for {@link PulsarTopicProducerStateManagerSnapshotBuffer}. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/GlobalKTableTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/GlobalKTableTest.java index af5869529f..6ee3e9f9a7 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/GlobalKTableTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/GlobalKTableTest.java @@ -13,12 +13,6 @@ */ package io.streamnative.pulsar.handlers.kop.streams; -import static org.testng.Assert.assertEquals; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.Serdes; @@ -26,19 +20,20 @@ import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsBuilder; -import org.apache.kafka.streams.kstream.Consumed; -import org.apache.kafka.streams.kstream.ForeachAction; -import org.apache.kafka.streams.kstream.GlobalKTable; -import org.apache.kafka.streams.kstream.KStream; -import org.apache.kafka.streams.kstream.KeyValueMapper; -import org.apache.kafka.streams.kstream.Materialized; -import org.apache.kafka.streams.kstream.ValueJoiner; +import org.apache.kafka.streams.kstream.*; import org.apache.kafka.streams.state.KeyValueStore; import org.apache.kafka.streams.state.QueryableStoreTypes; import org.apache.kafka.streams.state.ReadOnlyKeyValueStore; import org.apache.kafka.streams.state.Stores; import org.testng.annotations.Test; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import static org.testng.Assert.assertEquals; + /** * Test all available joins of Kafka Streams DSL. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KStreamAggregationTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KStreamAggregationTest.java index b156fb7106..b44c0dd177 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KStreamAggregationTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KStreamAggregationTest.java @@ -13,59 +13,16 @@ */ package io.streamnative.pulsar.handlers.kop.streams; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.is; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; - -import java.time.Duration; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; import lombok.NonNull; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.KafkaConsumer; -import org.apache.kafka.common.serialization.ByteArrayDeserializer; -import org.apache.kafka.common.serialization.Deserializer; -import org.apache.kafka.common.serialization.IntegerDeserializer; -import org.apache.kafka.common.serialization.IntegerSerializer; -import org.apache.kafka.common.serialization.LongDeserializer; -import org.apache.kafka.common.serialization.Serde; -import org.apache.kafka.common.serialization.Serdes; -import org.apache.kafka.common.serialization.StringDeserializer; -import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.serialization.*; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsConfig; -import org.apache.kafka.streams.kstream.Aggregator; -import org.apache.kafka.streams.kstream.Consumed; -import org.apache.kafka.streams.kstream.Initializer; -import org.apache.kafka.streams.kstream.KGroupedStream; -import org.apache.kafka.streams.kstream.KStream; -import org.apache.kafka.streams.kstream.KeyValueMapper; -import org.apache.kafka.streams.kstream.Materialized; -import org.apache.kafka.streams.kstream.Produced; -import org.apache.kafka.streams.kstream.Reducer; -import org.apache.kafka.streams.kstream.Serialized; -import org.apache.kafka.streams.kstream.SessionWindowedDeserializer; -import org.apache.kafka.streams.kstream.SessionWindows; -import org.apache.kafka.streams.kstream.TimeWindowedDeserializer; -import org.apache.kafka.streams.kstream.TimeWindows; -import org.apache.kafka.streams.kstream.Transformer; -import org.apache.kafka.streams.kstream.Windowed; -import org.apache.kafka.streams.kstream.WindowedSerdes; +import org.apache.kafka.streams.kstream.*; import org.apache.kafka.streams.kstream.internals.SessionWindow; import org.apache.kafka.streams.kstream.internals.TimeWindow; import org.apache.kafka.streams.processor.ProcessorContext; @@ -75,6 +32,18 @@ import org.apache.kafka.streams.state.ReadOnlySessionStore; import org.testng.annotations.Test; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; + /** * Tests for KStream aggregation. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KTableTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KTableTest.java index b27b455ee8..4c2968e6fd 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KTableTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KTableTest.java @@ -13,10 +13,6 @@ */ package io.streamnative.pulsar.handlers.kop.streams; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.Serdes; @@ -34,6 +30,11 @@ import org.apache.kafka.streams.state.Stores; import org.testng.annotations.Test; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + /** * Test usage of KTable from the Kafka Streams DSL. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KafkaStreamsTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KafkaStreamsTestBase.java index 88a0ad7db7..36fc50136c 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KafkaStreamsTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KafkaStreamsTestBase.java @@ -15,8 +15,6 @@ import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.utils.timer.MockTime; -import java.util.Properties; -import java.util.concurrent.TimeUnit; import lombok.Getter; import lombok.NonNull; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -28,6 +26,9 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; +import java.util.Properties; +import java.util.concurrent.TimeUnit; + /** * Base test class for tests related to Kafka Streams. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/TestUtils.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/TestUtils.java index e7e0b8723d..053a69cda9 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/TestUtils.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/TestUtils.java @@ -13,40 +13,24 @@ */ package io.streamnative.pulsar.handlers.kop.streams; -import java.io.File; -import java.io.IOException; -import java.nio.file.FileVisitResult; -import java.nio.file.Files; -import java.nio.file.NoSuchFileException; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.SimpleFileVisitor; -import java.nio.file.attribute.BasicFileAttributes; -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Properties; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; import lombok.extern.slf4j.Slf4j; -import org.apache.kafka.clients.consumer.Consumer; -import org.apache.kafka.clients.consumer.ConsumerConfig; -import org.apache.kafka.clients.consumer.ConsumerRecord; -import org.apache.kafka.clients.consumer.ConsumerRecords; -import org.apache.kafka.clients.consumer.KafkaConsumer; -import org.apache.kafka.clients.producer.KafkaProducer; -import org.apache.kafka.clients.producer.Producer; -import org.apache.kafka.clients.producer.ProducerConfig; -import org.apache.kafka.clients.producer.ProducerRecord; -import org.apache.kafka.clients.producer.RecordMetadata; +import org.apache.kafka.clients.consumer.*; +import org.apache.kafka.clients.producer.*; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsConfig; +import java.io.File; +import java.io.IOException; +import java.nio.file.*; +import java.nio.file.attribute.BasicFileAttributes; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; + /** * Util methods for Kafka Streams tests. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/MockTime.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/MockTime.java index aeeecfe862..2060352e1f 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/MockTime.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/MockTime.java @@ -13,12 +13,13 @@ */ package io.streamnative.pulsar.handlers.kop.utils.timer; +import org.apache.kafka.common.errors.TimeoutException; +import org.apache.kafka.common.utils.Time; + import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import java.util.function.Supplier; -import org.apache.kafka.common.errors.TimeoutException; -import org.apache.kafka.common.utils.Time; /** * A clock that you can manually advance by calling sleep. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/MockTimer.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/MockTimer.java index 064404e75f..741dec733f 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/MockTimer.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/MockTimer.java @@ -14,11 +14,12 @@ package io.streamnative.pulsar.handlers.kop.utils.timer; import io.streamnative.pulsar.handlers.kop.utils.timer.TimerTaskList.TimerTaskEntry; -import java.util.Comparator; -import java.util.PriorityQueue; import lombok.Getter; import lombok.experimental.Accessors; +import java.util.Comparator; +import java.util.PriorityQueue; + /** * A mock implementation of {@link Timer}. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/TimerTaskListTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/TimerTaskListTest.java index 588ec9beea..98880bb7d6 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/TimerTaskListTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/TimerTaskListTest.java @@ -13,14 +13,15 @@ */ package io.streamnative.pulsar.handlers.kop.utils.timer; -import static org.testng.Assert.assertEquals; - import io.streamnative.pulsar.handlers.kop.utils.timer.TimerTaskList.TimerTaskEntry; +import org.testng.annotations.Test; + import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.testng.annotations.Test; + +import static org.testng.Assert.assertEquals; /** * Unit test {@link TimerTaskList}. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/TimerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/TimerTest.java index 2a3771f199..c26a829edb 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/TimerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/TimerTest.java @@ -13,11 +13,13 @@ */ package io.streamnative.pulsar.handlers.kop.utils.timer; -import static org.testng.Assert.fail; -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertTrue; - import com.google.common.collect.Lists; +import lombok.extern.slf4j.Slf4j; +import org.apache.kafka.common.utils.Time; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -26,11 +28,10 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; import java.util.stream.IntStream; -import lombok.extern.slf4j.Slf4j; -import org.apache.kafka.common.utils.Time; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; + +import static org.testng.Assert.fail; +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertTrue; /** * Unit test {@link Timer}. From 1d18de804af9548b4977c3130f89dafd4184a931 Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Mon, 3 Jul 2023 12:24:31 -0700 Subject: [PATCH 10/19] Fix import stylei --- .github/workflows/pr-tests.yml | 21 +++++++++++++ .../handlers/kop/CacheInvalidatorTest.java | 12 ++++---- .../kop/EntryPublishTimeKafkaFormatTest.java | 8 ++--- .../kop/EntryPublishTimePulsarFormatTest.java | 4 +-- .../handlers/kop/EntryPublishTimeTest.java | 6 ++-- .../pulsar/handlers/kop/KafkaApisTest.java | 30 +++++++++---------- .../handlers/kop/KafkaCommonTestUtils.java | 13 ++++---- .../handlers/kop/KafkaIdleConnectionTest.java | 6 ++-- .../handlers/kop/KafkaListenerNameTest.java | 12 ++++---- .../handlers/kop/KafkaProducerStatsTest.java | 4 +-- .../handlers/kop/KafkaRequestHandlerTest.java | 20 ++++++------- ...kaRequestHandlerWithAuthorizationTest.java | 16 +++++----- .../kop/KafkaTopicConsumerManagerTest.java | 24 +++++++-------- .../handlers/kop/KopEventManagerTest.java | 10 +++---- .../kop/KopProtocolHandlerTestBase.java | 24 +++++++-------- .../handlers/kop/MetricsProviderTest.java | 22 +++++++------- .../kop/OffsetTopicWriteTimeoutTest.java | 14 ++++----- .../pulsar/handlers/kop/UpgradeTest.java | 9 +++--- .../handlers/kop/admin/KafkaAdminTest.java | 14 ++++----- .../kop/admin/KopBrokerLookupManagerTest.java | 4 +-- .../handlers/kop/admin/OffsetResetTest.java | 20 ++++++------- .../BasicEndToEndPulsarTest.java | 9 +++--- .../compatibility/BasicEndToEndTestBase.java | 9 +++--- .../DefaultKafkaClientFactory.java | 13 ++++---- .../saslplain/SaslPlainEndToEndTest.java | 20 ++++++------- .../CompactedPartitionedTopicTest.java | 13 ++++---- .../group/GroupCoordinatorTest.java | 14 ++++----- .../group/GroupMetadataManagerTest.java | 20 ++++++------- .../ProducerIdManagerImplTest.java | 6 ++-- ...ulsarStorageProducerIdManagerImplTest.java | 12 ++++---- .../TransactionCoordinatorTest.java | 20 ++++++------- .../transaction/TransactionLogTest.java | 6 ++-- .../TransactionMarkerChannelManagerTest.java | 8 ++--- .../TransactionStateManagerTest.java | 10 +++---- .../transaction/TransactionTest.java | 16 +++++----- .../TransactionWithOAuthBearerAuthTest.java | 5 ++-- .../kop/e2e/BasicEndToEndKafkaTest.java | 20 ++++++------- .../kop/e2e/BasicEndToEndPulsarTest.java | 12 ++++---- .../kop/e2e/BasicEndToEndTestBase.java | 24 +++++++-------- .../kop/e2e/DistributedClusterTest.java | 24 +++++++-------- .../kop/e2e/KafkaMessageOrderTestBase.java | 10 +++---- .../kop/e2e/KafkaNonPartitionedTopicTest.java | 10 +++---- .../handlers/kop/e2e/MultiLedgerTest.java | 14 ++++----- .../kop/e2e/PerTopicConfigurationTest.java | 18 +++++------ .../kop/format/EntryFormatterTestBase.java | 5 ++-- .../kop/metadata/DifferentNamespaceTest.java | 10 +++---- .../kop/metadata/MetadataInitTest.java | 12 ++++---- .../kop/producer/IdempotentProducerTest.java | 10 +++---- .../producer/InnerTopicProtectionTest.java | 11 ++++--- .../MessagePublishBufferThrottleTestBase.java | 10 +++---- .../MessagePublishThrottlingTest.java | 16 +++++----- .../model/impl/PulsarSchemaStorageTest.java | 8 ++--- .../model/impl/SchemaRegistryTest.java | 16 +++++----- .../model/impl/SchemaRestApiTest.java | 10 +++---- .../model/impl/SchemaStorageTestsBase.java | 6 ++-- .../kop/security/KafkaSSLChannelTest.java | 16 +++++----- .../KafkaSSLChannelWithClientAuthTest.java | 8 ++--- .../kop/security/SaslPlainTestBase.java | 14 ++++----- .../DelayAuthorizationFailedCloseTest.java | 12 ++++---- ...ionKafkaMultitenantTenantMetadataTest.java | 1 - .../auth/KafkaAuthorizationMockTest.java | 8 ++--- .../auth/KafkaAuthorizationTestBase.java | 10 +++---- .../auth/KafkaMockAuthorizationProvider.java | 5 ++-- .../auth/SimpleAclAuthorizerTest.java | 12 ++++---- .../CustomOAuthBearerCallbackHandlerTest.java | 14 ++++----- .../kop/security/oauth/HydraOAuthUtils.java | 9 +++--- .../OauthValidatorCallbackHandlerTest.java | 8 ++--- .../oauth/SaslOAuthBearerTestBase.java | 14 ++++----- .../oauth/SaslOAuthDefaultHandlersTest.java | 8 ++--- .../oauth/SaslOAuthKopHandlersTest.java | 22 +++++++------- ...slOAuthKopHandlersWithMultiTenantTest.java | 12 ++++---- .../kop/storage/PartitionLogTest.java | 6 ++-- ...cerStateManagerSnapshotBufferTestBase.java | 4 +-- .../kop/storage/ProducerStateManagerTest.java | 6 ++-- ...roducerStateManagerSnapshotBufferTest.java | 6 ++-- .../kop/streams/GlobalKTableTest.java | 10 +++---- .../kop/streams/KStreamAggregationTest.java | 12 ++++---- .../handlers/kop/streams/KTableTest.java | 9 +++--- .../kop/streams/KafkaStreamsTestBase.java | 5 ++-- .../handlers/kop/streams/TestUtils.java | 17 +++++------ .../handlers/kop/utils/timer/MockTime.java | 5 ++-- .../handlers/kop/utils/timer/MockTimer.java | 5 ++-- .../kop/utils/timer/TimerTaskListTest.java | 4 +-- .../handlers/kop/utils/timer/TimerTest.java | 12 ++++---- 84 files changed, 433 insertions(+), 561 deletions(-) diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml index 4e8e6f3e8b..c58081b8e1 100644 --- a/.github/workflows/pr-tests.yml +++ b/.github/workflows/pr-tests.yml @@ -95,6 +95,27 @@ jobs: "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.compatibility..*.*Test' -pl tests" ] }, + { + name: "coordinator test", + scripts: [ + "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.coordinator.*Test' -pl tests", + "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.coordinator..*.*Test' -pl tests" + ] + }, + { + name: "end to end test", + scripts: [ + "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.e2e.*Test' -pl tests", + "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.e2e..*.*Test' -pl tests" + ] + }, + { + name: "end to end test", + scripts: [ + "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.e2e.*Test' -pl tests", + "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.e2e..*.*Test' -pl tests" + ] + }, ] steps: - uses: actions/checkout@v3 diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/CacheInvalidatorTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/CacheInvalidatorTest.java index 14538975f1..a667aaf21d 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/CacheInvalidatorTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/CacheInvalidatorTest.java @@ -14,6 +14,11 @@ package io.streamnative.pulsar.handlers.kop; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; @@ -30,13 +35,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; - -import java.time.Duration; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.TimeUnit; - import static org.testng.Assert.*; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimeKafkaFormatTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimeKafkaFormatTest.java index ca346d535b..51d239e349 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimeKafkaFormatTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimeKafkaFormatTest.java @@ -13,6 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop; +import java.time.Duration; +import java.util.Collections; +import java.util.concurrent.CompletableFuture; import lombok.Cleanup; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; @@ -28,11 +31,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; - -import java.time.Duration; -import java.util.Collections; -import java.util.concurrent.CompletableFuture; - import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimePulsarFormatTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimePulsarFormatTest.java index dc6a1c5e51..44d6be3f8a 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimePulsarFormatTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimePulsarFormatTest.java @@ -13,6 +13,7 @@ */ package io.streamnative.pulsar.handlers.kop; +import java.util.concurrent.TimeUnit; import lombok.Cleanup; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.TopicPartition; @@ -22,9 +23,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; - -import java.util.concurrent.TimeUnit; - import static org.testng.Assert.assertTrue; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimeTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimeTest.java index 5204296799..b9e400fc3c 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimeTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimeTest.java @@ -15,12 +15,10 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; - import java.net.InetSocketAddress; import java.net.SocketAddress; - +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaApisTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaApisTest.java index 8ec4d45f3b..962cbc9269 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaApisTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaApisTest.java @@ -22,6 +22,20 @@ import io.netty.channel.EventLoopGroup; import io.netty.util.concurrent.DefaultThreadFactory; import io.streamnative.pulsar.handlers.kop.KafkaCommandDecoder.KafkaHeaderAndRequest; +import java.net.InetSocketAddress; +import java.net.SocketAddress; +import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Function; +import java.util.stream.Collectors; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.tuple.Pair; @@ -54,22 +68,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Ignore; import org.testng.annotations.Test; - -import java.net.InetSocketAddress; -import java.net.SocketAddress; -import java.nio.ByteBuffer; -import java.nio.charset.StandardCharsets; -import java.time.Duration; -import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Function; -import java.util.stream.Collectors; - import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.getListOffsetsPartitionResponse; import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.newOffsetCommitRequestPartitionData; import static org.apache.kafka.clients.consumer.ConsumerConfig.DEFAULT_FETCH_MAX_BYTES; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaCommonTestUtils.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaCommonTestUtils.java index 9a7a1064b4..628e73ce41 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaCommonTestUtils.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaCommonTestUtils.java @@ -14,6 +14,12 @@ package io.streamnative.pulsar.handlers.kop; import io.netty.buffer.ByteBuf; +import java.net.SocketAddress; +import java.nio.ByteBuffer; +import java.util.Collections; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.message.CreatePartitionsRequestData; import org.apache.kafka.common.message.ListOffsetsRequestData; @@ -22,13 +28,6 @@ import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.requests.*; -import java.net.SocketAddress; -import java.nio.ByteBuffer; -import java.util.Collections; -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; - public class KafkaCommonTestUtils { public static List newListOffsetTargetTimes( diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaIdleConnectionTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaIdleConnectionTest.java index a2493fd953..9b9ffdba89 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaIdleConnectionTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaIdleConnectionTest.java @@ -15,6 +15,8 @@ import io.streamnative.kafka.client.api.KafkaVersion; import io.streamnative.kafka.client.api.ProducerConfiguration; +import java.io.IOException; +import java.net.InetSocketAddress; import org.apache.kafka.clients.ClientUtils; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.metrics.Metrics; @@ -27,10 +29,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; - -import java.io.IOException; -import java.net.InetSocketAddress; - import static org.testng.Assert.fail; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertTrue; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaListenerNameTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaListenerNameTest.java index e9eb2181bc..6906888833 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaListenerNameTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaListenerNameTest.java @@ -15,6 +15,11 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerConfig; @@ -29,13 +34,6 @@ import org.apache.pulsar.broker.ServiceConfigurationUtils; import org.testng.Assert; import org.testng.annotations.Test; - -import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - import static io.streamnative.pulsar.handlers.kop.KafkaCommandDecoder.KafkaHeaderAndRequest; import static org.apache.kafka.common.requests.MetadataResponse.PartitionMetadata; import static org.mockito.Mockito.doReturn; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaProducerStatsTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaProducerStatsTest.java index 96ffa3316a..7133f755c7 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaProducerStatsTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaProducerStatsTest.java @@ -14,6 +14,7 @@ package io.streamnative.pulsar.handlers.kop; import com.google.common.collect.Sets; +import java.util.Properties; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -28,9 +29,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; - -import java.util.Properties; - import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotEquals; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerTest.java index 9890bf1e80..f0377b6c20 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerTest.java @@ -29,6 +29,15 @@ import io.streamnative.pulsar.handlers.kop.offset.OffsetAndMetadata; import io.streamnative.pulsar.handlers.kop.utils.KafkaResponseUtils; import io.streamnative.pulsar.handlers.kop.utils.TopicNameUtils; +import java.net.InetSocketAddress; +import java.net.SocketAddress; +import java.nio.ByteBuffer; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.stream.Collectors; +import java.util.stream.LongStream; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.admin.*; @@ -67,17 +76,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; - -import java.net.InetSocketAddress; -import java.net.SocketAddress; -import java.nio.ByteBuffer; -import java.time.Duration; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.stream.Collectors; -import java.util.stream.LongStream; - import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.getListOffsetsPartitionResponse; import static io.streamnative.pulsar.handlers.kop.utils.TopicNameUtils.getPartitionedTopicNameWithoutPartitions; import static org.apache.pulsar.common.naming.TopicName.PARTITIONED_TOPIC_SUFFIX; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerWithAuthorizationTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerWithAuthorizationTest.java index 0cb46265e4..f07bbfcc39 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerWithAuthorizationTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerWithAuthorizationTest.java @@ -25,6 +25,13 @@ import io.streamnative.pulsar.handlers.kop.security.auth.Resource; import io.streamnative.pulsar.handlers.kop.security.auth.ResourceType; import io.streamnative.pulsar.handlers.kop.utils.KopTopic; +import java.net.InetSocketAddress; +import java.net.SocketAddress; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import java.util.stream.Collectors; +import javax.crypto.SecretKey; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.producer.ProducerRecord; @@ -52,15 +59,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; - -import javax.crypto.SecretKey; -import java.net.InetSocketAddress; -import java.net.SocketAddress; -import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; -import java.util.stream.Collectors; - import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.getListOffsetsPartitionResponse; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaTopicConsumerManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaTopicConsumerManagerTest.java index fc738a7e48..de61813753 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaTopicConsumerManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaTopicConsumerManagerTest.java @@ -16,6 +16,17 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.streamnative.pulsar.handlers.kop.utils.KopTopic; +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Properties; +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.IntStream; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.mledger.ManagedCursor; @@ -36,19 +47,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Properties; -import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.testng.Assert.*; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopEventManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopEventManagerTest.java index b880c9ba55..15768806ce 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopEventManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopEventManagerTest.java @@ -14,6 +14,10 @@ package io.streamnative.pulsar.handlers.kop; import com.google.common.collect.Lists; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; import org.apache.kafka.clients.admin.AdminClient; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.ConsumerGroupDescription; @@ -31,12 +35,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import java.time.Duration; -import java.util.*; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; - import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopProtocolHandlerTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopProtocolHandlerTestBase.java index 3dc4bc7e3b..5c058eb652 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopProtocolHandlerTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopProtocolHandlerTestBase.java @@ -21,6 +21,17 @@ import io.streamnative.pulsar.handlers.kop.coordinator.group.GroupCoordinator; import io.streamnative.pulsar.handlers.kop.coordinator.transaction.TransactionCoordinator; import io.streamnative.pulsar.handlers.kop.utils.MetadataUtils; +import java.io.Closeable; +import java.lang.reflect.Field; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; +import java.util.function.Predicate; +import java.util.function.Supplier; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.client.BookKeeper; @@ -64,19 +75,6 @@ import org.apache.zookeeper.data.ACL; import org.awaitility.Awaitility; import org.testng.Assert; - -import java.io.Closeable; -import java.lang.reflect.Field; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.TimeUnit; -import java.util.function.Predicate; -import java.util.function.Supplier; - import static org.mockito.Mockito.*; import static org.testng.Assert.assertTrue; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderTest.java index 660386e7c7..e06cc7aba6 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderTest.java @@ -13,6 +13,16 @@ */ package io.streamnative.pulsar.handlers.kop; +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.time.Duration; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import java.util.stream.IntStream; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpResponse; @@ -36,18 +46,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; -import java.time.Duration; -import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - import static org.testng.AssertJUnit.fail; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/OffsetTopicWriteTimeoutTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/OffsetTopicWriteTimeoutTest.java index 90b31cfe53..55426db9e3 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/OffsetTopicWriteTimeoutTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/OffsetTopicWriteTimeoutTest.java @@ -15,6 +15,12 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; +import java.net.InetSocketAddress; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.function.Supplier; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRebalanceListener; import org.apache.kafka.clients.consumer.KafkaConsumer; @@ -28,14 +34,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; - -import java.net.InetSocketAddress; -import java.time.Duration; -import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.function.Supplier; - import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.buildRequest; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/UpgradeTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/UpgradeTest.java index 165385e133..a8ef9d98b8 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/UpgradeTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/UpgradeTest.java @@ -13,6 +13,10 @@ */ package io.streamnative.pulsar.handlers.kop; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.tuple.Pair; @@ -33,11 +37,6 @@ import org.testng.annotations.Test; import org.testng.collections.Lists; -import java.time.Duration; -import java.util.*; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; - /** * Test upgrade from older version that doesn't support BrokerEntryMetadata. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KafkaAdminTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KafkaAdminTest.java index a2d907b665..8694c215cf 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KafkaAdminTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KafkaAdminTest.java @@ -17,6 +17,12 @@ import io.jsonwebtoken.lang.Maps; import io.streamnative.pulsar.handlers.kop.KafkaLogConfig; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.nio.charset.StandardCharsets; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.admin.*; @@ -42,14 +48,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; - -import java.nio.charset.StandardCharsets; -import java.time.Duration; -import java.util.*; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; - import static org.testng.Assert.*; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KopBrokerLookupManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KopBrokerLookupManagerTest.java index 493055e7b4..6d0c86c5b1 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KopBrokerLookupManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KopBrokerLookupManagerTest.java @@ -16,14 +16,12 @@ import io.streamnative.pulsar.handlers.kop.KopBrokerLookupManager; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.LookupClient; +import java.util.Collections; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.common.policies.data.TenantInfo; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; - -import java.util.Collections; - import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/OffsetResetTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/OffsetResetTest.java index 2192bc03c1..df300c8233 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/OffsetResetTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/OffsetResetTest.java @@ -18,6 +18,15 @@ import io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadataManager.BaseKey; import io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadataManager.OffsetKey; import io.streamnative.pulsar.handlers.kop.utils.CoreUtils; +import java.lang.reflect.Method; +import java.nio.ByteBuffer; +import java.time.Duration; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.mledger.ManagedLedgerConfig; @@ -43,17 +52,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Ignore; import org.testng.annotations.Test; - -import java.lang.reflect.Method; -import java.nio.ByteBuffer; -import java.time.Duration; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - import static org.apache.pulsar.common.naming.TopicName.PARTITIONED_TOPIC_SUFFIX; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/BasicEndToEndPulsarTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/BasicEndToEndPulsarTest.java index 577111bbc1..60c95d7862 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/BasicEndToEndPulsarTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/BasicEndToEndPulsarTest.java @@ -14,6 +14,10 @@ package io.streamnative.pulsar.handlers.kop.compatibility; import io.streamnative.kafka.client.api.*; +import java.nio.charset.StandardCharsets; +import java.util.*; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.util.MathUtils; import org.apache.pulsar.client.api.Message; @@ -25,11 +29,6 @@ import org.testng.annotations.Test; import org.testng.collections.Maps; -import java.nio.charset.StandardCharsets; -import java.util.*; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - /** * Basic end-to-end test for different versions of Kafka clients with `entryFormat=kafka`. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/BasicEndToEndTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/BasicEndToEndTestBase.java index 53c0ff50ba..0b2b3c660e 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/BasicEndToEndTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/BasicEndToEndTestBase.java @@ -15,17 +15,16 @@ import io.streamnative.kafka.client.api.*; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.io.IOException; +import java.time.Duration; +import java.util.*; +import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.collections.Maps; -import java.io.IOException; -import java.time.Duration; -import java.util.*; -import java.util.stream.Collectors; - /** * Basic end-to-end test for different versions of Kafka clients. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/DefaultKafkaClientFactory.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/DefaultKafkaClientFactory.java index 8f69b43dcb..4a3899c3a9 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/DefaultKafkaClientFactory.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/DefaultKafkaClientFactory.java @@ -15,6 +15,12 @@ import com.google.common.collect.Maps; import io.streamnative.kafka.client.api.*; +import java.time.Duration; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Future; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.clients.consumer.OffsetAndMetadata; import org.apache.kafka.clients.producer.KafkaProducer; @@ -23,13 +29,6 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.header.internals.RecordHeader; -import java.time.Duration; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Future; - /** * Kafka client factory for the default version of Kafka client. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/saslplain/SaslPlainEndToEndTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/saslplain/SaslPlainEndToEndTest.java index 718ace62ac..b7a4581c60 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/saslplain/SaslPlainEndToEndTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/saslplain/SaslPlainEndToEndTest.java @@ -19,6 +19,15 @@ import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.compatibility.DefaultKafkaClientFactory; +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.*; +import java.util.concurrent.ExecutionException; +import java.util.stream.Collectors; +import javax.crypto.SecretKey; +import javax.security.auth.login.Configuration; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.common.PartitionInfo; @@ -33,17 +42,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; - -import javax.crypto.SecretKey; -import javax.security.auth.login.Configuration; -import java.io.File; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.util.*; -import java.util.concurrent.ExecutionException; -import java.util.stream.Collectors; - import static org.mockito.Mockito.spy; import static org.testng.Assert.*; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/CompactedPartitionedTopicTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/CompactedPartitionedTopicTest.java index 3e8ae862b5..c351ddd75b 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/CompactedPartitionedTopicTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/CompactedPartitionedTopicTest.java @@ -17,6 +17,12 @@ import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.coordinator.group.OffsetConfig; import io.streamnative.pulsar.handlers.kop.utils.CoreUtils; +import java.nio.ByteBuffer; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.IntStream; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.admin.LongRunningProcessStatus; @@ -29,13 +35,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import java.nio.ByteBuffer; -import java.time.Duration; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.IntStream; - @Slf4j public class CompactedPartitionedTopicTest extends KopProtocolHandlerTestBase { diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupCoordinatorTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupCoordinatorTest.java index 6121986bc1..516e15e2d9 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupCoordinatorTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupCoordinatorTest.java @@ -24,6 +24,12 @@ import io.streamnative.pulsar.handlers.kop.offset.OffsetAndMetadata; import io.streamnative.pulsar.handlers.kop.utils.delayed.DelayedOperationPurgatory; import io.streamnative.pulsar.handlers.kop.utils.timer.MockTimer; +import java.util.Optional; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.stream.Collectors; import org.apache.bookkeeper.common.util.OrderedScheduler; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.internals.Topic; @@ -36,14 +42,6 @@ import org.apache.pulsar.client.api.PulsarClientException; import org.apache.pulsar.common.schema.KeyValue; import org.testng.annotations.*; - -import java.util.Optional; -import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import java.util.stream.Collectors; - import static org.mockito.Mockito.spy; import static org.testng.Assert.*; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupMetadataManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupMetadataManagerTest.java index 6fc19fe3db..6fdd8c008d 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupMetadataManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupMetadataManagerTest.java @@ -27,6 +27,15 @@ import io.streamnative.pulsar.handlers.kop.offset.OffsetAndMetadata; import io.streamnative.pulsar.handlers.kop.utils.KopTopic; import io.streamnative.pulsar.handlers.kop.utils.timer.MockTime; +import java.nio.ByteBuffer; +import java.util.Optional; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.common.util.MathUtils; import org.apache.bookkeeper.common.util.OrderedScheduler; @@ -42,17 +51,6 @@ import org.apache.pulsar.client.admin.PulsarAdminException; import org.apache.pulsar.client.api.*; import org.testng.annotations.*; - -import java.nio.ByteBuffer; -import java.util.Optional; -import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicReference; -import java.util.stream.Collectors; - import static io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadataConstants.*; import static io.streamnative.pulsar.handlers.kop.coordinator.group.GroupState.*; import static org.mockito.ArgumentMatchers.any; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/ProducerIdManagerImplTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/ProducerIdManagerImplTest.java index 6aeca63186..3a98ea8e20 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/ProducerIdManagerImplTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/ProducerIdManagerImplTest.java @@ -14,16 +14,14 @@ package io.streamnative.pulsar.handlers.kop.coordinator.transaction; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.util.Optional; +import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import java.util.Optional; -import java.util.concurrent.TimeUnit; - import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.fail; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/PulsarStorageProducerIdManagerImplTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/PulsarStorageProducerIdManagerImplTest.java index 8ec9dc5949..6d231bc4fd 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/PulsarStorageProducerIdManagerImplTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/PulsarStorageProducerIdManagerImplTest.java @@ -14,6 +14,11 @@ package io.streamnative.pulsar.handlers.kop.coordinator.transaction; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.util.HashSet; +import java.util.List; +import java.util.Random; +import java.util.Set; +import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.reflect.MethodUtils; import org.apache.pulsar.common.policies.data.InactiveTopicDeleteMode; @@ -24,13 +29,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; - -import java.util.HashSet; -import java.util.List; -import java.util.Random; -import java.util.Set; -import java.util.concurrent.TimeUnit; - import static org.testng.Assert.assertTrue; import static org.testng.AssertJUnit.assertEquals; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionCoordinatorTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionCoordinatorTest.java index 3b5f78fb7f..6e2a25057f 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionCoordinatorTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionCoordinatorTest.java @@ -21,6 +21,15 @@ import io.streamnative.pulsar.handlers.kop.storage.MemoryProducerStateManagerSnapshotBuffer; import io.streamnative.pulsar.handlers.kop.utils.ProducerIdAndEpoch; import io.streamnative.pulsar.handlers.kop.utils.timer.MockTime; +import java.util.Collections; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import java.util.function.Consumer; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.common.util.OrderedScheduler; import org.apache.curator.shaded.com.google.common.collect.Lists; @@ -34,17 +43,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import java.util.Collections; -import java.util.Optional; -import java.util.Set; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; -import java.util.function.Consumer; - import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import static org.mockito.internal.verification.VerificationModeFactory.atLeastOnce; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionLogTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionLogTest.java index 8d071f2de1..9a034f89e0 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionLogTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionLogTest.java @@ -14,6 +14,8 @@ package io.streamnative.pulsar.handlers.kop.coordinator.transaction; import com.google.common.collect.Lists; +import java.nio.ByteBuffer; +import java.util.*; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.record.RecordBatch; import org.apache.pulsar.client.api.Message; @@ -24,10 +26,6 @@ import org.testng.Assert; import org.testng.annotations.Test; import org.testng.collections.Maps; - -import java.nio.ByteBuffer; -import java.util.*; - import static org.testng.AssertJUnit.assertEquals; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionMarkerChannelManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionMarkerChannelManagerTest.java index 827ce5443e..41fdfafbb8 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionMarkerChannelManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionMarkerChannelManagerTest.java @@ -19,6 +19,9 @@ import io.streamnative.pulsar.handlers.kop.KopBrokerLookupManager; import io.streamnative.pulsar.handlers.kop.scala.Either; import io.streamnative.pulsar.handlers.kop.utils.timer.MockTime; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.CompletableFuture; import org.apache.bookkeeper.common.util.OrderedScheduler; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.record.RecordBatch; @@ -27,11 +30,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; - -import java.util.Optional; -import java.util.Set; -import java.util.concurrent.CompletableFuture; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import static org.testng.Assert.assertEquals; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionStateManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionStateManagerTest.java index a8f7ac0fcf..50e0046f58 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionStateManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionStateManagerTest.java @@ -19,6 +19,10 @@ import io.streamnative.pulsar.handlers.kop.SystemTopicClient; import io.streamnative.pulsar.handlers.kop.utils.MetadataUtils; import io.streamnative.pulsar.handlers.kop.utils.timer.MockTime; +import java.nio.ByteBuffer; +import java.util.Optional; +import java.util.*; +import java.util.concurrent.CompletableFuture; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.common.util.OrderedScheduler; @@ -32,12 +36,6 @@ import org.testng.Assert; import org.testng.annotations.*; import org.testng.collections.Maps; - -import java.nio.ByteBuffer; -import java.util.Optional; -import java.util.*; -import java.util.concurrent.CompletableFuture; - import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.spy; import static org.testng.Assert.assertNotNull; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionTest.java index 5022b6f100..a0a3617d60 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionTest.java @@ -18,6 +18,13 @@ import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.scala.Either; import io.streamnative.pulsar.handlers.kop.storage.PartitionLog; +import java.time.Duration; +import java.time.temporal.ChronoUnit; +import java.util.*; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Function; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.RandomStringUtils; @@ -41,15 +48,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; - -import java.time.Duration; -import java.time.temporal.ChronoUnit; -import java.util.*; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Function; - import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; import static org.testng.Assert.*; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionWithOAuthBearerAuthTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionWithOAuthBearerAuthTest.java index 029fd06c52..7eb82cee89 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionWithOAuthBearerAuthTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionWithOAuthBearerAuthTest.java @@ -18,6 +18,8 @@ import io.streamnative.pulsar.handlers.kop.security.oauth.OauthLoginCallbackHandler; import io.streamnative.pulsar.handlers.kop.security.oauth.OauthValidatorCallbackHandler; import io.streamnative.pulsar.handlers.kop.security.oauth.SaslOAuthKopHandlersTest; +import java.net.URL; +import java.util.Properties; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.broker.authentication.AuthenticationProviderToken; import org.apache.pulsar.client.admin.PulsarAdmin; @@ -27,9 +29,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import java.net.URL; -import java.util.Properties; - @Slf4j public class TransactionWithOAuthBearerAuthTest extends TransactionTest { diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java index cf97c42e80..c79e32bca0 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java @@ -16,6 +16,15 @@ import io.streamnative.kafka.client.api.Header; import io.streamnative.pulsar.handlers.kop.KafkaPayloadProcessor; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.nio.charset.StandardCharsets; +import java.time.Duration; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Future; +import java.util.stream.Collectors; +import java.util.stream.IntStream; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecord; @@ -31,17 +40,6 @@ import org.awaitility.Awaitility; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; - -import java.nio.charset.StandardCharsets; -import java.time.Duration; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.Future; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - import static org.testng.Assert.*; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndPulsarTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndPulsarTest.java index 4e5cc37ad6..f3e37a34a1 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndPulsarTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndPulsarTest.java @@ -15,6 +15,11 @@ import io.netty.buffer.ByteBuf; import io.streamnative.pulsar.handlers.kop.utils.KopTopic; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.stream.Collectors; +import java.util.stream.IntStream; import lombok.Cleanup; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.KafkaConsumer; @@ -26,13 +31,6 @@ import org.apache.pulsar.common.api.proto.MarkersMessageIdData; import org.apache.pulsar.common.protocol.Markers; import org.testng.annotations.Test; - -import java.time.Duration; -import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndTestBase.java index 0dcaa727e8..51320ed603 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndTestBase.java @@ -15,6 +15,17 @@ import io.streamnative.kafka.client.api.Header; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.nio.charset.StandardCharsets; +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Properties; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; @@ -31,19 +42,6 @@ import org.apache.pulsar.client.impl.MessageIdImpl; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; - -import java.nio.charset.StandardCharsets; -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Properties; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - import static org.testng.Assert.*; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/DistributedClusterTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/DistributedClusterTest.java index d6eaf7e441..c021f4412f 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/DistributedClusterTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/DistributedClusterTest.java @@ -19,6 +19,17 @@ import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.PortManager; +import java.net.URL; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.time.Duration; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; +import java.util.stream.IntStream; import lombok.Cleanup; import org.apache.kafka.clients.admin.AdminClient; import org.apache.kafka.clients.admin.DescribeClusterResult; @@ -35,19 +46,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import java.net.URL; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.time.Duration; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - import static org.apache.kafka.common.internals.Topic.GROUP_METADATA_TOPIC_NAME; import static org.apache.pulsar.common.naming.TopicName.PARTITIONED_TOPIC_SUFFIX; import static org.testng.Assert.*; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderTestBase.java index 88dba91c0e..5a57c233d2 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderTestBase.java @@ -16,6 +16,10 @@ import com.google.common.collect.Sets; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecord; @@ -35,12 +39,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; - -import java.time.Duration; -import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.TimeUnit; - import static org.testng.Assert.*; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaNonPartitionedTopicTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaNonPartitionedTopicTest.java index 5f8718b028..0ea6cb4ec0 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaNonPartitionedTopicTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaNonPartitionedTopicTest.java @@ -15,6 +15,10 @@ import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.time.Duration; +import java.util.Collections; +import java.util.List; +import java.util.Map; import lombok.Cleanup; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; @@ -24,12 +28,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; - -import java.time.Duration; -import java.util.Collections; -import java.util.List; -import java.util.Map; - import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java index 3b1fff0045..aa69c15b3d 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java @@ -15,6 +15,12 @@ import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.lang.reflect.Field; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; +import java.util.stream.IntStream; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.mledger.impl.ManagedLedgerImpl; @@ -37,14 +43,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; - -import java.lang.reflect.Field; -import java.time.Duration; -import java.util.*; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - import static org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedLedgerInfo.LedgerInfo; import static org.testng.Assert.*; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/PerTopicConfigurationTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/PerTopicConfigurationTest.java index d1733c5354..1333e74596 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/PerTopicConfigurationTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/PerTopicConfigurationTest.java @@ -14,6 +14,14 @@ package io.streamnative.pulsar.handlers.kop.e2e; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.time.Duration; +import java.util.Base64; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; +import java.util.stream.IntStream; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecord; @@ -27,16 +35,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; - -import java.time.Duration; -import java.util.Base64; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/format/EntryFormatterTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/format/EntryFormatterTestBase.java index cf328be947..278e1865f9 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/format/EntryFormatterTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/format/EntryFormatterTestBase.java @@ -14,6 +14,8 @@ package io.streamnative.pulsar.handlers.kop.format; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.time.Duration; +import java.util.Collections; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.clients.producer.KafkaProducer; @@ -22,9 +24,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; -import java.time.Duration; -import java.util.Collections; - public class EntryFormatterTestBase extends KopProtocolHandlerTestBase { private static final String group1 = "test-format-group1"; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/DifferentNamespaceTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/DifferentNamespaceTest.java index 8a7a597ea5..0b31bb31e3 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/DifferentNamespaceTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/DifferentNamespaceTest.java @@ -15,6 +15,10 @@ import com.google.common.collect.Sets; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.time.Duration; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.IntStream; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.admin.*; @@ -24,12 +28,6 @@ import org.apache.kafka.common.internals.Topic; import org.apache.pulsar.common.policies.data.TenantInfo; import org.testng.annotations.*; - -import java.time.Duration; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/MetadataInitTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/MetadataInitTest.java index 308f3e1f58..97093440cc 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/MetadataInitTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/MetadataInitTest.java @@ -17,6 +17,11 @@ import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.PortManager; import io.streamnative.pulsar.handlers.kop.utils.MetadataUtils; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.file.Paths; +import java.util.Collections; +import java.util.Optional; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.broker.PulsarService; import org.apache.pulsar.client.admin.PulsarAdmin; @@ -26,13 +31,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import java.net.URISyntaxException; -import java.net.URL; -import java.nio.file.Paths; -import java.util.Collections; -import java.util.Optional; - import static org.testng.Assert.*; @Slf4j diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/IdempotentProducerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/IdempotentProducerTest.java index 34d011e424..35726e35d5 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/IdempotentProducerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/IdempotentProducerTest.java @@ -14,6 +14,10 @@ package io.streamnative.pulsar.handlers.kop.producer; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.time.Duration; +import java.util.Collections; +import java.util.Properties; +import java.util.concurrent.ExecutionException; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.KafkaConsumer; @@ -26,12 +30,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; - -import java.time.Duration; -import java.util.Collections; -import java.util.Properties; -import java.util.concurrent.ExecutionException; - import static org.testng.Assert.assertEquals; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/InnerTopicProtectionTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/InnerTopicProtectionTest.java index 5208c79fcc..7810dde048 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/InnerTopicProtectionTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/InnerTopicProtectionTest.java @@ -16,6 +16,11 @@ import com.google.common.collect.Sets; import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.net.URL; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Optional; +import java.util.Properties; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.producer.KafkaProducer; @@ -30,12 +35,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import java.net.URL; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Optional; -import java.util.Properties; - /** * Inner topic protection test. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishBufferThrottleTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishBufferThrottleTestBase.java index 2a67fcc81d..c4ac44be35 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishBufferThrottleTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishBufferThrottleTestBase.java @@ -15,6 +15,10 @@ import io.streamnative.pulsar.handlers.kop.KafkaRequestHandler; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.util.Properties; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerConfig; @@ -25,12 +29,6 @@ import org.mockito.MockedStatic; import org.testng.Assert; import org.testng.annotations.Test; - -import java.util.Properties; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mockStatic; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishThrottlingTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishThrottlingTest.java index a062e7883c..102cc6cf5b 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishThrottlingTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishThrottlingTest.java @@ -16,6 +16,13 @@ import com.google.common.collect.Sets; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.producer.KafkaProducer; @@ -34,15 +41,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; - -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - import static org.testng.Assert.*; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/PulsarSchemaStorageTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/PulsarSchemaStorageTest.java index 940c002cb5..ef37df35f1 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/PulsarSchemaStorageTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/PulsarSchemaStorageTest.java @@ -18,15 +18,13 @@ import io.streamnative.pulsar.handlers.kop.schemaregistry.model.Schema; import io.streamnative.pulsar.handlers.kop.schemaregistry.model.SchemaStorage; import io.streamnative.pulsar.handlers.kop.schemaregistry.model.SchemaStorageAccessor; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.CompletableFuture; import lombok.extern.slf4j.Slf4j; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.CompletableFuture; - import static org.testng.Assert.assertEquals; @Slf4j diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRegistryTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRegistryTest.java index 27e0f62e76..81f406778e 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRegistryTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRegistryTest.java @@ -20,6 +20,13 @@ import io.confluent.kafka.serializers.KafkaAvroSerializer; import io.confluent.kafka.serializers.KafkaAvroSerializerConfig; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.lang.reflect.Field; +import java.time.Duration; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; +import java.util.concurrent.TimeUnit; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.avro.Schema; @@ -37,15 +44,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import java.lang.reflect.Field; -import java.time.Duration; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; -import java.util.concurrent.TimeUnit; - import static org.testng.Assert.*; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRestApiTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRestApiTest.java index 5ef4a93250..470a248205 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRestApiTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRestApiTest.java @@ -18,11 +18,6 @@ import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.schemaregistry.model.Schema; import io.streamnative.pulsar.handlers.kop.schemaregistry.resources.SubjectResource; -import lombok.Cleanup; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -32,7 +27,10 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; - +import lombok.Cleanup; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; import static org.testng.Assert.*; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaStorageTestsBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaStorageTestsBase.java index 87aaf12a72..c88e905f1c 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaStorageTestsBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaStorageTestsBase.java @@ -17,13 +17,11 @@ import io.streamnative.pulsar.handlers.kop.schemaregistry.model.Schema; import io.streamnative.pulsar.handlers.kop.schemaregistry.model.SchemaStorage; import io.streamnative.pulsar.handlers.kop.schemaregistry.model.SchemaStorageAccessor; +import java.util.List; +import java.util.concurrent.ExecutionException; import lombok.AllArgsConstructor; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; - -import java.util.List; -import java.util.concurrent.ExecutionException; - import static org.testng.Assert.*; @AllArgsConstructor diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelTest.java index 7da8f13475..6684787492 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelTest.java @@ -14,6 +14,13 @@ package io.streamnative.pulsar.handlers.kop.security; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.io.Closeable; +import java.time.Duration; +import java.time.temporal.ChronoUnit; +import java.util.Collections; +import java.util.Properties; +import java.util.concurrent.atomic.AtomicInteger; +import javax.net.ssl.HostnameVerifier; import lombok.Cleanup; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -33,15 +40,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Factory; import org.testng.annotations.Test; - -import javax.net.ssl.HostnameVerifier; -import java.io.Closeable; -import java.time.Duration; -import java.time.temporal.ChronoUnit; -import java.util.Collections; -import java.util.Properties; -import java.util.concurrent.atomic.AtomicInteger; - import static java.nio.charset.StandardCharsets.UTF_8; import static org.testng.AssertJUnit.assertFalse; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelWithClientAuthTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelWithClientAuthTest.java index 6211b2ba33..2131218c29 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelWithClientAuthTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelWithClientAuthTest.java @@ -15,6 +15,9 @@ import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.io.Closeable; +import java.util.Properties; +import javax.net.ssl.HostnameVerifier; import lombok.Cleanup; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -27,11 +30,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Factory; import org.testng.annotations.Test; - -import javax.net.ssl.HostnameVerifier; -import java.io.Closeable; -import java.util.Properties; - import static java.nio.charset.StandardCharsets.UTF_8; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainTestBase.java index 8325acfe1c..b889011f86 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainTestBase.java @@ -17,6 +17,12 @@ import io.jsonwebtoken.SignatureAlgorithm; import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.time.Duration; +import java.time.temporal.ChronoUnit; +import java.util.*; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.atomic.AtomicInteger; +import javax.crypto.SecretKey; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecord; @@ -40,14 +46,6 @@ import org.apache.pulsar.common.policies.data.TenantInfo; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; - -import javax.crypto.SecretKey; -import java.time.Duration; -import java.time.temporal.ChronoUnit; -import java.util.*; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.atomic.AtomicInteger; - import static org.mockito.Mockito.spy; import static org.testng.Assert.*; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/DelayAuthorizationFailedCloseTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/DelayAuthorizationFailedCloseTest.java index cac3e24c33..96c76a07e5 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/DelayAuthorizationFailedCloseTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/DelayAuthorizationFailedCloseTest.java @@ -18,6 +18,11 @@ import io.streamnative.kafka.client.api.KafkaVersion; import io.streamnative.kafka.client.api.ProducerConfiguration; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.io.IOException; +import java.net.InetSocketAddress; +import java.util.Optional; +import java.util.Properties; +import javax.crypto.SecretKey; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.ClientUtils; import org.apache.kafka.clients.producer.ProducerConfig; @@ -41,13 +46,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; - -import javax.crypto.SecretKey; -import java.io.IOException; -import java.net.InetSocketAddress; -import java.util.Optional; -import java.util.Properties; - import static org.mockito.Mockito.spy; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationKafkaMultitenantTenantMetadataTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationKafkaMultitenantTenantMetadataTest.java index 1c00eac477..0a987f4480 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationKafkaMultitenantTenantMetadataTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationKafkaMultitenantTenantMetadataTest.java @@ -15,7 +15,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; - import static org.testng.Assert.assertFalse; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationMockTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationMockTest.java index e3f510e4d0..7cf83f5b33 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationMockTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationMockTest.java @@ -16,6 +16,9 @@ import com.google.common.collect.Sets; import io.jsonwebtoken.SignatureAlgorithm; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.time.Duration; +import java.util.*; +import javax.crypto.SecretKey; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.producer.ProducerRecord; @@ -28,11 +31,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; - -import javax.crypto.SecretKey; -import java.time.Duration; -import java.util.*; - import static org.mockito.Mockito.spy; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationTestBase.java index b6433f69b3..cbbd1a3d73 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationTestBase.java @@ -21,6 +21,10 @@ import io.jsonwebtoken.SignatureAlgorithm; import io.netty.handler.codec.http.HttpResponseStatus; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.ExecutionException; +import javax.crypto.SecretKey; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.avro.Schema; @@ -52,12 +56,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; - -import javax.crypto.SecretKey; -import java.time.Duration; -import java.util.*; -import java.util.concurrent.ExecutionException; - import static org.mockito.Mockito.spy; import static org.testng.Assert.*; import static org.testng.AssertJUnit.fail; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaMockAuthorizationProvider.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaMockAuthorizationProvider.java index 6d2b122635..f01e9fab6e 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaMockAuthorizationProvider.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaMockAuthorizationProvider.java @@ -13,6 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop.security.auth; +import java.util.Set; +import java.util.concurrent.CompletableFuture; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.broker.ServiceConfiguration; import org.apache.pulsar.broker.authentication.AuthenticationDataSource; @@ -22,9 +24,6 @@ import org.apache.pulsar.common.policies.data.*; import org.testng.Assert; -import java.util.Set; -import java.util.concurrent.CompletableFuture; - @Slf4j public class KafkaMockAuthorizationProvider implements AuthorizationProvider { diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/SimpleAclAuthorizerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/SimpleAclAuthorizerTest.java index ee6c703579..2602b57bf3 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/SimpleAclAuthorizerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/SimpleAclAuthorizerTest.java @@ -18,6 +18,11 @@ import io.jsonwebtoken.SignatureAlgorithm; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.security.KafkaPrincipal; +import java.util.Collections; +import java.util.Optional; +import java.util.Properties; +import java.util.concurrent.ExecutionException; +import javax.crypto.SecretKey; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.broker.ServiceConfiguration; import org.apache.pulsar.broker.authentication.AuthenticationDataCommand; @@ -31,13 +36,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; - -import javax.crypto.SecretKey; -import java.util.Collections; -import java.util.Optional; -import java.util.Properties; -import java.util.concurrent.ExecutionException; - import static org.mockito.Mockito.spy; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/CustomOAuthBearerCallbackHandlerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/CustomOAuthBearerCallbackHandlerTest.java index 83274f9f4f..95366a4e93 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/CustomOAuthBearerCallbackHandlerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/CustomOAuthBearerCallbackHandlerTest.java @@ -16,6 +16,12 @@ import com.google.common.collect.Sets; import io.jsonwebtoken.SignatureAlgorithm; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import javax.crypto.SecretKey; +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.UnsupportedCallbackException; +import javax.security.auth.login.AppConfigurationEntry; import lombok.Cleanup; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerRecord; @@ -31,14 +37,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; - -import javax.crypto.SecretKey; -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.UnsupportedCallbackException; -import javax.security.auth.login.AppConfigurationEntry; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; - import static org.mockito.Mockito.spy; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/HydraOAuthUtils.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/HydraOAuthUtils.java index 80e3f70813..02bd8e1330 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/HydraOAuthUtils.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/HydraOAuthUtils.java @@ -20,11 +20,6 @@ import io.fusionauth.jwks.domain.JSONWebKey; import io.jsonwebtoken.SignatureAlgorithm; import io.jsonwebtoken.security.Keys; -import sh.ory.hydra.ApiException; -import sh.ory.hydra.api.AdminApi; -import sh.ory.hydra.model.JSONWebKeySet; -import sh.ory.hydra.model.OAuth2Client; - import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -33,6 +28,10 @@ import java.util.Arrays; import java.util.Base64; import java.util.Collections; +import sh.ory.hydra.ApiException; +import sh.ory.hydra.api.AdminApi; +import sh.ory.hydra.model.JSONWebKeySet; +import sh.ory.hydra.model.OAuth2Client; /** * The Hydra OAuth utils. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/OauthValidatorCallbackHandlerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/OauthValidatorCallbackHandlerTest.java index 31cc537cd2..7dbea029b6 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/OauthValidatorCallbackHandlerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/OauthValidatorCallbackHandlerTest.java @@ -13,15 +13,13 @@ */ package io.streamnative.pulsar.handlers.kop.security.oauth; +import java.util.HashMap; +import java.util.concurrent.CompletableFuture; +import javax.naming.AuthenticationException; import org.apache.pulsar.broker.authentication.AuthenticationProvider; import org.apache.pulsar.broker.authentication.AuthenticationService; import org.apache.pulsar.broker.authentication.AuthenticationState; import org.testng.annotations.Test; - -import javax.naming.AuthenticationException; -import java.util.HashMap; -import java.util.concurrent.CompletableFuture; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.*; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthBearerTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthBearerTestBase.java index 7d666dbe9c..154c2a264e 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthBearerTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthBearerTestBase.java @@ -14,6 +14,12 @@ package io.streamnative.pulsar.handlers.kop.security.oauth; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Properties; +import java.util.concurrent.ExecutionException; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecord; @@ -23,14 +29,6 @@ import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.clients.producer.RecordMetadata; import org.apache.kafka.common.errors.TimeoutException; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Properties; -import java.util.concurrent.ExecutionException; - import static org.testng.Assert.*; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthDefaultHandlersTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthDefaultHandlersTest.java index 2612ed60ec..c05c9406c0 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthDefaultHandlersTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthDefaultHandlersTest.java @@ -15,6 +15,9 @@ import com.google.common.collect.Sets; import io.jsonwebtoken.SignatureAlgorithm; +import java.util.Optional; +import java.util.Properties; +import javax.crypto.SecretKey; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.broker.authentication.AuthenticationProviderToken; import org.apache.pulsar.broker.authentication.utils.AuthTokenUtils; @@ -24,11 +27,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; - -import javax.crypto.SecretKey; -import java.util.Optional; -import java.util.Properties; - import static org.mockito.Mockito.spy; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersTest.java index ec7f6ee60b..15f1be8967 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersTest.java @@ -14,6 +14,16 @@ package io.streamnative.pulsar.handlers.kop.security.oauth; import com.google.common.collect.Sets; +import java.io.IOException; +import java.net.URL; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import javax.naming.AuthenticationException; +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.UnsupportedCallbackException; +import javax.security.auth.login.LoginException; import lombok.Cleanup; import lombok.SneakyThrows; import org.apache.kafka.clients.consumer.ConsumerRecords; @@ -41,18 +51,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; - -import javax.naming.AuthenticationException; -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.UnsupportedCallbackException; -import javax.security.auth.login.LoginException; -import java.io.IOException; -import java.net.URL; -import java.time.Duration; -import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; - import static org.mockito.Mockito.*; import static org.testng.Assert.*; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersWithMultiTenantTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersWithMultiTenantTest.java index f38b666058..4b252e77f1 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersWithMultiTenantTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersWithMultiTenantTest.java @@ -14,6 +14,11 @@ package io.streamnative.pulsar.handlers.kop.security.oauth; import com.google.common.collect.Sets; +import java.net.URL; +import java.time.Duration; +import java.util.Collections; +import java.util.Properties; +import java.util.concurrent.ExecutionException; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.KafkaConsumer; @@ -31,13 +36,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; - -import java.net.URL; -import java.time.Duration; -import java.util.Collections; -import java.util.Properties; -import java.util.concurrent.ExecutionException; - import static org.testng.Assert.*; @Slf4j diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PartitionLogTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PartitionLogTest.java index c4f4eeca51..26cdd007db 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PartitionLogTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PartitionLogTest.java @@ -15,6 +15,8 @@ import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; import io.streamnative.pulsar.handlers.kop.KafkaTopicLookupService; +import java.nio.ByteBuffer; +import java.util.Arrays; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.common.util.OrderedExecutor; import org.apache.kafka.common.TopicPartition; @@ -24,10 +26,6 @@ import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; - -import java.nio.ByteBuffer; -import java.util.Arrays; - import static org.mockito.Mockito.mock; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerSnapshotBufferTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerSnapshotBufferTestBase.java index 9fb3985e92..4b61c9458c 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerSnapshotBufferTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerSnapshotBufferTestBase.java @@ -17,15 +17,13 @@ import com.google.common.collect.Maps; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.SystemTopicClient; +import java.util.*; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.admin.PulsarAdminException; import org.apache.pulsar.common.naming.TopicName; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import java.util.*; - import static org.testng.Assert.assertEquals; @Slf4j diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerTest.java index 2772859263..42ad47c826 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerTest.java @@ -15,6 +15,8 @@ import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.utils.timer.MockTime; +import java.util.Collections; +import java.util.Optional; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.InvalidTxnStateException; @@ -24,10 +26,6 @@ import org.apache.kafka.common.record.RecordBatch; import org.mockito.Mockito; import org.testng.annotations.*; - -import java.util.Collections; -import java.util.Optional; - import static org.testng.Assert.*; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PulsarTopicProducerStateManagerSnapshotBufferTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PulsarTopicProducerStateManagerSnapshotBufferTest.java index f03cb8ee41..1fe54e559d 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PulsarTopicProducerStateManagerSnapshotBufferTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PulsarTopicProducerStateManagerSnapshotBufferTest.java @@ -15,15 +15,13 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import lombok.extern.slf4j.Slf4j; -import org.testng.annotations.Test; - import java.nio.ByteBuffer; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.TreeMap; - +import lombok.extern.slf4j.Slf4j; +import org.testng.annotations.Test; import static org.testng.Assert.assertEquals; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/GlobalKTableTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/GlobalKTableTest.java index 6ee3e9f9a7..e9ea718d5c 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/GlobalKTableTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/GlobalKTableTest.java @@ -13,6 +13,10 @@ */ package io.streamnative.pulsar.handlers.kop.streams; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.Serdes; @@ -26,12 +30,6 @@ import org.apache.kafka.streams.state.ReadOnlyKeyValueStore; import org.apache.kafka.streams.state.Stores; import org.testng.annotations.Test; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - import static org.testng.Assert.assertEquals; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KStreamAggregationTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KStreamAggregationTest.java index b44c0dd177..a99421e228 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KStreamAggregationTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KStreamAggregationTest.java @@ -13,6 +13,11 @@ */ package io.streamnative.pulsar.handlers.kop.streams; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; import lombok.NonNull; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; @@ -31,13 +36,6 @@ import org.apache.kafka.streams.state.QueryableStoreTypes; import org.apache.kafka.streams.state.ReadOnlySessionStore; import org.testng.annotations.Test; - -import java.time.Duration; -import java.util.*; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; - import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KTableTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KTableTest.java index 4c2968e6fd..b27b455ee8 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KTableTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KTableTest.java @@ -13,6 +13,10 @@ */ package io.streamnative.pulsar.handlers.kop.streams; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.Serdes; @@ -30,11 +34,6 @@ import org.apache.kafka.streams.state.Stores; import org.testng.annotations.Test; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - /** * Test usage of KTable from the Kafka Streams DSL. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KafkaStreamsTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KafkaStreamsTestBase.java index 36fc50136c..88a0ad7db7 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KafkaStreamsTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KafkaStreamsTestBase.java @@ -15,6 +15,8 @@ import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.utils.timer.MockTime; +import java.util.Properties; +import java.util.concurrent.TimeUnit; import lombok.Getter; import lombok.NonNull; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -26,9 +28,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; -import java.util.Properties; -import java.util.concurrent.TimeUnit; - /** * Base test class for tests related to Kafka Streams. */ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/TestUtils.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/TestUtils.java index 053a69cda9..d40850c8f2 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/TestUtils.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/TestUtils.java @@ -13,15 +13,6 @@ */ package io.streamnative.pulsar.handlers.kop.streams; -import lombok.extern.slf4j.Slf4j; -import org.apache.kafka.clients.consumer.*; -import org.apache.kafka.clients.producer.*; -import org.apache.kafka.common.header.Headers; -import org.apache.kafka.common.utils.Time; -import org.apache.kafka.common.utils.Utils; -import org.apache.kafka.streams.KeyValue; -import org.apache.kafka.streams.StreamsConfig; - import java.io.File; import java.io.IOException; import java.nio.file.*; @@ -30,6 +21,14 @@ import java.util.*; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; +import lombok.extern.slf4j.Slf4j; +import org.apache.kafka.clients.consumer.*; +import org.apache.kafka.clients.producer.*; +import org.apache.kafka.common.header.Headers; +import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.streams.KeyValue; +import org.apache.kafka.streams.StreamsConfig; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/MockTime.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/MockTime.java index 2060352e1f..aeeecfe862 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/MockTime.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/MockTime.java @@ -13,13 +13,12 @@ */ package io.streamnative.pulsar.handlers.kop.utils.timer; -import org.apache.kafka.common.errors.TimeoutException; -import org.apache.kafka.common.utils.Time; - import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import java.util.function.Supplier; +import org.apache.kafka.common.errors.TimeoutException; +import org.apache.kafka.common.utils.Time; /** * A clock that you can manually advance by calling sleep. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/MockTimer.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/MockTimer.java index 741dec733f..064404e75f 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/MockTimer.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/MockTimer.java @@ -14,11 +14,10 @@ package io.streamnative.pulsar.handlers.kop.utils.timer; import io.streamnative.pulsar.handlers.kop.utils.timer.TimerTaskList.TimerTaskEntry; -import lombok.Getter; -import lombok.experimental.Accessors; - import java.util.Comparator; import java.util.PriorityQueue; +import lombok.Getter; +import lombok.experimental.Accessors; /** * A mock implementation of {@link Timer}. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/TimerTaskListTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/TimerTaskListTest.java index 98880bb7d6..46d5aab687 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/TimerTaskListTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/TimerTaskListTest.java @@ -14,13 +14,11 @@ package io.streamnative.pulsar.handlers.kop.utils.timer; import io.streamnative.pulsar.handlers.kop.utils.timer.TimerTaskList.TimerTaskEntry; -import org.testng.annotations.Test; - import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; import java.util.stream.IntStream; - +import org.testng.annotations.Test; import static org.testng.Assert.assertEquals; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/TimerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/TimerTest.java index c26a829edb..0b01e644c3 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/TimerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/TimerTest.java @@ -14,12 +14,6 @@ package io.streamnative.pulsar.handlers.kop.utils.timer; import com.google.common.collect.Lists; -import lombok.extern.slf4j.Slf4j; -import org.apache.kafka.common.utils.Time; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -28,7 +22,11 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; import java.util.stream.IntStream; - +import lombok.extern.slf4j.Slf4j; +import org.apache.kafka.common.utils.Time; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; import static org.testng.Assert.fail; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertTrue; From 753861beb7a104f43d94f3c78e22260803d8e594 Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Mon, 3 Jul 2023 12:27:30 -0700 Subject: [PATCH 11/19] Reorder imports --- .github/workflows/pr-tests.yml | 8 +++----- .../handlers/kop/CacheInvalidatorTest.java | 3 ++- .../kop/EntryPublishTimeKafkaFormatTest.java | 5 +++-- .../kop/EntryPublishTimePulsarFormatTest.java | 3 ++- .../handlers/kop/EntryPublishTimeTest.java | 5 +++-- .../pulsar/handlers/kop/KafkaApisTest.java | 19 ++++++++++--------- .../handlers/kop/KafkaIdleConnectionTest.java | 7 ++++--- .../handlers/kop/KafkaListenerNameTest.java | 9 +++++---- .../handlers/kop/KafkaProducerStatsTest.java | 5 +++-- .../handlers/kop/KafkaRequestHandlerTest.java | 13 +++++++------ ...kaRequestHandlerWithAuthorizationTest.java | 9 +++++---- .../kop/KafkaTopicConsumerManagerTest.java | 7 ++++--- .../handlers/kop/KopEventManagerTest.java | 5 +++-- .../kop/KopProtocolHandlerTestBase.java | 5 +++-- .../handlers/kop/MetricsProviderTest.java | 3 ++- .../kop/OffsetTopicWriteTimeoutTest.java | 7 ++++--- .../handlers/kop/admin/KafkaAdminTest.java | 3 ++- .../kop/admin/KopBrokerLookupManagerTest.java | 5 +++-- .../handlers/kop/admin/OffsetResetTest.java | 7 ++++--- .../saslplain/SaslPlainEndToEndTest.java | 5 +++-- .../group/GroupCoordinatorTest.java | 5 +++-- .../group/GroupMetadataManagerTest.java | 15 ++++++++------- .../ProducerIdManagerImplTest.java | 5 +++-- ...ulsarStorageProducerIdManagerImplTest.java | 5 +++-- .../TransactionCoordinatorTest.java | 11 ++++++----- .../transaction/TransactionLogTest.java | 3 ++- .../TransactionMarkerChannelManagerTest.java | 7 ++++--- .../TransactionStateManagerTest.java | 9 +++++---- .../transaction/TransactionTest.java | 7 ++++--- .../kop/e2e/BasicEndToEndKafkaTest.java | 3 ++- .../kop/e2e/BasicEndToEndPulsarTest.java | 5 +++-- .../kop/e2e/BasicEndToEndTestBase.java | 3 ++- .../kop/e2e/DistributedClusterTest.java | 7 ++++--- .../kop/e2e/KafkaMessageOrderTestBase.java | 3 ++- .../kop/e2e/KafkaNonPartitionedTopicTest.java | 5 +++-- .../handlers/kop/e2e/MultiLedgerTest.java | 5 +++-- .../kop/e2e/PerTopicConfigurationTest.java | 5 +++-- .../kop/metadata/DifferentNamespaceTest.java | 5 +++-- .../kop/metadata/MetadataInitTest.java | 3 ++- .../kop/producer/IdempotentProducerTest.java | 3 ++- .../MessagePublishBufferThrottleTestBase.java | 7 ++++--- .../MessagePublishThrottlingTest.java | 3 ++- .../model/impl/PulsarSchemaStorageTest.java | 3 ++- .../model/impl/SchemaRegistryTest.java | 3 ++- .../model/impl/SchemaRestApiTest.java | 3 ++- .../model/impl/SchemaStorageTestsBase.java | 3 ++- .../kop/security/KafkaSSLChannelTest.java | 5 +++-- .../KafkaSSLChannelWithClientAuthTest.java | 3 ++- .../kop/security/SaslPlainTestBase.java | 5 +++-- .../DelayAuthorizationFailedCloseTest.java | 7 ++++--- ...ionKafkaMultitenantTenantMetadataTest.java | 3 ++- .../auth/KafkaAuthorizationMockTest.java | 7 ++++--- .../auth/KafkaAuthorizationTestBase.java | 7 ++++--- .../auth/SimpleAclAuthorizerTest.java | 7 ++++--- .../CustomOAuthBearerCallbackHandlerTest.java | 7 ++++--- .../OauthValidatorCallbackHandlerTest.java | 11 ++++++----- .../oauth/SaslOAuthBearerTestBase.java | 3 ++- .../oauth/SaslOAuthDefaultHandlersTest.java | 3 ++- .../oauth/SaslOAuthKopHandlersTest.java | 5 +++-- ...slOAuthKopHandlersWithMultiTenantTest.java | 3 ++- .../kop/storage/PartitionLogTest.java | 3 ++- ...cerStateManagerSnapshotBufferTestBase.java | 3 ++- .../kop/storage/ProducerStateManagerTest.java | 3 ++- ...roducerStateManagerSnapshotBufferTest.java | 3 ++- .../kop/streams/GlobalKTableTest.java | 3 ++- .../kop/streams/KStreamAggregationTest.java | 11 ++++++----- .../kop/utils/timer/TimerTaskListTest.java | 3 ++- .../handlers/kop/utils/timer/TimerTest.java | 7 ++++--- 68 files changed, 223 insertions(+), 158 deletions(-) diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml index c58081b8e1..5b2541adbe 100644 --- a/.github/workflows/pr-tests.yml +++ b/.github/workflows/pr-tests.yml @@ -105,15 +105,13 @@ jobs: { name: "end to end test", scripts: [ - "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.e2e.*Test' -pl tests", - "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.e2e..*.*Test' -pl tests" + "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.e2e.*Test' -pl tests" ] }, { - name: "end to end test", + name: "format test", scripts: [ - "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.e2e.*Test' -pl tests", - "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.e2e..*.*Test' -pl tests" + "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.format.*Test' -pl tests" ] }, ] diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/CacheInvalidatorTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/CacheInvalidatorTest.java index a667aaf21d..73fcefb39e 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/CacheInvalidatorTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/CacheInvalidatorTest.java @@ -14,6 +14,8 @@ package io.streamnative.pulsar.handlers.kop; +import static org.testng.Assert.*; + import java.time.Duration; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -35,7 +37,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static org.testng.Assert.*; /** * Validate CacheInvalidator. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimeKafkaFormatTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimeKafkaFormatTest.java index 51d239e349..35efa41895 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimeKafkaFormatTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimeKafkaFormatTest.java @@ -13,6 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + import java.time.Duration; import java.util.Collections; import java.util.concurrent.CompletableFuture; @@ -31,8 +34,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; /** * Test for publish time when entry format is kafka. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimePulsarFormatTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimePulsarFormatTest.java index 44d6be3f8a..053c16f501 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimePulsarFormatTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimePulsarFormatTest.java @@ -13,6 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop; +import static org.testng.Assert.assertTrue; + import java.util.concurrent.TimeUnit; import lombok.Cleanup; import org.apache.kafka.clients.producer.ProducerRecord; @@ -23,7 +25,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -import static org.testng.Assert.assertTrue; /** * Test for publish time when entry format is pulsar. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimeTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimeTest.java index b9e400fc3c..227df6f62c 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimeTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/EntryPublishTimeTest.java @@ -13,14 +13,15 @@ */ package io.streamnative.pulsar.handlers.kop; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; + import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import java.net.InetSocketAddress; import java.net.SocketAddress; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; /** * Test for entry publish time. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaApisTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaApisTest.java index 962cbc9269..a1c290d5ac 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaApisTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaApisTest.java @@ -13,6 +13,16 @@ */ package io.streamnative.pulsar.handlers.kop; +import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.getListOffsetsPartitionResponse; +import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.newOffsetCommitRequestPartitionData; +import static org.apache.kafka.clients.consumer.ConsumerConfig.DEFAULT_FETCH_MAX_BYTES; +import static org.apache.kafka.clients.consumer.ConsumerConfig.DEFAULT_MAX_PARTITION_FETCH_BYTES; +import static org.apache.kafka.common.requests.ListOffsetsRequest.EARLIEST_TIMESTAMP; +import static org.apache.pulsar.common.naming.TopicName.PARTITIONED_TOPIC_SUFFIX; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; +import static org.testng.Assert.*; + import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -68,15 +78,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Ignore; import org.testng.annotations.Test; -import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.getListOffsetsPartitionResponse; -import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.newOffsetCommitRequestPartitionData; -import static org.apache.kafka.clients.consumer.ConsumerConfig.DEFAULT_FETCH_MAX_BYTES; -import static org.apache.kafka.clients.consumer.ConsumerConfig.DEFAULT_MAX_PARTITION_FETCH_BYTES; -import static org.apache.kafka.common.requests.ListOffsetsRequest.EARLIEST_TIMESTAMP; -import static org.apache.pulsar.common.naming.TopicName.PARTITIONED_TOPIC_SUFFIX; -import static org.mockito.ArgumentMatchers.*; -import static org.mockito.Mockito.*; -import static org.testng.Assert.*; /** * Validate KafkaApisTest. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaIdleConnectionTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaIdleConnectionTest.java index 9b9ffdba89..db66bc741b 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaIdleConnectionTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaIdleConnectionTest.java @@ -13,6 +13,10 @@ */ package io.streamnative.pulsar.handlers.kop; +import static org.testng.Assert.fail; +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertTrue; + import io.streamnative.kafka.client.api.KafkaVersion; import io.streamnative.kafka.client.api.ProducerConfiguration; import java.io.IOException; @@ -29,9 +33,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import static org.testng.Assert.fail; -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertTrue; /** * Unit test for KoP Idle connection close. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaListenerNameTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaListenerNameTest.java index 6906888833..c4f1353203 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaListenerNameTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaListenerNameTest.java @@ -13,6 +13,11 @@ */ package io.streamnative.pulsar.handlers.kop; +import static io.streamnative.pulsar.handlers.kop.KafkaCommandDecoder.KafkaHeaderAndRequest; +import static org.apache.kafka.common.requests.MetadataResponse.PartitionMetadata; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; + import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import java.util.*; @@ -34,10 +39,6 @@ import org.apache.pulsar.broker.ServiceConfigurationUtils; import org.testng.Assert; import org.testng.annotations.Test; -import static io.streamnative.pulsar.handlers.kop.KafkaCommandDecoder.KafkaHeaderAndRequest; -import static org.apache.kafka.common.requests.MetadataResponse.PartitionMetadata; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaProducerStatsTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaProducerStatsTest.java index 7133f755c7..96b63e54da 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaProducerStatsTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaProducerStatsTest.java @@ -13,6 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotEquals; + import com.google.common.collect.Sets; import java.util.Properties; import lombok.Cleanup; @@ -29,8 +32,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotEquals; /** * Unit test for producer stats. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerTest.java index f0377b6c20..6efe625c3b 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerTest.java @@ -14,6 +14,13 @@ package io.streamnative.pulsar.handlers.kop; +import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.getListOffsetsPartitionResponse; +import static io.streamnative.pulsar.handlers.kop.utils.TopicNameUtils.getPartitionedTopicNameWithoutPartitions; +import static org.apache.pulsar.common.naming.TopicName.PARTITIONED_TOPIC_SUFFIX; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.testng.Assert.*; + import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -76,12 +83,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.getListOffsetsPartitionResponse; -import static io.streamnative.pulsar.handlers.kop.utils.TopicNameUtils.getPartitionedTopicNameWithoutPartitions; -import static org.apache.pulsar.common.naming.TopicName.PARTITIONED_TOPIC_SUFFIX; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.testng.Assert.*; /** * Unit test for {@link KafkaRequestHandler}. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerWithAuthorizationTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerWithAuthorizationTest.java index f07bbfcc39..a0b7aad377 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerWithAuthorizationTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerWithAuthorizationTest.java @@ -13,6 +13,11 @@ */ package io.streamnative.pulsar.handlers.kop; +import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.getListOffsetsPartitionResponse; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.*; +import static org.testng.Assert.*; + import com.google.common.collect.Maps; import com.google.common.collect.Sets; import io.jsonwebtoken.SignatureAlgorithm; @@ -59,10 +64,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.getListOffsetsPartitionResponse; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.*; -import static org.testng.Assert.*; /** * Unit test for {@link KafkaRequestHandler} with authorization enabled. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaTopicConsumerManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaTopicConsumerManagerTest.java index de61813753..8ecb06f5ce 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaTopicConsumerManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaTopicConsumerManagerTest.java @@ -13,6 +13,10 @@ */ package io.streamnative.pulsar.handlers.kop; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.testng.Assert.*; + import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.streamnative.pulsar.handlers.kop.utils.KopTopic; @@ -47,9 +51,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.testng.Assert.*; /** * Pulsar service configuration object. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopEventManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopEventManagerTest.java index 15768806ce..a41d8b7b15 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopEventManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopEventManagerTest.java @@ -13,6 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + import com.google.common.collect.Lists; import java.time.Duration; import java.util.*; @@ -35,8 +38,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; public class KopEventManagerTest extends KopProtocolHandlerTestBase { private AdminClient adminClient; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopProtocolHandlerTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopProtocolHandlerTestBase.java index 5c058eb652..4993837b67 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopProtocolHandlerTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopProtocolHandlerTestBase.java @@ -13,6 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop; +import static org.mockito.Mockito.*; +import static org.testng.Assert.assertTrue; + import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.google.common.collect.Sets; @@ -75,8 +78,6 @@ import org.apache.zookeeper.data.ACL; import org.awaitility.Awaitility; import org.testng.Assert; -import static org.mockito.Mockito.*; -import static org.testng.Assert.assertTrue; /** * Unit test to test KoP handler. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderTest.java index e06cc7aba6..f9a6fd909d 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderTest.java @@ -13,6 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop; +import static org.testng.AssertJUnit.fail; + import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; @@ -46,7 +48,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import static org.testng.AssertJUnit.fail; /** * test for kop prometheus metrics. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/OffsetTopicWriteTimeoutTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/OffsetTopicWriteTimeoutTest.java index 55426db9e3..432aca1626 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/OffsetTopicWriteTimeoutTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/OffsetTopicWriteTimeoutTest.java @@ -13,6 +13,10 @@ */ package io.streamnative.pulsar.handlers.kop; +import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.buildRequest; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; + import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import java.net.InetSocketAddress; @@ -34,9 +38,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.buildRequest; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; @Slf4j public class OffsetTopicWriteTimeoutTest extends KopProtocolHandlerTestBase { diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KafkaAdminTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KafkaAdminTest.java index 8694c215cf..4a4d62f2f2 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KafkaAdminTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KafkaAdminTest.java @@ -13,6 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop.admin; +import static org.testng.Assert.*; + import com.google.common.collect.Sets; import io.jsonwebtoken.lang.Maps; import io.streamnative.pulsar.handlers.kop.KafkaLogConfig; @@ -48,7 +50,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import static org.testng.Assert.*; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KopBrokerLookupManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KopBrokerLookupManagerTest.java index 6d0c86c5b1..830a29193c 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KopBrokerLookupManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KopBrokerLookupManagerTest.java @@ -13,6 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop.admin; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; + import io.streamnative.pulsar.handlers.kop.KopBrokerLookupManager; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.LookupClient; @@ -22,8 +25,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; @Slf4j diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/OffsetResetTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/OffsetResetTest.java index df300c8233..7c4e7f5fbf 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/OffsetResetTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/OffsetResetTest.java @@ -13,6 +13,10 @@ */ package io.streamnative.pulsar.handlers.kop.admin; +import static org.apache.pulsar.common.naming.TopicName.PARTITIONED_TOPIC_SUFFIX; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadataConstants; import io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadataManager.BaseKey; @@ -52,9 +56,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Ignore; import org.testng.annotations.Test; -import static org.apache.pulsar.common.naming.TopicName.PARTITIONED_TOPIC_SUFFIX; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; /** * Tests for handling out-of-range cases. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/saslplain/SaslPlainEndToEndTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/saslplain/SaslPlainEndToEndTest.java index b7a4581c60..3b7d9ae08b 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/saslplain/SaslPlainEndToEndTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/saslplain/SaslPlainEndToEndTest.java @@ -13,6 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop.compatibility.saslplain; +import static org.mockito.Mockito.spy; +import static org.testng.Assert.*; + import com.google.common.collect.Sets; import io.jsonwebtoken.SignatureAlgorithm; import io.streamnative.kafka.client.api.*; @@ -42,8 +45,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import static org.mockito.Mockito.spy; -import static org.testng.Assert.*; @Slf4j public class SaslPlainEndToEndTest extends KopProtocolHandlerTestBase { diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupCoordinatorTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupCoordinatorTest.java index 516e15e2d9..bc32c346a9 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupCoordinatorTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupCoordinatorTest.java @@ -13,6 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop.coordinator.group; +import static org.mockito.Mockito.spy; +import static org.testng.Assert.*; + import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -42,8 +45,6 @@ import org.apache.pulsar.client.api.PulsarClientException; import org.apache.pulsar.common.schema.KeyValue; import org.testng.annotations.*; -import static org.mockito.Mockito.spy; -import static org.testng.Assert.*; /** * Unit test {@link GroupCoordinator}. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupMetadataManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupMetadataManagerTest.java index 6fdd8c008d..89135ff20b 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupMetadataManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupMetadataManagerTest.java @@ -13,6 +13,14 @@ */ package io.streamnative.pulsar.handlers.kop.coordinator.group; +import static io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadataConstants.*; +import static io.streamnative.pulsar.handlers.kop.coordinator.group.GroupState.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.spy; +import static org.testng.Assert.*; + import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -51,13 +59,6 @@ import org.apache.pulsar.client.admin.PulsarAdminException; import org.apache.pulsar.client.api.*; import org.testng.annotations.*; -import static io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadataConstants.*; -import static io.streamnative.pulsar.handlers.kop.coordinator.group.GroupState.*; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.spy; -import static org.testng.Assert.*; /** * Unit test {@link GroupMetadataManager}. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/ProducerIdManagerImplTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/ProducerIdManagerImplTest.java index 3a98ea8e20..3f7a3ddca5 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/ProducerIdManagerImplTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/ProducerIdManagerImplTest.java @@ -13,6 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop.coordinator.transaction; +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.fail; + import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.util.Optional; import java.util.concurrent.TimeUnit; @@ -22,8 +25,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.fail; /** * Producer id manager test. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/PulsarStorageProducerIdManagerImplTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/PulsarStorageProducerIdManagerImplTest.java index 6d231bc4fd..6c2bef215e 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/PulsarStorageProducerIdManagerImplTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/PulsarStorageProducerIdManagerImplTest.java @@ -13,6 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop.coordinator.transaction; +import static org.testng.Assert.assertTrue; +import static org.testng.AssertJUnit.assertEquals; + import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.util.HashSet; import java.util.List; @@ -29,8 +32,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import static org.testng.Assert.assertTrue; -import static org.testng.AssertJUnit.assertEquals; /** * Producer id manager test. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionCoordinatorTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionCoordinatorTest.java index 6e2a25057f..75e36c8bec 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionCoordinatorTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionCoordinatorTest.java @@ -13,6 +13,12 @@ */ package io.streamnative.pulsar.handlers.kop.coordinator.transaction; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; +import static org.mockito.internal.verification.VerificationModeFactory.atLeastOnce; +import static org.testng.Assert.assertNotEquals; +import static org.testng.AssertJUnit.*; + import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import io.streamnative.pulsar.handlers.kop.KafkaProtocolHandler; @@ -43,11 +49,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import static org.mockito.ArgumentMatchers.*; -import static org.mockito.Mockito.*; -import static org.mockito.internal.verification.VerificationModeFactory.atLeastOnce; -import static org.testng.Assert.assertNotEquals; -import static org.testng.AssertJUnit.*; /** * Unit test {@link TransactionCoordinator}. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionLogTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionLogTest.java index 9a034f89e0..b3801316a6 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionLogTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionLogTest.java @@ -13,6 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop.coordinator.transaction; +import static org.testng.AssertJUnit.assertEquals; + import com.google.common.collect.Lists; import java.nio.ByteBuffer; import java.util.*; @@ -26,7 +28,6 @@ import org.testng.Assert; import org.testng.annotations.Test; import org.testng.collections.Maps; -import static org.testng.AssertJUnit.assertEquals; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionMarkerChannelManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionMarkerChannelManagerTest.java index 41fdfafbb8..5941a34439 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionMarkerChannelManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionMarkerChannelManagerTest.java @@ -13,6 +13,10 @@ */ package io.streamnative.pulsar.handlers.kop.coordinator.transaction; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; +import static org.testng.Assert.assertEquals; + import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; @@ -30,9 +34,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; -import static org.testng.Assert.assertEquals; /** * Unit test {@link TransactionMarkerChannelManager}. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionStateManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionStateManagerTest.java index 50e0046f58..f6a114b060 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionStateManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionStateManagerTest.java @@ -13,6 +13,11 @@ */ package io.streamnative.pulsar.handlers.kop.coordinator.transaction; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.spy; +import static org.testng.Assert.assertNotNull; +import static org.testng.AssertJUnit.*; + import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; @@ -36,10 +41,6 @@ import org.testng.Assert; import org.testng.annotations.*; import org.testng.collections.Maps; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.spy; -import static org.testng.Assert.assertNotNull; -import static org.testng.AssertJUnit.*; /** * Unit test {@link TransactionStateManager}. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionTest.java index a0a3617d60..355c760889 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionTest.java @@ -13,6 +13,10 @@ */ package io.streamnative.pulsar.handlers.kop.coordinator.transaction; +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.testng.Assert.*; + import com.google.common.collect.ImmutableMap; import io.streamnative.pulsar.handlers.kop.KafkaProtocolHandler; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; @@ -48,9 +52,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.testng.Assert.*; /** * Transaction test. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java index c79e32bca0..829305d155 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java @@ -13,6 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop.e2e; +import static org.testng.Assert.*; + import io.streamnative.kafka.client.api.Header; import io.streamnative.pulsar.handlers.kop.KafkaPayloadProcessor; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; @@ -40,7 +42,6 @@ import org.awaitility.Awaitility; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static org.testng.Assert.*; /** * Basic end-to-end test with `entryFormat=kafka`. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndPulsarTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndPulsarTest.java index f3e37a34a1..813cf350e1 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndPulsarTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndPulsarTest.java @@ -13,6 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop.e2e; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + import io.netty.buffer.ByteBuf; import io.streamnative.pulsar.handlers.kop.utils.KopTopic; import java.time.Duration; @@ -31,8 +34,6 @@ import org.apache.pulsar.common.api.proto.MarkersMessageIdData; import org.apache.pulsar.common.protocol.Markers; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; /** * Basic end-to-end test with `entryFormat=pulsar`. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndTestBase.java index 51320ed603..a412e17220 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndTestBase.java @@ -13,6 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop.e2e; +import static org.testng.Assert.*; + import io.streamnative.kafka.client.api.Header; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.nio.charset.StandardCharsets; @@ -42,7 +44,6 @@ import org.apache.pulsar.client.impl.MessageIdImpl; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; -import static org.testng.Assert.*; /** * Basic end-to-end test. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/DistributedClusterTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/DistributedClusterTest.java index c021f4412f..2192b77720 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/DistributedClusterTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/DistributedClusterTest.java @@ -13,6 +13,10 @@ */ package io.streamnative.pulsar.handlers.kop.e2e; +import static org.apache.kafka.common.internals.Topic.GROUP_METADATA_TOPIC_NAME; +import static org.apache.pulsar.common.naming.TopicName.PARTITIONED_TOPIC_SUFFIX; +import static org.testng.Assert.*; + import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -46,9 +50,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import static org.apache.kafka.common.internals.Topic.GROUP_METADATA_TOPIC_NAME; -import static org.apache.pulsar.common.naming.TopicName.PARTITIONED_TOPIC_SUFFIX; -import static org.testng.Assert.*; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderTestBase.java index 5a57c233d2..7dd35c6bd5 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderTestBase.java @@ -14,6 +14,8 @@ package io.streamnative.pulsar.handlers.kop.e2e; +import static org.testng.Assert.*; + import com.google.common.collect.Sets; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.time.Duration; @@ -39,7 +41,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static org.testng.Assert.*; /** * Unit test for Different kafka produce messages. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaNonPartitionedTopicTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaNonPartitionedTopicTest.java index 0ea6cb4ec0..5b11878242 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaNonPartitionedTopicTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaNonPartitionedTopicTest.java @@ -14,6 +14,9 @@ package io.streamnative.pulsar.handlers.kop.e2e; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.time.Duration; import java.util.Collections; @@ -28,8 +31,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; /** * Test unit for non-partitioned topic. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java index aa69c15b3d..769aef0789 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java @@ -14,6 +14,9 @@ package io.streamnative.pulsar.handlers.kop.e2e; +import static org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedLedgerInfo.LedgerInfo; +import static org.testng.Assert.*; + import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.lang.reflect.Field; import java.time.Duration; @@ -43,8 +46,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import static org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedLedgerInfo.LedgerInfo; -import static org.testng.Assert.*; /** * Unit test for Different kafka produce messages. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/PerTopicConfigurationTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/PerTopicConfigurationTest.java index 1333e74596..9c5682ea03 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/PerTopicConfigurationTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/PerTopicConfigurationTest.java @@ -13,6 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop.e2e; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; + import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.time.Duration; import java.util.Base64; @@ -35,8 +38,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNull; /** * Unit test for custom topic configuration. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/DifferentNamespaceTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/DifferentNamespaceTest.java index 0b31bb31e3..135783e5b0 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/DifferentNamespaceTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/DifferentNamespaceTest.java @@ -13,6 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop.metadata; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + import com.google.common.collect.Sets; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.time.Duration; @@ -28,8 +31,6 @@ import org.apache.kafka.common.internals.Topic; import org.apache.pulsar.common.policies.data.TenantInfo; import org.testng.annotations.*; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; /** * test topics in different namespaces. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/MetadataInitTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/MetadataInitTest.java index 97093440cc..33858b45c2 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/MetadataInitTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/MetadataInitTest.java @@ -13,6 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop.metadata; +import static org.testng.Assert.*; + import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.PortManager; @@ -31,7 +33,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import static org.testng.Assert.*; @Slf4j public class MetadataInitTest extends KopProtocolHandlerTestBase { diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/IdempotentProducerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/IdempotentProducerTest.java index 35726e35d5..0944cfb283 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/IdempotentProducerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/IdempotentProducerTest.java @@ -13,6 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop.producer; +import static org.testng.Assert.assertEquals; + import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.time.Duration; import java.util.Collections; @@ -30,7 +32,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; /** * Idempotent producer test. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishBufferThrottleTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishBufferThrottleTestBase.java index c4ac44be35..87484dfaae 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishBufferThrottleTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishBufferThrottleTestBase.java @@ -13,6 +13,10 @@ */ package io.streamnative.pulsar.handlers.kop.producer; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.mockStatic; + import io.streamnative.pulsar.handlers.kop.KafkaRequestHandler; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.util.Properties; @@ -29,9 +33,6 @@ import org.mockito.MockedStatic; import org.testng.Assert; import org.testng.annotations.Test; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Mockito.mockStatic; /** * Test class for message publish buffer throttle from kop side. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishThrottlingTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishThrottlingTest.java index 102cc6cf5b..75232c9e03 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishThrottlingTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishThrottlingTest.java @@ -14,6 +14,8 @@ package io.streamnative.pulsar.handlers.kop.producer; +import static org.testng.Assert.*; + import com.google.common.collect.Sets; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.util.ArrayList; @@ -41,7 +43,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static org.testng.Assert.*; /** * Test KoP message publish throttling. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/PulsarSchemaStorageTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/PulsarSchemaStorageTest.java index ef37df35f1..0b70ab9cd4 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/PulsarSchemaStorageTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/PulsarSchemaStorageTest.java @@ -13,6 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop.schemaregistry.model.impl; +import static org.testng.Assert.assertEquals; + import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.schemaregistry.model.CompatibilityChecker; import io.streamnative.pulsar.handlers.kop.schemaregistry.model.Schema; @@ -25,7 +27,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; @Slf4j public class PulsarSchemaStorageTest extends KopProtocolHandlerTestBase { diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRegistryTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRegistryTest.java index 81f406778e..11827bb3ef 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRegistryTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRegistryTest.java @@ -13,6 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop.schemaregistry.model.impl; +import static org.testng.Assert.*; + import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient; import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException; import io.confluent.kafka.serializers.AbstractKafkaAvroSerDe; @@ -44,7 +46,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import static org.testng.Assert.*; /** * Test for KoP with Confluent Schema Registry. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRestApiTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRestApiTest.java index 470a248205..917456767a 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRestApiTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRestApiTest.java @@ -13,6 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop.schemaregistry.model.impl; +import static org.testng.Assert.*; + import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; @@ -31,7 +33,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import static org.testng.Assert.*; /** * Test the Schema related REST APIs. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaStorageTestsBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaStorageTestsBase.java index c88e905f1c..de144c64cb 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaStorageTestsBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaStorageTestsBase.java @@ -13,6 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop.schemaregistry.model.impl; +import static org.testng.Assert.*; + import io.streamnative.pulsar.handlers.kop.schemaregistry.model.CompatibilityChecker; import io.streamnative.pulsar.handlers.kop.schemaregistry.model.Schema; import io.streamnative.pulsar.handlers.kop.schemaregistry.model.SchemaStorage; @@ -22,7 +24,6 @@ import lombok.AllArgsConstructor; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; -import static org.testng.Assert.*; @AllArgsConstructor public class SchemaStorageTestsBase { diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelTest.java index 6684787492..7d7fbd785e 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelTest.java @@ -13,6 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop.security; +import static java.nio.charset.StandardCharsets.UTF_8; +import static org.testng.AssertJUnit.assertFalse; + import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.io.Closeable; import java.time.Duration; @@ -40,8 +43,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Factory; import org.testng.annotations.Test; -import static java.nio.charset.StandardCharsets.UTF_8; -import static org.testng.AssertJUnit.assertFalse; /** * Validate Kafka SSL channel config. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelWithClientAuthTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelWithClientAuthTest.java index 2131218c29..57fb22f225 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelWithClientAuthTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/KafkaSSLChannelWithClientAuthTest.java @@ -13,6 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop.security; +import static java.nio.charset.StandardCharsets.UTF_8; + import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.io.Closeable; @@ -30,7 +32,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Factory; import org.testng.annotations.Test; -import static java.nio.charset.StandardCharsets.UTF_8; /** * Validate Kafka SSL channel config. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainTestBase.java index b889011f86..5a06d5d1c9 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainTestBase.java @@ -13,6 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop.security; +import static org.mockito.Mockito.spy; +import static org.testng.Assert.*; + import com.google.common.collect.Sets; import io.jsonwebtoken.SignatureAlgorithm; import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; @@ -46,8 +49,6 @@ import org.apache.pulsar.common.policies.data.TenantInfo; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import static org.mockito.Mockito.spy; -import static org.testng.Assert.*; /** * Testing the SASL-PLAIN features on KoP. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/DelayAuthorizationFailedCloseTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/DelayAuthorizationFailedCloseTest.java index 96c76a07e5..6e315d9014 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/DelayAuthorizationFailedCloseTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/DelayAuthorizationFailedCloseTest.java @@ -13,6 +13,10 @@ */ package io.streamnative.pulsar.handlers.kop.security.auth; +import static org.mockito.Mockito.spy; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; + import com.google.common.collect.Sets; import io.jsonwebtoken.SignatureAlgorithm; import io.streamnative.kafka.client.api.KafkaVersion; @@ -46,9 +50,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import static org.mockito.Mockito.spy; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; /** * Test delay close handler when authorization failed. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationKafkaMultitenantTenantMetadataTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationKafkaMultitenantTenantMetadataTest.java index 0a987f4480..ebb18d256d 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationKafkaMultitenantTenantMetadataTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationKafkaMultitenantTenantMetadataTest.java @@ -13,9 +13,10 @@ */ package io.streamnative.pulsar.handlers.kop.security.auth; +import static org.testng.Assert.assertFalse; + import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import static org.testng.Assert.assertFalse; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationMockTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationMockTest.java index 7cf83f5b33..5c37d15807 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationMockTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationMockTest.java @@ -13,6 +13,10 @@ */ package io.streamnative.pulsar.handlers.kop.security.auth; +import static org.mockito.Mockito.spy; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + import com.google.common.collect.Sets; import io.jsonwebtoken.SignatureAlgorithm; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; @@ -31,9 +35,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import static org.mockito.Mockito.spy; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; /** * Unit test for Authorization with `entryFormat=pulsar`. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationTestBase.java index cbbd1a3d73..54d46073e8 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationTestBase.java @@ -13,6 +13,10 @@ */ package io.streamnative.pulsar.handlers.kop.security.auth; +import static org.mockito.Mockito.spy; +import static org.testng.Assert.*; +import static org.testng.AssertJUnit.fail; + import com.google.common.collect.Sets; import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException; import io.confluent.kafka.serializers.KafkaAvroDeserializer; @@ -56,9 +60,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static org.mockito.Mockito.spy; -import static org.testng.Assert.*; -import static org.testng.AssertJUnit.fail; /** * Unit test for KoP enable authorization. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/SimpleAclAuthorizerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/SimpleAclAuthorizerTest.java index 2602b57bf3..593e1e0596 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/SimpleAclAuthorizerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/SimpleAclAuthorizerTest.java @@ -14,6 +14,10 @@ package io.streamnative.pulsar.handlers.kop.security.auth; +import static org.mockito.Mockito.spy; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; + import com.google.common.collect.Sets; import io.jsonwebtoken.SignatureAlgorithm; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; @@ -36,9 +40,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import static org.mockito.Mockito.spy; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; /** * Test SimpleAclAuthorizer. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/CustomOAuthBearerCallbackHandlerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/CustomOAuthBearerCallbackHandlerTest.java index 95366a4e93..5ba4a51f77 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/CustomOAuthBearerCallbackHandlerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/CustomOAuthBearerCallbackHandlerTest.java @@ -13,6 +13,10 @@ */ package io.streamnative.pulsar.handlers.kop.security.oauth; +import static org.mockito.Mockito.spy; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + import com.google.common.collect.Sets; import io.jsonwebtoken.SignatureAlgorithm; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; @@ -37,9 +41,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import static org.mockito.Mockito.spy; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; /** * Test custom AuthenticateCallbackHandler for OAUTHBEARER. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/OauthValidatorCallbackHandlerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/OauthValidatorCallbackHandlerTest.java index 7dbea029b6..7f900a2806 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/OauthValidatorCallbackHandlerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/OauthValidatorCallbackHandlerTest.java @@ -13,6 +13,12 @@ */ package io.streamnative.pulsar.handlers.kop.security.oauth; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; + import java.util.HashMap; import java.util.concurrent.CompletableFuture; import javax.naming.AuthenticationException; @@ -20,11 +26,6 @@ import org.apache.pulsar.broker.authentication.AuthenticationService; import org.apache.pulsar.broker.authentication.AuthenticationState; import org.testng.annotations.Test; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.*; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNull; /** * Unit test for {@link OauthValidatorCallbackHandler}. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthBearerTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthBearerTestBase.java index 154c2a264e..8d70c98a33 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthBearerTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthBearerTestBase.java @@ -13,6 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop.security.oauth; +import static org.testng.Assert.*; + import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.time.Duration; import java.util.ArrayList; @@ -29,7 +31,6 @@ import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.clients.producer.RecordMetadata; import org.apache.kafka.common.errors.TimeoutException; -import static org.testng.Assert.*; /** * Base class for SASL-OAUTHBEARER tests. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthDefaultHandlersTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthDefaultHandlersTest.java index c05c9406c0..8c36cf4f91 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthDefaultHandlersTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthDefaultHandlersTest.java @@ -13,6 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop.security.oauth; +import static org.mockito.Mockito.spy; + import com.google.common.collect.Sets; import io.jsonwebtoken.SignatureAlgorithm; import java.util.Optional; @@ -27,7 +29,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import static org.mockito.Mockito.spy; /** * Testing the SASL-OAUTHBEARER features on KoP with default login and validate callback handlers. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersTest.java index 15f1be8967..d8b2d1bea5 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersTest.java @@ -13,6 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop.security.oauth; +import static org.mockito.Mockito.*; +import static org.testng.Assert.*; + import com.google.common.collect.Sets; import java.io.IOException; import java.net.URL; @@ -51,8 +54,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import static org.mockito.Mockito.*; -import static org.testng.Assert.*; /** * Testing the SASL-OAUTHBEARER features on KoP with KoP's own login callback handler and server callback handler. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersWithMultiTenantTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersWithMultiTenantTest.java index 4b252e77f1..fb8aba3a68 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersWithMultiTenantTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersWithMultiTenantTest.java @@ -13,6 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop.security.oauth; +import static org.testng.Assert.*; + import com.google.common.collect.Sets; import java.net.URL; import java.time.Duration; @@ -36,7 +38,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import static org.testng.Assert.*; @Slf4j public class SaslOAuthKopHandlersWithMultiTenantTest extends SaslOAuthBearerTestBase { diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PartitionLogTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PartitionLogTest.java index 26cdd007db..a093e7a215 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PartitionLogTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PartitionLogTest.java @@ -13,6 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop.storage; +import static org.mockito.Mockito.mock; + import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; import io.streamnative.pulsar.handlers.kop.KafkaTopicLookupService; import java.nio.ByteBuffer; @@ -26,7 +28,6 @@ import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static org.mockito.Mockito.mock; /** * Unit test {@link PartitionLog}. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerSnapshotBufferTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerSnapshotBufferTestBase.java index 4b61c9458c..21793b7b35 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerSnapshotBufferTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerSnapshotBufferTestBase.java @@ -13,6 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop.storage; +import static org.testng.Assert.assertEquals; + import com.google.common.collect.Lists; import com.google.common.collect.Maps; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; @@ -24,7 +26,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; @Slf4j public abstract class ProducerStateManagerSnapshotBufferTestBase extends KopProtocolHandlerTestBase { diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerTest.java index 42ad47c826..8d698bc7ec 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerTest.java @@ -13,6 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop.storage; +import static org.testng.Assert.*; + import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.utils.timer.MockTime; import java.util.Collections; @@ -26,7 +28,6 @@ import org.apache.kafka.common.record.RecordBatch; import org.mockito.Mockito; import org.testng.annotations.*; -import static org.testng.Assert.*; /** * Producer state manager test. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PulsarTopicProducerStateManagerSnapshotBufferTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PulsarTopicProducerStateManagerSnapshotBufferTest.java index 1fe54e559d..0a6ee94041 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PulsarTopicProducerStateManagerSnapshotBufferTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PulsarTopicProducerStateManagerSnapshotBufferTest.java @@ -13,6 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop.storage; +import static org.testng.Assert.assertEquals; + import com.google.common.collect.Lists; import com.google.common.collect.Maps; import java.nio.ByteBuffer; @@ -22,7 +24,6 @@ import java.util.TreeMap; import lombok.extern.slf4j.Slf4j; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; /** * Unit test for {@link PulsarTopicProducerStateManagerSnapshotBuffer}. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/GlobalKTableTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/GlobalKTableTest.java index e9ea718d5c..a7d246af06 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/GlobalKTableTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/GlobalKTableTest.java @@ -13,6 +13,8 @@ */ package io.streamnative.pulsar.handlers.kop.streams; +import static org.testng.Assert.assertEquals; + import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -30,7 +32,6 @@ import org.apache.kafka.streams.state.ReadOnlyKeyValueStore; import org.apache.kafka.streams.state.Stores; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KStreamAggregationTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KStreamAggregationTest.java index a99421e228..cc0a591f28 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KStreamAggregationTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KStreamAggregationTest.java @@ -13,6 +13,12 @@ */ package io.streamnative.pulsar.handlers.kop.streams; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; + import java.time.Duration; import java.util.*; import java.util.concurrent.CountDownLatch; @@ -36,11 +42,6 @@ import org.apache.kafka.streams.state.QueryableStoreTypes; import org.apache.kafka.streams.state.ReadOnlySessionStore; import org.testng.annotations.Test; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.is; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/TimerTaskListTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/TimerTaskListTest.java index 46d5aab687..588ec9beea 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/TimerTaskListTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/TimerTaskListTest.java @@ -13,13 +13,14 @@ */ package io.streamnative.pulsar.handlers.kop.utils.timer; +import static org.testng.Assert.assertEquals; + import io.streamnative.pulsar.handlers.kop.utils.timer.TimerTaskList.TimerTaskEntry; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; import java.util.stream.IntStream; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; /** * Unit test {@link TimerTaskList}. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/TimerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/TimerTest.java index 0b01e644c3..2a3771f199 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/TimerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/utils/timer/TimerTest.java @@ -13,6 +13,10 @@ */ package io.streamnative.pulsar.handlers.kop.utils.timer; +import static org.testng.Assert.fail; +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertTrue; + import com.google.common.collect.Lists; import java.util.ArrayList; import java.util.Collections; @@ -27,9 +31,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import static org.testng.Assert.fail; -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertTrue; /** * Unit test {@link Timer}. From c5cdcd69914d3fe58c979ff0126a9f3673e4f029 Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Mon, 3 Jul 2023 12:31:55 -0700 Subject: [PATCH 12/19] Avoid using * in import --- .../handlers/kop/CacheInvalidatorTest.java | 11 ++++- .../pulsar/handlers/kop/KafkaApisTest.java | 47 +++++++++++++++--- .../handlers/kop/KafkaCommonTestUtils.java | 6 ++- .../handlers/kop/KafkaListenerNameTest.java | 8 +++- .../handlers/kop/KafkaRequestHandlerTest.java | 48 ++++++++++++++++--- ...kaRequestHandlerWithAuthorizationTest.java | 43 +++++++++++++++-- .../kop/KafkaTopicConsumerManagerTest.java | 16 ++++++- .../handlers/kop/KopEventManagerTest.java | 6 ++- .../kop/KopProtocolHandlerTestBase.java | 13 ++++- .../handlers/kop/MetricsProviderTest.java | 7 ++- .../kop/OffsetTopicWriteTimeoutTest.java | 15 +++++- .../pulsar/handlers/kop/UpgradeTest.java | 6 ++- .../handlers/kop/admin/KafkaAdminTest.java | 33 +++++++++++-- .../BasicEndToEndPulsarTest.java | 14 +++++- .../compatibility/BasicEndToEndTestBase.java | 21 +++++++- .../DefaultKafkaClientFactory.java | 10 +++- .../saslplain/SaslPlainEndToEndTest.java | 25 ++++++++-- .../CompactedPartitionedTopicTest.java | 15 +++++- .../group/GroupCoordinatorTest.java | 17 +++++-- .../group/GroupMetadataManagerTest.java | 47 +++++++++++++++--- .../TransactionCoordinatorTest.java | 15 ++++-- .../transaction/TransactionLogTest.java | 6 ++- .../TransactionMarkerChannelManagerTest.java | 4 +- .../TransactionStateManagerTest.java | 22 +++++++-- .../transaction/TransactionTest.java | 22 +++++++-- .../kop/e2e/BasicEndToEndKafkaTest.java | 11 ++++- .../kop/e2e/BasicEndToEndPulsarTest.java | 8 +++- .../kop/e2e/BasicEndToEndTestBase.java | 12 ++++- .../kop/e2e/DistributedClusterTest.java | 4 +- .../kop/e2e/KafkaMessageOrderTestBase.java | 11 ++++- .../handlers/kop/e2e/MultiLedgerTest.java | 12 ++++- .../kop/metadata/DifferentNamespaceTest.java | 23 +++++++-- .../kop/metadata/MetadataInitTest.java | 4 +- .../MessagePublishThrottlingTest.java | 4 +- .../model/impl/SchemaRegistryTest.java | 4 +- .../model/impl/SchemaRestApiTest.java | 4 +- .../model/impl/SchemaStorageTestsBase.java | 6 ++- .../kop/security/SaslPlainTestBase.java | 11 ++++- .../auth/KafkaAuthorizationMockTest.java | 6 ++- .../auth/KafkaAuthorizationTestBase.java | 21 ++++++-- .../auth/KafkaMockAuthorizationProvider.java | 8 +++- .../CustomOAuthBearerCallbackHandlerTest.java | 7 ++- .../OauthValidatorCallbackHandlerTest.java | 4 +- .../oauth/SaslOAuthBearerTestBase.java | 4 +- .../oauth/SaslOAuthKopHandlersTest.java | 14 ++++-- ...slOAuthKopHandlersWithMultiTenantTest.java | 4 +- .../kop/storage/PartitionLogTest.java | 8 +++- ...cerStateManagerSnapshotBufferTestBase.java | 6 ++- .../kop/storage/ProducerStateManagerTest.java | 10 +++- .../kop/streams/GlobalKTableTest.java | 8 +++- .../kop/streams/KStreamAggregationTest.java | 38 +++++++++++++-- .../handlers/kop/streams/TestUtils.java | 25 ++++++++-- 52 files changed, 645 insertions(+), 109 deletions(-) diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/CacheInvalidatorTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/CacheInvalidatorTest.java index 73fcefb39e..4a4f2cb660 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/CacheInvalidatorTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/CacheInvalidatorTest.java @@ -14,10 +14,17 @@ package io.streamnative.pulsar.handlers.kop; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; import java.time.Duration; -import java.util.*; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.TimeUnit; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaApisTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaApisTest.java index a1c290d5ac..056a7cc0ce 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaApisTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaApisTest.java @@ -19,9 +19,18 @@ import static org.apache.kafka.clients.consumer.ConsumerConfig.DEFAULT_MAX_PARTITION_FETCH_BYTES; import static org.apache.kafka.common.requests.ListOffsetsRequest.EARLIEST_TIMESTAMP; import static org.apache.pulsar.common.naming.TopicName.PARTITIONED_TOPIC_SUFFIX; -import static org.mockito.ArgumentMatchers.*; -import static org.mockito.Mockito.*; -import static org.testng.Assert.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -37,7 +46,13 @@ import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.time.Duration; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Properties; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; @@ -64,9 +79,29 @@ import org.apache.kafka.common.message.ProduceRequestData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; -import org.apache.kafka.common.record.*; -import org.apache.kafka.common.requests.*; +import org.apache.kafka.common.record.CompressionType; +import org.apache.kafka.common.record.ControlRecordType; +import org.apache.kafka.common.record.EndTransactionMarker; +import org.apache.kafka.common.record.MemoryRecords; +import org.apache.kafka.common.record.MemoryRecordsBuilder; +import org.apache.kafka.common.record.MutableRecordBatch; +import org.apache.kafka.common.record.RecordBatch; +import org.apache.kafka.common.record.TimestampType; +import org.apache.kafka.common.requests.AbstractRequest; +import org.apache.kafka.common.requests.AbstractResponse; +import org.apache.kafka.common.requests.FetchRequest; +import org.apache.kafka.common.requests.FetchResponse; +import org.apache.kafka.common.requests.FindCoordinatorRequest; +import org.apache.kafka.common.requests.ListOffsetsRequest; +import org.apache.kafka.common.requests.ListOffsetsResponse; +import org.apache.kafka.common.requests.MetadataRequest; +import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.requests.MetadataResponse.TopicMetadata; +import org.apache.kafka.common.requests.OffsetCommitRequest; +import org.apache.kafka.common.requests.OffsetCommitResponse; +import org.apache.kafka.common.requests.ProduceRequest; +import org.apache.kafka.common.requests.ProduceResponse; +import org.apache.kafka.common.requests.ResponseCallbackWrapper; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; import org.apache.pulsar.broker.service.Topic; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaCommonTestUtils.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaCommonTestUtils.java index 628e73ce41..129a5928d4 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaCommonTestUtils.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaCommonTestUtils.java @@ -26,7 +26,11 @@ import org.apache.kafka.common.message.ListOffsetsResponseData; import org.apache.kafka.common.message.OffsetCommitRequestData; import org.apache.kafka.common.protocol.ApiKeys; -import org.apache.kafka.common.requests.*; +import org.apache.kafka.common.requests.AbstractRequest; +import org.apache.kafka.common.requests.FetchRequest; +import org.apache.kafka.common.requests.KopResponseUtils; +import org.apache.kafka.common.requests.RequestHeader; +import org.apache.kafka.common.requests.TxnOffsetCommitRequest; public class KafkaCommonTestUtils { diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaListenerNameTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaListenerNameTest.java index c4f1353203..db245d7e0d 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaListenerNameTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaListenerNameTest.java @@ -20,7 +20,13 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerTest.java index 6efe625c3b..6ded463c1c 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerTest.java @@ -19,7 +19,11 @@ import static org.apache.pulsar.common.naming.TopicName.PARTITIONED_TOPIC_SUFFIX; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; @@ -40,14 +44,29 @@ import java.net.SocketAddress; import java.nio.ByteBuffer; import java.time.Duration; -import java.util.*; -import java.util.concurrent.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; import java.util.stream.LongStream; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; -import org.apache.kafka.clients.admin.*; +import org.apache.kafka.clients.admin.AdminClient; +import org.apache.kafka.clients.admin.AdminClientConfig; +import org.apache.kafka.clients.admin.NewPartitions; +import org.apache.kafka.clients.admin.NewTopic; +import org.apache.kafka.clients.admin.TopicDescription; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.clients.producer.KafkaProducer; @@ -58,14 +77,31 @@ import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.Node; import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.errors.*; +import org.apache.kafka.common.errors.InvalidPartitionsException; +import org.apache.kafka.common.errors.InvalidRequestException; +import org.apache.kafka.common.errors.RecordTooLargeException; +import org.apache.kafka.common.errors.TopicExistsException; +import org.apache.kafka.common.errors.UnknownServerException; +import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; import org.apache.kafka.common.message.ApiMessageType; import org.apache.kafka.common.message.ListOffsetsResponseData; import org.apache.kafka.common.message.MetadataRequestData; import org.apache.kafka.common.message.OffsetCommitRequestData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; -import org.apache.kafka.common.requests.*; +import org.apache.kafka.common.requests.AbstractRequest; +import org.apache.kafka.common.requests.AbstractResponse; +import org.apache.kafka.common.requests.ApiVersionsRequest; +import org.apache.kafka.common.requests.ApiVersionsResponse; +import org.apache.kafka.common.requests.CreateTopicsRequest; +import org.apache.kafka.common.requests.KopResponseUtils; +import org.apache.kafka.common.requests.ListOffsetsRequest; +import org.apache.kafka.common.requests.ListOffsetsResponse; +import org.apache.kafka.common.requests.MetadataRequest; +import org.apache.kafka.common.requests.MetadataResponse; +import org.apache.kafka.common.requests.OffsetCommitRequest; +import org.apache.kafka.common.requests.RequestHeader; +import org.apache.kafka.common.requests.ResponseHeader; import org.apache.kafka.common.serialization.ByteArraySerializer; import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.StringSerializer; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerWithAuthorizationTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerWithAuthorizationTest.java index a0b7aad377..c10026058a 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerWithAuthorizationTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandlerWithAuthorizationTest.java @@ -15,8 +15,13 @@ import static io.streamnative.pulsar.handlers.kop.KafkaCommonTestUtils.getListOffsetsPartitionResponse; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.*; -import static org.testng.Assert.*; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertTrue; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -32,7 +37,13 @@ import io.streamnative.pulsar.handlers.kop.utils.KopTopic; import java.net.InetSocketAddress; import java.net.SocketAddress; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Properties; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; @@ -43,13 +54,35 @@ import org.apache.kafka.common.IsolationLevel; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.acl.AclOperation; -import org.apache.kafka.common.message.*; +import org.apache.kafka.common.message.CreatePartitionsResponseData; +import org.apache.kafka.common.message.ListOffsetsResponseData; +import org.apache.kafka.common.message.MetadataRequestData; +import org.apache.kafka.common.message.OffsetCommitRequestData; +import org.apache.kafka.common.message.ProduceRequestData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.record.CompressionType; import org.apache.kafka.common.record.MemoryRecords; import org.apache.kafka.common.record.SimpleRecord; -import org.apache.kafka.common.requests.*; +import org.apache.kafka.common.requests.AbstractRequest; +import org.apache.kafka.common.requests.AbstractResponse; +import org.apache.kafka.common.requests.AddPartitionsToTxnRequest; +import org.apache.kafka.common.requests.AddPartitionsToTxnResponse; +import org.apache.kafka.common.requests.CreatePartitionsRequest; +import org.apache.kafka.common.requests.CreatePartitionsResponse; +import org.apache.kafka.common.requests.ListOffsetsRequest; +import org.apache.kafka.common.requests.ListOffsetsResponse; +import org.apache.kafka.common.requests.MetadataRequest; +import org.apache.kafka.common.requests.MetadataResponse; +import org.apache.kafka.common.requests.OffsetCommitRequest; +import org.apache.kafka.common.requests.OffsetCommitResponse; +import org.apache.kafka.common.requests.OffsetFetchRequest; +import org.apache.kafka.common.requests.OffsetFetchResponse; +import org.apache.kafka.common.requests.ProduceRequest; +import org.apache.kafka.common.requests.ProduceResponse; +import org.apache.kafka.common.requests.RequestHeader; +import org.apache.kafka.common.requests.TxnOffsetCommitRequest; +import org.apache.kafka.common.requests.TxnOffsetCommitResponse; import org.apache.pulsar.broker.ServiceConfiguration; import org.apache.pulsar.broker.authentication.AuthenticationProviderToken; import org.apache.pulsar.broker.authentication.utils.AuthTokenUtils; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaTopicConsumerManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaTopicConsumerManagerTest.java index 8ecb06f5ce..4fa30ff5fb 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaTopicConsumerManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaTopicConsumerManagerTest.java @@ -15,7 +15,14 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertSame; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; @@ -25,7 +32,12 @@ import java.util.Collections; import java.util.List; import java.util.Properties; -import java.util.concurrent.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import java.util.function.Function; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopEventManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopEventManagerTest.java index a41d8b7b15..6f3f952582 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopEventManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopEventManagerTest.java @@ -18,7 +18,11 @@ import com.google.common.collect.Lists; import java.time.Duration; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Properties; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import org.apache.kafka.clients.admin.AdminClient; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopProtocolHandlerTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopProtocolHandlerTestBase.java index 4993837b67..e022552681 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopProtocolHandlerTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopProtocolHandlerTestBase.java @@ -13,7 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; import static org.testng.Assert.assertTrue; import com.fasterxml.jackson.databind.ObjectMapper; @@ -30,7 +32,14 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Properties; +import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.function.Predicate; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderTest.java index f9a6fd909d..ab358c8e09 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderTest.java @@ -20,7 +20,12 @@ import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.time.Duration; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Properties; +import java.util.Set; +import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/OffsetTopicWriteTimeoutTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/OffsetTopicWriteTimeoutTest.java index 432aca1626..32c47a9d7b 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/OffsetTopicWriteTimeoutTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/OffsetTopicWriteTimeoutTest.java @@ -21,7 +21,12 @@ import io.netty.channel.ChannelHandlerContext; import java.net.InetSocketAddress; import java.time.Duration; -import java.util.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Supplier; @@ -33,7 +38,13 @@ import org.apache.kafka.common.message.OffsetCommitRequestData; import org.apache.kafka.common.message.SyncGroupRequestData; import org.apache.kafka.common.protocol.Errors; -import org.apache.kafka.common.requests.*; +import org.apache.kafka.common.requests.AbstractResponse; +import org.apache.kafka.common.requests.JoinGroupRequest; +import org.apache.kafka.common.requests.JoinGroupResponse; +import org.apache.kafka.common.requests.OffsetCommitRequest; +import org.apache.kafka.common.requests.OffsetCommitResponse; +import org.apache.kafka.common.requests.SyncGroupRequest; +import org.apache.kafka.common.requests.SyncGroupResponse; import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/UpgradeTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/UpgradeTest.java index a8ef9d98b8..83849a9b9c 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/UpgradeTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/UpgradeTest.java @@ -14,7 +14,11 @@ package io.streamnative.pulsar.handlers.kop; import java.time.Duration; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Properties; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import lombok.Cleanup; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KafkaAdminTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KafkaAdminTest.java index 4a4d62f2f2..897af7490c 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KafkaAdminTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/admin/KafkaAdminTest.java @@ -13,7 +13,11 @@ */ package io.streamnative.pulsar.handlers.kop.admin; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; import com.google.common.collect.Sets; import io.jsonwebtoken.lang.Maps; @@ -21,13 +25,36 @@ import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.nio.charset.StandardCharsets; import java.time.Duration; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; -import org.apache.kafka.clients.admin.*; +import org.apache.kafka.clients.admin.AdminClient; +import org.apache.kafka.clients.admin.AdminClientConfig; +import org.apache.kafka.clients.admin.Config; +import org.apache.kafka.clients.admin.ConsumerGroupDescription; +import org.apache.kafka.clients.admin.ConsumerGroupListing; +import org.apache.kafka.clients.admin.CreatePartitionsResult; +import org.apache.kafka.clients.admin.DeleteConsumerGroupOffsetsResult; +import org.apache.kafka.clients.admin.DescribeClientQuotasResult; +import org.apache.kafka.clients.admin.DescribeClusterResult; +import org.apache.kafka.clients.admin.ListConsumerGroupsResult; +import org.apache.kafka.clients.admin.ListTopicsResult; +import org.apache.kafka.clients.admin.NewPartitions; +import org.apache.kafka.clients.admin.NewTopic; +import org.apache.kafka.clients.admin.OffsetSpec; +import org.apache.kafka.clients.admin.RecordsToDelete; +import org.apache.kafka.clients.admin.TopicDescription; +import org.apache.kafka.clients.admin.TopicListing; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.clients.producer.KafkaProducer; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/BasicEndToEndPulsarTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/BasicEndToEndPulsarTest.java index 60c95d7862..922f849b39 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/BasicEndToEndPulsarTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/BasicEndToEndPulsarTest.java @@ -13,9 +13,19 @@ */ package io.streamnative.pulsar.handlers.kop.compatibility; -import io.streamnative.kafka.client.api.*; +import io.streamnative.kafka.client.api.Consumer; +import io.streamnative.kafka.client.api.ConsumerRecord; +import io.streamnative.kafka.client.api.Header; +import io.streamnative.kafka.client.api.KafkaVersion; +import io.streamnative.kafka.client.api.ProduceContext; +import io.streamnative.kafka.client.api.Producer; +import io.streamnative.kafka.client.api.RecordMetadata; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/BasicEndToEndTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/BasicEndToEndTestBase.java index 0b2b3c660e..c20a3b8cd3 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/BasicEndToEndTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/BasicEndToEndTestBase.java @@ -13,11 +13,28 @@ */ package io.streamnative.pulsar.handlers.kop.compatibility; -import io.streamnative.kafka.client.api.*; +import io.streamnative.kafka.client.api.Consumer; +import io.streamnative.kafka.client.api.ConsumerConfiguration; +import io.streamnative.kafka.client.api.ConsumerRecord; +import io.streamnative.kafka.client.api.Header; +import io.streamnative.kafka.client.api.KafkaClientFactory; +import io.streamnative.kafka.client.api.KafkaClientFactoryImpl; +import io.streamnative.kafka.client.api.KafkaVersion; +import io.streamnative.kafka.client.api.Producer; +import io.streamnative.kafka.client.api.ProducerConfiguration; +import io.streamnative.kafka.client.api.RecordMetadata; +import io.streamnative.kafka.client.api.TopicOffsetAndMetadata; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.io.IOException; import java.time.Duration; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.TreeMap; import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.testng.Assert; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/DefaultKafkaClientFactory.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/DefaultKafkaClientFactory.java index 4a3899c3a9..41a7edb692 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/DefaultKafkaClientFactory.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/DefaultKafkaClientFactory.java @@ -14,7 +14,15 @@ package io.streamnative.pulsar.handlers.kop.compatibility; import com.google.common.collect.Maps; -import io.streamnative.kafka.client.api.*; +import io.streamnative.kafka.client.api.Consumer; +import io.streamnative.kafka.client.api.ConsumerConfiguration; +import io.streamnative.kafka.client.api.ConsumerRecord; +import io.streamnative.kafka.client.api.KafkaClientFactory; +import io.streamnative.kafka.client.api.ProduceContext; +import io.streamnative.kafka.client.api.Producer; +import io.streamnative.kafka.client.api.ProducerConfiguration; +import io.streamnative.kafka.client.api.RecordMetadata; +import io.streamnative.kafka.client.api.TopicOffsetAndMetadata; import java.time.Duration; import java.util.ArrayList; import java.util.HashMap; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/saslplain/SaslPlainEndToEndTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/saslplain/SaslPlainEndToEndTest.java index 3b7d9ae08b..381efe9c06 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/saslplain/SaslPlainEndToEndTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/compatibility/saslplain/SaslPlainEndToEndTest.java @@ -14,11 +14,22 @@ package io.streamnative.pulsar.handlers.kop.compatibility.saslplain; import static org.mockito.Mockito.spy; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; import com.google.common.collect.Sets; import io.jsonwebtoken.SignatureAlgorithm; -import io.streamnative.kafka.client.api.*; +import io.streamnative.kafka.client.api.Consumer; +import io.streamnative.kafka.client.api.ConsumerConfiguration; +import io.streamnative.kafka.client.api.ConsumerRecord; +import io.streamnative.kafka.client.api.Header; +import io.streamnative.kafka.client.api.KafkaClientFactory; +import io.streamnative.kafka.client.api.KafkaClientFactoryImpl; +import io.streamnative.kafka.client.api.KafkaVersion; +import io.streamnative.kafka.client.api.Producer; +import io.streamnative.kafka.client.api.ProducerConfiguration; +import io.streamnative.kafka.client.api.RecordMetadata; import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.compatibility.DefaultKafkaClientFactory; @@ -26,7 +37,15 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Properties; +import java.util.TreeMap; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; import javax.crypto.SecretKey; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/CompactedPartitionedTopicTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/CompactedPartitionedTopicTest.java index c351ddd75b..6afdaf5080 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/CompactedPartitionedTopicTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/CompactedPartitionedTopicTest.java @@ -19,8 +19,19 @@ import io.streamnative.pulsar.handlers.kop.utils.CoreUtils; import java.nio.ByteBuffer; import java.time.Duration; -import java.util.*; -import java.util.concurrent.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Callable; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.IntStream; import lombok.Cleanup; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupCoordinatorTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupCoordinatorTest.java index bc32c346a9..105958975d 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupCoordinatorTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupCoordinatorTest.java @@ -14,7 +14,10 @@ package io.streamnative.pulsar.handlers.kop.coordinator.group; import static org.mockito.Mockito.spy; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotEquals; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; @@ -27,8 +30,12 @@ import io.streamnative.pulsar.handlers.kop.offset.OffsetAndMetadata; import io.streamnative.pulsar.handlers.kop.utils.delayed.DelayedOperationPurgatory; import io.streamnative.pulsar.handlers.kop.utils.timer.MockTimer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Optional; -import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -44,7 +51,11 @@ import org.apache.kafka.common.requests.TransactionResult; import org.apache.pulsar.client.api.PulsarClientException; import org.apache.pulsar.common.schema.KeyValue; -import org.testng.annotations.*; +import org.testng.annotations.AfterClass; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; /** * Unit test {@link GroupCoordinator}. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupMetadataManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupMetadataManagerTest.java index 89135ff20b..aadfb3322a 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupMetadataManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/group/GroupMetadataManagerTest.java @@ -13,13 +13,24 @@ */ package io.streamnative.pulsar.handlers.kop.coordinator.group; -import static io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadataConstants.*; -import static io.streamnative.pulsar.handlers.kop.coordinator.group.GroupState.*; +import static io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadataConstants.groupMetadataKey; +import static io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadataConstants.groupMetadataValue; +import static io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadataConstants.offsetCommitKey; +import static io.streamnative.pulsar.handlers.kop.coordinator.group.GroupMetadataConstants.offsetCommitValue; +import static io.streamnative.pulsar.handlers.kop.coordinator.group.GroupState.Empty; +import static io.streamnative.pulsar.handlers.kop.coordinator.group.GroupState.PreparingRebalance; +import static io.streamnative.pulsar.handlers.kop.coordinator.group.GroupState.Stable; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.spy; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertSame; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; @@ -36,8 +47,12 @@ import io.streamnative.pulsar.handlers.kop.utils.KopTopic; import io.streamnative.pulsar.handlers.kop.utils.timer.MockTime; import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Optional; -import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; @@ -50,15 +65,33 @@ import org.apache.bookkeeper.mledger.impl.PositionImpl; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.protocol.Errors; +import org.apache.kafka.common.record.AbstractRecords; import org.apache.kafka.common.record.CompressionType; +import org.apache.kafka.common.record.ControlRecordType; +import org.apache.kafka.common.record.EndTransactionMarker; +import org.apache.kafka.common.record.MemoryRecords; +import org.apache.kafka.common.record.MemoryRecordsBuilder; import org.apache.kafka.common.record.Record; -import org.apache.kafka.common.record.*; +import org.apache.kafka.common.record.RecordBatch; +import org.apache.kafka.common.record.SimpleRecord; +import org.apache.kafka.common.record.TimestampType; import org.apache.kafka.common.requests.OffsetFetchResponse; import org.apache.kafka.common.requests.OffsetFetchResponse.PartitionData; import org.apache.kafka.common.utils.Time; import org.apache.pulsar.client.admin.PulsarAdminException; -import org.apache.pulsar.client.api.*; -import org.testng.annotations.*; +import org.apache.pulsar.client.api.Consumer; +import org.apache.pulsar.client.api.Message; +import org.apache.pulsar.client.api.MessageId; +import org.apache.pulsar.client.api.ProducerBuilder; +import org.apache.pulsar.client.api.PulsarClientException; +import org.apache.pulsar.client.api.ReaderBuilder; +import org.apache.pulsar.client.api.Schema; +import org.apache.pulsar.client.api.SubscriptionInitialPosition; +import org.testng.annotations.AfterClass; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; /** * Unit test {@link GroupMetadataManager}. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionCoordinatorTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionCoordinatorTest.java index 75e36c8bec..a9652d7330 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionCoordinatorTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionCoordinatorTest.java @@ -13,11 +13,20 @@ */ package io.streamnative.pulsar.handlers.kop.coordinator.transaction; -import static org.mockito.ArgumentMatchers.*; -import static org.mockito.Mockito.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; import static org.mockito.internal.verification.VerificationModeFactory.atLeastOnce; import static org.testng.Assert.assertNotEquals; -import static org.testng.AssertJUnit.*; +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertFalse; +import static org.testng.AssertJUnit.assertNotNull; +import static org.testng.AssertJUnit.assertTrue; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionLogTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionLogTest.java index b3801316a6..0833728dca 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionLogTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionLogTest.java @@ -17,7 +17,11 @@ import com.google.common.collect.Lists; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.record.RecordBatch; import org.apache.pulsar.client.api.Message; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionMarkerChannelManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionMarkerChannelManagerTest.java index 5941a34439..e26268f5a9 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionMarkerChannelManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionMarkerChannelManagerTest.java @@ -14,7 +14,9 @@ package io.streamnative.pulsar.handlers.kop.coordinator.transaction; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; import com.google.common.collect.ImmutableSet; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionStateManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionStateManagerTest.java index f6a114b060..8feaeb5d52 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionStateManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionStateManagerTest.java @@ -16,7 +16,10 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.spy; import static org.testng.Assert.assertNotNull; -import static org.testng.AssertJUnit.*; +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertFalse; +import static org.testng.AssertJUnit.assertTrue; +import static org.testng.AssertJUnit.fail; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; @@ -25,8 +28,11 @@ import io.streamnative.pulsar.handlers.kop.utils.MetadataUtils; import io.streamnative.pulsar.handlers.kop.utils.timer.MockTime; import java.nio.ByteBuffer; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Optional; -import java.util.*; import java.util.concurrent.CompletableFuture; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; @@ -34,12 +40,20 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.pulsar.client.admin.LongRunningProcessStatus; import org.apache.pulsar.client.admin.PulsarAdminException; -import org.apache.pulsar.client.api.*; +import org.apache.pulsar.client.api.Message; +import org.apache.pulsar.client.api.MessageId; +import org.apache.pulsar.client.api.Producer; +import org.apache.pulsar.client.api.Reader; +import org.apache.pulsar.client.api.Schema; import org.apache.pulsar.common.naming.TopicName; import org.awaitility.Awaitility; import org.mockito.ArgumentCaptor; import org.testng.Assert; -import org.testng.annotations.*; +import org.testng.annotations.AfterClass; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; import org.testng.collections.Maps; /** diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionTest.java index 355c760889..6b18cac4bf 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/coordinator/transaction/TransactionTest.java @@ -15,7 +15,11 @@ import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.expectThrows; +import static org.testng.Assert.fail; import com.google.common.collect.ImmutableMap; import io.streamnative.pulsar.handlers.kop.KafkaProtocolHandler; @@ -24,7 +28,15 @@ import io.streamnative.pulsar.handlers.kop.storage.PartitionLog; import java.time.Duration; import java.time.temporal.ChronoUnit; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Properties; +import java.util.UUID; import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; @@ -34,7 +46,11 @@ import org.apache.commons.lang3.RandomStringUtils; import org.apache.kafka.clients.admin.AdminClient; import org.apache.kafka.clients.admin.NewTopic; -import org.apache.kafka.clients.consumer.*; +import org.apache.kafka.clients.consumer.ConsumerConfig; +import org.apache.kafka.clients.consumer.ConsumerRecord; +import org.apache.kafka.clients.consumer.ConsumerRecords; +import org.apache.kafka.clients.consumer.KafkaConsumer; +import org.apache.kafka.clients.consumer.OffsetAndMetadata; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.clients.producer.ProducerRecord; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java index 829305d155..fab9335675 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java @@ -13,7 +13,10 @@ */ package io.streamnative.pulsar.handlers.kop.e2e; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; import io.streamnative.kafka.client.api.Header; import io.streamnative.pulsar.handlers.kop.KafkaPayloadProcessor; @@ -38,7 +41,11 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.header.internals.RecordHeader; import org.apache.pulsar.client.admin.PulsarAdminException; -import org.apache.pulsar.client.api.*; +import org.apache.pulsar.client.api.Consumer; +import org.apache.pulsar.client.api.Message; +import org.apache.pulsar.client.api.MessageId; +import org.apache.pulsar.client.api.Producer; +import org.apache.pulsar.client.api.TypedMessageBuilder; import org.awaitility.Awaitility; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndPulsarTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndPulsarTest.java index 813cf350e1..62ae9d6668 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndPulsarTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndPulsarTest.java @@ -19,7 +19,13 @@ import io.netty.buffer.ByteBuf; import io.streamnative.pulsar.handlers.kop.utils.KopTopic; import java.time.Duration; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Properties; +import java.util.TreeMap; import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; import java.util.stream.IntStream; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndTestBase.java index a412e17220..6958222584 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndTestBase.java @@ -13,7 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop.e2e; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertNull; import io.streamnative.kafka.client.api.Header; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; @@ -40,7 +42,13 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; -import org.apache.pulsar.client.api.*; +import org.apache.pulsar.client.api.Consumer; +import org.apache.pulsar.client.api.Message; +import org.apache.pulsar.client.api.MessageId; +import org.apache.pulsar.client.api.MessagePayloadProcessor; +import org.apache.pulsar.client.api.Producer; +import org.apache.pulsar.client.api.PulsarClientException; +import org.apache.pulsar.client.api.SubscriptionInitialPosition; import org.apache.pulsar.client.impl.MessageIdImpl; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/DistributedClusterTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/DistributedClusterTest.java index 2192b77720..97cf46e17d 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/DistributedClusterTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/DistributedClusterTest.java @@ -15,7 +15,9 @@ import static org.apache.kafka.common.internals.Topic.GROUP_METADATA_TOPIC_NAME; import static org.apache.pulsar.common.naming.TopicName.PARTITIONED_TOPIC_SUFFIX; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderTestBase.java index 7dd35c6bd5..e3198e4b3a 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/KafkaMessageOrderTestBase.java @@ -14,12 +14,19 @@ package io.streamnative.pulsar.handlers.kop.e2e; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertTrue; import com.google.common.collect.Sets; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.time.Duration; -import java.util.*; +import java.util.ArrayList; +import java.util.Base64; +import java.util.Collections; +import java.util.List; +import java.util.Properties; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import lombok.Cleanup; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java index 769aef0789..6b0724713c 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java @@ -15,12 +15,20 @@ import static org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedLedgerInfo.LedgerInfo; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.lang.reflect.Field; import java.time.Duration; -import java.util.*; +import java.util.ArrayList; +import java.util.Base64; +import java.util.Collections; +import java.util.List; +import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.IntStream; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/DifferentNamespaceTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/DifferentNamespaceTest.java index 135783e5b0..a1311725a8 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/DifferentNamespaceTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/DifferentNamespaceTest.java @@ -19,18 +19,35 @@ import com.google.common.collect.Sets; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.time.Duration; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; import java.util.stream.Collectors; import java.util.stream.IntStream; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; -import org.apache.kafka.clients.admin.*; +import org.apache.kafka.clients.admin.AdminClient; +import org.apache.kafka.clients.admin.AdminClientConfig; +import org.apache.kafka.clients.admin.ListTopicsOptions; +import org.apache.kafka.clients.admin.ListTopicsResult; +import org.apache.kafka.clients.admin.NewTopic; +import org.apache.kafka.clients.admin.TopicListing; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.internals.Topic; import org.apache.pulsar.common.policies.data.TenantInfo; -import org.testng.annotations.*; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; /** * test topics in different namespaces. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/MetadataInitTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/MetadataInitTest.java index 33858b45c2..35af8d5b9b 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/MetadataInitTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metadata/MetadataInitTest.java @@ -13,7 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop.metadata; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertThrows; import io.streamnative.pulsar.handlers.kop.KafkaServiceConfiguration; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishThrottlingTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishThrottlingTest.java index 75232c9e03..d7af69bf2b 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishThrottlingTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/MessagePublishThrottlingTest.java @@ -14,7 +14,9 @@ package io.streamnative.pulsar.handlers.kop.producer; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotEquals; +import static org.testng.Assert.assertTrue; import com.google.common.collect.Sets; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRegistryTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRegistryTest.java index 11827bb3ef..91d0c782c4 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRegistryTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRegistryTest.java @@ -13,7 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop.schemaregistry.model.impl; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient; import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRestApiTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRestApiTest.java index 917456767a..6dfe672f58 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRestApiTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaRestApiTest.java @@ -13,7 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop.schemaregistry.model.impl; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertTrue; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaStorageTestsBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaStorageTestsBase.java index de144c64cb..a1e0ac7871 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaStorageTestsBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/schemaregistry/model/impl/SchemaStorageTestsBase.java @@ -13,7 +13,11 @@ */ package io.streamnative.pulsar.handlers.kop.schemaregistry.model.impl; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotEquals; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.expectThrows; import io.streamnative.pulsar.handlers.kop.schemaregistry.model.CompatibilityChecker; import io.streamnative.pulsar.handlers.kop.schemaregistry.model.Schema; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainTestBase.java index 5a06d5d1c9..dd38891c49 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/SaslPlainTestBase.java @@ -14,7 +14,9 @@ package io.streamnative.pulsar.handlers.kop.security; import static org.mockito.Mockito.spy; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; import com.google.common.collect.Sets; import io.jsonwebtoken.SignatureAlgorithm; @@ -22,7 +24,12 @@ import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.time.Duration; import java.time.temporal.ChronoUnit; -import java.util.*; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Properties; +import java.util.UUID; import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicInteger; import javax.crypto.SecretKey; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationMockTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationMockTest.java index 5c37d15807..edeada2ce6 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationMockTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationMockTest.java @@ -21,7 +21,11 @@ import io.jsonwebtoken.SignatureAlgorithm; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.time.Duration; -import java.util.*; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Properties; import javax.crypto.SecretKey; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationTestBase.java index 54d46073e8..325edf8b8c 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaAuthorizationTestBase.java @@ -14,7 +14,10 @@ package io.streamnative.pulsar.handlers.kop.security.auth; import static org.mockito.Mockito.spy; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; import static org.testng.AssertJUnit.fail; import com.google.common.collect.Sets; @@ -26,7 +29,12 @@ import io.netty.handler.codec.http.HttpResponseStatus; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.time.Duration; -import java.util.*; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Properties; +import java.util.Set; import java.util.concurrent.ExecutionException; import javax.crypto.SecretKey; import lombok.Cleanup; @@ -35,7 +43,14 @@ import org.apache.avro.generic.GenericData; import org.apache.avro.generic.GenericRecord; import org.apache.avro.generic.IndexedRecord; -import org.apache.kafka.clients.admin.*; +import org.apache.kafka.clients.admin.AdminClient; +import org.apache.kafka.clients.admin.AdminClientConfig; +import org.apache.kafka.clients.admin.Config; +import org.apache.kafka.clients.admin.CreateTopicsResult; +import org.apache.kafka.clients.admin.DeleteTopicsResult; +import org.apache.kafka.clients.admin.DescribeConfigsResult; +import org.apache.kafka.clients.admin.ListTopicsResult; +import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaMockAuthorizationProvider.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaMockAuthorizationProvider.java index f01e9fab6e..574bf352ac 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaMockAuthorizationProvider.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaMockAuthorizationProvider.java @@ -21,7 +21,13 @@ import org.apache.pulsar.broker.authorization.AuthorizationProvider; import org.apache.pulsar.common.naming.NamespaceName; import org.apache.pulsar.common.naming.TopicName; -import org.apache.pulsar.common.policies.data.*; +import org.apache.pulsar.common.policies.data.AuthAction; +import org.apache.pulsar.common.policies.data.NamespaceOperation; +import org.apache.pulsar.common.policies.data.PolicyName; +import org.apache.pulsar.common.policies.data.PolicyOperation; +import org.apache.pulsar.common.policies.data.TenantInfo; +import org.apache.pulsar.common.policies.data.TenantOperation; +import org.apache.pulsar.common.policies.data.TopicOperation; import org.testng.Assert; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/CustomOAuthBearerCallbackHandlerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/CustomOAuthBearerCallbackHandlerTest.java index 5ba4a51f77..b0297206a0 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/CustomOAuthBearerCallbackHandlerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/CustomOAuthBearerCallbackHandlerTest.java @@ -20,7 +20,12 @@ import com.google.common.collect.Sets; import io.jsonwebtoken.SignatureAlgorithm; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; -import java.util.*; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Properties; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import javax.crypto.SecretKey; import javax.security.auth.callback.Callback; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/OauthValidatorCallbackHandlerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/OauthValidatorCallbackHandlerTest.java index 7f900a2806..85becdcd1c 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/OauthValidatorCallbackHandlerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/OauthValidatorCallbackHandlerTest.java @@ -15,7 +15,9 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthBearerTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthBearerTestBase.java index 8d70c98a33..3d7ff7e42d 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthBearerTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthBearerTestBase.java @@ -13,7 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop.security.oauth; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.time.Duration; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersTest.java index d8b2d1bea5..b2efb5b4c8 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersTest.java @@ -13,14 +13,22 @@ */ package io.streamnative.pulsar.handlers.kop.security.oauth; -import static org.mockito.Mockito.*; -import static org.testng.Assert.*; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.when; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotEquals; +import static org.testng.Assert.assertTrue; import com.google.common.collect.Sets; import java.io.IOException; import java.net.URL; import java.time.Duration; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Properties; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import javax.naming.AuthenticationException; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersWithMultiTenantTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersWithMultiTenantTest.java index fb8aba3a68..f8632a712c 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersWithMultiTenantTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/oauth/SaslOAuthKopHandlersWithMultiTenantTest.java @@ -13,7 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop.security.oauth; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; import com.google.common.collect.Sets; import java.net.URL; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PartitionLogTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PartitionLogTest.java index a093e7a215..cce3aac4cb 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PartitionLogTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/PartitionLogTest.java @@ -23,7 +23,13 @@ import org.apache.bookkeeper.common.util.OrderedExecutor; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.RecordTooLargeException; -import org.apache.kafka.common.record.*; +import org.apache.kafka.common.record.CompressionType; +import org.apache.kafka.common.record.ControlRecordType; +import org.apache.kafka.common.record.EndTransactionMarker; +import org.apache.kafka.common.record.MemoryRecords; +import org.apache.kafka.common.record.MemoryRecordsBuilder; +import org.apache.kafka.common.record.RecordBatch; +import org.apache.kafka.common.record.TimestampType; import org.apache.kafka.common.utils.Time; import org.testng.Assert; import org.testng.annotations.DataProvider; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerSnapshotBufferTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerSnapshotBufferTestBase.java index 21793b7b35..c77cd45e4b 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerSnapshotBufferTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerSnapshotBufferTestBase.java @@ -19,7 +19,11 @@ import com.google.common.collect.Maps; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.SystemTopicClient; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.TreeMap; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.admin.PulsarAdminException; import org.apache.pulsar.common.naming.TopicName; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerTest.java index 8d698bc7ec..4459742f13 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/storage/ProducerStateManagerTest.java @@ -13,7 +13,9 @@ */ package io.streamnative.pulsar.handlers.kop.storage; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import io.streamnative.pulsar.handlers.kop.utils.timer.MockTime; @@ -27,7 +29,11 @@ import org.apache.kafka.common.record.EndTransactionMarker; import org.apache.kafka.common.record.RecordBatch; import org.mockito.Mockito; -import org.testng.annotations.*; +import org.testng.annotations.AfterClass; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; /** * Producer state manager test. diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/GlobalKTableTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/GlobalKTableTest.java index a7d246af06..af5869529f 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/GlobalKTableTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/GlobalKTableTest.java @@ -26,7 +26,13 @@ import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsBuilder; -import org.apache.kafka.streams.kstream.*; +import org.apache.kafka.streams.kstream.Consumed; +import org.apache.kafka.streams.kstream.ForeachAction; +import org.apache.kafka.streams.kstream.GlobalKTable; +import org.apache.kafka.streams.kstream.KStream; +import org.apache.kafka.streams.kstream.KeyValueMapper; +import org.apache.kafka.streams.kstream.Materialized; +import org.apache.kafka.streams.kstream.ValueJoiner; import org.apache.kafka.streams.state.KeyValueStore; import org.apache.kafka.streams.state.QueryableStoreTypes; import org.apache.kafka.streams.state.ReadOnlyKeyValueStore; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KStreamAggregationTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KStreamAggregationTest.java index cc0a591f28..b156fb7106 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KStreamAggregationTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/KStreamAggregationTest.java @@ -20,7 +20,15 @@ import static org.testng.Assert.assertTrue; import java.time.Duration; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; @@ -29,11 +37,35 @@ import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.KafkaConsumer; -import org.apache.kafka.common.serialization.*; +import org.apache.kafka.common.serialization.ByteArrayDeserializer; +import org.apache.kafka.common.serialization.Deserializer; +import org.apache.kafka.common.serialization.IntegerDeserializer; +import org.apache.kafka.common.serialization.IntegerSerializer; +import org.apache.kafka.common.serialization.LongDeserializer; +import org.apache.kafka.common.serialization.Serde; +import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.serialization.StringDeserializer; +import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsConfig; -import org.apache.kafka.streams.kstream.*; +import org.apache.kafka.streams.kstream.Aggregator; +import org.apache.kafka.streams.kstream.Consumed; +import org.apache.kafka.streams.kstream.Initializer; +import org.apache.kafka.streams.kstream.KGroupedStream; +import org.apache.kafka.streams.kstream.KStream; +import org.apache.kafka.streams.kstream.KeyValueMapper; +import org.apache.kafka.streams.kstream.Materialized; +import org.apache.kafka.streams.kstream.Produced; +import org.apache.kafka.streams.kstream.Reducer; +import org.apache.kafka.streams.kstream.Serialized; +import org.apache.kafka.streams.kstream.SessionWindowedDeserializer; +import org.apache.kafka.streams.kstream.SessionWindows; +import org.apache.kafka.streams.kstream.TimeWindowedDeserializer; +import org.apache.kafka.streams.kstream.TimeWindows; +import org.apache.kafka.streams.kstream.Transformer; +import org.apache.kafka.streams.kstream.Windowed; +import org.apache.kafka.streams.kstream.WindowedSerdes; import org.apache.kafka.streams.kstream.internals.SessionWindow; import org.apache.kafka.streams.kstream.internals.TimeWindow; import org.apache.kafka.streams.processor.ProcessorContext; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/TestUtils.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/TestUtils.java index d40850c8f2..e7e0b8723d 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/TestUtils.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/streams/TestUtils.java @@ -15,15 +15,32 @@ import java.io.File; import java.io.IOException; -import java.nio.file.*; +import java.nio.file.FileVisitResult; +import java.nio.file.Files; +import java.nio.file.NoSuchFileException; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.SimpleFileVisitor; import java.nio.file.attribute.BasicFileAttributes; import java.time.Duration; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Properties; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import lombok.extern.slf4j.Slf4j; -import org.apache.kafka.clients.consumer.*; -import org.apache.kafka.clients.producer.*; +import org.apache.kafka.clients.consumer.Consumer; +import org.apache.kafka.clients.consumer.ConsumerConfig; +import org.apache.kafka.clients.consumer.ConsumerRecord; +import org.apache.kafka.clients.consumer.ConsumerRecords; +import org.apache.kafka.clients.consumer.KafkaConsumer; +import org.apache.kafka.clients.producer.KafkaProducer; +import org.apache.kafka.clients.producer.Producer; +import org.apache.kafka.clients.producer.ProducerConfig; +import org.apache.kafka.clients.producer.ProducerRecord; +import org.apache.kafka.clients.producer.RecordMetadata; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; From f5173b68d696be618509a3bb3dde0c97de66bc50 Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Mon, 3 Jul 2023 12:37:39 -0700 Subject: [PATCH 13/19] Fix line to long issue --- .../kop/e2e/BasicEndToEndKafkaTest.java | 60 +++++++++---------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java index fab9335675..c1adb1872b 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java @@ -62,27 +62,24 @@ public BasicEndToEndKafkaTest() { @DataProvider(name = "enableBatching") public static Object[][] enableBatching() { - return new Object[][]{ { true }, { false } }; + return new Object[][]{{true}, {false}}; } @Test(timeOut = 20000) public void testNullValueMessages() throws Exception { final String topic = "test-produce-null-value"; - @Cleanup - final KafkaProducer kafkaProducer = newKafkaProducer(); + @Cleanup final KafkaProducer kafkaProducer = newKafkaProducer(); sendSingleMessages(kafkaProducer, topic, Arrays.asList(null, "")); sendBatchedMessages(kafkaProducer, topic, Arrays.asList("test", "", null)); final List expectedMessages = Arrays.asList(null, "", "test", "", null); - @Cleanup - final KafkaConsumer kafkaConsumer = newKafkaConsumer(topic); + @Cleanup final KafkaConsumer kafkaConsumer = newKafkaConsumer(topic); List kafkaReceives = receiveMessages(kafkaConsumer, expectedMessages.size()); assertEquals(kafkaReceives, expectedMessages); - @Cleanup - final Consumer pulsarConsumer = newPulsarConsumer(topic, SUBSCRIPTION, new KafkaPayloadProcessor()); + @Cleanup final Consumer pulsarConsumer = newPulsarConsumer(topic, SUBSCRIPTION, new KafkaPayloadProcessor()); List pulsarReceives = receiveMessages(pulsarConsumer, expectedMessages.size()); assertEquals(pulsarReceives, expectedMessages); } @@ -145,22 +142,28 @@ public void testPollEmptyTopic() throws Exception { String msgStrPrefix = "Message_kop_KafkaProduceAndConsume_" + partitionNumber + "_"; @Cleanup - KopProtocolHandlerTestBase.KProducer kProducer = new KopProtocolHandlerTestBase.KProducer(kafkaTopic, false, getKafkaBrokerPort(), true); + KopProtocolHandlerTestBase.KProducer kProducer = + new KopProtocolHandlerTestBase.KProducer(kafkaTopic, false, getKafkaBrokerPort(), true); kafkaPublishMessage(kProducer, totalMsg, msgStrPrefix); @Cleanup - KopProtocolHandlerTestBase.KConsumer kConsumer1 = new KopProtocolHandlerTestBase.KConsumer(kafkaTopic, getKafkaBrokerPort(), "consumer-group-1"); + KopProtocolHandlerTestBase.KConsumer kConsumer1 = + new KopProtocolHandlerTestBase.KConsumer(kafkaTopic, getKafkaBrokerPort(), "consumer-group-1"); @Cleanup - KopProtocolHandlerTestBase.KConsumer kConsumer2 = new KopProtocolHandlerTestBase.KConsumer(kafkaTopic, getKafkaBrokerPort(), "consumer-group-2"); + KopProtocolHandlerTestBase.KConsumer kConsumer2 = + new KopProtocolHandlerTestBase.KConsumer(kafkaTopic, getKafkaBrokerPort(), "consumer-group-2"); @Cleanup - KopProtocolHandlerTestBase.KConsumer kConsumer3 = new KopProtocolHandlerTestBase.KConsumer(kafkaTopic, getKafkaBrokerPort(), "consumer-group-3"); + KopProtocolHandlerTestBase.KConsumer kConsumer3 = + new KopProtocolHandlerTestBase.KConsumer(kafkaTopic, getKafkaBrokerPort(), "consumer-group-3"); @Cleanup - KopProtocolHandlerTestBase.KConsumer kConsumer4 = new KopProtocolHandlerTestBase.KConsumer(kafkaTopic, getKafkaBrokerPort(), "consumer-group-4"); + KopProtocolHandlerTestBase.KConsumer kConsumer4 = + new KopProtocolHandlerTestBase.KConsumer(kafkaTopic, getKafkaBrokerPort(), "consumer-group-4"); @Cleanup - KopProtocolHandlerTestBase.KConsumer kConsumer5 = new KopProtocolHandlerTestBase.KConsumer(kafkaTopic, getKafkaBrokerPort(), "consumer-group-5"); + KopProtocolHandlerTestBase.KConsumer kConsumer5 = + new KopProtocolHandlerTestBase.KConsumer(kafkaTopic, getKafkaBrokerPort(), "consumer-group-5"); List topicPartitions = IntStream.range(0, partitionNumber) - .mapToObj(i -> new TopicPartition(kafkaTopic, i)).collect(Collectors.toList()); + .mapToObj(i -> new TopicPartition(kafkaTopic, i)).collect(Collectors.toList()); kafkaConsumeCommitMessage(kConsumer1, totalMsg, msgStrPrefix, topicPartitions); kafkaConsumeCommitMessage(kConsumer2, totalMsg, msgStrPrefix, topicPartitions); @@ -242,8 +245,7 @@ public void testPulsarProduceKafkaConsume(boolean enableBatching) throws Excepti sendCompleteLatch.await(); pulsarProducer.close(); - @Cleanup - final KafkaConsumer kafkaConsumer = newKafkaConsumer(topic); + @Cleanup final KafkaConsumer kafkaConsumer = newKafkaConsumer(topic); final List> receivedRecords = receiveRecords(kafkaConsumer, numMessages); assertEquals(getValuesFromRecords(receivedRecords), values); @@ -273,14 +275,14 @@ public void testMixedProduceKafkaConsume() throws Exception { final Header header = headers.get(i); if (i % 2 == 0) { - final MessageId id = pulsarProducer.newMessage() + final MessageId id = pulsarProducer.newMessage() .value(value.getBytes(StandardCharsets.UTF_8)) .key(key) .property(header.getKey(), header.getValue()) .send(); - if (log.isDebugEnabled()) { - log.debug("PulsarProducer send {} to {}", i, id); - } + if (log.isDebugEnabled()) { + log.debug("PulsarProducer send {} to {}", i, id); + } } else { final RecordMetadata metadata = kafkaProducer.send(new ProducerRecord<>(topic, 0, key, value, Header.toHeaders(Collections.singletonList(header), RecordHeader::new))).get(); @@ -293,8 +295,7 @@ public void testMixedProduceKafkaConsume() throws Exception { kafkaProducer.close(); pulsarProducer.close(); - @Cleanup - final KafkaConsumer kafkaConsumer = newKafkaConsumer(topic); + @Cleanup final KafkaConsumer kafkaConsumer = newKafkaConsumer(topic); final List> receivedRecords = receiveRecords(kafkaConsumer, numMessages); assertEquals(getValuesFromRecords(receivedRecords), values); @@ -323,8 +324,7 @@ public void testKafkaProducePulsarConsume(boolean enableBatching) throws Excepti sendFuture.get(); producer.close(); - @Cleanup - final Consumer consumer = newPulsarConsumer( + @Cleanup final Consumer consumer = newPulsarConsumer( topic, "my-sub-" + enableBatching, new KafkaPayloadProcessor()); final List> messages = receivePulsarMessages(consumer, numMessages); assertEquals(messages.size(), numMessages); @@ -355,8 +355,7 @@ public void testKafkaProducePulsarConsumeWithHeaders(boolean enableBatching) thr sendFuture.get(); producer.close(); - @Cleanup - final Consumer consumer = newPulsarConsumer( + @Cleanup final Consumer consumer = newPulsarConsumer( topic, "my-sub-" + enableBatching, new KafkaPayloadProcessor()); final List> messages = receivePulsarMessages(consumer, numMessages); assertEquals(messages.size(), numMessages); @@ -392,8 +391,7 @@ public void testMixedProducePulsarConsume() throws Exception { kafkaProducer.close(); pulsarProducer.close(); - @Cleanup - final Consumer consumer = newPulsarConsumer(topic, SUBSCRIPTION, new KafkaPayloadProcessor()); + @Cleanup final Consumer consumer = newPulsarConsumer(topic, SUBSCRIPTION, new KafkaPayloadProcessor()); final List> messages = receivePulsarMessages(consumer, numMessages); assertEquals(messages.size(), numMessages); @@ -463,14 +461,12 @@ public void testReadCommitted() throws Exception { pulsar.getAdminClient().topics().createPartitionedTopic(topic, 2); - @Cleanup - final KafkaProducer kafkaProducer = newKafkaProducer(); + @Cleanup final KafkaProducer kafkaProducer = newKafkaProducer(); sendSingleMessages(kafkaProducer, topic, Arrays.asList("a", "b", "c")); List expectValues = Arrays.asList("a", "b", "c"); - @Cleanup - final KafkaConsumer kafkaConsumer = newKafkaConsumer(topic, "test-group", true); + @Cleanup final KafkaConsumer kafkaConsumer = newKafkaConsumer(topic, "test-group", true); List kafkaReceives = receiveMessages(kafkaConsumer, expectValues.size()); assertEquals(kafkaReceives.stream().sorted().collect(Collectors.toList()), expectValues); } From 2f93f9b4ce36bc09c5cd13cca89c54d17c57d896 Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Mon, 3 Jul 2023 12:42:27 -0700 Subject: [PATCH 14/19] Add all tests --- .github/workflows/pr-tests.yml | 49 ++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml index 5b2541adbe..d0880933b7 100644 --- a/.github/workflows/pr-tests.yml +++ b/.github/workflows/pr-tests.yml @@ -114,6 +114,55 @@ jobs: "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.format.*Test' -pl tests" ] }, + { + name: "metadata test", + scripts: [ + "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.metadata.*Test' -pl tests" + ] + }, + { + name: "producer test", + scripts: [ + "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.producer.*Test' -pl tests" + ] + }, + { + name: "schema test", + scripts: [ + "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.schemaregistry.model.impl.*Test' -pl tests" + ] + }, + { + name: "security test", + scripts: [ + "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.security.*Test' -pl tests", + "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.security.*.*Test' -pl tests" + ] + }, + { + name: "storage test", + scripts: [ + "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.storage.*Test' -pl tests" + ] + }, + { + name: "streams test", + scripts: [ + "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.streams.*Test' -pl tests" + ] + }, + { + name: "util test", + scripts: [ + "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.util.timer.*Test' -pl tests" + ] + }, + { + name: "other test", + scripts: [ + "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.*Test' -pl tests" + ] + }, ] steps: - uses: actions/checkout@v3 From aa167be5ff19fe418f98d014d638c3e93ee379de Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Mon, 3 Jul 2023 12:45:25 -0700 Subject: [PATCH 15/19] Fix style issue --- .../pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java index c1adb1872b..a5a17719e2 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/BasicEndToEndKafkaTest.java @@ -79,7 +79,8 @@ public void testNullValueMessages() throws Exception { List kafkaReceives = receiveMessages(kafkaConsumer, expectedMessages.size()); assertEquals(kafkaReceives, expectedMessages); - @Cleanup final Consumer pulsarConsumer = newPulsarConsumer(topic, SUBSCRIPTION, new KafkaPayloadProcessor()); + @Cleanup final Consumer pulsarConsumer = + newPulsarConsumer(topic, SUBSCRIPTION, new KafkaPayloadProcessor()); List pulsarReceives = receiveMessages(pulsarConsumer, expectedMessages.size()); assertEquals(pulsarReceives, expectedMessages); } From dbf94bd3eb837d86bb9e7bb188cdd5e5867f9bde Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Mon, 3 Jul 2023 15:08:40 -0700 Subject: [PATCH 16/19] More move arounds --- .github/workflows/pr-tests.yml | 7 +++++++ .../handlers/kop/{ => metrics}/KafkaProducerStatsTest.java | 3 ++- .../handlers/kop/{ => metrics}/MetricsProviderTest.java | 4 +++- ...csProviderWithDisableGroupLevelConsumerMetricsTest.java | 4 +++- .../PreciselyMessagePublishThrottlingTest.java | 4 +--- 5 files changed, 16 insertions(+), 6 deletions(-) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => metrics}/KafkaProducerStatsTest.java (97%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => metrics}/MetricsProviderTest.java (98%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => metrics}/MetricsProviderWithDisableGroupLevelConsumerMetricsTest.java (85%) rename tests/src/test/java/io/streamnative/pulsar/handlers/kop/{ => producer}/PreciselyMessagePublishThrottlingTest.java (86%) diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml index d0880933b7..65952c0c3f 100644 --- a/.github/workflows/pr-tests.yml +++ b/.github/workflows/pr-tests.yml @@ -16,6 +16,7 @@ concurrency: jobs: basic-test: + name: Style check and basic unit tests runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 @@ -120,6 +121,12 @@ jobs: "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.metadata.*Test' -pl tests" ] }, + { + name: "metrics test", + scripts: [ + "mvn test -ntp -B -DfailIfNoTests=false '-Dtest=io.streamnative.pulsar.handlers.kop.metrics.*Test' -pl tests" + ] + }, { name: "producer test", scripts: [ diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaProducerStatsTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metrics/KafkaProducerStatsTest.java similarity index 97% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaProducerStatsTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/metrics/KafkaProducerStatsTest.java index 96b63e54da..4d97f89d14 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KafkaProducerStatsTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metrics/KafkaProducerStatsTest.java @@ -11,12 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.metrics; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotEquals; import com.google.common.collect.Sets; +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.util.Properties; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metrics/MetricsProviderTest.java similarity index 98% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/metrics/MetricsProviderTest.java index ab358c8e09..17109602ae 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metrics/MetricsProviderTest.java @@ -11,10 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.metrics; import static org.testng.AssertJUnit.fail; +import io.streamnative.pulsar.handlers.kop.KafkaProtocolHandler; +import io.streamnative.pulsar.handlers.kop.KopProtocolHandlerTestBase; import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderWithDisableGroupLevelConsumerMetricsTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metrics/MetricsProviderWithDisableGroupLevelConsumerMetricsTest.java similarity index 85% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderWithDisableGroupLevelConsumerMetricsTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/metrics/MetricsProviderWithDisableGroupLevelConsumerMetricsTest.java index 0e59248508..5d2edddb4a 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/MetricsProviderWithDisableGroupLevelConsumerMetricsTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metrics/MetricsProviderWithDisableGroupLevelConsumerMetricsTest.java @@ -11,7 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; +package io.streamnative.pulsar.handlers.kop.metrics; + +import io.streamnative.pulsar.handlers.kop.metrics.MetricsProviderTest; public class MetricsProviderWithDisableGroupLevelConsumerMetricsTest extends MetricsProviderTest { public MetricsProviderWithDisableGroupLevelConsumerMetricsTest() { diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/PreciselyMessagePublishThrottlingTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/PreciselyMessagePublishThrottlingTest.java similarity index 86% rename from tests/src/test/java/io/streamnative/pulsar/handlers/kop/PreciselyMessagePublishThrottlingTest.java rename to tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/PreciselyMessagePublishThrottlingTest.java index 9304804759..e9548f0db0 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/PreciselyMessagePublishThrottlingTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/producer/PreciselyMessagePublishThrottlingTest.java @@ -11,9 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.streamnative.pulsar.handlers.kop; - -import io.streamnative.pulsar.handlers.kop.producer.MessagePublishThrottlingTest; +package io.streamnative.pulsar.handlers.kop.producer; /** * Test KoP precisely messages publish throttling. From 829cdd7fb2e251f36b5b0fbda53fabf38b357b4b Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Mon, 3 Jul 2023 15:16:03 -0700 Subject: [PATCH 17/19] Fix style --- ...MetricsProviderWithDisableGroupLevelConsumerMetricsTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metrics/MetricsProviderWithDisableGroupLevelConsumerMetricsTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metrics/MetricsProviderWithDisableGroupLevelConsumerMetricsTest.java index 5d2edddb4a..368f9e4794 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metrics/MetricsProviderWithDisableGroupLevelConsumerMetricsTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/metrics/MetricsProviderWithDisableGroupLevelConsumerMetricsTest.java @@ -13,8 +13,6 @@ */ package io.streamnative.pulsar.handlers.kop.metrics; -import io.streamnative.pulsar.handlers.kop.metrics.MetricsProviderTest; - public class MetricsProviderWithDisableGroupLevelConsumerMetricsTest extends MetricsProviderTest { public MetricsProviderWithDisableGroupLevelConsumerMetricsTest() { super(false); From 90140816caad4e6c520403f8ab178cf256fe1cc2 Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Mon, 3 Jul 2023 15:42:41 -0700 Subject: [PATCH 18/19] Fix one more flaky test --- .../streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java index 6b0724713c..f64461a815 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java @@ -221,7 +221,7 @@ public void testListOffsetForEmptyRolloverLedger() throws Exception { // Rollover and delete the old ledgers, wait until there is only one empty ledger managedLedger.getConfig().setRetentionTime(0, TimeUnit.MILLISECONDS); managedLedger.rollCurrentLedgerIfFull(); - Awaitility.await().atMost(Duration.ofSeconds(10)) + Awaitility.await().atMost(Duration.ofSeconds(20)) .until(() -> { log.info("Managed ledger status: [{}], ledgers info: [{}]", managedLedger.getState(), managedLedger.getLedgersInfo().toString()); From b02bd7315bd692b4617c611652bae770a75da992 Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Mon, 3 Jul 2023 16:59:35 -0700 Subject: [PATCH 19/19] Add unit test check process --- .github/workflows/pr-tests.yml | 14 +++++++++++--- .../pulsar/handlers/kop/e2e/MultiLedgerTest.java | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml index 65952c0c3f..59d89d233e 100644 --- a/.github/workflows/pr-tests.yml +++ b/.github/workflows/pr-tests.yml @@ -15,7 +15,7 @@ concurrency: cancel-in-progress: true jobs: - basic-test: + basic-validation: name: Style check and basic unit tests runs-on: ubuntu-latest steps: @@ -74,12 +74,12 @@ jobs: name: surefire-artifacts path: artifacts.zip - kop-module-tests: + kop-unit-tests: name: Unit Test (${{ matrix.test.name }}) runs-on: ubuntu-latest timeout-minutes: 60 strategy: - # other jobs should run even if one integration test fails + # other jobs should run even if one test fails fail-fast: false matrix: test: [ @@ -204,3 +204,11 @@ jobs: bash -c "${script}" done unset IFS # revert the internal field separator back to default + + unit-test-check: + name: Unit Test Check + runs-on: ubuntu-latest + needs: kop-unit-tests # This job will only run if all 'kop-unit-tests' jobs have completed successfully + steps: + - name: Check + run: echo "All tests have passed!" diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java index f64461a815..6197e78942 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/e2e/MultiLedgerTest.java @@ -221,7 +221,7 @@ public void testListOffsetForEmptyRolloverLedger() throws Exception { // Rollover and delete the old ledgers, wait until there is only one empty ledger managedLedger.getConfig().setRetentionTime(0, TimeUnit.MILLISECONDS); managedLedger.rollCurrentLedgerIfFull(); - Awaitility.await().atMost(Duration.ofSeconds(20)) + Awaitility.await().atMost(Duration.ofSeconds(15)) .until(() -> { log.info("Managed ledger status: [{}], ledgers info: [{}]", managedLedger.getState(), managedLedger.getLedgersInfo().toString());