From 43ab7a2f3b1ba8dd84bd680228a35136636a4e56 Mon Sep 17 00:00:00 2001 From: Igor Soarez Date: Fri, 1 May 2026 23:42:49 +0100 Subject: [PATCH 01/10] add test-common-base with TestSslUtils and others --- build.gradle | 34 +- .../import-control-test-common-base.xml | 29 + gradle/spotbugs-exclude.xml | 5 + settings.gradle | 3 +- .../kafka/base/test/NoRetryException.java | 35 + .../kafka/base/test/ReflectionUtils.java | 39 + .../apache/kafka/base/test/TestCondition.java | 27 + .../apache/kafka/base/test/TestSslUtils.java | 860 ++++++++++++++++++ .../org/apache/kafka/base/test/TestUtils.java | 719 +++++++++++++++ .../kafka/base/test/ValuelessCallable.java | 25 + .../src/test/resources/log4j2.yaml | 38 + 11 files changed, 1812 insertions(+), 2 deletions(-) create mode 100644 checkstyle/import-control-test-common-base.xml create mode 100644 test-common/test-common-base/src/main/java/org/apache/kafka/base/test/NoRetryException.java create mode 100644 test-common/test-common-base/src/main/java/org/apache/kafka/base/test/ReflectionUtils.java create mode 100644 test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestCondition.java create mode 100644 test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestSslUtils.java create mode 100644 test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestUtils.java create mode 100644 test-common/test-common-base/src/main/java/org/apache/kafka/base/test/ValuelessCallable.java create mode 100644 test-common/test-common-base/src/test/resources/log4j2.yaml diff --git a/build.gradle b/build.gradle index e4640eb35fc14..0d6bc81be61c3 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ plugins { ext { minClientJavaVersion = 11 minNonClientJavaVersion = 17 - modulesNeedingJava11 = [":clients", ":generator", ":streams", ":streams:test-utils", ":streams:examples", ":streams:streams-scala", ":test-common:test-common-util"] + modulesNeedingJava11 = [":clients", ":generator", ":streams", ":streams:test-utils", ":streams:examples", ":streams:streams-scala", ":test-common:test-common-util", ":test-common:test-common-base"] buildVersionFileName = "kafka-version.properties" @@ -1131,6 +1131,7 @@ project(':core') { testImplementation project(':test-common:test-common-runtime') testImplementation project(':test-common:test-common-internal-api') testImplementation project(':test-common:test-common-util') + testImplementation project(':test-common:test-common-base') testImplementation libs.bcpkix testImplementation libs.mockitoCore testImplementation(libs.apacheda) { @@ -1574,6 +1575,32 @@ project(':group-coordinator') { srcJar.dependsOn 'processMessages' } +project(':test-common:test-common-base') { + // Generic utilities for testing. Depends on `clients` only to minimize classpath leakage. + // e.g. SSL utilities, wait functions, file-related operations + // Java 11 is the minimum Java version required. + + base { + archivesName = "kafka-test-common-base" + } + + dependencies { + implementation project(':clients') + implementation libs.bcpkix + implementation libs.junitJupiter + implementation testLog4j2Libs + + testRuntimeOnly runtimeTestLibs + } + + checkstyle { + configProperties = checkstyleConfigProperties("import-control-test-common-base.xml") + } + + javadoc { + enabled = false + } +} project(':test-common:test-common-internal-api') { // Interfaces, config classes, and other test APIs. Java 17 is the minimum Java version. @@ -1903,6 +1930,7 @@ project(':clients') { compileOnly libs.jose4j // for SASL/OAUTHBEARER JWT validation; only used by broker + testImplementation project(':test-common:test-common-base') testImplementation project(':test-common:test-common-util') testImplementation libs.bcpkix testImplementation libs.jacksonJakartarsJsonProvider @@ -2354,6 +2382,7 @@ project(':storage') { testImplementation project(':test-common:test-common-internal-api') testImplementation project(':test-common:test-common-runtime') testImplementation project(':test-common:test-common-util') + testImplementation project(':test-common:test-common-base') testImplementation project(':server') testImplementation project(':server-common') testImplementation project(':server-common').sourceSets.test.output @@ -2547,6 +2576,7 @@ project(':tools') { testImplementation project(':core').sourceSets.test.output testImplementation project(':test-common:test-common-internal-api') testImplementation project(':test-common:test-common-runtime') + testImplementation project(':test-common:test-common-base') testImplementation project(':server-common') testImplementation project(':server-common').sourceSets.test.output testImplementation project(':connect:api') @@ -3665,6 +3695,7 @@ project(':connect:runtime') { testImplementation project(':test-common:test-common-internal-api') testImplementation project(':test-common:test-common-util') testImplementation project(':test-common:test-common-runtime') + testImplementation project(':test-common:test-common-base') testImplementation project(':raft') testImplementation project(':server-common') testImplementation project(':server') @@ -3894,6 +3925,7 @@ project(':connect:mirror') { testImplementation project(':connect:runtime').sourceSets.test.output testImplementation project(':core') testImplementation project(':test-common:test-common-runtime') + testImplementation project(':test-common:test-common-base') testImplementation project(':raft') testImplementation project(':server') testImplementation project(':server-common') diff --git a/checkstyle/import-control-test-common-base.xml b/checkstyle/import-control-test-common-base.xml new file mode 100644 index 0000000000000..e6631c7946c25 --- /dev/null +++ b/checkstyle/import-control-test-common-base.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + diff --git a/gradle/spotbugs-exclude.xml b/gradle/spotbugs-exclude.xml index f02f9e04bb3c6..14382159ef913 100644 --- a/gradle/spotbugs-exclude.xml +++ b/gradle/spotbugs-exclude.xml @@ -428,6 +428,11 @@ For a detailed description of spotbugs bug categories, see https://spotbugs.read + + + + + diff --git a/settings.gradle b/settings.gradle index 7c37a046838d8..2ec1572fbf85c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -124,7 +124,8 @@ include 'clients', 'trogdor', 'test-common:test-common-internal-api', 'test-common:test-common-util', - 'test-common:test-common-runtime' + 'test-common:test-common-runtime', + 'test-common:test-common-base' project(":storage:api").name = "storage-api" rootProject.name = 'kafka' diff --git a/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/NoRetryException.java b/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/NoRetryException.java new file mode 100644 index 0000000000000..e5e0c7b2c9277 --- /dev/null +++ b/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/NoRetryException.java @@ -0,0 +1,35 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.kafka.base.test; + +/** + * This class can be used in the callback given to {@link TestUtils#retryOnExceptionWithTimeout(long, long, ValuelessCallable)} + * to indicate that a particular exception should not be retried. Instead the retry operation will + * be aborted immediately and the exception will be rethrown. + */ +public class NoRetryException extends RuntimeException { + private final Throwable cause; + + public NoRetryException(Throwable cause) { + this.cause = cause; + } + + @Override + public Throwable getCause() { + return this.cause; + } +} diff --git a/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/ReflectionUtils.java b/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/ReflectionUtils.java new file mode 100644 index 0000000000000..f50c5c36d6f29 --- /dev/null +++ b/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/ReflectionUtils.java @@ -0,0 +1,39 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.kafka.base.test; + +import java.lang.reflect.Field; + +public class ReflectionUtils { + + @SuppressWarnings("unchecked") + public static T fieldValue(Object o, Class clazz, String fieldName) { + try { + Field field = clazz.getDeclaredField(fieldName); + field.setAccessible(true); + return (T) field.get(o); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + public static void setFieldValue(Object obj, String fieldName, Object value) throws Exception { + Field field = obj.getClass().getDeclaredField(fieldName); + field.setAccessible(true); + field.set(obj, value); + } +} diff --git a/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestCondition.java b/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestCondition.java new file mode 100644 index 0000000000000..666e9b0348ee4 --- /dev/null +++ b/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestCondition.java @@ -0,0 +1,27 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.kafka.base.test; + +/** + * Interface to wrap actions that are required to wait until a condition is met + * for testing purposes. Note that this is not intended to do any assertions. + */ +@FunctionalInterface +public interface TestCondition { + + boolean conditionMet() throws Exception; +} diff --git a/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestSslUtils.java b/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestSslUtils.java new file mode 100644 index 0000000000000..0b78b692404e5 --- /dev/null +++ b/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestSslUtils.java @@ -0,0 +1,860 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.kafka.base.test; + +import org.apache.kafka.common.config.SslConfigs; +import org.apache.kafka.common.config.types.Password; +import org.apache.kafka.common.network.ConnectionMode; +import org.apache.kafka.common.security.auth.SslEngineFactory; +import org.apache.kafka.common.security.ssl.DefaultSslEngineFactory; + +import org.bouncycastle.asn1.ASN1EncodableVector; +import org.bouncycastle.asn1.DEROctetString; +import org.bouncycastle.asn1.DERSequence; +import org.bouncycastle.asn1.DERT61String; +import org.bouncycastle.asn1.DERUTF8String; +import org.bouncycastle.asn1.x500.AttributeTypeAndValue; +import org.bouncycastle.asn1.x500.RDN; +import org.bouncycastle.asn1.x500.X500Name; +import org.bouncycastle.asn1.x500.style.BCStyle; +import org.bouncycastle.asn1.x509.AlgorithmIdentifier; +import org.bouncycastle.asn1.x509.BasicConstraints; +import org.bouncycastle.asn1.x509.Extension; +import org.bouncycastle.asn1.x509.GeneralName; +import org.bouncycastle.asn1.x509.GeneralNames; +import org.bouncycastle.asn1.x509.KeyPurposeId; +import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; +import org.bouncycastle.cert.X509CertificateHolder; +import org.bouncycastle.cert.X509v3CertificateBuilder; +import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; +import org.bouncycastle.crypto.params.AsymmetricKeyParameter; +import org.bouncycastle.crypto.util.PrivateKeyFactory; +import org.bouncycastle.jce.provider.BouncyCastleProvider; +import org.bouncycastle.openssl.PKCS8Generator; +import org.bouncycastle.openssl.jcajce.JcaMiscPEMGenerator; +import org.bouncycastle.openssl.jcajce.JcaPKCS8Generator; +import org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8EncryptorBuilder; +import org.bouncycastle.operator.ContentSigner; +import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder; +import org.bouncycastle.operator.DefaultSignatureAlgorithmIdentifierFinder; +import org.bouncycastle.operator.bc.BcContentSignerBuilder; +import org.bouncycastle.operator.bc.BcDSAContentSignerBuilder; +import org.bouncycastle.operator.bc.BcECContentSignerBuilder; +import org.bouncycastle.operator.bc.BcRSAContentSignerBuilder; +import org.bouncycastle.util.io.pem.PemWriter; + +import java.io.ByteArrayOutputStream; +import java.io.EOFException; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.math.BigInteger; +import java.net.InetAddress; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.security.GeneralSecurityException; +import java.security.Key; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.KeyStore; +import java.security.NoSuchAlgorithmException; +import java.security.PrivateKey; +import java.security.SecureRandom; +import java.security.Security; +import java.security.cert.Certificate; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.Date; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + +import javax.net.ssl.SSLEngine; +import javax.net.ssl.TrustManagerFactory; + +public class TestSslUtils { + + public static final String TRUST_STORE_PASSWORD = "TrustStorePassword"; + public static final String DEFAULT_TLS_PROTOCOL_FOR_TESTS = SslConfigs.DEFAULT_SSL_PROTOCOL; + + /** + * Create a self-signed X.509 Certificate. + * From http://bfo.com/blog/2011/03/08/odds_and_ends_creating_a_new_x_509_certificate.html. + * + * @param dn the X.509 Distinguished Name, eg "CN=Test, L=London, C=GB" + * @param pair the KeyPair + * @param days how many days from now the Certificate is valid for, or - for negative values - how many days before now + * @param algorithm the signing algorithm, eg "SHA256withRSA" + * @return the self-signed certificate + * @throws CertificateException thrown if a security error or an IO error occurred. + */ + public static X509Certificate generateCertificate(String dn, KeyPair pair, + int days, String algorithm) + throws CertificateException { + return new CertificateBuilder(days, algorithm).generate(dn, pair); + } + + /** + * Generate a signed certificate. Self-signed, if no issuer and parentKeyPair are supplied + * + * @param dn The distinguished name of this certificate + * @param keyPair A key pair + * @param daysBeforeNow how many days before now the Certificate is valid for + * @param daysAfterNow how many days from now the Certificate is valid for + * @param issuer The issuer who signs the certificate. Leave null if you want to generate a root + * CA. + * @param parentKeyPair The key pair of the issuer. Leave null if you want to generate a root + * CA. + * @param algorithm the signing algorithm, eg "SHA256withRSA" + * @return the signed certificate + * @throws CertificateException + */ + public static X509Certificate generateSignedCertificate(String dn, KeyPair keyPair, + int daysBeforeNow, int daysAfterNow, String issuer, KeyPair parentKeyPair, + String algorithm, boolean isCA, boolean isServerCert, boolean isClientCert) throws CertificateException { + return new CertificateBuilder(0, algorithm).generateSignedCertificate(dn, keyPair, + daysBeforeNow, daysAfterNow, issuer, parentKeyPair, isCA, isServerCert, isClientCert); + } + + public static X509Certificate generateSignedCertificate(String dn, KeyPair keyPair, + int daysBeforeNow, int daysAfterNow, String issuer, KeyPair parentKeyPair, + String algorithm, boolean isCA, boolean isServerCert, boolean isClientCert, + String[] hostNames) throws CertificateException, IOException { + return new CertificateBuilder(0, algorithm).sanDnsNames(hostNames).generateSignedCertificate(dn, keyPair, + daysBeforeNow, daysAfterNow, issuer, parentKeyPair, isCA, isServerCert, isClientCert); + } + + public static KeyPair generateKeyPair(String algorithm) throws NoSuchAlgorithmException { + KeyPairGenerator keyGen = KeyPairGenerator.getInstance(algorithm); + keyGen.initialize(algorithm.equals("EC") ? 256 : 2048); + return keyGen.genKeyPair(); + } + + private static KeyStore createEmptyKeyStore() throws GeneralSecurityException, IOException { + KeyStore ks = KeyStore.getInstance("JKS"); + ks.load(null, null); // initialize + return ks; + } + + private static void saveKeyStore(KeyStore ks, String filename, + Password password) throws GeneralSecurityException, IOException { + try (OutputStream out = Files.newOutputStream(Paths.get(filename))) { + ks.store(out, password.value().toCharArray()); + } + } + + /** + * Creates a keystore with a single key and saves it to a file. + * + * @param filename String file to save + * @param password String store password to set on keystore + * @param keyPassword String key password to set on key + * @param alias String alias to use for the key + * @param privateKey Key to save in keystore + * @param cert Certificate to use as certificate chain associated to key + * @throws GeneralSecurityException for any error with the security APIs + * @throws IOException if there is an I/O error saving the file + */ + public static void createKeyStore(String filename, + Password password, Password keyPassword, String alias, + Key privateKey, Certificate cert) throws GeneralSecurityException, IOException { + KeyStore ks = createEmptyKeyStore(); + ks.setKeyEntry(alias, privateKey, keyPassword.value().toCharArray(), + new Certificate[]{cert}); + saveKeyStore(ks, filename, password); + } + + public static void createTrustStore( + String filename, Password password, Map certs) throws GeneralSecurityException, IOException { + KeyStore ks = KeyStore.getInstance("JKS"); + try (InputStream in = Files.newInputStream(Paths.get(filename))) { + ks.load(in, password.value().toCharArray()); + } catch (EOFException e) { + ks = createEmptyKeyStore(); + } + for (Map.Entry cert : certs.entrySet()) { + ks.setCertificateEntry(cert.getKey(), cert.getValue()); + } + saveKeyStore(ks, filename, password); + } + + public static Map createSslConfig(String keyManagerAlgorithm, String trustManagerAlgorithm, String tlsProtocol) { + Map sslConfigs = new HashMap<>(); + sslConfigs.put(SslConfigs.SSL_PROTOCOL_CONFIG, tlsProtocol); // protocol to create SSLContext + + sslConfigs.put(SslConfigs.SSL_KEYMANAGER_ALGORITHM_CONFIG, keyManagerAlgorithm); + sslConfigs.put(SslConfigs.SSL_TRUSTMANAGER_ALGORITHM_CONFIG, trustManagerAlgorithm); + sslConfigs.put(SslConfigs.SSL_CIPHER_SUITES_CONFIG, List.of()); + + List enabledProtocols = new ArrayList<>(); + enabledProtocols.add(tlsProtocol); + sslConfigs.put(SslConfigs.SSL_ENABLED_PROTOCOLS_CONFIG, enabledProtocols); + + return sslConfigs; + } + + public static Map createSslConfig(boolean useClientCert, boolean trustStore, ConnectionMode connectionMode, File trustStoreFile, String certAlias) + throws IOException, GeneralSecurityException { + return createSslConfig(useClientCert, trustStore, connectionMode, trustStoreFile, certAlias, "localhost"); + } + + public static Map createSslConfig(boolean useClientCert, boolean trustStore, + ConnectionMode connectionMode, File trustStoreFile, String certAlias, String cn) + throws IOException, GeneralSecurityException { + return createSslConfig(useClientCert, trustStore, connectionMode, trustStoreFile, certAlias, cn, new CertificateBuilder()); + } + + public static Map createSslConfig(boolean useClientCert, boolean createTrustStore, + ConnectionMode connectionMode, File trustStoreFile, String certAlias, String cn, CertificateBuilder certBuilder) + throws IOException, GeneralSecurityException { + SslConfigsBuilder builder = new SslConfigsBuilder(connectionMode) + .useClientCert(useClientCert) + .certAlias(certAlias) + .cn(cn) + .certBuilder(certBuilder); + if (createTrustStore) + builder = builder.createNewTrustStore(trustStoreFile); + else + builder = builder.useExistingTrustStore(trustStoreFile); + return builder.build(); + } + + public static void convertToPem(Map sslProps, boolean writeToFile, boolean encryptPrivateKey) throws Exception { + String tsPath = (String) sslProps.get(SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG); + String tsType = (String) sslProps.get(SslConfigs.SSL_TRUSTSTORE_TYPE_CONFIG); + Password tsPassword = (Password) sslProps.remove(SslConfigs.SSL_TRUSTSTORE_PASSWORD_CONFIG); + Password trustCerts = (Password) sslProps.remove(SslConfigs.SSL_TRUSTSTORE_CERTIFICATES_CONFIG); + if (trustCerts == null && tsPath != null) { + trustCerts = exportCertificates(tsPath, tsPassword, tsType); + } + if (trustCerts != null) { + if (tsPath == null) { + tsPath = TestUtils.tempFile("truststore", ".pem").getPath(); + sslProps.put(SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG, tsPath); + } + sslProps.put(SslConfigs.SSL_TRUSTSTORE_TYPE_CONFIG, DefaultSslEngineFactory.PEM_TYPE); + if (writeToFile) + writeToFile(tsPath, trustCerts); + else { + sslProps.put(SslConfigs.SSL_TRUSTSTORE_CERTIFICATES_CONFIG, trustCerts); + sslProps.remove(SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG); + } + } + + String ksPath = (String) sslProps.get(SslConfigs.SSL_KEYSTORE_LOCATION_CONFIG); + Password certChain = (Password) sslProps.remove(SslConfigs.SSL_KEYSTORE_CERTIFICATE_CHAIN_CONFIG); + Password key = (Password) sslProps.remove(SslConfigs.SSL_KEYSTORE_KEY_CONFIG); + if (certChain == null && ksPath != null) { + String ksType = (String) sslProps.get(SslConfigs.SSL_KEYSTORE_TYPE_CONFIG); + Password ksPassword = (Password) sslProps.remove(SslConfigs.SSL_KEYSTORE_PASSWORD_CONFIG); + Password keyPassword = (Password) sslProps.get(SslConfigs.SSL_KEY_PASSWORD_CONFIG); + certChain = exportCertificates(ksPath, ksPassword, ksType); + Password pemKeyPassword = encryptPrivateKey ? keyPassword : null; + key = exportPrivateKey(ksPath, ksPassword, keyPassword, ksType, pemKeyPassword); + if (!encryptPrivateKey) + sslProps.remove(SslConfigs.SSL_KEY_PASSWORD_CONFIG); + } + + if (certChain != null) { + if (ksPath == null) { + ksPath = TestUtils.tempFile("keystore", ".pem").getPath(); + sslProps.put(SslConfigs.SSL_KEYSTORE_LOCATION_CONFIG, ksPath); + } + sslProps.put(SslConfigs.SSL_KEYSTORE_TYPE_CONFIG, DefaultSslEngineFactory.PEM_TYPE); + if (writeToFile) + writeToFile(ksPath, key, certChain); + else { + sslProps.put(SslConfigs.SSL_KEYSTORE_KEY_CONFIG, key); + sslProps.put(SslConfigs.SSL_KEYSTORE_CERTIFICATE_CHAIN_CONFIG, certChain); + sslProps.remove(SslConfigs.SSL_KEYSTORE_LOCATION_CONFIG); + } + } + } + + private static void writeToFile(String path, Password... entries) throws IOException { + try (FileOutputStream out = new FileOutputStream(path)) { + for (Password entry: entries) { + out.write(entry.value().getBytes(StandardCharsets.UTF_8)); + } + } + } + + public static void convertToPemWithoutFiles(Properties sslProps) throws Exception { + String tsPath = sslProps.getProperty(SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG); + if (tsPath != null) { + Password trustCerts = exportCertificates(tsPath, + (Password) sslProps.get(SslConfigs.SSL_TRUSTSTORE_PASSWORD_CONFIG), + sslProps.getProperty(SslConfigs.SSL_TRUSTSTORE_TYPE_CONFIG)); + sslProps.remove(SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG); + sslProps.remove(SslConfigs.SSL_TRUSTSTORE_PASSWORD_CONFIG); + sslProps.setProperty(SslConfigs.SSL_TRUSTSTORE_TYPE_CONFIG, DefaultSslEngineFactory.PEM_TYPE); + sslProps.put(SslConfigs.SSL_TRUSTSTORE_CERTIFICATES_CONFIG, trustCerts); + } + String ksPath = sslProps.getProperty(SslConfigs.SSL_KEYSTORE_LOCATION_CONFIG); + if (ksPath != null) { + String ksType = sslProps.getProperty(SslConfigs.SSL_KEYSTORE_TYPE_CONFIG); + Password ksPassword = (Password) sslProps.get(SslConfigs.SSL_KEYSTORE_PASSWORD_CONFIG); + Password keyPassword = (Password) sslProps.get(SslConfigs.SSL_KEY_PASSWORD_CONFIG); + Password certChain = exportCertificates(ksPath, ksPassword, ksType); + Password key = exportPrivateKey(ksPath, ksPassword, keyPassword, ksType, keyPassword); + sslProps.remove(SslConfigs.SSL_KEYSTORE_LOCATION_CONFIG); + sslProps.remove(SslConfigs.SSL_KEYSTORE_PASSWORD_CONFIG); + sslProps.setProperty(SslConfigs.SSL_KEYSTORE_TYPE_CONFIG, DefaultSslEngineFactory.PEM_TYPE); + sslProps.put(SslConfigs.SSL_KEYSTORE_CERTIFICATE_CHAIN_CONFIG, certChain); + sslProps.put(SslConfigs.SSL_KEYSTORE_KEY_CONFIG, key); + } + } + + public static Password exportCertificates(String storePath, Password storePassword, String storeType) throws Exception { + StringBuilder builder = new StringBuilder(); + try (FileInputStream in = new FileInputStream(storePath)) { + KeyStore ks = KeyStore.getInstance(storeType); + ks.load(in, storePassword.value().toCharArray()); + Enumeration aliases = ks.aliases(); + if (!aliases.hasMoreElements()) + throw new IllegalArgumentException("No certificates found in file " + storePath); + while (aliases.hasMoreElements()) { + String alias = aliases.nextElement(); + Certificate[] certs = ks.getCertificateChain(alias); + if (certs != null) { + for (Certificate cert : certs) { + builder.append(pem(cert)); + } + } else { + builder.append(pem(ks.getCertificate(alias))); + } + } + } + return new Password(builder.toString()); + } + + public static Password exportPrivateKey(String storePath, + Password storePassword, + Password keyPassword, + String storeType, + Password pemKeyPassword) throws Exception { + try (FileInputStream in = new FileInputStream(storePath)) { + KeyStore ks = KeyStore.getInstance(storeType); + ks.load(in, storePassword.value().toCharArray()); + String alias = ks.aliases().nextElement(); + return new Password(pem((PrivateKey) ks.getKey(alias, keyPassword.value().toCharArray()), pemKeyPassword)); + } + } + + static String pem(Certificate cert) throws IOException { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + try (PemWriter pemWriter = new PemWriter(new OutputStreamWriter(out, StandardCharsets.UTF_8))) { + pemWriter.writeObject(new JcaMiscPEMGenerator(cert)); + } + return out.toString(StandardCharsets.UTF_8); + } + + static String pem(PrivateKey privateKey, Password password) throws IOException { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + try (PemWriter pemWriter = new PemWriter(new OutputStreamWriter(out, StandardCharsets.UTF_8))) { + if (password == null) { + pemWriter.writeObject(new JcaPKCS8Generator(privateKey, null)); + } else { + JceOpenSSLPKCS8EncryptorBuilder encryptorBuilder = new JceOpenSSLPKCS8EncryptorBuilder(PKCS8Generator.PBE_SHA1_3DES); + encryptorBuilder.setPassword(password.value().toCharArray()); + try { + pemWriter.writeObject(new JcaPKCS8Generator(privateKey, encryptorBuilder.build())); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + } + return out.toString(StandardCharsets.UTF_8); + } + + public static class CertificateBuilder { + private final int days; + private final String algorithm; + private byte[] subjectAltName; + + public CertificateBuilder() { + this(30, "SHA256withRSA"); + } + + public CertificateBuilder(int days, String algorithm) { + this.days = days; + this.algorithm = algorithm; + } + + public CertificateBuilder sanDnsNames(String... hostNames) throws IOException { + if (hostNames.length > 0) { + GeneralName[] altNames = new GeneralName[hostNames.length]; + for (int i = 0; i < hostNames.length; i++) + altNames[i] = new GeneralName(GeneralName.dNSName, hostNames[i]); + subjectAltName = GeneralNames.getInstance(new DERSequence(altNames)).getEncoded(); + } else { + subjectAltName = null; + } + return this; + } + + public CertificateBuilder sanIpAddress(InetAddress hostAddress) throws IOException { + subjectAltName = new GeneralNames(new GeneralName(GeneralName.iPAddress, new DEROctetString(hostAddress.getAddress()))).getEncoded(); + return this; + } + + public X509Certificate generate(String dn, KeyPair keyPair) throws CertificateException { + return generate(new X500Name(dn), keyPair); + } + + public X509Certificate generate(String commonName, String org, boolean utf8, KeyPair keyPair) throws CertificateException { + RDN[] rdns = new RDN[2]; + rdns[0] = new RDN(new AttributeTypeAndValue(BCStyle.CN, utf8 ? new DERUTF8String(commonName) : new DERT61String(commonName))); + rdns[1] = new RDN(new AttributeTypeAndValue(BCStyle.O, utf8 ? new DERUTF8String(org) : new DERT61String(org))); + return generate(new X500Name(rdns), keyPair); + } + + public X509Certificate generate(X500Name dn, KeyPair keyPair) throws CertificateException { + try { + Security.addProvider(new BouncyCastleProvider()); + AlgorithmIdentifier sigAlgId = new DefaultSignatureAlgorithmIdentifierFinder().find(algorithm); + AlgorithmIdentifier digAlgId = new DefaultDigestAlgorithmIdentifierFinder().find(sigAlgId); + AsymmetricKeyParameter privateKeyAsymKeyParam = PrivateKeyFactory.createKey(keyPair.getPrivate().getEncoded()); + SubjectPublicKeyInfo subPubKeyInfo = SubjectPublicKeyInfo.getInstance(keyPair.getPublic().getEncoded()); + BcContentSignerBuilder signerBuilder; + String keyAlgorithm = keyPair.getPublic().getAlgorithm(); + switch (keyAlgorithm) { + case "RSA": + signerBuilder = new BcRSAContentSignerBuilder(sigAlgId, digAlgId); + break; + case "DSA": + signerBuilder = new BcDSAContentSignerBuilder(sigAlgId, digAlgId); + break; + case "EC": + signerBuilder = new BcECContentSignerBuilder(sigAlgId, digAlgId); + break; + default: + throw new IllegalArgumentException("Unsupported algorithm " + keyAlgorithm); + } + ContentSigner sigGen = signerBuilder.build(privateKeyAsymKeyParam); + // Negative numbers for "days" can be used to generate expired certificates + Date now = new Date(); + Date from = (days >= 0) ? now : new Date(now.getTime() + days * 86400000L); + Date to = (days >= 0) ? new Date(now.getTime() + days * 86400000L) : now; + BigInteger sn = new BigInteger(64, new SecureRandom()); + X509v3CertificateBuilder v3CertGen = new X509v3CertificateBuilder(dn, sn, from, to, dn, subPubKeyInfo); + + if (subjectAltName != null) + v3CertGen.addExtension(Extension.subjectAlternativeName, false, subjectAltName); + X509CertificateHolder certificateHolder = v3CertGen.build(sigGen); + return new JcaX509CertificateConverter().setProvider("BC").getCertificate(certificateHolder); + } catch (CertificateException ce) { + throw ce; + } catch (Exception e) { + throw new CertificateException(e); + } + } + + /** + * @param dn The distinguished name to use + * @param keyPair A key pair to use + * @param daysBeforeNow how many days before now the Certificate is valid for + * @param daysAfterNow how many days from now the Certificate is valid for + * @param issuer The issuer name. if null, "dn" is used + * @param parentKeyPair The parent key pair used to sign this certificate. If null, create + * self-signed certificate authority (CA) + * @return A (self-) signed certificate + * @throws CertificateException + */ + public X509Certificate generateSignedCertificate(String dn, KeyPair keyPair, + int daysBeforeNow, int daysAfterNow, String issuer, KeyPair parentKeyPair, boolean isCA, boolean isServerCert, boolean isClientCert) + throws CertificateException { + X500Name issuerOrDn = (issuer != null) ? new X500Name(issuer) : new X500Name(dn); + return generateSignedCertificate(new X500Name(dn), keyPair, daysBeforeNow, daysAfterNow, + issuerOrDn, parentKeyPair, isCA, isServerCert, isClientCert); + } + + /** + * + * @param dn The distinguished name to use + * @param keyPair A key pair to use + * @param daysBeforeNow how many days before now the Certificate is valid for + * @param daysAfterNow how many days from now the Certificate is valid for + * @param issuer The issuer name. if null, "dn" is used + * @param parentKeyPair The parent key pair used to sign this certificate. If null, create + * self-signed certificate authority (CA) + * @return A (self-) signed certificate + * @throws CertificateException + */ + public X509Certificate generateSignedCertificate(X500Name dn, KeyPair keyPair, + int daysBeforeNow, int daysAfterNow, X500Name issuer, KeyPair parentKeyPair, boolean isCA, boolean isServerCert, boolean isClientCert) + throws CertificateException { + try { + Security.addProvider(new BouncyCastleProvider()); + AlgorithmIdentifier sigAlgId = + new DefaultSignatureAlgorithmIdentifierFinder().find(algorithm); + AlgorithmIdentifier digAlgId = + new DefaultDigestAlgorithmIdentifierFinder().find(sigAlgId); + // Create self-signed certificate if no parentKeyPair has been specified, otherwise + // sign with private key of parentKeyPair + KeyPair signingKeyPair = (parentKeyPair != null) ? parentKeyPair : keyPair; + AsymmetricKeyParameter privateKeyAsymKeyParam = + PrivateKeyFactory.createKey(signingKeyPair.getPrivate().getEncoded()); + SubjectPublicKeyInfo subPubKeyInfo = + SubjectPublicKeyInfo.getInstance(keyPair.getPublic().getEncoded()); + BcContentSignerBuilder signerBuilder; + String keyAlgorithm = keyPair.getPublic().getAlgorithm(); + switch (keyAlgorithm) { + case "RSA": + signerBuilder = new BcRSAContentSignerBuilder(sigAlgId, digAlgId); + break; + case "DSA": + signerBuilder = new BcDSAContentSignerBuilder(sigAlgId, digAlgId); + break; + case "EC": + signerBuilder = new BcECContentSignerBuilder(sigAlgId, digAlgId); + break; + default: + throw new IllegalArgumentException("Unsupported algorithm " + keyAlgorithm); + } + ContentSigner sigGen = signerBuilder.build(privateKeyAsymKeyParam); + // Negative numbers for "days" can be used to generate expired certificates + Date now = new Date(); + Date from = new Date(now.getTime() - daysBeforeNow * 86400000L); + Date to = new Date(now.getTime() + daysAfterNow * 86400000L); + BigInteger sn = new BigInteger(64, new SecureRandom()); + X500Name issuerOrDn = (issuer != null) ? issuer : dn; + X509v3CertificateBuilder v3CertGen = + new X509v3CertificateBuilder(issuerOrDn, sn, from, to, dn, subPubKeyInfo); + if (isCA) { + v3CertGen.addExtension(Extension.basicConstraints, true, new BasicConstraints(isCA)); + } + if (isServerCert || isClientCert) { + ASN1EncodableVector purposes = new ASN1EncodableVector(); + if (isServerCert) { + purposes.add(KeyPurposeId.id_kp_serverAuth); + } + if (isClientCert) { + purposes.add(KeyPurposeId.id_kp_clientAuth); + } + v3CertGen.addExtension(Extension.extendedKeyUsage, false, new DERSequence(purposes)); + } + if (subjectAltName != null) { + v3CertGen.addExtension(Extension.subjectAlternativeName, false, subjectAltName); + } + X509CertificateHolder certificateHolder = v3CertGen.build(sigGen); + return new JcaX509CertificateConverter().setProvider("BC") + .getCertificate(certificateHolder); + } catch (CertificateException ce) { + throw ce; + } catch (Exception e) { + throw new CertificateException(e); + } + } + } + + public static class SslConfigsBuilder { + final ConnectionMode connectionMode; + String tlsProtocol; + boolean useClientCert; + boolean createTrustStore; + File trustStoreFile; + Password trustStorePassword; + Password keyStorePassword; + Password keyPassword; + String certAlias; + String cn; + String algorithm; + CertificateBuilder certBuilder; + boolean usePem; + + public SslConfigsBuilder(ConnectionMode connectionMode) { + this.connectionMode = connectionMode; + this.tlsProtocol = DEFAULT_TLS_PROTOCOL_FOR_TESTS; + trustStorePassword = new Password(TRUST_STORE_PASSWORD); + keyStorePassword = connectionMode == ConnectionMode.SERVER ? new Password("ServerPassword") : new Password("ClientPassword"); + keyPassword = keyStorePassword; + this.certBuilder = new CertificateBuilder(); + this.cn = "localhost"; + this.certAlias = connectionMode.name().toLowerCase(Locale.ROOT); + this.algorithm = "RSA"; + this.createTrustStore = true; + } + + public SslConfigsBuilder tlsProtocol(String tlsProtocol) { + this.tlsProtocol = tlsProtocol; + return this; + } + + public SslConfigsBuilder createNewTrustStore(File trustStoreFile) { + this.trustStoreFile = trustStoreFile; + this.createTrustStore = true; + return this; + } + + public SslConfigsBuilder useExistingTrustStore(File trustStoreFile) { + this.trustStoreFile = trustStoreFile; + this.createTrustStore = false; + return this; + } + + public SslConfigsBuilder useClientCert(boolean useClientCert) { + this.useClientCert = useClientCert; + return this; + } + + public SslConfigsBuilder certAlias(String certAlias) { + this.certAlias = certAlias; + return this; + } + + public SslConfigsBuilder cn(String cn) { + this.cn = cn; + return this; + } + + public SslConfigsBuilder algorithm(String algorithm) { + this.algorithm = algorithm; + return this; + } + + public SslConfigsBuilder certBuilder(CertificateBuilder certBuilder) { + this.certBuilder = certBuilder; + return this; + } + + public SslConfigsBuilder usePem(boolean usePem) { + this.usePem = usePem; + return this; + } + + public Map build() throws IOException, GeneralSecurityException { + if (usePem) { + return buildPem(); + } else + return buildJks(); + } + + private Map buildJks() throws IOException, GeneralSecurityException { + Map certs = new HashMap<>(); + File keyStoreFile = null; + + if (connectionMode == ConnectionMode.CLIENT && useClientCert) { + keyStoreFile = TestUtils.tempFile("clientKS", ".jks"); + KeyPair cKP = generateKeyPair(algorithm); + X509Certificate cCert = certBuilder.generate("CN=" + cn + ", O=A client", cKP); + createKeyStore(keyStoreFile.getPath(), keyStorePassword, keyPassword, "client", cKP.getPrivate(), cCert); + certs.put(certAlias, cCert); + } else if (connectionMode == ConnectionMode.SERVER) { + keyStoreFile = TestUtils.tempFile("serverKS", ".jks"); + KeyPair sKP = generateKeyPair(algorithm); + X509Certificate sCert = certBuilder.generate("CN=" + cn + ", O=A server", sKP); + createKeyStore(keyStoreFile.getPath(), keyStorePassword, keyPassword, "server", sKP.getPrivate(), sCert); + certs.put(certAlias, sCert); + keyStoreFile.deleteOnExit(); + } + + if (createTrustStore) { + createTrustStore(trustStoreFile.getPath(), trustStorePassword, certs); + trustStoreFile.deleteOnExit(); + } + + Map sslConfigs = new HashMap<>(); + + sslConfigs.put(SslConfigs.SSL_PROTOCOL_CONFIG, tlsProtocol); // protocol to create SSLContext + + if (connectionMode == ConnectionMode.SERVER || (connectionMode == ConnectionMode.CLIENT && keyStoreFile != null)) { + sslConfigs.put(SslConfigs.SSL_KEYSTORE_LOCATION_CONFIG, keyStoreFile.getPath()); + sslConfigs.put(SslConfigs.SSL_KEYSTORE_TYPE_CONFIG, "JKS"); + sslConfigs.put(SslConfigs.SSL_KEYMANAGER_ALGORITHM_CONFIG, TrustManagerFactory.getDefaultAlgorithm()); + sslConfigs.put(SslConfigs.SSL_KEYSTORE_PASSWORD_CONFIG, keyStorePassword); + sslConfigs.put(SslConfigs.SSL_KEY_PASSWORD_CONFIG, keyPassword); + } + + sslConfigs.put(SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG, trustStoreFile.getPath()); + sslConfigs.put(SslConfigs.SSL_TRUSTSTORE_PASSWORD_CONFIG, trustStorePassword); + sslConfigs.put(SslConfigs.SSL_TRUSTSTORE_TYPE_CONFIG, "JKS"); + sslConfigs.put(SslConfigs.SSL_TRUSTMANAGER_ALGORITHM_CONFIG, TrustManagerFactory.getDefaultAlgorithm()); + sslConfigs.put(SslConfigs.SSL_CIPHER_SUITES_CONFIG, List.of()); + + List enabledProtocols = new ArrayList<>(); + enabledProtocols.add(tlsProtocol); + sslConfigs.put(SslConfigs.SSL_ENABLED_PROTOCOLS_CONFIG, enabledProtocols); + + return sslConfigs; + } + + private Map buildPem() throws IOException, GeneralSecurityException { + if (!createTrustStore) { + throw new IllegalArgumentException("PEM configs cannot be created with existing trust stores"); + } + + Map sslConfigs = new HashMap<>(); + sslConfigs.put(SslConfigs.SSL_PROTOCOL_CONFIG, tlsProtocol); + sslConfigs.put(SslConfigs.SSL_ENABLED_PROTOCOLS_CONFIG, List.of(tlsProtocol)); + sslConfigs.put(SslConfigs.SSL_CIPHER_SUITES_CONFIG, List.of()); + + if (connectionMode != ConnectionMode.CLIENT || useClientCert) { + KeyPair keyPair = generateKeyPair(algorithm); + X509Certificate cert = certBuilder.generate("CN=" + cn + ", O=A " + connectionMode.name().toLowerCase(Locale.ROOT), keyPair); + + Password privateKeyPem = new Password(pem(keyPair.getPrivate(), keyPassword)); + Password certPem = new Password(pem(cert)); + sslConfigs.put(SslConfigs.SSL_KEYSTORE_TYPE_CONFIG, DefaultSslEngineFactory.PEM_TYPE); + sslConfigs.put(SslConfigs.SSL_TRUSTSTORE_TYPE_CONFIG, DefaultSslEngineFactory.PEM_TYPE); + sslConfigs.put(SslConfigs.SSL_KEYSTORE_KEY_CONFIG, privateKeyPem); + sslConfigs.put(SslConfigs.SSL_KEYSTORE_CERTIFICATE_CHAIN_CONFIG, certPem); + sslConfigs.put(SslConfigs.SSL_KEY_PASSWORD_CONFIG, keyPassword); + sslConfigs.put(SslConfigs.SSL_TRUSTSTORE_CERTIFICATES_CONFIG, certPem); + } + return sslConfigs; + } + } + + public static final class TestSslEngineFactory implements SslEngineFactory { + + private boolean closed = false; + + DefaultSslEngineFactory defaultSslEngineFactory = new DefaultSslEngineFactory(); + + @Override + public SSLEngine createClientSslEngine(String peerHost, int peerPort, String endpointIdentification) { + return defaultSslEngineFactory.createClientSslEngine(peerHost, peerPort, endpointIdentification); + } + + @Override + public SSLEngine createServerSslEngine(String peerHost, int peerPort) { + return defaultSslEngineFactory.createServerSslEngine(peerHost, peerPort); + } + + @Override + public boolean shouldBeRebuilt(Map nextConfigs) { + return defaultSslEngineFactory.shouldBeRebuilt(nextConfigs); + } + + @Override + public Set reconfigurableConfigs() { + return defaultSslEngineFactory.reconfigurableConfigs(); + } + + @Override + public KeyStore keystore() { + return defaultSslEngineFactory.keystore(); + } + + @Override + public KeyStore truststore() { + return defaultSslEngineFactory.truststore(); + } + + @Override + public void close() throws IOException { + defaultSslEngineFactory.close(); + closed = true; + } + + @Override + public void configure(Map configs) { + defaultSslEngineFactory.configure(configs); + } + + public boolean isClosed() { + return closed; + } + } + + /** + * method to generate ssl configs for keystore with large number of entries. This is used to verify large key stores and + * post-handshake messages in SslEngineValidator with TLSv3/JDK17+ + * @param tlsProtocol + * @return ssl configs + * @throws Exception + */ + public static Map generateConfigsWithCertificateChains(String tlsProtocol) throws Exception { + int nrOfCerts = 10; + KeyPair[] keyPairs = new KeyPair[nrOfCerts]; + for (int i = 0; i < nrOfCerts; i++) { + keyPairs[i] = TestSslUtils.generateKeyPair("RSA"); + } + + //add a bunch of hostNames to keystore to increase the keystore size + String[] hostNames = new String[150]; + for (int i = 0; i < hostNames.length; i++) { + hostNames[i] = "hostName" + i; + } + + X509Certificate[] certs = new X509Certificate[nrOfCerts]; + // Generate root CA + int caIndex = nrOfCerts - 1; + certs[caIndex] = TestSslUtils.generateSignedCertificate("CN=CA", keyPairs[caIndex], 365, + 365, null, null, "SHA512withRSA", true, false, false, hostNames); + + //Generate Intermediate certificates + for (int intermediateCertIndex = caIndex - 1; intermediateCertIndex > 0; intermediateCertIndex--) { + certs[intermediateCertIndex] = TestSslUtils.generateSignedCertificate("CN=Intermediate CA" + intermediateCertIndex, + keyPairs[intermediateCertIndex], 365, 365, certs[intermediateCertIndex + 1].getSubjectX500Principal().getName(), + keyPairs[intermediateCertIndex + 1], "SHA512withRSA", true, false, false, hostNames); + } + + // Generate a valid end certificate + certs[0] = TestSslUtils.generateSignedCertificate("CN=kafka", keyPairs[0], 1, 1, + certs[1].getSubjectX500Principal().getName(), keyPairs[1], "SHA512withRSA", false, true, true, hostNames); + + File keystoreStoreFile = TestUtils.tempFile("keystore", ".jks"); + Password keyStorePassword = new Password("password"); + KeyStore keyStore = KeyStore.getInstance("PKCS12"); + keyStore.load(null, null); + keyStore.setKeyEntry("issued-cert", keyPairs[0].getPrivate(), keyStorePassword.value().toCharArray(), certs); + saveKeyStore(keyStore, keystoreStoreFile.getPath(), keyStorePassword); + + File trustStoreFile = TestUtils.tempFile("truststore", ".jks"); + Password trustStorePassword = new Password("password"); + KeyStore trustStore = KeyStore.getInstance("PKCS12"); + trustStore.load(null, null); + for (X509Certificate cert : certs) { + trustStore.setCertificateEntry(cert.getSubjectX500Principal().getName(), cert); + } + saveKeyStore(trustStore, trustStoreFile.getPath(), trustStorePassword); + + Map sslConfigs = new HashMap<>(); + + sslConfigs.put(SslConfigs.SSL_PROTOCOL_CONFIG, tlsProtocol); // protocol to create SSLContext + sslConfigs.put(SslConfigs.SSL_KEYSTORE_LOCATION_CONFIG, keystoreStoreFile.getPath()); + sslConfigs.put(SslConfigs.SSL_KEYSTORE_TYPE_CONFIG, "JKS"); + sslConfigs.put(SslConfigs.SSL_KEYMANAGER_ALGORITHM_CONFIG, TrustManagerFactory.getDefaultAlgorithm()); + sslConfigs.put(SslConfigs.SSL_KEYSTORE_PASSWORD_CONFIG, keyStorePassword); + sslConfigs.put(SslConfigs.SSL_KEY_PASSWORD_CONFIG, keyStorePassword); + + sslConfigs.put(SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG, trustStoreFile.getPath()); + sslConfigs.put(SslConfigs.SSL_TRUSTSTORE_PASSWORD_CONFIG, trustStorePassword); + sslConfigs.put(SslConfigs.SSL_TRUSTSTORE_TYPE_CONFIG, "JKS"); + sslConfigs.put(SslConfigs.SSL_TRUSTMANAGER_ALGORITHM_CONFIG, TrustManagerFactory.getDefaultAlgorithm()); + + List enabledProtocols = new ArrayList<>(); + enabledProtocols.add(tlsProtocol); + sslConfigs.put(SslConfigs.SSL_ENABLED_PROTOCOLS_CONFIG, enabledProtocols); + sslConfigs.put(SslConfigs.SSL_CIPHER_SUITES_CONFIG, List.of()); + + return sslConfigs; + } + +} diff --git a/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestUtils.java b/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestUtils.java new file mode 100644 index 0000000000000..60b2e26f9aa04 --- /dev/null +++ b/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestUtils.java @@ -0,0 +1,719 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.kafka.base.test; + +import org.apache.kafka.clients.MetadataSnapshot; +import org.apache.kafka.clients.consumer.ConsumerConfig; +import org.apache.kafka.clients.producer.ProducerConfig; +import org.apache.kafka.common.Cluster; +import org.apache.kafka.common.Node; +import org.apache.kafka.common.PartitionInfo; +import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.feature.Features; +import org.apache.kafka.common.feature.SupportedVersionRange; +import org.apache.kafka.common.message.ApiMessageType; +import org.apache.kafka.common.message.ApiVersionsResponseData; +import org.apache.kafka.common.network.NetworkReceive; +import org.apache.kafka.common.protocol.ApiKeys; +import org.apache.kafka.common.protocol.Errors; +import org.apache.kafka.common.requests.ApiVersionsResponse; +import org.apache.kafka.common.requests.MetadataResponse.PartitionMetadata; +import org.apache.kafka.common.requests.RequestHeader; +import org.apache.kafka.common.serialization.StringDeserializer; +import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.Exit; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.io.IOException; +import java.lang.reflect.Field; +import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Base64; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Properties; +import java.util.Random; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.CancellationException; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.function.Consumer; +import java.util.function.Supplier; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import static java.util.Arrays.asList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + +/** + * Helper functions for writing unit tests + */ +public class TestUtils { + private static final Logger log = LoggerFactory.getLogger(TestUtils.class); + + public static final File IO_TMP_DIR = new File(System.getProperty("java.io.tmpdir")); + + public static final String LETTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; + public static final String DIGITS = "0123456789"; + public static final String LETTERS_AND_DIGITS = LETTERS + DIGITS; + + /* A consistent random number generator to make tests repeatable */ + public static final Random SEEDED_RANDOM = new Random(192348092834L); + public static final Random RANDOM = new Random(); + public static final long DEFAULT_POLL_INTERVAL_MS = 100; + public static final long DEFAULT_MAX_WAIT_MS = 15000; + + public static Cluster singletonCluster() { + return clusterWith(1); + } + + public static Cluster singletonCluster(final String topic, final int partitions) { + return clusterWith(1, topic, partitions); + } + + public static Cluster clusterWith(int nodes) { + return clusterWith(nodes, new HashMap<>()); + } + + public static Cluster clusterWith(final int nodes, final Map topicPartitionCounts) { + final Node[] ns = new Node[nodes]; + for (int i = 0; i < nodes; i++) + ns[i] = new Node(i, "localhost", 1969); + final List parts = new ArrayList<>(); + for (final Map.Entry topicPartition : topicPartitionCounts.entrySet()) { + final String topic = topicPartition.getKey(); + final int partitions = topicPartition.getValue(); + for (int i = 0; i < partitions; i++) + parts.add(new PartitionInfo(topic, i, ns[i % ns.length], ns, ns)); + } + return new Cluster("kafka-cluster", asList(ns), parts, Collections.emptySet(), Collections.emptySet()); + } + + public static Cluster clusterWith(final int nodes, final String topic, final int partitions) { + return clusterWith(nodes, Collections.singletonMap(topic, partitions)); + } + + /** + * Test utility function to get MetadataSnapshot with configured nodes and partitions. + * @param nodes number of nodes in the cluster + * @param topicPartitionCounts map of topic -> # of partitions + * @return a MetadataSnapshot with number of nodes, partitions as per the input. + */ + + public static MetadataSnapshot metadataSnapshotWith(final int nodes, final Map topicPartitionCounts) { + final Node[] ns = new Node[nodes]; + Map nodesById = new HashMap<>(); + for (int i = 0; i < nodes; i++) { + ns[i] = new Node(i, "localhost", 1969); + nodesById.put(ns[i].id(), ns[i]); + } + final List partsMetadatas = new ArrayList<>(); + for (final Map.Entry topicPartition : topicPartitionCounts.entrySet()) { + final String topic = topicPartition.getKey(); + final int partitions = topicPartition.getValue(); + for (int i = 0; i < partitions; i++) { + TopicPartition tp = new TopicPartition(topic, partitions); + Node node = ns[i % ns.length]; + partsMetadatas.add(new PartitionMetadata(Errors.NONE, tp, Optional.of(node.id()), Optional.empty(), null, null, null)); + } + } + return new MetadataSnapshot("kafka-cluster", nodesById, partsMetadatas, Collections.emptySet(), Collections.emptySet(), Collections.emptySet(), null, Collections.emptyMap()); + } + + /** + * Asserts that there are no leaked threads with a specified name prefix and daemon status. + * This method checks all threads in the JVM, filters them by the provided thread name prefix + * and daemon status, and verifies that no matching threads are alive. + * Use the {@link #waitForCondition(TestCondition, String) waitForCondition} to retry the check at a regular interval + * until either no matching threads are found or the timeout is exceeded. + * If any matching, alive threads are found after the timeout has elapsed, the assertion will fail. + * + * @param threadName The prefix of the thread names to check. Only threads whose names + * start with this prefix will be considered. + * @param isDaemon The daemon status to check. Only threads with the specified + * daemon status (either true for daemon threads or false for non-daemon threads) + * will be considered. + * + * @throws AssertionError If any thread with the specified name prefix and daemon status are found after the timeout. + */ + public static void assertNoLeakedThreadsWithNameAndDaemonStatus(String threadName, boolean isDaemon) throws InterruptedException { + waitForCondition(() -> Thread.getAllStackTraces().keySet().stream() + .noneMatch(t -> t.isDaemon() == isDaemon && t.isAlive() && t.getName().startsWith(threadName)), String.format("Thread leak detected: %s", threadName)); + } + + /** + * Test utility function to get MetadataSnapshot of cluster with configured, and 0 partitions. + * @param nodes number of nodes in the cluster. + * @return a MetadataSnapshot of cluster with number of nodes in the input. + */ + public static MetadataSnapshot metadataSnapshotWith(int nodes) { + return metadataSnapshotWith(nodes, new HashMap<>()); + } + + /** + * Generate an array of random bytes + * + * @param size The size of the array + */ + public static byte[] randomBytes(final int size) { + final byte[] bytes = new byte[size]; + SEEDED_RANDOM.nextBytes(bytes); + return bytes; + } + + /** + * Generate a random string of letters and digits of the given length + * + * @param len The length of the string + * @return The random string + */ + public static String randomString(final int len) { + final StringBuilder b = new StringBuilder(); + for (int i = 0; i < len; i++) + b.append(LETTERS_AND_DIGITS.charAt(SEEDED_RANDOM.nextInt(LETTERS_AND_DIGITS.length()))); + return b.toString(); + } + + /** + * Select a random element from collections + * + * @param elements A collection we can select + * @return A element from collection + */ + public static T randomSelect(final Collection elements) { + List elementsCopy = new ArrayList<>(elements); + return elementsCopy.get(SEEDED_RANDOM.nextInt(elementsCopy.size())); + } + + /** + * Create an empty file in the default temporary-file directory, using the given prefix and suffix + * to generate its name. + * @throws IOException + */ + public static File tempFile(final String prefix, final String suffix) throws IOException { + final File file = Files.createTempFile(prefix, suffix).toFile(); + file.deleteOnExit(); + return file; + } + + /** + * Create an empty file in the default temporary-file directory, using `kafka` as the prefix and `tmp` as the + * suffix to generate its name. + */ + public static File tempFile() throws IOException { + return tempFile("kafka", ".tmp"); + } + + /** + * Create a file with the given contents in the default temporary-file directory, + * using `kafka` as the prefix and `tmp` as the suffix to generate its name. + */ + public static File tempFile(final String contents) throws IOException { + final File file = tempFile(); + Files.write(file.toPath(), contents.getBytes(StandardCharsets.UTF_8)); + return file; + } + + /** + * Create a temporary relative directory in the default temporary-file directory with the given prefix. + * + * @param prefix The prefix of the temporary directory, if null using "kafka-" as default prefix + */ + public static File tempDirectory(final String prefix) { + return tempDirectory(null, prefix); + } + + /** + * Create a temporary relative directory in the default temporary-file directory with a + * prefix of "kafka-" + * + * @return the temporary directory just created. + */ + public static File tempDirectory() { + return tempDirectory(null); + } + + /** + * Create a temporary directory under the given root directory. + * The root directory is removed on JVM exit if it doesn't already exist + * when this function is invoked. + * + * @param root path to create temporary directory under + * @return the temporary directory created within {@code root} + */ + public static File tempRelativeDir(String root) { + File rootFile = new File(root); + if (rootFile.mkdir()) { + rootFile.deleteOnExit(); + } + return tempDirectory(rootFile.toPath(), null); + } + + /** + * Create a temporary relative directory in the specified parent directory with the given prefix. + * + * @param parent The parent folder path name, if null using the default temporary-file directory + * @param prefix The prefix of the temporary directory, if null using "kafka-" as default prefix + */ + public static File tempDirectory(final Path parent, String prefix) { + final File file; + prefix = prefix == null ? "kafka-" : prefix; + try { + file = parent == null ? + Files.createTempDirectory(prefix).toFile() : Files.createTempDirectory(parent, prefix).toFile(); + } catch (final IOException ex) { + throw new RuntimeException("Failed to create a temp dir", ex); + } + + Exit.addShutdownHook("delete-temp-file-shutdown-hook", () -> { + try { + Utils.delete(file); + } catch (IOException e) { + log.error("Error deleting {}", file.getAbsolutePath(), e); + } + }); + + return file; + } + + /** + * Create a random log directory in the format - used for Kafka partition logs. + * It is the responsibility of the caller to set up a shutdown hook for deletion of the directory. + */ + public static File randomPartitionLogDir(File parentDir) { + int attempts = 1000; + while (attempts > 0) { + File f = new File(parentDir, "kafka-" + RANDOM.nextInt(1000000)); + if (f.mkdir()) { + f.deleteOnExit(); + return f; + } + attempts--; + } + throw new RuntimeException("Failed to create directory after 1000 attempts"); + } + + public static Properties producerConfig(final String bootstrapServers, + final Class keySerializer, + final Class valueSerializer, + final Properties additional) { + final Properties properties = new Properties(); + properties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers); + properties.put(ProducerConfig.ACKS_CONFIG, "all"); + properties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, keySerializer); + properties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, valueSerializer); + properties.putAll(additional); + return properties; + } + + public static Properties producerConfig(final String bootstrapServers, final Class keySerializer, final Class valueSerializer) { + return producerConfig(bootstrapServers, keySerializer, valueSerializer, new Properties()); + } + + public static Properties requiredConsumerConfig() { + final Properties consumerConfig = new Properties(); + consumerConfig.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9091"); + consumerConfig.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class); + consumerConfig.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class); + return consumerConfig; + } + + public static Properties consumerConfig(final String bootstrapServers, + final String groupId, + final Class keyDeserializer, + final Class valueDeserializer, + final Properties additional) { + + final Properties consumerConfig = new Properties(); + consumerConfig.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers); + consumerConfig.put(ConsumerConfig.GROUP_ID_CONFIG, groupId); + consumerConfig.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest"); + consumerConfig.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, keyDeserializer); + consumerConfig.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, valueDeserializer); + consumerConfig.putAll(additional); + return consumerConfig; + } + + public static Properties consumerConfig(final String bootstrapServers, + final String groupId, + final Class keyDeserializer, + final Class valueDeserializer) { + return consumerConfig(bootstrapServers, + groupId, + keyDeserializer, + valueDeserializer, + new Properties()); + } + + /** + * returns consumer config with random UUID for the Group ID + */ + public static Properties consumerConfig(final String bootstrapServers, final Class keyDeserializer, final Class valueDeserializer) { + return consumerConfig(bootstrapServers, + UUID.randomUUID().toString(), + keyDeserializer, + valueDeserializer, + new Properties()); + } + + /** + * uses default value of 15 seconds for timeout + */ + public static void waitForCondition(final TestCondition testCondition, final String conditionDetails) throws InterruptedException { + waitForCondition(testCondition, DEFAULT_MAX_WAIT_MS, () -> conditionDetails); + } + + /** + * uses default value of 15 seconds for timeout + */ + public static void waitForCondition(final TestCondition testCondition, final Supplier conditionDetailsSupplier) throws InterruptedException { + waitForCondition(testCondition, DEFAULT_MAX_WAIT_MS, conditionDetailsSupplier); + } + + /** + * Wait for condition to be met for at most {@code maxWaitMs} and throw assertion failure otherwise. + * This should be used instead of {@code Thread.sleep} whenever possible as it allows a longer timeout to be used + * without unnecessarily increasing test time (as the condition is checked frequently). The longer timeout is needed to + * avoid transient failures due to slow or overloaded machines. + */ + public static void waitForCondition(final TestCondition testCondition, final long maxWaitMs, String conditionDetails) throws InterruptedException { + waitForCondition(testCondition, maxWaitMs, () -> conditionDetails); + } + + /** + * Wait for condition to be met for at most {@code maxWaitMs} and throw assertion failure otherwise. + * This should be used instead of {@code Thread.sleep} whenever possible as it allows a longer timeout to be used + * without unnecessarily increasing test time (as the condition is checked frequently). The longer timeout is needed to + * avoid transient failures due to slow or overloaded machines. + */ + public static void waitForCondition(final TestCondition testCondition, final long maxWaitMs, Supplier conditionDetailsSupplier) throws InterruptedException { + waitForCondition(testCondition, maxWaitMs, DEFAULT_POLL_INTERVAL_MS, conditionDetailsSupplier); + } + + /** + * Wait for condition to be met for at most {@code maxWaitMs} with a polling interval of {@code pollIntervalMs} + * and throw assertion failure otherwise. This should be used instead of {@code Thread.sleep} whenever possible + * as it allows a longer timeout to be used without unnecessarily increasing test time (as the condition is + * checked frequently). The longer timeout is needed to avoid transient failures due to slow or overloaded + * machines. + */ + public static void waitForCondition( + final TestCondition testCondition, + final long maxWaitMs, + final long pollIntervalMs, + Supplier conditionDetailsSupplier + ) throws InterruptedException { + retryOnExceptionWithTimeout(maxWaitMs, pollIntervalMs, () -> { + String conditionDetailsSupplied = conditionDetailsSupplier != null ? conditionDetailsSupplier.get() : null; + String conditionDetails = conditionDetailsSupplied != null ? conditionDetailsSupplied : ""; + assertTrue(testCondition.conditionMet(), + "Condition not met within timeout " + maxWaitMs + ". " + conditionDetails); + }); + } + + /** + * Wait for the given runnable to complete successfully, i.e. throw now {@link Exception}s or + * {@link AssertionError}s, or for the given timeout to expire. If the timeout expires then the + * last exception or assertion failure will be thrown thus providing context for the failure. + * + * @param timeoutMs the total time in milliseconds to wait for {@code runnable} to complete successfully. + * @param runnable the code to attempt to execute successfully. + * @throws InterruptedException if the current thread is interrupted while waiting for {@code runnable} to complete successfully. + */ + public static void retryOnExceptionWithTimeout(final long timeoutMs, + final ValuelessCallable runnable) throws InterruptedException { + retryOnExceptionWithTimeout(timeoutMs, DEFAULT_POLL_INTERVAL_MS, runnable); + } + + /** + * Wait for the given runnable to complete successfully, i.e. throw now {@link Exception}s or + * {@link AssertionError}s, or for the default timeout to expire. If the timeout expires then the + * last exception or assertion failure will be thrown thus providing context for the failure. + * + * @param runnable the code to attempt to execute successfully. + * @throws InterruptedException if the current thread is interrupted while waiting for {@code runnable} to complete successfully. + */ + public static void retryOnExceptionWithTimeout(final ValuelessCallable runnable) throws InterruptedException { + retryOnExceptionWithTimeout(DEFAULT_MAX_WAIT_MS, DEFAULT_POLL_INTERVAL_MS, runnable); + } + + /** + * Wait for the given runnable to complete successfully, i.e. throw now {@link Exception}s or + * {@link AssertionError}s, or for the given timeout to expire. If the timeout expires then the + * last exception or assertion failure will be thrown thus providing context for the failure. + * + * @param timeoutMs the total time in milliseconds to wait for {@code runnable} to complete successfully. + * @param pollIntervalMs the interval in milliseconds to wait between invoking {@code runnable}. + * @param runnable the code to attempt to execute successfully. + * @throws InterruptedException if the current thread is interrupted while waiting for {@code runnable} to complete successfully. + */ + public static void retryOnExceptionWithTimeout(final long timeoutMs, + final long pollIntervalMs, + final ValuelessCallable runnable) throws InterruptedException { + final long expectedEnd = System.currentTimeMillis() + timeoutMs; + + while (true) { + try { + runnable.call(); + return; + } catch (final NoRetryException e) { + throw e; + } catch (final AssertionError t) { + if (expectedEnd <= System.currentTimeMillis()) { + throw t; + } + } catch (final Exception e) { + if (expectedEnd <= System.currentTimeMillis()) { + throw new AssertionError(String.format("Assertion failed with an exception after %s ms", timeoutMs), e); + } + } + Thread.sleep(Math.min(pollIntervalMs, timeoutMs)); + } + } + + /** + * Checks if a cluster id is valid. + * @param clusterId + */ + public static void isValidClusterId(String clusterId) { + assertNotNull(clusterId); + + // Base 64 encoded value is 22 characters + assertEquals(22, clusterId.length()); + + Pattern clusterIdPattern = Pattern.compile("[a-zA-Z0-9_\\-]+"); + Matcher matcher = clusterIdPattern.matcher(clusterId); + assertTrue(matcher.matches()); + + // Convert into normal variant and add padding at the end. + String originalClusterId = String.format("%s==", clusterId.replace("_", "/").replace("-", "+")); + byte[] decodedUuid = Base64.getDecoder().decode(originalClusterId); + + // We expect 16 bytes, same as the input UUID. + assertEquals(16, decodedUuid.length); + + //Check if it can be converted back to a UUID. + try { + ByteBuffer uuidBuffer = ByteBuffer.wrap(decodedUuid); + assertEquals(originalClusterId, new UUID(uuidBuffer.getLong(), uuidBuffer.getLong()).toString()); + } catch (Exception e) { + fail(clusterId + " cannot be converted back to UUID."); + } + } + + /** + * Checks the two iterables for equality by first converting both to a list. + */ + public static void checkEquals(Iterable it1, Iterable it2) { + assertEquals(toList(it1), toList(it2)); + } + + public static void checkEquals(Iterator it1, Iterator it2) { + assertEquals(Utils.toList(it1), Utils.toList(it2)); + } + + public static void checkEquals(Set c1, Set c2, String firstDesc, String secondDesc) { + if (!c1.equals(c2)) { + Set missing1 = new HashSet<>(c2); + missing1.removeAll(c1); + Set missing2 = new HashSet<>(c1); + missing2.removeAll(c2); + fail(String.format("Sets not equal, missing %s=%s, missing %s=%s", firstDesc, missing1, secondDesc, missing2)); + } + } + + public static List toList(Iterable iterable) { + List list = new ArrayList<>(); + for (T item : iterable) + list.add(item); + return list; + } + + /** + * Assert that a future raises an expected exception cause type. + * This method will wait for the future to complete or timeout(15000 milliseconds). + * + * @param Exception cause type parameter + * @param exceptionCauseClass Class of the expected exception cause + * @param future The future to await + * @return The caught exception cause + */ + public static T assertFutureThrows(Class exceptionCauseClass, Future future) { + try { + future.get(DEFAULT_MAX_WAIT_MS, TimeUnit.MILLISECONDS); + fail("Should throw expected exception " + exceptionCauseClass.getSimpleName() + " but nothing was thrown."); + } catch (InterruptedException | ExecutionException | CancellationException e) { + Throwable cause = e instanceof ExecutionException ? e.getCause() : e; + // Enable strict type checking. + // This ensures we're testing for the exact exception type, not its subclasses. + assertEquals( + exceptionCauseClass, + cause.getClass(), + "Expected " + exceptionCauseClass.getSimpleName() + ", but got " + cause.getClass().getSimpleName() + ); + return exceptionCauseClass.cast(cause); + } catch (TimeoutException e) { + fail("Future is not completed within " + DEFAULT_MAX_WAIT_MS + " milliseconds."); + } catch (Exception e) { + fail("Expected " + exceptionCauseClass.getSimpleName() + ", but got " + e.getClass().getSimpleName()); + } + return null; + } + + public static void assertFutureThrows( + Class expectedCauseClassApiException, + Future future, + String expectedMessage + ) { + T receivedException = assertFutureThrows(expectedCauseClassApiException, future); + assertEquals(expectedMessage, receivedException.getMessage()); + } + + public static void assertFutureThrowsWithMessageContaining( + Class expectedCauseClassApiException, + Future future, + String expectedMessage + ) { + T receivedException = assertFutureThrows(expectedCauseClassApiException, future); + assertTrue(receivedException.getMessage().contains(expectedMessage)); + } + + public static ApiKeys apiKeyFrom(NetworkReceive networkReceive) { + return RequestHeader.parse(networkReceive.payload().duplicate()).apiKey(); + } + + public static void assertOptional(Optional optional, Consumer assertion) { + if (optional.isPresent()) { + assertion.accept(optional.get()); + } else { + fail("Missing value from Optional"); + } + } + + /** + * Returns true if both iterators have same elements in the same order. + * + * @param iterator1 first iterator. + * @param iterator2 second iterator. + * @param type of element in the iterators. + */ + public static boolean sameElementsWithOrder(Iterator iterator1, + Iterator iterator2) { + while (iterator1.hasNext()) { + if (!iterator2.hasNext()) { + return false; + } + + if (!Objects.equals(iterator1.next(), iterator2.next())) { + return false; + } + } + + return !iterator2.hasNext(); + } + + /** + * Returns true if both the iterators have same set of elements irrespective of order and duplicates. + * + * @param iterator1 first iterator. + * @param iterator2 second iterator. + * @param type of element in the iterators. + */ + public static boolean sameElementsWithoutOrder(Iterator iterator1, + Iterator iterator2) { + // Check both the iterators have the same set of elements irrespective of order and duplicates. + Set allSegmentsSet = new HashSet<>(); + iterator1.forEachRemaining(allSegmentsSet::add); + Set expectedSegmentsSet = new HashSet<>(); + iterator2.forEachRemaining(expectedSegmentsSet::add); + + return allSegmentsSet.equals(expectedSegmentsSet); + } + + public static ApiVersionsResponse defaultApiVersionsResponse( + ApiMessageType.ListenerType listenerType + ) { + return defaultApiVersionsResponse(0, listenerType); + } + + public static ApiVersionsResponse defaultApiVersionsResponse( + int throttleTimeMs, + ApiMessageType.ListenerType listenerType + ) { + return createApiVersionsResponse( + throttleTimeMs, + ApiVersionsResponse.filterApis(listenerType, true, true), + Features.emptySupportedFeatures(), + false + ); + } + + public static ApiVersionsResponse defaultApiVersionsResponse( + int throttleTimeMs, + ApiMessageType.ListenerType listenerType, + boolean enableUnstableLastVersion + ) { + return createApiVersionsResponse( + throttleTimeMs, + ApiVersionsResponse.filterApis(listenerType, enableUnstableLastVersion, true), + Features.emptySupportedFeatures(), + false + ); + } + + public static ApiVersionsResponse createApiVersionsResponse( + int throttleTimeMs, + ApiVersionsResponseData.ApiVersionCollection apiVersions + ) { + return createApiVersionsResponse(throttleTimeMs, apiVersions, Features.emptySupportedFeatures(), false); + } + + public static ApiVersionsResponse createApiVersionsResponse( + int throttleTimeMs, + ApiVersionsResponseData.ApiVersionCollection apiVersions, + Features latestSupportedFeatures, + boolean zkMigrationEnabled + ) { + return new ApiVersionsResponse.Builder(). + setThrottleTimeMs(throttleTimeMs). + setApiVersions(apiVersions). + setSupportedFeatures(latestSupportedFeatures). + setFinalizedFeatures(Collections.emptyMap()). + setFinalizedFeaturesEpoch(ApiVersionsResponse.UNKNOWN_FINALIZED_FEATURES_EPOCH). + setZkMigrationEnabled(zkMigrationEnabled). + build(); + } +} diff --git a/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/ValuelessCallable.java b/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/ValuelessCallable.java new file mode 100644 index 0000000000000..336e30a841430 --- /dev/null +++ b/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/ValuelessCallable.java @@ -0,0 +1,25 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.kafka.base.test; + +/** + * Like a {@link Runnable} that allows exceptions to be thrown or a {@link java.util.concurrent.Callable} + * that does not return a value. + */ +public interface ValuelessCallable { + void call() throws Exception; +} diff --git a/test-common/test-common-base/src/test/resources/log4j2.yaml b/test-common/test-common-base/src/test/resources/log4j2.yaml new file mode 100644 index 0000000000000..54161280b554a --- /dev/null +++ b/test-common/test-common-base/src/test/resources/log4j2.yaml @@ -0,0 +1,38 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +Configuration: + Properties: + Property: + - name: "logPattern" + value: "[%d] %p %m (%c:%L)%n" + + Appenders: + Console: + name: STDOUT + PatternLayout: + pattern: "${logPattern}" + + Loggers: + Root: + level: "OFF" + AppenderRef: + - ref: STDOUT + Logger: + - name: kafka + level: WARN + + - name: org.apache.kafka + level: WARN From d6c4ce8bcc90b529ab010a7e95c201ea43395243 Mon Sep 17 00:00:00 2001 From: Igor Soarez Date: Fri, 1 May 2026 23:43:16 +0100 Subject: [PATCH 02/10] Fix compilation errors --- build.gradle | 18 + .../import-control-coordinator-common.xml | 1 + checkstyle/import-control-core.xml | 1 + .../import-control-group-coordinator.xml | 1 + checkstyle/import-control-jmh-benchmarks.xml | 2 +- checkstyle/import-control-metadata.xml | 3 + checkstyle/import-control-server-common.xml | 5 +- checkstyle/import-control-server.xml | 1 + checkstyle/import-control-storage.xml | 3 + ...import-control-transaction-coordinator.xml | 1 + checkstyle/import-control.xml | 9 + .../kafka/clients/ClientRebootstrapTest.java | 2 +- .../kafka/clients/ClientsTestUtils.java | 2 +- .../MetadataVersionIntegrationTest.java | 2 +- .../clients/TransactionsExpirationTest.java | 4 +- .../TransactionsWithMaxInFlightOneTest.java | 2 +- ...dminClientWithPoliciesIntegrationTest.java | 2 +- .../ConcurrentListOffsetsRequestTest.java | 8 +- .../kafka/clients/admin/DeleteTopicTest.java | 2 +- .../DescribeProducersWithBrokerIdTest.java | 2 +- .../admin/ListOffsetsIntegrationTest.java | 2 +- .../clients/consumer/ConsumerBounceTest.java | 4 +- .../consumer/ConsumerIntegrationTest.java | 2 +- .../consumer/PlaintextConsumerAssignTest.java | 2 +- .../consumer/PlaintextConsumerCommitTest.java | 2 +- .../consumer/PlaintextConsumerPollTest.java | 2 +- .../PlaintextConsumerSubscriptionTest.java | 2 +- .../consumer/PlaintextConsumerTest.java | 2 +- .../consumer/ShareConsumerCallbackTest.java | 6 +- .../consumer/ShareConsumerDeliveryTest.java | 6 +- .../consumer/ShareConsumerLagTest.java | 6 +- .../consumer/ShareConsumerRackAwareTest.java | 2 +- .../clients/consumer/ShareConsumerTest.java | 6 +- .../consumer/ShareConsumerTestBase.java | 8 +- .../producer/ProducerCompressionTest.java | 2 +- .../producer/ProducerIdExpirationTest.java | 4 +- .../producer/ProducerIntegrationTest.java | 2 +- .../ProducerSendWhileDeletionTest.java | 2 +- .../GroupAuthorizerIntegrationTest.java | 2 +- .../server/quota/CustomQuotaCallbackTest.java | 2 +- .../kafka/clients/InFlightRequestsTest.java | 2 +- .../apache/kafka/clients/MetadataTest.java | 2 +- .../org/apache/kafka/clients/MockClient.java | 2 +- .../kafka/clients/NetworkClientTest.java | 5 +- .../kafka/clients/NodeApiVersionsTest.java | 2 +- .../DeleteConsumerGroupOffsetsResultTest.java | 2 +- .../clients/admin/KafkaAdminClientTest.java | 2 +- .../admin/ListTransactionsResultTest.java | 2 +- ...oveMembersFromConsumerGroupResultTest.java | 2 +- .../AllBrokersStrategyIntegrationTest.java | 2 +- ...artitionLeaderStrategyIntegrationTest.java | 2 +- .../clients/consumer/KafkaConsumerTest.java | 2 +- .../internals/AbstractCoordinatorTest.java | 2 +- ...nowledgementCommitCallbackHandlerTest.java | 2 +- .../internals/AsyncKafkaConsumerTest.java | 4 +- .../internals/CommitRequestManagerTest.java | 4 +- .../internals/ConsumerCoordinatorTest.java | 2 +- .../internals/ConsumerNetworkClientTest.java | 2 +- .../internals/ConsumerNetworkThreadTest.java | 6 +- .../internals/FetchRequestManagerTest.java | 6 +- .../consumer/internals/FetcherTest.java | 4 +- .../internals/NetworkClientDelegateTest.java | 2 +- .../consumer/internals/OffsetFetcherTest.java | 2 +- .../internals/OffsetsRequestManagerTest.java | 2 +- .../internals/RequestManagersTest.java | 2 +- .../internals/SubscriptionStateTest.java | 2 +- .../events/ApplicationEventProcessorTest.java | 2 +- .../clients/producer/KafkaProducerTest.java | 2 +- .../producer/internals/BufferPoolTest.java | 2 +- .../producer/internals/ProducerBatchTest.java | 2 +- .../internals/RecordAccumulatorTest.java | 2 +- .../producer/internals/SenderTest.java | 2 +- .../internals/TransactionManagerTest.java | 2 +- .../kafka/common/internals/TopicTest.java | 2 +- .../kafka/common/network/CertStores.java | 7 +- .../common/network/KafkaChannelTest.java | 2 +- .../common/network/NetworkReceiveTest.java | 2 +- .../common/network/NetworkTestUtils.java | 2 +- .../kafka/common/network/NioEchoServer.java | 2 +- .../network/SaslChannelBuilderTest.java | 2 +- .../kafka/common/network/SelectorTest.java | 13 +- .../kafka/common/network/SslSelectorTest.java | 4 +- .../common/network/SslTransportLayerTest.java | 4 +- .../SslVersionsTransportLayerTest.java | 2 +- .../common/network/Tls12SelectorTest.java | 2 +- .../common/network/Tls13SelectorTest.java | 4 +- .../common/protocol/SendBuilderTest.java | 10 +- .../internal/DefaultRecordBatchTest.java | 2 +- .../internal/FileLogInputStreamTest.java | 4 +- .../record/internal/FileRecordsTest.java | 4 +- .../internal/MemoryRecordsBuilderTest.java | 2 +- .../record/internal/MemoryRecordsTest.java | 2 +- .../record/internal/MultiRecordsSendTest.java | 2 +- .../internal/RemoteLogInputStreamTest.java | 4 +- .../internal/UnalignedFileRecordsTest.java | 2 +- .../common/replica/ReplicaSelectorTest.java | 2 +- .../requests/ApiVersionsResponseTest.java | 2 +- .../common/requests/ByteBufferChannel.java | 20 + .../common/requests/EnvelopeRequestTest.java | 3 +- .../common/requests/EnvelopeResponseTest.java | 3 +- .../common/requests/JoinGroupRequestTest.java | 2 +- .../common/requests/RequestResponseTest.java | 2 +- .../common/security/JaasContextTest.java | 2 +- .../ClientAuthenticationFailureTest.java | 2 +- .../SaslAuthenticatorFailureDelayTest.java | 2 +- .../authenticator/SaslAuthenticatorTest.java | 5 +- .../SaslServerAuthenticatorTest.java | 2 +- .../oauthbearer/DefaultJwtRetrieverTest.java | 2 +- .../oauthbearer/DefaultJwtValidatorTest.java | 2 +- .../JwtBearerJwtRetrieverTest.java | 2 +- .../OAuthBearerLoginCallbackHandlerTest.java | 2 +- .../internals/secured/CachedFileTest.java | 2 +- ...redentialsRequestFormatterFactoryTest.java | 2 +- .../secured/ConfigurationUtilsTest.java | 2 +- .../VerificationKeyResolverFactoryTest.java | 2 +- .../AssertionSupplierFactoryTest.java | 2 +- .../assertion/FileAssertionCreatorTest.java | 2 +- .../FileAssertionJwtTemplateTest.java | 2 +- ...LoggingTrustManagerFactoryWrapperTest.java | 2 +- .../ssl/DefaultSslEngineFactoryTest.java | 2 +- .../common/security/ssl/SslFactoryTest.java | 12 +- .../ssl/mock/TestKeyManagerFactory.java | 6 +- .../apache/kafka/common/utils/UtilsTest.java | 2 +- .../internals/ByteBufferUnmapperTest.java | 2 +- .../apache/kafka/test/NoRetryException.java | 35 - .../org/apache/kafka/test/TestCondition.java | 27 - .../org/apache/kafka/test/TestSslUtils.java | 858 ------------------ .../java/org/apache/kafka/test/TestUtils.java | 754 --------------- .../apache/kafka/test/ValuelessCallable.java | 25 - .../extension/JaasBasicAuthFilterTest.java | 2 +- ...ileStreamSinkConnectorIntegrationTest.java | 2 +- ...eStreamSourceConnectorIntegrationTest.java | 2 +- .../DedicatedMirrorIntegrationTest.java | 4 +- .../MirrorConnectorsIntegrationBaseTest.java | 4 +- .../MirrorConnectorsIntegrationSSLTest.java | 4 +- ...hCustomForwardingAdminIntegrationTest.java | 2 +- .../connect/cli/ConnectStandaloneTest.java | 2 +- .../ConnectWorkerIntegrationTest.java | 4 +- .../ErrorHandlingIntegrationTest.java | 2 +- .../ExactlyOnceSourceIntegrationTest.java | 4 +- .../ExampleConnectIntegrationTest.java | 2 +- .../MonitorableSinkIntegrationTest.java | 2 +- .../OffsetsApiIntegrationTest.java | 4 +- ...alanceSourceConnectorsIntegrationTest.java | 2 +- .../RestExtensionIntegrationTest.java | 2 +- .../RestForwardingIntegrationTest.java | 4 +- .../SinkConnectorsIntegrationTest.java | 2 +- .../StandaloneWorkerIntegrationTest.java | 2 +- .../TransformationIntegrationTest.java | 2 +- .../util/clusters/ConnectAssertions.java | 2 +- .../clusters/EmbeddedConnectStandalone.java | 2 +- .../runtime/CoordinatorLoaderImplTest.java | 2 +- .../runtime/CoordinatorRuntimeTest.java | 2 +- .../MultiThreadedEventProcessorTest.java | 4 +- .../java/kafka/security/JaasTestUtils.java | 2 +- .../server/share/ShareFetchUtilsTest.java | 2 +- .../share/SharePartitionManagerTest.java | 2 +- .../server/share/SharePartitionTest.java | 4 +- .../kafka/api/AbstractConsumerTest.scala | 2 +- .../kafka/api/AuthorizerIntegrationTest.scala | 2 +- .../kafka/api/BaseAdminIntegrationTest.scala | 2 +- .../api/ClientOAuthIntegrationTest.scala | 2 +- .../api/GroupCoordinatorIntegrationTest.scala | 2 +- .../api/PlaintextAdminIntegrationTest.scala | 2 +- ...aslPlainSslEndToEndAuthorizationTest.scala | 2 +- ...aslScramSslEndToEndAuthorizationTest.scala | 2 +- .../api/SaslSslAdminIntegrationTest.scala | 2 +- .../kafka/api/TransactionsTest.scala | 4 +- .../DynamicBrokerReconfigurationTest.scala | 2 +- .../server/GssapiAuthenticationTest.scala | 2 +- .../CoordinatorPartitionWriterTest.scala | 2 +- .../kafka/network/RequestChannelTest.scala | 3 +- .../unit/kafka/network/SocketServerTest.scala | 25 +- .../AbstractApiVersionsRequestTest.scala | 2 +- .../kafka/server/ControllerApisTest.scala | 2 +- .../server/ControllerMutationQuotaTest.scala | 2 +- .../ControllerRegistrationManagerTest.scala | 2 +- .../server/DynamicConfigChangeTest.scala | 2 +- .../server/KafkaMetricsReporterTest.scala | 2 +- .../kafka/server/KafkaRaftServerTest.scala | 2 +- .../unit/kafka/server/LogRecoveryTest.scala | 2 +- .../epoch/LeaderEpochIntegrationTest.scala | 2 +- .../scala/unit/kafka/utils/TestUtils.scala | 2 +- .../group/GroupCoordinatorServiceTest.java | 2 +- .../apache/kafka/jmh/log/StressTestLog.java | 2 +- .../kafka/jmh/util/BenchmarkConfigUtils.java | 2 +- .../kafka/controller/MockRaftClientTest.java | 2 +- .../controller/MockRaftClientTestEnv.java | 2 +- ...uorumControllerMetricsIntegrationTest.java | 2 +- .../controller/QuorumControllerTest.java | 2 +- .../controller/QuorumControllerTestEnv.java | 2 +- .../image/loader/MetadataLoaderTest.java | 2 +- .../publisher/SnapshotGeneratorTest.java | 2 +- .../bootstrap/BootstrapDirectoryTest.java | 2 +- .../kafka/metadata/storage/FormatterTest.java | 2 +- .../metadata/storage/ScramParserTest.java | 2 +- .../util/BatchFileWriterReaderTest.java | 2 +- .../kafka/raft/FileQuorumStateStoreTest.java | 2 +- .../kafka/raft/KafkaRaftClientTest.java | 4 +- .../kafka/raft/MockExpirationServiceTest.java | 2 +- .../kafka/raft/RaftClientTestContext.java | 4 +- .../raft/internals/KafkaRaftLogTest.java | 4 +- .../internals/RecordsBatchReaderTest.java | 2 +- .../raft/internals/RecordsIteratorTest.java | 2 +- .../internals/ThresholdPurgatoryTest.java | 2 +- .../kafka/snapshot/FileRawSnapshotTest.java | 11 +- .../apache/kafka/snapshot/SnapshotsTest.java | 2 +- .../MetaPropertiesEnsembleTest.java | 2 +- .../properties/PropertiesUtilsTest.java | 2 +- .../kafka/queue/KafkaEventQueueTest.java | 2 +- .../persister/DefaultStatePersisterTest.java | 2 +- .../persister/PersisterStateManagerTest.java | 2 +- .../kafka/server/util/FileLockTest.java | 2 +- .../server/util/ShutdownableThreadTest.java | 2 +- .../util/timer/SystemTimerReaperTest.java | 2 +- .../kafka/server/util/timer/TimerTest.java | 2 +- .../kafka/api/EndToEndClusterIdTest.java | 4 +- .../kafka/server/AssignmentsManagerTest.java | 2 +- .../BootstrapControllersIntegrationTest.java | 2 +- .../server/ClientMetricsManagerTest.java | 2 +- .../CordonedLogDirsIntegrationTest.java | 2 +- ...EligibleLeaderReplicasIntegrationTest.java | 4 +- .../apache/kafka/server/KRaftClusterTest.java | 2 +- .../server/LogManagerIntegrationTest.java | 2 +- .../kafka/server/MetadataRequestTest.java | 2 +- .../ReconfigurableQuorumIntegrationTest.java | 4 +- .../org/apache/kafka/server/TestUtils.java | 4 +- .../server/UncleanLeaderElectionTest.java | 4 +- .../server/config/DynamicConfigTest.java | 2 +- .../metrics/ClientMetricsTestUtils.java | 2 +- .../metrics/LinuxIoMetricsCollectorTest.java | 2 +- .../partition/AlterPartitionManagerTest.java | 2 +- .../server/purgatory/DelayedFutureTest.java | 2 +- .../server/quota/ClientQuotasRequestTest.java | 2 +- .../share/fetch/ShareFetchTestUtils.java | 4 +- .../share/session/ShareSessionCacheTest.java | 2 +- .../kafka/server/util/SchedulerTest.java | 2 +- .../remote/storage/LogSegmentDataTest.java | 2 +- .../kafka/admin/RemoteTopicCrudTest.java | 6 +- .../kafka/server/log/LogAppendTimeTest.java | 2 +- .../RemoteLogMetadataManagerTestUtils.java | 2 +- .../RemoteLogSegmentLifecycleTest.java | 2 +- ...sedRemoteLogMetadataManagerConfigTest.java | 2 +- ...edRemoteLogMetadataManagerRestartTest.java | 2 +- ...opicBasedRemoteLogMetadataManagerTest.java | 2 +- .../remote/storage/LocalTieredStorage.java | 2 +- .../remote/storage/RemoteLogManagerTest.java | 4 +- .../storage/RemoteLogOffsetReaderTest.java | 2 +- ...hCheckpointFileWithFailureHandlerTest.java | 2 +- ...tCheckpointFileWithFailureHandlerTest.java | 2 +- .../checkpoint/PartitionMetadataFileTest.java | 2 +- .../internals/log/AbstractIndexTest.java | 2 +- .../internals/log/BrokerCompressionTest.java | 2 +- .../storage/internals/log/LocalLogTest.java | 2 +- .../log/LogCleanerIntegrationTest.java | 2 +- .../internals/log/LogCleanerManagerTest.java | 2 +- .../internals/log/LogConcurrencyTest.java | 2 +- .../storage/internals/log/LogSegmentTest.java | 2 +- .../internals/log/LogSegmentsTest.java | 2 +- .../internals/log/LogValidatorTest.java | 2 +- .../internals/log/OffsetIndexTest.java | 2 +- .../log/ProducerStateManagerTest.java | 2 +- .../internals/log/RemoteIndexCacheTest.java | 2 +- .../storage/internals/log/TimeIndexTest.java | 2 +- .../internals/log/TransactionIndexTest.java | 2 +- .../storage/internals/log/UnifiedLogTest.java | 2 +- .../storage/TieredStorageTestHarness.java | 2 +- .../storage/actions/AlterLogDirAction.java | 2 +- .../actions/ExpectBrokerInISRAction.java | 2 +- .../ExpectEmptyRemoteStorageAction.java | 2 +- .../storage/actions/ExpectLeaderAction.java | 2 +- .../ExpectLeaderEpochCheckpointAction.java | 2 +- .../actions/ReassignReplicaAction.java | 2 +- .../storage/actions/ShrinkReplicaAction.java | 2 +- .../TransactionsWithTieredStoreTest.java | 2 +- .../examples/wordcount/WordCountDemoTest.java | 2 +- .../AbstractJoinIntegrationTest.java | 2 +- .../AdjustStreamThreadCountTest.java | 4 +- ...nceDeliveryMessageLossIntegrationTest.java | 8 +- .../ConsistencyVectorIntegrationTest.java | 2 +- .../DeadLetterQueueIntegrationTest.java | 2 +- .../EOSUncleanShutdownIntegrationTest.java | 2 +- .../EmitOnChangeIntegrationTest.java | 2 +- .../integration/EosIntegrationTest.java | 6 +- .../FineGrainedAutoResetIntegrationTest.java | 4 +- .../GlobalKTableEOSIntegrationTest.java | 2 +- .../GlobalKTableIntegrationTest.java | 2 +- .../integration/GlobalStateReprocessTest.java | 2 +- .../GlobalThreadShutDownOrderTest.java | 2 +- ...ingSourceTopicDeletionIntegrationTest.java | 2 +- .../HeadersStoreUpgradeIntegrationTest.java | 2 +- ...ailabilityTaskAssignorIntegrationTest.java | 4 +- ...v2EndpointToPartitionsIntegrationTest.java | 4 +- .../integration/IQv2IntegrationTest.java | 2 +- .../integration/IQv2StoreIntegrationTest.java | 2 +- .../InternalTopicIntegrationTest.java | 2 +- ...nGracePeriodDurabilityIntegrationTest.java | 2 +- .../integration/JoinStoreIntegrationTest.java | 2 +- ...WithIncompleteMetadataIntegrationTest.java | 2 +- ...StreamAggregationDedupIntegrationTest.java | 2 +- .../KStreamAggregationIntegrationTest.java | 2 +- .../KStreamKStreamIntegrationTest.java | 2 +- .../KStreamRepartitionIntegrationTest.java | 2 +- .../KTableEfficientRangeQueryTest.java | 2 +- ...rJoinCustomPartitionerIntegrationTest.java | 2 +- ...reignKeyInnerJoinMultiIntegrationTest.java | 2 +- ...leKTableForeignKeyJoinDistributedTest.java | 2 +- ...leKTableForeignKeyJoinIntegrationTest.java | 2 +- ...KeyJoinMaterializationIntegrationTest.java | 2 +- ...ableSourceTopicRestartIntegrationTest.java | 2 +- ...fkaStreamsCloseOptionsIntegrationTest.java | 2 +- .../KafkaStreamsTelemetryIntegrationTest.java | 4 +- .../integration/LagFetchIntegrationTest.java | 2 +- .../integration/MetricsIntegrationTest.java | 2 +- .../NamedTopologyIntegrationTest.java | 2 +- .../OptimizedKTableIntegrationTest.java | 4 +- ...uterJoinListValueStoreRestorationTest.java | 2 +- .../PauseResumeIntegrationTest.java | 4 +- .../PositionRestartIntegrationTest.java | 2 +- .../PurgeRepartitionTopicIntegrationTest.java | 4 +- .../QueryableStateIntegrationTest.java | 6 +- .../RangeQueryIntegrationTest.java | 2 +- .../integration/RebalanceIntegrationTest.java | 2 +- ...lanceProtocolMigrationIntegrationTest.java | 2 +- .../RebalanceTaskClosureIntegrationTest.java | 2 +- .../RegexSourceIntegrationTest.java | 4 +- .../ResetPartitionTimeIntegrationTest.java | 2 +- .../integration/RestoreIntegrationTest.java | 4 +- .../RocksDBMetricsIntegrationTest.java | 2 +- .../SelfJoinUpgradeIntegrationTest.java | 2 +- ...ManagedOffsetLifecycleIntegrationTest.java | 2 +- ...fManagedOffsetRecoveryIntegrationTest.java | 2 +- .../SessionsStoreWithHeadersTest.java | 2 +- ...SlidingWindowedKStreamIntegrationTest.java | 2 +- .../StandbyTaskCreationIntegrationTest.java | 2 +- .../StandbyTaskEOSIntegrationTest.java | 4 +- ...yTaskEOSMultiRebalanceIntegrationTest.java | 4 +- .../StateDirectoryIntegrationTest.java | 2 +- .../StateUpdaterFailureIntegrationTest.java | 2 +- .../StoreQueryIntegrationTest.java | 4 +- ...inTopologyOptimizationIntegrationTest.java | 2 +- ...caughtExceptionHandlerIntegrationTest.java | 2 +- .../StreamsUpgradeTestIntegrationTest.java | 2 +- .../SuppressionDurabilityIntegrationTest.java | 2 +- .../SuppressionIntegrationTest.java | 4 +- ...allowUnknownTopicErrorIntegrationTest.java | 2 +- .../TaskAssignorIntegrationTest.java | 2 +- .../TaskMetadataIntegrationTest.java | 2 +- .../TimeWindowedKStreamIntegrationTest.java | 2 +- ...mestampedKeyValueStoreWithHeadersTest.java | 2 +- ...imestampedStoreUpgradeIntegrationTest.java | 2 +- ...TimestampedWindowStoreWithHeadersTest.java | 2 +- ...VersionedKeyValueStoreIntegrationTest.java | 2 +- .../utils/EmbeddedKafkaCluster.java | 4 +- .../utils/IntegrationTestUtils.java | 6 +- .../streams/integration/WordCountTest.scala | 2 +- ...mToTableJoinScalaIntegrationTestBase.scala | 2 +- .../kafka/streams/KafkaStreamsTest.java | 4 +- .../kafka/streams/kstream/PrintedTest.java | 2 +- ...amSessionWindowAggregateProcessorTest.java | 2 +- .../internals/KStreamWindowAggregateTest.java | 2 +- .../internals/KTableAggregateTest.java | 2 +- ...TableKTableForeignKeyJoinScenarioTest.java | 2 +- .../internals/KTableTransformValuesTest.java | 2 +- .../internals/SuppressScenarioTest.java | 2 +- ...oreignTableJoinProcessorSupplierTests.java | 2 +- ...scriptionReceiveProcessorSupplierTest.java | 2 +- .../KTableSuppressProcessorMetricsTest.java | 2 +- .../internals/DefaultStateUpdaterTest.java | 2 +- .../internals/GlobalStateManagerImplTest.java | 2 +- .../internals/GlobalStateTaskTest.java | 2 +- .../internals/GlobalStreamThreadTest.java | 2 +- .../internals/NamedTopologyTest.java | 2 +- .../internals/ProcessorStateManagerTest.java | 2 +- .../internals/ProcessorTopologyTest.java | 2 +- .../processor/internals/StandbyTaskTest.java | 2 +- .../internals/StateDirectoryTest.java | 2 +- .../internals/StateManagerUtilTest.java | 2 +- .../processor/internals/StreamTaskTest.java | 2 +- .../processor/internals/StreamThreadTest.java | 8 +- .../tasks/DefaultTaskExecutorTest.java | 4 +- .../state/KeyValueStoreTestDriver.java | 2 +- ...lSchemaRocksDBSegmentedBytesStoreTest.java | 2 +- ...bstractRocksDBSegmentedBytesStoreTest.java | 2 +- .../state/internals/AbstractSegmentsTest.java | 2 +- .../AbstractSessionBytesStoreTest.java | 2 +- .../AbstractWindowBytesStoreTest.java | 2 +- .../CachingInMemoryKeyValueStoreTest.java | 2 +- .../CachingInMemorySessionStoreTest.java | 2 +- .../CachingPersistentSessionStoreTest.java | 2 +- .../CachingPersistentWindowStoreTest.java | 2 +- .../ChangeLoggingKeyValueBytesStoreTest.java | 2 +- ...gingTimestampedKeyValueBytesStoreTest.java | 2 +- ...mpedKeyValueBytesStoreWithHeadersTest.java | 2 +- ...tampedWindowBytesStoreWithHeadersTest.java | 2 +- ...oggingVersionedKeyValueBytesStoreTest.java | 2 +- .../internals/InMemoryWindowStoreTest.java | 2 +- .../state/internals/KeyValueSegmentTest.java | 2 +- .../LegacyCheckpointingStateStoreTest.java | 2 +- .../state/internals/ListValueStoreTest.java | 2 +- .../internals/LogicalKeyValueSegmentTest.java | 2 +- .../internals/MeteredKeyValueStoreTest.java | 2 +- .../internals/MeteredSessionStoreTest.java | 2 +- .../MeteredTimestampedWindowStoreTest.java | 2 +- ...TimestampedWindowStoreWithHeadersTest.java | 2 +- .../internals/MeteredWindowStoreTest.java | 2 +- .../state/internals/OffsetCheckpointTest.java | 2 +- .../PlainToHeadersWindowStoreAdapterTest.java | 2 +- .../RocksDBSessionStoreWithHeadersTest.java | 2 +- .../state/internals/RocksDBStoreTest.java | 2 +- .../RocksDBTimeOrderedKeyValueBufferTest.java | 2 +- ...ksDBTimeOrderedKeyValueBytesStoreTest.java | 2 +- ...imeOrderedSessionStoreWithHeadersTest.java | 2 +- ...TimeOrderedWindowStoreWithHeadersTest.java | 2 +- ...TimestampedWindowStoreWithHeadersTest.java | 2 +- .../internals/RocksDBVersionedStoreTest.java | 2 +- .../state/internals/SegmentIteratorTest.java | 2 +- .../SessionSegmentWithHeadersTest.java | 2 +- .../internals/SessionStoreFetchTest.java | 2 +- .../StreamThreadStateStoreProviderTest.java | 2 +- ...deredCachingPersistentWindowStoreTest.java | 2 +- .../TimeOrderedKeyValueBufferTest.java | 2 +- .../TimeOrderedSessionStoreUpgradeTest.java | 2 +- .../internals/TimeOrderedWindowStoreTest.java | 2 +- .../TimeOrderedWindowStoreUpgradeTest.java | 2 +- ...edKeyValueStoreBuilderWithHeadersTest.java | 2 +- .../internals/TimestampedSegmentTest.java | 2 +- .../TimestampedSegmentWithHeadersTest.java | 2 +- ...tampedToHeadersWindowStoreAdapterTest.java | 2 +- ...reWithHeadersSerializerSideEffectTest.java | 2 +- .../state/internals/WindowStoreFetchTest.java | 2 +- .../metrics/RocksDBBlockCacheMetricsTest.java | 2 +- .../tests/RelationalSmokeTestTest.java | 2 +- .../kafka/streams/tests/SmokeTestClient.java | 2 +- .../apache/kafka/streams/utils/TestUtils.java | 2 +- .../apache/kafka/test/StreamsTestUtils.java | 1 + .../streams/scala/utils/TestDriver.scala | 2 +- .../kafka/streams/TopologyTestDriverTest.java | 2 +- .../MockProcessorContextStateStoreTest.java | 2 +- .../WindowedWordCountProcessorTest.java | 2 +- .../tools/AbstractResetIntegrationTest.java | 2 +- .../apache/kafka/tools/AclCommandTest.java | 2 +- .../apache/kafka/tools/ClusterToolTest.java | 2 +- .../tools/ConfigCommandIntegrationTest.java | 4 +- .../apache/kafka/tools/ConfigCommandTest.java | 2 +- .../kafka/tools/GetOffsetShellTest.java | 2 +- .../apache/kafka/tools/GroupsCommandTest.java | 2 +- .../tools/MetadataQuorumCommandTest.java | 2 +- .../tools/MetadataQuorumCommandUnitTest.java | 2 +- .../kafka/tools/ResetIntegrationTest.java | 2 +- .../tools/ResetIntegrationWithSslTest.java | 4 +- .../apache/kafka/tools/ToolsTestUtils.java | 2 +- .../apache/kafka/tools/TopicCommandTest.java | 2 +- .../UserScramCredentialsCommandTest.java | 4 +- .../group/DeleteConsumerGroupsTest.java | 2 +- ...tsConsumerGroupCommandIntegrationTest.java | 2 +- .../group/DescribeConsumerGroupTest.java | 4 +- .../consumer/group/ListConsumerGroupTest.java | 2 +- .../group/ResetConsumerGroupOffsetTest.java | 4 +- ...SaslClientsWithInvalidCredentialsTest.java | 2 +- .../consumer/group/ShareGroupCommandTest.java | 2 +- .../tools/other/ReplicationQuotasTestRig.java | 2 +- .../ReassignPartitionsCommandTest.java | 2 +- .../streams/DeleteStreamsGroupOffsetTest.java | 2 +- .../tools/streams/DeleteStreamsGroupTest.java | 2 +- .../streams/DescribeStreamsGroupTest.java | 2 +- .../tools/streams/ListStreamsGroupTest.java | 2 +- .../streams/ResetStreamsGroupOffsetTest.java | 2 +- .../streams/StreamsGroupCommandTest.java | 2 +- .../transaction/ProducerIdManagerTest.java | 2 +- .../apache/kafka/trogdor/agent/AgentTest.java | 2 +- .../trogdor/basic/BasicPlatformTest.java | 2 +- .../kafka/trogdor/common/ExpectedTasks.java | 2 +- .../kafka/trogdor/common/JsonUtilTest.java | 2 +- .../trogdor/coordinator/CoordinatorTest.java | 2 +- .../workload/ExternalCommandWorkerTest.java | 2 +- 476 files changed, 648 insertions(+), 2284 deletions(-) delete mode 100644 clients/src/test/java/org/apache/kafka/test/NoRetryException.java delete mode 100644 clients/src/test/java/org/apache/kafka/test/TestCondition.java delete mode 100644 clients/src/test/java/org/apache/kafka/test/TestSslUtils.java delete mode 100644 clients/src/test/java/org/apache/kafka/test/TestUtils.java delete mode 100644 clients/src/test/java/org/apache/kafka/test/ValuelessCallable.java diff --git a/build.gradle b/build.gradle index 0d6bc81be61c3..f29de414ddac0 100644 --- a/build.gradle +++ b/build.gradle @@ -1005,6 +1005,7 @@ project(':server') { testImplementation testLog4j2Libs testImplementation project(':test-common:test-common-internal-api') testImplementation project(':test-common:test-common-runtime') + testImplementation project(':test-common:test-common-base') testImplementation project(':storage:storage-api').sourceSets.test.output testImplementation project(':server-common').sourceSets.test.output @@ -1402,6 +1403,7 @@ project(':metadata') { testImplementation project(':raft').sourceSets.test.output testImplementation project(':server-common').sourceSets.test.output testImplementation project(':test-common:test-common-util') + testImplementation project(':test-common:test-common-base') testRuntimeOnly runtimeTestLibs @@ -1521,6 +1523,7 @@ project(':group-coordinator') { implementation libs.slf4jApi implementation libs.hash4j + testImplementation project(':test-common:test-common-base') testImplementation project(':clients').sourceSets.test.output testImplementation project(':server-common').sourceSets.test.output testImplementation project(':coordinator-common').sourceSets.test.output @@ -1713,6 +1716,7 @@ project(':transaction-coordinator') { testImplementation project(':clients').sourceSets.test.output testImplementation project(':test-common:test-common-runtime') testImplementation project(':test-common:test-common-internal-api') + testImplementation project(':test-common:test-common-base') testRuntimeOnly runtimeTestLibs @@ -1776,6 +1780,7 @@ project(':coordinator-common') { testImplementation project(':clients').sourceSets.test.output testImplementation project(':server-common').sourceSets.test.output + testImplementation project(':test-common:test-common-base') testImplementation libs.junitJupiter testImplementation libs.mockitoCore testImplementation testLog4j2Libs @@ -2104,6 +2109,7 @@ project(':clients:clients-integration-tests') { testImplementation libs.slf4jApi testImplementation project(':test-common:test-common-internal-api') testImplementation project(':test-common:test-common-runtime') + testImplementation project(':test-common:test-common-base') testImplementation project(':metadata') testImplementation project(':raft') testImplementation project(':server') @@ -2148,6 +2154,7 @@ project(':raft') { testImplementation project(':server-common') testImplementation project(':server-common').sourceSets.test.output + testImplementation project(':test-common:test-common-base') testImplementation project(':clients') testImplementation project(':clients').sourceSets.test.output testImplementation libs.jacksonDataformatYaml @@ -2247,6 +2254,7 @@ project(':server-common') { testImplementation project(':clients') testImplementation project(':clients').sourceSets.test.output + testImplementation project(':test-common:test-common-base') testImplementation libs.jacksonDataformatYaml testImplementation libs.junitJupiter testImplementation libs.mockitoCore @@ -2307,6 +2315,7 @@ project(':storage:storage-api') { testImplementation project(':clients') testImplementation project(':clients').sourceSets.test.output + testImplementation project(':test-common:test-common-base') testImplementation libs.junitJupiter testImplementation libs.mockitoCore testImplementation testLog4j2Libs @@ -2656,6 +2665,7 @@ project(':trogdor') { testImplementation project(':clients') testImplementation project(':clients').sourceSets.test.output + testImplementation project(':test-common:test-common-base') testImplementation project(':group-coordinator') testImplementation libs.junitJupiter testImplementation libs.mockitoCore @@ -2757,6 +2767,7 @@ project(':streams') { testCompileOnly libs.bndlib testImplementation project(':clients').sourceSets.test.output + testImplementation project(':test-common:test-common-base') testImplementation libs.jacksonDataformatYaml testImplementation libs.junitJupiter testImplementation libs.bcpkix @@ -2901,6 +2912,7 @@ project(':streams:streams-scala') { testImplementation project(':streams').sourceSets.test.output testImplementation project(':clients').sourceSets.test.output testImplementation project(':streams:test-utils') + testImplementation project(':test-common:test-common-base') testImplementation libs.jacksonDataformatYaml testImplementation libs.junitJupiter @@ -2960,6 +2972,7 @@ project(':streams:integration-tests') { testImplementation project(':streams').sourceSets.test.output testImplementation project(':streams:streams-scala') testImplementation project(':test-common:test-common-runtime') + testImplementation project(':test-common:test-common-base') testImplementation project(':tools') testImplementation project(':transaction-coordinator') testImplementation libs.bcpkix @@ -3006,6 +3019,7 @@ project(':streams:test-utils') { implementation libs.slf4jApi testImplementation project(':clients').sourceSets.test.output + testImplementation project(':test-common:test-common-base') testImplementation libs.jacksonDataformatYaml testImplementation libs.junitJupiter testImplementation libs.mockitoCore @@ -3042,6 +3056,7 @@ project(':streams:examples') { testImplementation project(':streams:test-utils') testImplementation project(':clients').sourceSets.test.output // for org.apache.kafka.test.IntegrationTest + testImplementation project(':test-common:test-common-base') testImplementation libs.junitJupiter testImplementation libs.hamcrest testImplementation testLog4j2Libs @@ -3484,6 +3499,7 @@ project(':jmh-benchmarks') { implementation project(':server-common').sourceSets.test.output implementation project(':server').sourceSets.test.output implementation project(':metadata').sourceSets.test.output + implementation project(':test-common:test-common-base') implementation libs.jmhCore annotationProcessor libs.jmhGeneratorAnnProcess @@ -3821,6 +3837,7 @@ project(':connect:file') { testImplementation project(':connect:runtime').sourceSets.test.output testImplementation project(':core') testImplementation project(':test-common:test-common-runtime') + testImplementation project(':test-common:test-common-base') testImplementation project(':server-common').sourceSets.test.output testRuntimeOnly runtimeTestLibs @@ -3861,6 +3878,7 @@ project(':connect:basic-auth-extension') { testImplementation libs.junitJupiter testImplementation testLog4j2Libs testImplementation project(':clients').sourceSets.test.output + testImplementation project(':test-common:test-common-base') testRuntimeOnly libs.jerseyContainerServlet testRuntimeOnly runtimeTestLibs diff --git a/checkstyle/import-control-coordinator-common.xml b/checkstyle/import-control-coordinator-common.xml index 7841697cf892a..4271b781b6f66 100644 --- a/checkstyle/import-control-coordinator-common.xml +++ b/checkstyle/import-control-coordinator-common.xml @@ -65,6 +65,7 @@ + diff --git a/checkstyle/import-control-core.xml b/checkstyle/import-control-core.xml index 1b6b6ab0edd67..426490bd5a2a5 100644 --- a/checkstyle/import-control-core.xml +++ b/checkstyle/import-control-core.xml @@ -71,6 +71,7 @@ + diff --git a/checkstyle/import-control-group-coordinator.xml b/checkstyle/import-control-group-coordinator.xml index 0e9aabad4a27f..ed93b0bdafe3e 100644 --- a/checkstyle/import-control-group-coordinator.xml +++ b/checkstyle/import-control-group-coordinator.xml @@ -72,6 +72,7 @@ + diff --git a/checkstyle/import-control-jmh-benchmarks.xml b/checkstyle/import-control-jmh-benchmarks.xml index 8828e713e49f5..bed5f64ce96d5 100644 --- a/checkstyle/import-control-jmh-benchmarks.xml +++ b/checkstyle/import-control-jmh-benchmarks.xml @@ -56,7 +56,7 @@ - + diff --git a/checkstyle/import-control-metadata.xml b/checkstyle/import-control-metadata.xml index 5c8e377f628a2..8b03214763f56 100644 --- a/checkstyle/import-control-metadata.xml +++ b/checkstyle/import-control-metadata.xml @@ -89,6 +89,7 @@ + @@ -119,6 +120,7 @@ + @@ -164,6 +166,7 @@ + diff --git a/checkstyle/import-control-server-common.xml b/checkstyle/import-control-server-common.xml index 92da434568eb7..06bd76c268877 100644 --- a/checkstyle/import-control-server-common.xml +++ b/checkstyle/import-control-server-common.xml @@ -55,6 +55,7 @@ + @@ -64,6 +65,7 @@ + @@ -112,6 +114,7 @@ + @@ -128,7 +131,7 @@ - + diff --git a/checkstyle/import-control-server.xml b/checkstyle/import-control-server.xml index 1f020ebe71748..ef108b6fe926a 100644 --- a/checkstyle/import-control-server.xml +++ b/checkstyle/import-control-server.xml @@ -69,6 +69,7 @@ + diff --git a/checkstyle/import-control-storage.xml b/checkstyle/import-control-storage.xml index 040e3761e3780..06b59c061f796 100644 --- a/checkstyle/import-control-storage.xml +++ b/checkstyle/import-control-storage.xml @@ -66,6 +66,7 @@ + @@ -102,6 +103,7 @@ + @@ -136,6 +138,7 @@ + diff --git a/checkstyle/import-control-transaction-coordinator.xml b/checkstyle/import-control-transaction-coordinator.xml index a5d29579b453b..2c5c856af17e7 100644 --- a/checkstyle/import-control-transaction-coordinator.xml +++ b/checkstyle/import-control-transaction-coordinator.xml @@ -38,6 +38,7 @@ + diff --git a/checkstyle/import-control.xml b/checkstyle/import-control.xml index a9fb1cdc71d6a..f2946bef39731 100644 --- a/checkstyle/import-control.xml +++ b/checkstyle/import-control.xml @@ -59,6 +59,7 @@ + @@ -229,6 +230,7 @@ + @@ -306,6 +308,7 @@ + @@ -367,6 +370,7 @@ + @@ -384,6 +388,7 @@ + @@ -473,6 +478,7 @@ + @@ -481,9 +487,11 @@ + + @@ -494,6 +502,7 @@ + diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientRebootstrapTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientRebootstrapTest.java index b388744b711ab..ee38abdb53cff 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientRebootstrapTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientRebootstrapTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.GroupProtocol; @@ -28,7 +29,6 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.Type; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; -import org.apache.kafka.test.TestUtils; import java.time.Duration; import java.util.List; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientsTestUtils.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientsTestUtils.java index 5635f6e36b756..1eaf58b487e7d 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientsTestUtils.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientsTestUtils.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerRebalanceListener; import org.apache.kafka.clients.consumer.ConsumerRecord; @@ -33,7 +34,6 @@ import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.test.ClusterInstance; -import org.apache.kafka.test.TestUtils; import java.time.Duration; import java.util.ArrayList; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/MetadataVersionIntegrationTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/MetadataVersionIntegrationTest.java index 864f8ed7422a3..de77d6a9780ea 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/MetadataVersionIntegrationTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/MetadataVersionIntegrationTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.clients; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.FeatureUpdate; import org.apache.kafka.common.test.ClusterInstance; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTests; import org.apache.kafka.common.test.api.Type; import org.apache.kafka.server.common.MetadataVersion; -import org.apache.kafka.test.TestUtils; import java.util.Map; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/TransactionsExpirationTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/TransactionsExpirationTest.java index 01eca9afb971a..d7cc616ef1e84 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/TransactionsExpirationTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/TransactionsExpirationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.ProducerState; import org.apache.kafka.clients.consumer.Consumer; @@ -46,7 +47,6 @@ import org.apache.kafka.server.config.ReplicationConfigs; import org.apache.kafka.server.config.ServerConfigs; import org.apache.kafka.server.config.ServerLogConfigs; -import org.apache.kafka.test.TestUtils; import java.time.Duration; import java.util.ArrayList; @@ -137,7 +137,7 @@ private void testFatalErrorAfterInvalidProducerIdMapping(ClusterInstance cluster Future failedFuture = producer.send( new ProducerRecord<>(TOPIC1, 3, "1".getBytes(), "1".getBytes(), Collections.singleton(new RecordHeader(HEADER_KEY, ABORTED_VALUE)))); TestUtils.waitForCondition(failedFuture::isDone, "Producer future never completed."); - org.apache.kafka.test.TestUtils.assertFutureThrows(InvalidPidMappingException.class, failedFuture); + org.apache.kafka.base.test.TestUtils.assertFutureThrows(InvalidPidMappingException.class, failedFuture); // Assert that aborting the transaction throws a KafkaException due to the fatal error. assertThrows(KafkaException.class, producer::abortTransaction); diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/TransactionsWithMaxInFlightOneTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/TransactionsWithMaxInFlightOneTest.java index d95901249c009..fcdb0bcd7e923 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/TransactionsWithMaxInFlightOneTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/TransactionsWithMaxInFlightOneTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; @@ -37,7 +38,6 @@ import org.apache.kafka.server.config.ReplicationConfigs; import org.apache.kafka.server.config.ServerConfigs; import org.apache.kafka.server.config.ServerLogConfigs; -import org.apache.kafka.test.TestUtils; import java.time.Duration; import java.util.ArrayList; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/AdminClientWithPoliciesIntegrationTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/AdminClientWithPoliciesIntegrationTest.java index 8bad3b1c9006c..ec6b8be7a24ef 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/AdminClientWithPoliciesIntegrationTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/AdminClientWithPoliciesIntegrationTest.java @@ -43,7 +43,7 @@ import java.util.Map; import java.util.Set; -import static org.apache.kafka.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ConcurrentListOffsetsRequestTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ConcurrentListOffsetsRequestTest.java index 8facea1de3499..b853343709303 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ConcurrentListOffsetsRequestTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ConcurrentListOffsetsRequestTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.admin; +import org.apache.kafka.base.test.ReflectionUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.DefaultHostResolver; import org.apache.kafka.clients.NetworkClient; @@ -28,7 +29,6 @@ import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; import org.apache.kafka.common.utils.Utils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -79,7 +79,7 @@ public void setup() throws Exception { adminClient = KafkaAdminClient.createInternal(new AdminClientConfig(clusterInstance.setClientSaslConfig(props), true), null, new TestHostResolver()); - networkClient = TestUtils.fieldValue(adminClient, KafkaAdminClient.class, "client"); + networkClient = ReflectionUtils.fieldValue(adminClient, KafkaAdminClient.class, "client"); } @AfterEach @@ -119,10 +119,10 @@ public void correctlyHandleConcurrentModificationOfPartitionLeaderCache() throws } private TestPartitionLeaderCache replacePartitionLeaderCache(CountDownLatch invalidationLatch) throws Exception { - PartitionLeaderCache oldPartitionLeaderCache = TestUtils.fieldValue(adminClient, KafkaAdminClient.class, "partitionLeaderCache"); + PartitionLeaderCache oldPartitionLeaderCache = ReflectionUtils.fieldValue(adminClient, KafkaAdminClient.class, "partitionLeaderCache"); TestPartitionLeaderCache partitionLeaderCache = new TestPartitionLeaderCache(oldPartitionLeaderCache.get(getTopicPartitions()), invalidationLatch); - TestUtils.setFieldValue(adminClient, "partitionLeaderCache", partitionLeaderCache); + ReflectionUtils.setFieldValue(adminClient, "partitionLeaderCache", partitionLeaderCache); return partitionLeaderCache; } diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DeleteTopicTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DeleteTopicTest.java index ee57fc6e86c44..7f9962db493de 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DeleteTopicTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DeleteTopicTest.java @@ -18,6 +18,7 @@ import kafka.server.KafkaBroker; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.errors.TopicDeletionDisabledException; @@ -36,7 +37,6 @@ import org.apache.kafka.storage.internals.log.AppendOrigin; import org.apache.kafka.storage.internals.log.UnifiedLog; import org.apache.kafka.storage.internals.log.VerificationGuard; -import org.apache.kafka.test.TestUtils; import java.util.ArrayList; import java.util.Collection; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DescribeProducersWithBrokerIdTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DescribeProducersWithBrokerIdTest.java index 3ac09d4a6ab8d..2994682d085e2 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DescribeProducersWithBrokerIdTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DescribeProducersWithBrokerIdTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.admin; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.Node; @@ -24,7 +25,6 @@ import org.apache.kafka.common.test.ClusterInstance; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ListOffsetsIntegrationTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ListOffsetsIntegrationTest.java index d2f67c76fc7a5..31cae135eaa4f 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ListOffsetsIntegrationTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ListOffsetsIntegrationTest.java @@ -18,6 +18,7 @@ import kafka.server.KafkaBroker; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.ListOffsetsResult.ListOffsetsResultInfo; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerConfig; @@ -33,7 +34,6 @@ import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; import org.apache.kafka.common.utils.Utils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerBounceTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerBounceTest.java index d8838d1b6e95a..cca1babea04c7 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerBounceTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerBounceTest.java @@ -18,6 +18,7 @@ import kafka.server.KafkaBroker; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.ClientsTestUtils; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerRecord; @@ -41,7 +42,6 @@ import org.apache.kafka.server.config.ServerConfigs; import org.apache.kafka.server.config.ServerLogConfigs; import org.apache.kafka.server.util.ShutdownableThread; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -66,7 +66,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.IntStream; -import static org.apache.kafka.test.TestUtils.SEEDED_RANDOM; +import static org.apache.kafka.base.test.TestUtils.SEEDED_RANDOM; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerIntegrationTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerIntegrationTest.java index d10dddde472b6..f02a5f8a878e0 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerIntegrationTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.consumer; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewPartitionReassignment; import org.apache.kafka.clients.admin.NewPartitions; @@ -41,7 +42,6 @@ import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; import org.apache.kafka.coordinator.group.metrics.GroupCoordinatorRuntimeMetrics; import org.apache.kafka.server.common.Feature; -import org.apache.kafka.test.TestUtils; import java.nio.charset.StandardCharsets; import java.time.Duration; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerAssignTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerAssignTest.java index b1699851a189b..d7ef50473f49c 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerAssignTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerAssignTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.clients.consumer; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.ClientsTestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.test.ClusterInstance; @@ -24,7 +25,6 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerCommitTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerCommitTest.java index ef4c9c9552df4..5d3ecf2e65cba 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerCommitTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerCommitTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.consumer; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.ClientsTestUtils; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerConfig; @@ -28,7 +29,6 @@ import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; import org.apache.kafka.test.MockConsumerInterceptor; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerPollTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerPollTest.java index ab801a981c5fc..abaf59005ef6f 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerPollTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerPollTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.clients.consumer; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.ClientsTestUtils; import org.apache.kafka.clients.ClientsTestUtils.TestConsumerReassignmentListener; import org.apache.kafka.clients.producer.Producer; @@ -28,7 +29,6 @@ import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; import org.apache.kafka.common.utils.Utils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerSubscriptionTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerSubscriptionTest.java index 5dbe2248eb887..e3127ebf55e90 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerSubscriptionTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerSubscriptionTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.consumer; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.ClientsTestUtils.TestConsumerReassignmentListener; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.common.TopicPartition; @@ -27,7 +28,6 @@ import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.ClusterTests; import org.apache.kafka.common.test.api.Type; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerTest.java index 6a1b174d18835..d0c8b083a9667 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerTest.java @@ -18,6 +18,7 @@ import kafka.server.KafkaBroker; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.ClientsTestUtils.TestConsumerReassignmentListener; import org.apache.kafka.clients.admin.NewPartitions; import org.apache.kafka.clients.producer.Producer; @@ -51,7 +52,6 @@ import org.apache.kafka.server.quota.QuotaType; import org.apache.kafka.test.MockConsumerInterceptor; import org.apache.kafka.test.MockProducerInterceptor; -import org.apache.kafka.test.TestUtils; import java.time.Duration; import java.util.ArrayList; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerCallbackTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerCallbackTest.java index 483cb043450e6..699aa1b4351a4 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerCallbackTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerCallbackTest.java @@ -16,6 +16,8 @@ */ package org.apache.kafka.clients.consumer; +import org.apache.kafka.base.test.NoRetryException; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.KafkaException; @@ -28,8 +30,6 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; -import org.apache.kafka.test.NoRetryException; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Timeout; @@ -41,7 +41,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicBoolean; -import static org.apache.kafka.test.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerDeliveryTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerDeliveryTest.java index 771d95ac4445c..c4deef778d491 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerDeliveryTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerDeliveryTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.consumer; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterConfigOp; import org.apache.kafka.clients.admin.ConfigEntry; @@ -33,7 +34,6 @@ import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; import org.apache.kafka.coordinator.group.GroupConfig; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Timeout; @@ -51,8 +51,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import static org.apache.kafka.test.TestUtils.DEFAULT_MAX_WAIT_MS; -import static org.apache.kafka.test.TestUtils.waitForCondition; +import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerLagTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerLagTest.java index 372acaec3717a..e16e63ef8725e 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerLagTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerLagTest.java @@ -18,6 +18,7 @@ import kafka.server.KafkaBroker; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerRecord; @@ -28,7 +29,6 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Timeout; @@ -37,8 +37,8 @@ import java.util.Objects; import java.util.concurrent.ExecutionException; -import static org.apache.kafka.test.TestUtils.DEFAULT_MAX_WAIT_MS; -import static org.apache.kafka.test.TestUtils.DEFAULT_POLL_INTERVAL_MS; +import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.base.test.TestUtils.DEFAULT_POLL_INTERVAL_MS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerRackAwareTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerRackAwareTest.java index 668c84a0a064a..aeb78c76b41d0 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerRackAwareTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerRackAwareTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.consumer; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewPartitionReassignment; @@ -32,7 +33,6 @@ import org.apache.kafka.common.test.api.ClusterTests; import org.apache.kafka.common.test.api.Type; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; -import org.apache.kafka.test.TestUtils; import java.time.Duration; import java.util.List; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerTest.java index 6f188c6d1ea94..62a7e20311d33 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerTest.java @@ -18,6 +18,7 @@ import kafka.server.KafkaBroker; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.RecordsToDelete; import org.apache.kafka.clients.admin.SharePartitionOffsetInfo; @@ -56,7 +57,6 @@ import org.apache.kafka.common.utils.Utils; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; import org.apache.kafka.server.share.SharePartitionKey; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Timeout; @@ -83,8 +83,8 @@ import java.util.function.Function; import java.util.stream.Stream; -import static org.apache.kafka.test.TestUtils.DEFAULT_MAX_WAIT_MS; -import static org.apache.kafka.test.TestUtils.waitForCondition; +import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerTestBase.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerTestBase.java index 6ddb28e835d6b..183d85e9feb02 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerTestBase.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerTestBase.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.consumer; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterConfigOp; import org.apache.kafka.clients.admin.AlterConfigsOptions; @@ -51,7 +52,6 @@ import org.apache.kafka.coordinator.group.GroupConfig; import org.apache.kafka.coordinator.group.modern.share.ShareGroupConfig; import org.apache.kafka.server.util.ServerTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -78,9 +78,9 @@ import java.util.function.Predicate; import java.util.stream.IntStream; -import static org.apache.kafka.test.TestUtils.DEFAULT_MAX_WAIT_MS; -import static org.apache.kafka.test.TestUtils.DEFAULT_POLL_INTERVAL_MS; -import static org.apache.kafka.test.TestUtils.waitForCondition; +import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.base.test.TestUtils.DEFAULT_POLL_INTERVAL_MS; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerCompressionTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerCompressionTest.java index d8d3ebe3d860a..dae753ed8a530 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerCompressionTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerCompressionTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.clients.producer; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.CloseOptions; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -29,7 +30,6 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; -import org.apache.kafka.test.TestUtils; import java.time.Duration; import java.util.ArrayList; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerIdExpirationTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerIdExpirationTest.java index 94bc50b4955e9..f508fa2e8833e 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerIdExpirationTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerIdExpirationTest.java @@ -47,6 +47,8 @@ import java.util.concurrent.TimeUnit; import static kafka.utils.TestUtils.consumeRecords; +import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; import static org.apache.kafka.clients.consumer.ConsumerConfig.ISOLATION_LEVEL_CONFIG; import static org.apache.kafka.clients.producer.ProducerConfig.ENABLE_IDEMPOTENCE_CONFIG; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.GROUP_INITIAL_REBALANCE_DELAY_MS_CONFIG; @@ -62,8 +64,6 @@ import static org.apache.kafka.server.config.ReplicationConfigs.AUTO_LEADER_REBALANCE_ENABLE_CONFIG; import static org.apache.kafka.server.config.ServerConfigs.CONTROLLED_SHUTDOWN_ENABLE_CONFIG; import static org.apache.kafka.server.config.ServerLogConfigs.AUTO_CREATE_TOPICS_ENABLE_CONFIG; -import static org.apache.kafka.test.TestUtils.DEFAULT_MAX_WAIT_MS; -import static org.apache.kafka.test.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerIntegrationTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerIntegrationTest.java index d9bdd3347a378..43336a209a56f 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerIntegrationTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.producer; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.admin.TransactionState; import org.apache.kafka.clients.consumer.Consumer; @@ -42,7 +43,6 @@ import org.apache.kafka.server.IntegrationTestUtils; import org.apache.kafka.server.common.Feature; import org.apache.kafka.server.common.MetadataVersion; -import org.apache.kafka.test.TestUtils; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerSendWhileDeletionTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerSendWhileDeletionTest.java index 7d5f5e5584dbe..312a0bdb89e8b 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerSendWhileDeletionTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerSendWhileDeletionTest.java @@ -18,6 +18,7 @@ import kafka.server.KafkaBroker; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewPartitionReassignment; import org.apache.kafka.clients.admin.NewTopic; @@ -36,7 +37,6 @@ import org.apache.kafka.server.config.ServerLogConfigs; import org.apache.kafka.storage.internals.checkpoint.OffsetCheckpointFile; import org.apache.kafka.storage.internals.log.UnifiedLog; -import org.apache.kafka.test.TestUtils; import java.io.File; import java.nio.charset.StandardCharsets; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/security/GroupAuthorizerIntegrationTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/security/GroupAuthorizerIntegrationTest.java index 32069732db824..5ea53c7f018a2 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/security/GroupAuthorizerIntegrationTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/security/GroupAuthorizerIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.security; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.NewTopic; @@ -52,7 +53,6 @@ import org.apache.kafka.server.authorizer.AuthorizableRequestContext; import org.apache.kafka.server.authorizer.Authorizer; import org.apache.kafka.server.config.ServerConfigs; -import org.apache.kafka.test.TestUtils; import java.net.InetAddress; import java.time.Duration; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/server/quota/CustomQuotaCallbackTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/server/quota/CustomQuotaCallbackTest.java index 95169356a5945..eb77e68e50710 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/server/quota/CustomQuotaCallbackTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/server/quota/CustomQuotaCallbackTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.server.quota; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.common.Cluster; @@ -30,7 +31,6 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.Type; import org.apache.kafka.server.config.QuotaConfig; -import org.apache.kafka.test.TestUtils; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/clients/src/test/java/org/apache/kafka/clients/InFlightRequestsTest.java b/clients/src/test/java/org/apache/kafka/clients/InFlightRequestsTest.java index b60efe8950ff8..904e39f7928bf 100644 --- a/clients/src/test/java/org/apache/kafka/clients/InFlightRequestsTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/InFlightRequestsTest.java @@ -17,11 +17,11 @@ package org.apache.kafka.clients; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.requests.RequestHeader; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/MetadataTest.java b/clients/src/test/java/org/apache/kafka/clients/MetadataTest.java index 9ac7519100465..35c9b6a3068d8 100644 --- a/clients/src/test/java/org/apache/kafka/clients/MetadataTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/MetadataTest.java @@ -60,7 +60,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import static org.apache.kafka.test.TestUtils.assertOptional; +import static org.apache.kafka.base.test.TestUtils.assertOptional; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/src/test/java/org/apache/kafka/clients/MockClient.java b/clients/src/test/java/org/apache/kafka/clients/MockClient.java index fca0a9ca2121b..b162863b78a9f 100644 --- a/clients/src/test/java/org/apache/kafka/clients/MockClient.java +++ b/clients/src/test/java/org/apache/kafka/clients/MockClient.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.Node; import org.apache.kafka.common.errors.AuthenticationException; import org.apache.kafka.common.errors.InterruptException; @@ -26,7 +27,6 @@ import org.apache.kafka.common.requests.MetadataRequest; import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.utils.Time; -import org.apache.kafka.test.TestUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java b/clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java index 948834cff3456..93e3b9e8c057e 100644 --- a/clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java @@ -16,6 +16,8 @@ */ package org.apache.kafka.clients; +import org.apache.kafka.base.test.ReflectionUtils; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.Cluster; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.Node; @@ -54,7 +56,6 @@ import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.test.DelayedReceive; import org.apache.kafka.test.MockSelector; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -261,7 +262,7 @@ public synchronized void rebootstrap() { defaultRequestTimeoutMs, connectionSetupTimeoutMsTest, connectionSetupTimeoutMaxMsTest, time, false, new ApiVersions(), new LogContext(), rebootstrapTriggerMs, MetadataRecoveryStrategy.REBOOTSTRAP); - MetadataUpdater metadataUpdater = TestUtils.fieldValue(client, NetworkClient.class, "metadataUpdater"); + MetadataUpdater metadataUpdater = ReflectionUtils.fieldValue(client, NetworkClient.class, "metadataUpdater"); metadata.bootstrap(Collections.singletonList(new InetSocketAddress("localhost", 9999))); metadata.requestUpdate(true); diff --git a/clients/src/test/java/org/apache/kafka/clients/NodeApiVersionsTest.java b/clients/src/test/java/org/apache/kafka/clients/NodeApiVersionsTest.java index 8b22bc7963dee..9b535f9e51389 100644 --- a/clients/src/test/java/org/apache/kafka/clients/NodeApiVersionsTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/NodeApiVersionsTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.feature.SupportedVersionRange; import org.apache.kafka.common.message.ApiMessageType; @@ -24,7 +25,6 @@ import org.apache.kafka.common.message.ApiVersionsResponseData.ApiVersionCollection; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.requests.ApiVersionsResponse; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsResultTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsResultTest.java index 1e577b8319a42..132915b21d784 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsResultTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsResultTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.clients.admin; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.GroupAuthorizationException; import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; import org.apache.kafka.common.internals.KafkaFutureImpl; import org.apache.kafka.common.protocol.Errors; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java index ca1c5e9be30d6..1873c18a42105 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.admin; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.ClientDnsLookup; import org.apache.kafka.clients.ClientRequest; import org.apache.kafka.clients.ClientUtils; @@ -259,7 +260,6 @@ import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.test.MockMetricsReporter; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/ListTransactionsResultTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/ListTransactionsResultTest.java index 01556391ad313..cbfc3b51db692 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/ListTransactionsResultTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/ListTransactionsResultTest.java @@ -31,7 +31,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.singletonList; -import static org.apache.kafka.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertEquals; public class ListTransactionsResultTest { diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/RemoveMembersFromConsumerGroupResultTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/RemoveMembersFromConsumerGroupResultTest.java index ceb188a41759b..83a1c5e243d2f 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/RemoveMembersFromConsumerGroupResultTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/RemoveMembersFromConsumerGroupResultTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.clients.admin; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.errors.FencedInstanceIdException; import org.apache.kafka.common.errors.GroupAuthorizationException; import org.apache.kafka.common.internals.KafkaFutureImpl; import org.apache.kafka.common.message.LeaveGroupRequestData.MemberIdentity; import org.apache.kafka.common.protocol.Errors; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyIntegrationTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyIntegrationTest.java index af69717375d24..6a47e4cb9ca5f 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyIntegrationTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.admin.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.Node; import org.apache.kafka.common.errors.DisconnectException; import org.apache.kafka.common.errors.UnknownServerException; @@ -29,7 +30,6 @@ import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategyIntegrationTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategyIntegrationTest.java index dcbc78a02f995..3d024a76a62ff 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategyIntegrationTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategyIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.admin.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.Node; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.DisconnectException; @@ -35,7 +36,6 @@ import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java index 89e79eda5c684..742f06c886d49 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.consumer; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.ClientRequest; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.KafkaClient; @@ -109,7 +110,6 @@ import org.apache.kafka.test.MockConsumerInterceptor; import org.apache.kafka.test.MockDeserializer; import org.apache.kafka.test.MockMetricsReporter; -import org.apache.kafka.test.TestUtils; import org.apache.logging.log4j.Level; import org.junit.jupiter.api.AfterEach; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinatorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinatorTest.java index 18563b1ff9b30..26121536df4ca 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinatorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinatorTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.consumer.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.GroupRebalanceConfig; import org.apache.kafka.clients.MockClient; @@ -57,7 +58,6 @@ import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.Utils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AcknowledgementCommitCallbackHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AcknowledgementCommitCallbackHandlerTest.java index d06e495dde3ca..c4656634942d1 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AcknowledgementCommitCallbackHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AcknowledgementCommitCallbackHandlerTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.consumer.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.AcknowledgeType; import org.apache.kafka.clients.consumer.AcknowledgementCommitCallback; import org.apache.kafka.common.TopicIdPartition; @@ -24,7 +25,6 @@ import org.apache.kafka.common.errors.InvalidRecordStateException; import org.apache.kafka.common.errors.TopicAuthorizationException; import org.apache.kafka.common.protocol.Errors; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumerTest.java index e471243949498..c1783ceb86b62 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumerTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.consumer.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.Metadata.LeaderAndEpoch; import org.apache.kafka.clients.MockClient; import org.apache.kafka.clients.NodeApiVersions; @@ -92,7 +93,6 @@ import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.test.MockConsumerInterceptor; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -135,13 +135,13 @@ import static java.util.Arrays.asList; import static java.util.Collections.singleton; import static java.util.Collections.singletonList; +import static org.apache.kafka.base.test.TestUtils.requiredConsumerConfig; import static org.apache.kafka.clients.consumer.internals.AbstractMembershipManager.TOPIC_PARTITION_COMPARATOR; import static org.apache.kafka.clients.consumer.internals.ConsumerRebalanceListenerMethodName.ON_PARTITIONS_ASSIGNED; import static org.apache.kafka.clients.consumer.internals.ConsumerRebalanceListenerMethodName.ON_PARTITIONS_LOST; import static org.apache.kafka.clients.consumer.internals.ConsumerRebalanceListenerMethodName.ON_PARTITIONS_REVOKED; import static org.apache.kafka.clients.consumer.internals.ConsumerUtils.CONSUMER_METRIC_GROUP; import static org.apache.kafka.clients.consumer.internals.ConsumerUtils.THROW_ON_FETCH_STABLE_OFFSET_UNSUPPORTED; -import static org.apache.kafka.test.TestUtils.requiredConsumerConfig; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java index fe337f79bd761..ae9b34e1360aa 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.consumer.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.ClientResponse; import org.apache.kafka.clients.consumer.CommitFailedException; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -50,7 +51,6 @@ import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -75,12 +75,12 @@ import java.util.stream.Stream; import static java.util.Collections.singleton; +import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; import static org.apache.kafka.clients.consumer.ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG; import static org.apache.kafka.clients.consumer.ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG; import static org.apache.kafka.clients.consumer.ConsumerConfig.GROUP_ID_CONFIG; import static org.apache.kafka.clients.consumer.ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG; import static org.apache.kafka.clients.consumer.ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG; -import static org.apache.kafka.test.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinatorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinatorTest.java index 4ce2b2c77877e..345c7e70e83d5 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinatorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinatorTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.consumer.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.ClientResponse; import org.apache.kafka.clients.GroupRebalanceConfig; import org.apache.kafka.clients.MockClient; @@ -82,7 +83,6 @@ import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.Utils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClientTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClientTest.java index 1f5551e7df121..b2029331c5783 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClientTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClientTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.consumer.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.ClientResponse; import org.apache.kafka.clients.Metadata; import org.apache.kafka.clients.MockClient; @@ -39,7 +40,6 @@ import org.apache.kafka.common.requests.RequestTestUtils; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThreadTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThreadTest.java index dfa978462e2b5..b969784c2e1cb 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThreadTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThreadTest.java @@ -16,6 +16,8 @@ */ package org.apache.kafka.clients.consumer.internals; +import org.apache.kafka.base.test.TestCondition; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.internals.events.ApplicationEvent; import org.apache.kafka.clients.consumer.internals.events.ApplicationEventProcessor; import org.apache.kafka.clients.consumer.internals.events.AsyncPollEvent; @@ -26,8 +28,6 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; -import org.apache.kafka.test.TestCondition; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -43,7 +43,7 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.function.Supplier; -import static org.apache.kafka.test.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java index 6212a720c1f58..1e473114e7556 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.consumer.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.ClientRequest; import org.apache.kafka.clients.CommonClientConfigs; @@ -87,7 +88,6 @@ import org.apache.kafka.common.utils.internals.BufferSupplier; import org.apache.kafka.test.DelayedReceive; import org.apache.kafka.test.MockSelector; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -131,11 +131,11 @@ import static java.util.Collections.singleton; import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; +import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.base.test.TestUtils.assertOptional; import static org.apache.kafka.clients.consumer.ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG; import static org.apache.kafka.clients.consumer.ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG; import static org.apache.kafka.common.requests.FetchMetadata.INVALID_SESSION_ID; -import static org.apache.kafka.test.TestUtils.assertFutureThrows; -import static org.apache.kafka.test.TestUtils.assertOptional; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java index 8a102057a562f..c6342dd5cd724 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.consumer.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.ClientRequest; import org.apache.kafka.clients.CommonClientConfigs; @@ -85,7 +86,6 @@ import org.apache.kafka.common.utils.internals.BufferSupplier; import org.apache.kafka.test.DelayedReceive; import org.apache.kafka.test.MockSelector; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -128,8 +128,8 @@ import static java.util.Collections.singleton; import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; +import static org.apache.kafka.base.test.TestUtils.assertOptional; import static org.apache.kafka.common.requests.FetchMetadata.INVALID_SESSION_ID; -import static org.apache.kafka.test.TestUtils.assertOptional; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegateTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegateTest.java index 9ff52599b57b7..74cf42adee586 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegateTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegateTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.consumer.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.ClientResponse; import org.apache.kafka.clients.Metadata; import org.apache.kafka.clients.MockClient; @@ -37,7 +38,6 @@ import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherTest.java index a62a9145bd78e..342e2b393f1a4 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherTest.java @@ -82,9 +82,9 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.singleton; import static java.util.Collections.singletonMap; +import static org.apache.kafka.base.test.TestUtils.assertOptional; import static org.apache.kafka.common.requests.OffsetsForLeaderEpochResponse.UNDEFINED_EPOCH; import static org.apache.kafka.common.requests.OffsetsForLeaderEpochResponse.UNDEFINED_EPOCH_OFFSET; -import static org.apache.kafka.test.TestUtils.assertOptional; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertInstanceOf; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManagerTest.java index 309fd93862034..d2ea976a9f5a0 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManagerTest.java @@ -65,7 +65,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.apache.kafka.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/RequestManagersTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/RequestManagersTest.java index 5d188469d3f15..6a426e1519f80 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/RequestManagersTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/RequestManagersTest.java @@ -31,7 +31,7 @@ import java.util.Properties; import java.util.UUID; -import static org.apache.kafka.test.TestUtils.requiredConsumerConfig; +import static org.apache.kafka.base.test.TestUtils.requiredConsumerConfig; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/SubscriptionStateTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/SubscriptionStateTest.java index 0e89fe4e5a13f..46c2d02e637b5 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/SubscriptionStateTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/SubscriptionStateTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.consumer.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.Metadata; import org.apache.kafka.clients.NodeApiVersions; @@ -30,7 +31,6 @@ import org.apache.kafka.common.message.OffsetForLeaderEpochResponseData.EpochEndOffset; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.utils.LogContext; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessorTest.java index 00b1f6f358792..8933b8fcc8aca 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessorTest.java @@ -65,8 +65,8 @@ import java.util.regex.Pattern; import java.util.stream.Stream; +import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; import static org.apache.kafka.clients.consumer.internals.events.CompletableEvent.calculateDeadlineMs; -import static org.apache.kafka.test.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java index 98ffd66270c5a..7db1ca61149b5 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.producer; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.KafkaClient; @@ -100,7 +101,6 @@ import org.apache.kafka.test.MockPartitioner; import org.apache.kafka.test.MockProducerInterceptor; import org.apache.kafka.test.MockSerializer; -import org.apache.kafka.test.TestUtils; import org.apache.logging.log4j.Level; import org.junit.jupiter.api.AfterEach; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/BufferPoolTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/BufferPoolTest.java index 727368e8edd1b..c0859980a8e3f 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/BufferPoolTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/BufferPoolTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.clients.producer.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.producer.BufferExhaustedException; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerBatchTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerBatchTest.java index 2e97dcc6c6c8f..7408dea443167 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerBatchTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerBatchTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.producer.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.producer.Callback; import org.apache.kafka.clients.producer.RecordMetadata; import org.apache.kafka.common.KafkaException; @@ -29,7 +30,6 @@ import org.apache.kafka.common.record.internal.MemoryRecordsBuilder; import org.apache.kafka.common.record.internal.Record; import org.apache.kafka.common.record.internal.RecordBatch; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/RecordAccumulatorTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/RecordAccumulatorTest.java index 71ef3ba89f651..516e692d0c42b 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/RecordAccumulatorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/RecordAccumulatorTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.producer.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.MetadataSnapshot; @@ -47,7 +48,6 @@ import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.ProducerIdAndEpoch; import org.apache.kafka.common.utils.Time; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java index 52dd2e08e588c..f893efb8682e2 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.producer.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.ClientRequest; import org.apache.kafka.clients.ClientResponse; @@ -90,7 +91,6 @@ import org.apache.kafka.common.utils.Time; import org.apache.kafka.test.DelayedReceive; import org.apache.kafka.test.MockSelector; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/TransactionManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/TransactionManagerTest.java index a13e44a5e16df..706163491ddfe 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/TransactionManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/TransactionManagerTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.clients.producer.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.MetadataSnapshot; import org.apache.kafka.clients.MockClient; @@ -82,7 +83,6 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.ProducerIdAndEpoch; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/internals/TopicTest.java b/clients/src/test/java/org/apache/kafka/common/internals/TopicTest.java index 2eb4a7802a990..75f3292b907ff 100644 --- a/clients/src/test/java/org/apache/kafka/common/internals/TopicTest.java +++ b/clients/src/test/java/org/apache/kafka/common/internals/TopicTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.common.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.errors.InvalidTopicException; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/network/CertStores.java b/clients/src/test/java/org/apache/kafka/common/network/CertStores.java index 8fff62601fa3d..b68fd75365c6b 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/CertStores.java +++ b/clients/src/test/java/org/apache/kafka/common/network/CertStores.java @@ -16,10 +16,9 @@ */ package org.apache.kafka.common.network; +import org.apache.kafka.base.test.TestSslUtils; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.config.SslConfigs; -import org.apache.kafka.test.TestSslUtils; -import org.apache.kafka.test.TestSslUtils.SslConfigsBuilder; -import org.apache.kafka.test.TestUtils; import java.io.File; import java.net.InetAddress; @@ -63,7 +62,7 @@ private CertStores(boolean server, String commonName, String keyAlgorithm, TestS String name = server ? "server" : "client"; ConnectionMode connectionMode = server ? ConnectionMode.SERVER : ConnectionMode.CLIENT; File truststoreFile = usePem ? null : TestUtils.tempFile(name + "TS", ".jks"); - sslConfig = new SslConfigsBuilder(connectionMode) + sslConfig = new TestSslUtils.SslConfigsBuilder(connectionMode) .useClientCert(!server) .certAlias(name) .cn(commonName) diff --git a/clients/src/test/java/org/apache/kafka/common/network/KafkaChannelTest.java b/clients/src/test/java/org/apache/kafka/common/network/KafkaChannelTest.java index 87b5b0ac453df..699443e18bc9b 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/KafkaChannelTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/KafkaChannelTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.common.network; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.memory.MemoryPool; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; diff --git a/clients/src/test/java/org/apache/kafka/common/network/NetworkReceiveTest.java b/clients/src/test/java/org/apache/kafka/common/network/NetworkReceiveTest.java index c9980b78b5526..6a914b6915173 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/NetworkReceiveTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/NetworkReceiveTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.network; -import org.apache.kafka.test.TestUtils; +import org.apache.kafka.base.test.TestUtils; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; diff --git a/clients/src/test/java/org/apache/kafka/common/network/NetworkTestUtils.java b/clients/src/test/java/org/apache/kafka/common/network/NetworkTestUtils.java index 51db46d7d777e..f5c1cac32ee7d 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/NetworkTestUtils.java +++ b/clients/src/test/java/org/apache/kafka/common/network/NetworkTestUtils.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.common.network; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.config.AbstractConfig; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.security.auth.SecurityProtocol; @@ -24,7 +25,6 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; -import org.apache.kafka.test.TestUtils; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java b/clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java index df5e1aea7f8df..eefd6404794a6 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java +++ b/clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.common.network; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.config.AbstractConfig; import org.apache.kafka.common.message.ApiMessageType; @@ -31,7 +32,6 @@ import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; -import org.apache.kafka.test.TestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SaslChannelBuilderTest.java b/clients/src/test/java/org/apache/kafka/common/network/SaslChannelBuilderTest.java index 3366a46e06941..215c689e4ae57 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SaslChannelBuilderTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SaslChannelBuilderTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.common.network; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.SaslConfigs; @@ -33,7 +34,6 @@ import org.apache.kafka.common.security.scram.ScramLoginModule; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; -import org.apache.kafka.test.TestUtils; import org.ietf.jgss.GSSContext; import org.ietf.jgss.GSSCredential; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java b/clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java index 347f76135866d..b31c803f0c316 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java @@ -16,6 +16,8 @@ */ package org.apache.kafka.common.network; +import org.apache.kafka.base.test.ReflectionUtils; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.memory.MemoryPool; import org.apache.kafka.common.memory.SimpleMemoryPool; @@ -26,7 +28,6 @@ import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -58,7 +59,7 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import static org.apache.kafka.test.TestUtils.waitForCondition; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -964,7 +965,7 @@ public void testWriteCompletesSendWithNoBytesWritten() throws IOException { @Test public void testChannelCloseWhileProcessingReceives() throws Exception { int numChannels = 4; - Map channels = TestUtils.fieldValue(selector, Selector.class, "channels"); + Map channels = ReflectionUtils.fieldValue(selector, Selector.class, "channels"); Set selectionKeys = new HashSet<>(); for (int i = 0; i < numChannels; i++) { String id = String.valueOf(i); @@ -1160,9 +1161,9 @@ private void sendNoReceive(KafkaChannel channel, int numRequests) throws Excepti */ private void injectNetworkReceive(KafkaChannel channel, int size) throws Exception { NetworkReceive receive = new NetworkReceive(); - TestUtils.setFieldValue(channel, "receive", receive); - ByteBuffer sizeBuffer = TestUtils.fieldValue(receive, NetworkReceive.class, "size"); + ReflectionUtils.setFieldValue(channel, "receive", receive); + ByteBuffer sizeBuffer = ReflectionUtils.fieldValue(receive, NetworkReceive.class, "size"); sizeBuffer.putInt(size); - TestUtils.setFieldValue(receive, "buffer", ByteBuffer.allocate(size)); + ReflectionUtils.setFieldValue(receive, "buffer", ByteBuffer.allocate(size)); } } diff --git a/clients/src/test/java/org/apache/kafka/common/network/SslSelectorTest.java b/clients/src/test/java/org/apache/kafka/common/network/SslSelectorTest.java index 572ec443e08af..374398bc72a9f 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SslSelectorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SslSelectorTest.java @@ -16,6 +16,8 @@ */ package org.apache.kafka.common.network; +import org.apache.kafka.base.test.TestSslUtils; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.config.SecurityConfig; import org.apache.kafka.common.memory.MemoryPool; import org.apache.kafka.common.memory.SimpleMemoryPool; @@ -28,8 +30,6 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; -import org.apache.kafka.test.TestSslUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SslTransportLayerTest.java b/clients/src/test/java/org/apache/kafka/common/network/SslTransportLayerTest.java index e4b4c174a679e..16a0eafc344c5 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SslTransportLayerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SslTransportLayerTest.java @@ -16,6 +16,8 @@ */ package org.apache.kafka.common.network; +import org.apache.kafka.base.test.TestSslUtils; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.config.SslConfigs; import org.apache.kafka.common.config.internals.BrokerSecurityConfigs; @@ -32,8 +34,6 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; -import org.apache.kafka.test.TestSslUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SslVersionsTransportLayerTest.java b/clients/src/test/java/org/apache/kafka/common/network/SslVersionsTransportLayerTest.java index b1a7aa5bc1fa9..a34bbd049fb70 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SslVersionsTransportLayerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SslVersionsTransportLayerTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.common.network; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.config.SslConfigs; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.security.TestSecurityConfig; import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/clients/src/test/java/org/apache/kafka/common/network/Tls12SelectorTest.java b/clients/src/test/java/org/apache/kafka/common/network/Tls12SelectorTest.java index a0621cca072e5..cad5ce41ee522 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/Tls12SelectorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/Tls12SelectorTest.java @@ -17,8 +17,8 @@ package org.apache.kafka.common.network; +import org.apache.kafka.base.test.TestSslUtils; import org.apache.kafka.common.config.SslConfigs; -import org.apache.kafka.test.TestSslUtils; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/network/Tls13SelectorTest.java b/clients/src/test/java/org/apache/kafka/common/network/Tls13SelectorTest.java index 7adc3d3eb3c0e..d978cb30e0be9 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/Tls13SelectorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/Tls13SelectorTest.java @@ -17,10 +17,10 @@ package org.apache.kafka.common.network; +import org.apache.kafka.base.test.TestSslUtils; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.config.SslConfigs; import org.apache.kafka.common.test.api.Flaky; -import org.apache.kafka.test.TestSslUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/protocol/SendBuilderTest.java b/clients/src/test/java/org/apache/kafka/common/protocol/SendBuilderTest.java index d1cd59066b3d6..40673bd154626 100644 --- a/clients/src/test/java/org/apache/kafka/common/protocol/SendBuilderTest.java +++ b/clients/src/test/java/org/apache/kafka/common/protocol/SendBuilderTest.java @@ -23,8 +23,8 @@ import org.apache.kafka.common.record.internal.MemoryRecordsBuilder; import org.apache.kafka.common.record.internal.SimpleRecord; import org.apache.kafka.common.record.internal.UnalignedMemoryRecords; +import org.apache.kafka.common.requests.ByteBufferChannel; import org.apache.kafka.common.utils.Utils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; @@ -52,7 +52,7 @@ public void testZeroCopyByteBuffer() { zeroCopyBuffer.put(overwrittenData); zeroCopyBuffer.rewind(); - ByteBuffer buffer = TestUtils.toBuffer(send); + ByteBuffer buffer = ByteBufferChannel.toBuffer(send); assertEquals(8 + data.length, buffer.remaining()); assertEquals(5, buffer.getInt()); assertEquals("bar", getString(buffer, data.length)); @@ -77,7 +77,7 @@ public void testWriteByteBufferRespectsPosition() { assertEquals(2, buffer.position()); Send send = builder.build(); - ByteBuffer readBuffer = TestUtils.toBuffer(send); + ByteBuffer readBuffer = ByteBufferChannel.toBuffer(send); assertEquals("yolo", getString(readBuffer, 4)); } @@ -96,7 +96,7 @@ public void testZeroCopyRecords() { buffer.rewind(); MemoryRecords overwrittenRecords = createRecords(buffer, "bar"); - ByteBuffer readBuffer = TestUtils.toBuffer(send); + ByteBuffer readBuffer = ByteBufferChannel.toBuffer(send); assertEquals(5, readBuffer.getInt()); assertEquals(overwrittenRecords, getRecords(readBuffer, records.sizeInBytes())); assertEquals(15, readBuffer.getInt()); @@ -127,7 +127,7 @@ public void testZeroCopyUnalignedRecords() { buffer.rewind(); MemoryRecords overwrittenRecords = createRecords(buffer, "bar"); - ByteBuffer readBuffer = TestUtils.toBuffer(send); + ByteBuffer readBuffer = ByteBufferChannel.toBuffer(send); assertEquals(5, readBuffer.getInt()); assertEquals(overwrittenRecords, getRecords(readBuffer, records.sizeInBytes())); assertEquals(15, readBuffer.getInt()); diff --git a/clients/src/test/java/org/apache/kafka/common/record/internal/DefaultRecordBatchTest.java b/clients/src/test/java/org/apache/kafka/common/record/internal/DefaultRecordBatchTest.java index f48168a26a7e1..8e3887dc4e34b 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/internal/DefaultRecordBatchTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/internal/DefaultRecordBatchTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.common.record.internal; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.InvalidRecordException; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.compress.ZstdCompression; @@ -27,7 +28,6 @@ import org.apache.kafka.common.utils.internals.BufferSupplier; import org.apache.kafka.common.utils.internals.ChunkedBytesStream; import org.apache.kafka.common.utils.internals.CloseableIterator; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/clients/src/test/java/org/apache/kafka/common/record/internal/FileLogInputStreamTest.java b/clients/src/test/java/org/apache/kafka/common/record/internal/FileLogInputStreamTest.java index e057bec9a07f1..df28d1b1ccf80 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/internal/FileLogInputStreamTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/internal/FileLogInputStreamTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.common.record.internal; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.record.internal.FileLogInputStream.FileChannelRecordBatch; import org.apache.kafka.common.utils.Utils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtensionContext; @@ -35,13 +35,13 @@ import java.util.stream.Stream; import static java.util.Arrays.asList; +import static org.apache.kafka.base.test.TestUtils.tempFile; import static org.apache.kafka.common.record.TimestampType.CREATE_TIME; import static org.apache.kafka.common.record.TimestampType.NO_TIMESTAMP_TYPE; import static org.apache.kafka.common.record.internal.RecordBatch.MAGIC_VALUE_V0; import static org.apache.kafka.common.record.internal.RecordBatch.MAGIC_VALUE_V1; import static org.apache.kafka.common.record.internal.RecordBatch.MAGIC_VALUE_V2; import static org.apache.kafka.common.record.internal.RecordBatch.NO_TIMESTAMP; -import static org.apache.kafka.test.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/clients/src/test/java/org/apache/kafka/common/record/internal/FileRecordsTest.java b/clients/src/test/java/org/apache/kafka/common/record/internal/FileRecordsTest.java index f0831f556d9e9..f298002fbb4a2 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/internal/FileRecordsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/internal/FileRecordsTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.common.record.internal; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.internals.RecordHeader; import org.apache.kafka.common.network.TransferableChannel; import org.apache.kafka.common.record.TimestampType; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -46,7 +46,7 @@ import java.util.stream.IntStream; import static java.util.Arrays.asList; -import static org.apache.kafka.test.TestUtils.tempFile; +import static org.apache.kafka.base.test.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsBuilderTest.java b/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsBuilderTest.java index 0f8131ab1b27e..3c277dbb54177 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsBuilderTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsBuilderTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.common.record.internal; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.message.LeaderChangeMessage; import org.apache.kafka.common.message.LeaderChangeMessage.Voter; @@ -24,7 +25,6 @@ import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.BufferSupplier; import org.apache.kafka.common.utils.internals.CloseableIterator; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtensionContext; diff --git a/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsTest.java b/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsTest.java index 83b174cccd62f..90112531f736d 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.common.record.internal; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.errors.CorruptRecordException; import org.apache.kafka.common.header.internals.RecordHeaders; @@ -27,7 +28,6 @@ import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.BufferSupplier; import org.apache.kafka.common.utils.internals.CloseableIterator; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtensionContext; diff --git a/clients/src/test/java/org/apache/kafka/common/record/internal/MultiRecordsSendTest.java b/clients/src/test/java/org/apache/kafka/common/record/internal/MultiRecordsSendTest.java index e0cee01d09263..ac4065a6061ce 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/internal/MultiRecordsSendTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/internal/MultiRecordsSendTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.common.record.internal; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.network.ByteBufferSend; import org.apache.kafka.common.network.Send; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/record/internal/RemoteLogInputStreamTest.java b/clients/src/test/java/org/apache/kafka/common/record/internal/RemoteLogInputStreamTest.java index 9f5f4712e69e3..4d9c2242b5552 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/internal/RemoteLogInputStreamTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/internal/RemoteLogInputStreamTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.common.record.internal; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.internals.RecordHeader; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.params.ParameterizedTest; @@ -36,13 +36,13 @@ import java.util.stream.Stream; import static java.util.Arrays.asList; +import static org.apache.kafka.base.test.TestUtils.tempFile; import static org.apache.kafka.common.record.TimestampType.CREATE_TIME; import static org.apache.kafka.common.record.TimestampType.NO_TIMESTAMP_TYPE; import static org.apache.kafka.common.record.internal.RecordBatch.MAGIC_VALUE_V0; import static org.apache.kafka.common.record.internal.RecordBatch.MAGIC_VALUE_V1; import static org.apache.kafka.common.record.internal.RecordBatch.MAGIC_VALUE_V2; import static org.apache.kafka.common.record.internal.RecordBatch.NO_TIMESTAMP; -import static org.apache.kafka.test.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/src/test/java/org/apache/kafka/common/record/internal/UnalignedFileRecordsTest.java b/clients/src/test/java/org/apache/kafka/common/record/internal/UnalignedFileRecordsTest.java index b90178c919ed1..aee085514cfdf 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/internal/UnalignedFileRecordsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/internal/UnalignedFileRecordsTest.java @@ -27,7 +27,7 @@ import java.nio.ByteBuffer; import java.util.Iterator; -import static org.apache.kafka.test.TestUtils.tempFile; +import static org.apache.kafka.base.test.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/clients/src/test/java/org/apache/kafka/common/replica/ReplicaSelectorTest.java b/clients/src/test/java/org/apache/kafka/common/replica/ReplicaSelectorTest.java index d9d42d4d92295..534666968c432 100644 --- a/clients/src/test/java/org/apache/kafka/common/replica/ReplicaSelectorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/replica/ReplicaSelectorTest.java @@ -30,7 +30,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.apache.kafka.test.TestUtils.assertOptional; +import static org.apache.kafka.base.test.TestUtils.assertOptional; import static org.junit.jupiter.api.Assertions.assertEquals; public class ReplicaSelectorTest { diff --git a/clients/src/test/java/org/apache/kafka/common/requests/ApiVersionsResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/ApiVersionsResponseTest.java index ae1755a035c1e..bca7a7ed1d46c 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/ApiVersionsResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/ApiVersionsResponseTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.common.requests; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.feature.Features; import org.apache.kafka.common.feature.SupportedVersionRange; import org.apache.kafka.common.message.ApiMessageType; @@ -25,7 +26,6 @@ import org.apache.kafka.common.message.ApiVersionsResponseData.ApiVersionCollection; import org.apache.kafka.common.message.ApiVersionsResponseData.SupportedFeatureKey; import org.apache.kafka.common.protocol.ApiKeys; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/ByteBufferChannel.java b/clients/src/test/java/org/apache/kafka/common/requests/ByteBufferChannel.java index 7370f502a07be..b1e5683f85f8f 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/ByteBufferChannel.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/ByteBufferChannel.java @@ -16,12 +16,16 @@ */ package org.apache.kafka.common.requests; +import org.apache.kafka.common.network.Send; import org.apache.kafka.common.network.TransferableChannel; +import org.apache.kafka.common.record.internal.UnalignedRecords; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class ByteBufferChannel implements TransferableChannel { private final ByteBuffer buf; private boolean closed = false; @@ -76,4 +80,20 @@ public boolean hasPendingWrites() { public long transferFrom(FileChannel fileChannel, long position, long count) throws IOException { return fileChannel.transferTo(position, count, this); } + + public static ByteBuffer toBuffer(Send send) { + ByteBufferChannel channel = new ByteBufferChannel(send.size()); + try { + assertEquals(send.size(), send.writeTo(channel)); + channel.close(); + return channel.buffer(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + public static ByteBuffer toBuffer(UnalignedRecords records) { + return toBuffer(records.toSend()); + } + } diff --git a/clients/src/test/java/org/apache/kafka/common/requests/EnvelopeRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/EnvelopeRequestTest.java index e3250ffa4f2bb..5cf178b8b5151 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/EnvelopeRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/EnvelopeRequestTest.java @@ -22,7 +22,6 @@ import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.security.auth.KafkaPrincipal; import org.apache.kafka.common.security.authenticator.DefaultKafkaPrincipalBuilder; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; @@ -57,7 +56,7 @@ public void testToSend() throws IOException { ).build(version); Send send = request.toSend(header); - ByteBuffer buffer = TestUtils.toBuffer(send); + ByteBuffer buffer = ByteBufferChannel.toBuffer(send); assertEquals(send.size() - 4, buffer.getInt()); RequestHeader parsedHeader = RequestHeader.parse(buffer); assertEquals(header.size(), parsedHeader.size()); diff --git a/clients/src/test/java/org/apache/kafka/common/requests/EnvelopeResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/EnvelopeResponseTest.java index 6afe831963515..a712c5989e31a 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/EnvelopeResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/EnvelopeResponseTest.java @@ -21,7 +21,6 @@ import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.Errors; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; @@ -40,7 +39,7 @@ public void testToSend() { ResponseHeader header = new ResponseHeader(15, headerVersion); Send send = response.toSend(header, version); - ByteBuffer buffer = TestUtils.toBuffer(send); + ByteBuffer buffer = ByteBufferChannel.toBuffer(send); assertEquals(send.size() - 4, buffer.getInt()); ResponseHeader parsedHeader = ResponseHeader.parse(buffer, headerVersion); assertEquals(header.size(), parsedHeader.size()); diff --git a/clients/src/test/java/org/apache/kafka/common/requests/JoinGroupRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/JoinGroupRequestTest.java index c70b7eda5da98..c4aab66ffd254 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/JoinGroupRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/JoinGroupRequestTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.common.requests; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.errors.InvalidConfigurationException; import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.message.JoinGroupRequestData; import org.apache.kafka.common.protocol.MessageUtil; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java index b4f2e5c99458e..c6b53b5c21699 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.common.requests; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.ElectionType; import org.apache.kafka.common.GroupState; import org.apache.kafka.common.IsolationLevel; @@ -274,7 +275,6 @@ import org.apache.kafka.common.security.token.delegation.DelegationToken; import org.apache.kafka.common.security.token.delegation.TokenInformation; import org.apache.kafka.common.utils.SecurityUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/security/JaasContextTest.java b/clients/src/test/java/org/apache/kafka/common/security/JaasContextTest.java index 760b1afc41fa6..610560903b5c3 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/JaasContextTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/JaasContextTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.common.security; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.config.SaslConfigs; import org.apache.kafka.common.config.types.Password; import org.apache.kafka.common.network.ListenerName; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/common/security/authenticator/ClientAuthenticationFailureTest.java b/clients/src/test/java/org/apache/kafka/common/security/authenticator/ClientAuthenticationFailureTest.java index 68bd5e7879fe1..03290ba9dd893 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/authenticator/ClientAuthenticationFailureTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/authenticator/ClientAuthenticationFailureTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.common.security.authenticator; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.TopicDescription; @@ -38,7 +39,6 @@ import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.common.utils.MockTime; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorFailureDelayTest.java b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorFailureDelayTest.java index 75b9001f98cff..0c125559e5160 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorFailureDelayTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorFailureDelayTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.common.security.authenticator; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.config.SaslConfigs; import org.apache.kafka.common.config.internals.BrokerSecurityConfigs; import org.apache.kafka.common.errors.SaslAuthenticationException; @@ -32,7 +33,6 @@ import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java index 13ffba2715d56..32ec898e06b1d 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java @@ -16,6 +16,8 @@ */ package org.apache.kafka.common.security.authenticator; +import org.apache.kafka.base.test.ReflectionUtils; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.NetworkClient; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.config.SaslConfigs; @@ -98,7 +100,6 @@ import org.apache.kafka.common.utils.SecurityUtils; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -1935,7 +1936,7 @@ public void testServerSidePendingSendDuringReauthentication() throws Exception { // Set the client's channel `send` to null to allow setting a new send on the server's selector. // Without this, NioEchoServer will throw an error while processing the client request, // since we're manually setting a server side send to simulate the issue. - TestUtils.setFieldValue(selector.channel(node), "send", null); + ReflectionUtils.setFieldValue(selector.channel(node), "send", null); // extract the channel id from the server's selector and directly set a send on it. String channelId = server.selector().channels().get(0).id(); diff --git a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticatorTest.java b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticatorTest.java index 710caeb150a34..9f270ceac1eb6 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticatorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticatorTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.common.security.authenticator; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.config.internals.BrokerSecurityConfigs; import org.apache.kafka.common.errors.InvalidRequestException; import org.apache.kafka.common.errors.SaslAuthenticationException; @@ -51,7 +52,6 @@ import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.mockito.Answers; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/DefaultJwtRetrieverTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/DefaultJwtRetrieverTest.java index 3d5cbe1fd67ae..7bca12f424fb5 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/DefaultJwtRetrieverTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/DefaultJwtRetrieverTest.java @@ -35,6 +35,7 @@ import java.util.Map; import java.util.stream.Stream; +import static org.apache.kafka.base.test.TestUtils.tempFile; import static org.apache.kafka.common.config.SaslConfigs.DEFAULT_SASL_OAUTHBEARER_HEADER_URLENCODE; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_HEADER_URLENCODE; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_TOKEN_ENDPOINT_URL; @@ -42,7 +43,6 @@ import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginCallbackHandler.CLIENT_ID_CONFIG; import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginCallbackHandler.CLIENT_SECRET_CONFIG; import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule.OAUTHBEARER_MECHANISM; -import static org.apache.kafka.test.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/DefaultJwtValidatorTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/DefaultJwtValidatorTest.java index cf3754a77ac04..940e70cca03a0 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/DefaultJwtValidatorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/DefaultJwtValidatorTest.java @@ -32,9 +32,9 @@ import java.util.Map; +import static org.apache.kafka.base.test.TestUtils.tempFile; import static org.apache.kafka.common.config.internals.BrokerSecurityConfigs.ALLOWED_SASL_OAUTHBEARER_URLS_CONFIG; import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule.OAUTHBEARER_MECHANISM; -import static org.apache.kafka.test.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertInstanceOf; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/JwtBearerJwtRetrieverTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/JwtBearerJwtRetrieverTest.java index 4a4e567dedfdf..4abe2c4d5f605 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/JwtBearerJwtRetrieverTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/JwtBearerJwtRetrieverTest.java @@ -30,6 +30,7 @@ import javax.security.auth.login.AppConfigurationEntry; +import static org.apache.kafka.base.test.TestUtils.tempFile; import static org.apache.kafka.common.config.SaslConfigs.DEFAULT_SASL_OAUTHBEARER_ASSERTION_ALGORITHM; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_ALGORITHM; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_FILE; @@ -38,7 +39,6 @@ import static org.apache.kafka.common.config.internals.BrokerSecurityConfigs.ALLOWED_SASL_OAUTHBEARER_FILES_CONFIG; import static org.apache.kafka.common.config.internals.BrokerSecurityConfigs.ALLOWED_SASL_OAUTHBEARER_URLS_CONFIG; import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule.OAUTHBEARER_MECHANISM; -import static org.apache.kafka.test.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginCallbackHandlerTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginCallbackHandlerTest.java index 54857cd8cc07b..a1b43ace933b8 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginCallbackHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginCallbackHandlerTest.java @@ -34,12 +34,12 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.UnsupportedCallbackException; +import static org.apache.kafka.base.test.TestUtils.tempFile; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_TOKEN_ENDPOINT_URL; import static org.apache.kafka.common.config.internals.BrokerSecurityConfigs.ALLOWED_SASL_OAUTHBEARER_URLS_CONFIG; import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginCallbackHandler.CLIENT_ID_CONFIG; import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginCallbackHandler.CLIENT_SECRET_CONFIG; import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule.OAUTHBEARER_MECHANISM; -import static org.apache.kafka.test.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/CachedFileTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/CachedFileTest.java index 1685c98d9fe78..be02c98f7e3dc 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/CachedFileTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/CachedFileTest.java @@ -30,7 +30,7 @@ import java.nio.file.StandardOpenOption; import java.util.List; -import static org.apache.kafka.test.TestUtils.tempFile; +import static org.apache.kafka.base.test.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ClientCredentialsRequestFormatterFactoryTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ClientCredentialsRequestFormatterFactoryTest.java index 83c579c3a8def..0be348ecb3028 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ClientCredentialsRequestFormatterFactoryTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ClientCredentialsRequestFormatterFactoryTest.java @@ -35,6 +35,7 @@ import java.util.Map; import java.util.stream.Stream; +import static org.apache.kafka.base.test.TestUtils.tempFile; import static org.apache.kafka.common.config.SaslConfigs.DEFAULT_SASL_OAUTHBEARER_HEADER_URLENCODE; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_ALGORITHM; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_CLAIM_AUD; @@ -48,7 +49,6 @@ import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_PRIVATE_KEY_PASSPHRASE; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_HEADER_URLENCODE; import static org.apache.kafka.common.config.internals.BrokerSecurityConfigs.ALLOWED_SASL_OAUTHBEARER_FILES_CONFIG; -import static org.apache.kafka.test.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ConfigurationUtilsTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ConfigurationUtilsTest.java index efc41d64b3290..534f835ac6714 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ConfigurationUtilsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ConfigurationUtilsTest.java @@ -17,8 +17,8 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.config.ConfigException; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/VerificationKeyResolverFactoryTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/VerificationKeyResolverFactoryTest.java index b515255147f7b..e932eef4cc242 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/VerificationKeyResolverFactoryTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/VerificationKeyResolverFactoryTest.java @@ -26,10 +26,10 @@ import java.util.Collections; import java.util.Map; +import static org.apache.kafka.base.test.TestUtils.tempFile; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_URL; import static org.apache.kafka.common.config.internals.BrokerSecurityConfigs.ALLOWED_SASL_OAUTHBEARER_URLS_CONFIG; import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule.OAUTHBEARER_MECHANISM; -import static org.apache.kafka.test.TestUtils.tempFile; public class VerificationKeyResolverFactoryTest extends OAuthBearerTest { diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/AssertionSupplierFactoryTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/AssertionSupplierFactoryTest.java index a04a1b701244e..5e7adacd8aaeb 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/AssertionSupplierFactoryTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/AssertionSupplierFactoryTest.java @@ -31,6 +31,7 @@ import java.io.IOException; import java.security.KeyPair; +import static org.apache.kafka.base.test.TestUtils.tempFile; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_ALGORITHM; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_CLAIM_AUD; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_CLAIM_EXP_SECONDS; @@ -42,7 +43,6 @@ import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_PRIVATE_KEY_FILE; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_PRIVATE_KEY_PASSPHRASE; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_TEMPLATE_FILE; -import static org.apache.kafka.test.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/FileAssertionCreatorTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/FileAssertionCreatorTest.java index 0dbc665344194..7a5357a0f5d99 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/FileAssertionCreatorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/FileAssertionCreatorTest.java @@ -22,7 +22,7 @@ import java.io.File; -import static org.apache.kafka.test.TestUtils.tempFile; +import static org.apache.kafka.base.test.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertEquals; public class FileAssertionCreatorTest extends OAuthBearerTest { diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/FileAssertionJwtTemplateTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/FileAssertionJwtTemplateTest.java index edce26946c238..36d9f0ae7e812 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/FileAssertionJwtTemplateTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/FileAssertionJwtTemplateTest.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; -import static org.apache.kafka.test.TestUtils.tempFile; +import static org.apache.kafka.base.test.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/clients/src/test/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapperTest.java b/clients/src/test/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapperTest.java index 15c488e0060a4..f4f908784e0e5 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapperTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapperTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.common.security.ssl; +import org.apache.kafka.base.test.TestSslUtils; import org.apache.kafka.common.security.ssl.CommonNameLoggingTrustManagerFactoryWrapper.CommonNameLoggingTrustManager; import org.apache.kafka.common.security.ssl.CommonNameLoggingTrustManagerFactoryWrapper.NeverExpiringX509Certificate; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.test.TestSslUtils; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/security/ssl/DefaultSslEngineFactoryTest.java b/clients/src/test/java/org/apache/kafka/common/security/ssl/DefaultSslEngineFactoryTest.java index ed76495fa03a8..02a16b88e212e 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/ssl/DefaultSslEngineFactoryTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/ssl/DefaultSslEngineFactoryTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.common.security.ssl; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.config.SslConfigs; import org.apache.kafka.common.config.types.Password; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/security/ssl/SslFactoryTest.java b/clients/src/test/java/org/apache/kafka/common/security/ssl/SslFactoryTest.java index 1c82dc62ff0d4..030aa8c1903d6 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/ssl/SslFactoryTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/ssl/SslFactoryTest.java @@ -16,6 +16,8 @@ */ package org.apache.kafka.common.security.ssl; +import org.apache.kafka.base.test.TestSslUtils; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.config.ConfigException; import org.apache.kafka.common.config.SecurityConfig; @@ -30,8 +32,6 @@ import org.apache.kafka.common.security.ssl.mock.TestKeyManagerFactory; import org.apache.kafka.common.security.ssl.mock.TestProviderCreator; import org.apache.kafka.common.security.ssl.mock.TestTrustManagerFactory; -import org.apache.kafka.test.TestSslUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; @@ -183,7 +183,7 @@ public void staleSslEngineFactoryShouldBeClosed() throws IOException, GeneralSec sslFactory.configure(clientSslConfig); TestSslUtils.TestSslEngineFactory sslEngineFactory = (TestSslUtils.TestSslEngineFactory) sslFactory.sslEngineFactory(); assertNotNull(sslEngineFactory); - assertFalse(sslEngineFactory.closed); + assertFalse(sslEngineFactory.isClosed()); trustStoreFile = TestUtils.tempFile("truststore", ".jks"); clientSslConfig = sslConfigsBuilder(ConnectionMode.SERVER) @@ -194,7 +194,7 @@ public void staleSslEngineFactoryShouldBeClosed() throws IOException, GeneralSec TestSslUtils.TestSslEngineFactory newSslEngineFactory = (TestSslUtils.TestSslEngineFactory) sslFactory.sslEngineFactory(); assertNotEquals(sslEngineFactory, newSslEngineFactory); // the older one should be closed - assertTrue(sslEngineFactory.closed); + assertTrue(sslEngineFactory.isClosed()); } @Test @@ -495,9 +495,9 @@ public void testEngineFactoryClosed() throws Exception { SslFactory sslFactory = new SslFactory(ConnectionMode.CLIENT); sslFactory.configure(clientSslConfig); TestSslUtils.TestSslEngineFactory engine = (TestSslUtils.TestSslEngineFactory) sslFactory.sslEngineFactory(); - assertFalse(engine.closed); + assertFalse(engine.isClosed()); sslFactory.close(); - assertTrue(engine.closed); + assertTrue(engine.isClosed()); } /** diff --git a/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestKeyManagerFactory.java b/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestKeyManagerFactory.java index 8a44811edb083..254ecff4378a0 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestKeyManagerFactory.java +++ b/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestKeyManagerFactory.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.common.security.ssl.mock; +import org.apache.kafka.base.test.TestSslUtils; +import org.apache.kafka.base.test.TestSslUtils.CertificateBuilder; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.config.types.Password; -import org.apache.kafka.test.TestSslUtils; -import org.apache.kafka.test.TestSslUtils.CertificateBuilder; -import org.apache.kafka.test.TestUtils; import java.io.File; import java.io.IOException; diff --git a/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java b/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java index 8870e26a2597d..24b12598ee24f 100755 --- a/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.common.utils; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.config.ConfigException; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/clients/src/test/java/org/apache/kafka/common/utils/internals/ByteBufferUnmapperTest.java b/clients/src/test/java/org/apache/kafka/common/utils/internals/ByteBufferUnmapperTest.java index e516818c0d080..e391e40b30778 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/internals/ByteBufferUnmapperTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/internals/ByteBufferUnmapperTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.common.utils.internals; -import org.apache.kafka.test.TestUtils; +import org.apache.kafka.base.test.TestUtils; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/test/NoRetryException.java b/clients/src/test/java/org/apache/kafka/test/NoRetryException.java deleted file mode 100644 index a6f7db95afdeb..0000000000000 --- a/clients/src/test/java/org/apache/kafka/test/NoRetryException.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.kafka.test; - -/** - * This class can be used in the callback given to {@link TestUtils#retryOnExceptionWithTimeout(long, long, ValuelessCallable)} - * to indicate that a particular exception should not be retried. Instead the retry operation will - * be aborted immediately and the exception will be rethrown. - */ -public class NoRetryException extends RuntimeException { - private final Throwable cause; - - public NoRetryException(Throwable cause) { - this.cause = cause; - } - - @Override - public Throwable getCause() { - return this.cause; - } -} diff --git a/clients/src/test/java/org/apache/kafka/test/TestCondition.java b/clients/src/test/java/org/apache/kafka/test/TestCondition.java deleted file mode 100644 index a30ee68d0295a..0000000000000 --- a/clients/src/test/java/org/apache/kafka/test/TestCondition.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.kafka.test; - -/** - * Interface to wrap actions that are required to wait until a condition is met - * for testing purposes. Note that this is not intended to do any assertions. - */ -@FunctionalInterface -public interface TestCondition { - - boolean conditionMet() throws Exception; -} diff --git a/clients/src/test/java/org/apache/kafka/test/TestSslUtils.java b/clients/src/test/java/org/apache/kafka/test/TestSslUtils.java deleted file mode 100644 index 7b4680a8b0446..0000000000000 --- a/clients/src/test/java/org/apache/kafka/test/TestSslUtils.java +++ /dev/null @@ -1,858 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.kafka.test; - -import org.apache.kafka.common.config.SslConfigs; -import org.apache.kafka.common.config.types.Password; -import org.apache.kafka.common.network.ConnectionMode; -import org.apache.kafka.common.security.auth.SslEngineFactory; -import org.apache.kafka.common.security.ssl.DefaultSslEngineFactory; - -import org.bouncycastle.asn1.ASN1EncodableVector; -import org.bouncycastle.asn1.DEROctetString; -import org.bouncycastle.asn1.DERSequence; -import org.bouncycastle.asn1.DERT61String; -import org.bouncycastle.asn1.DERUTF8String; -import org.bouncycastle.asn1.x500.AttributeTypeAndValue; -import org.bouncycastle.asn1.x500.RDN; -import org.bouncycastle.asn1.x500.X500Name; -import org.bouncycastle.asn1.x500.style.BCStyle; -import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import org.bouncycastle.asn1.x509.BasicConstraints; -import org.bouncycastle.asn1.x509.Extension; -import org.bouncycastle.asn1.x509.GeneralName; -import org.bouncycastle.asn1.x509.GeneralNames; -import org.bouncycastle.asn1.x509.KeyPurposeId; -import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.X509v3CertificateBuilder; -import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; -import org.bouncycastle.crypto.params.AsymmetricKeyParameter; -import org.bouncycastle.crypto.util.PrivateKeyFactory; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openssl.PKCS8Generator; -import org.bouncycastle.openssl.jcajce.JcaMiscPEMGenerator; -import org.bouncycastle.openssl.jcajce.JcaPKCS8Generator; -import org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8EncryptorBuilder; -import org.bouncycastle.operator.ContentSigner; -import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder; -import org.bouncycastle.operator.DefaultSignatureAlgorithmIdentifierFinder; -import org.bouncycastle.operator.bc.BcContentSignerBuilder; -import org.bouncycastle.operator.bc.BcDSAContentSignerBuilder; -import org.bouncycastle.operator.bc.BcECContentSignerBuilder; -import org.bouncycastle.operator.bc.BcRSAContentSignerBuilder; -import org.bouncycastle.util.io.pem.PemWriter; - -import java.io.ByteArrayOutputStream; -import java.io.EOFException; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.math.BigInteger; -import java.net.InetAddress; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.security.GeneralSecurityException; -import java.security.Key; -import java.security.KeyPair; -import java.security.KeyPairGenerator; -import java.security.KeyStore; -import java.security.NoSuchAlgorithmException; -import java.security.PrivateKey; -import java.security.SecureRandom; -import java.security.Security; -import java.security.cert.Certificate; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; -import java.util.ArrayList; -import java.util.Date; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import javax.net.ssl.SSLEngine; -import javax.net.ssl.TrustManagerFactory; - -import static org.apache.kafka.common.security.ssl.DefaultSslEngineFactory.PEM_TYPE; - -public class TestSslUtils { - - public static final String TRUST_STORE_PASSWORD = "TrustStorePassword"; - public static final String DEFAULT_TLS_PROTOCOL_FOR_TESTS = SslConfigs.DEFAULT_SSL_PROTOCOL; - - /** - * Create a self-signed X.509 Certificate. - * From http://bfo.com/blog/2011/03/08/odds_and_ends_creating_a_new_x_509_certificate.html. - * - * @param dn the X.509 Distinguished Name, eg "CN=Test, L=London, C=GB" - * @param pair the KeyPair - * @param days how many days from now the Certificate is valid for, or - for negative values - how many days before now - * @param algorithm the signing algorithm, eg "SHA256withRSA" - * @return the self-signed certificate - * @throws CertificateException thrown if a security error or an IO error occurred. - */ - public static X509Certificate generateCertificate(String dn, KeyPair pair, - int days, String algorithm) - throws CertificateException { - return new CertificateBuilder(days, algorithm).generate(dn, pair); - } - - /** - * Generate a signed certificate. Self-signed, if no issuer and parentKeyPair are supplied - * - * @param dn The distinguished name of this certificate - * @param keyPair A key pair - * @param daysBeforeNow how many days before now the Certificate is valid for - * @param daysAfterNow how many days from now the Certificate is valid for - * @param issuer The issuer who signs the certificate. Leave null if you want to generate a root - * CA. - * @param parentKeyPair The key pair of the issuer. Leave null if you want to generate a root - * CA. - * @param algorithm the signing algorithm, eg "SHA256withRSA" - * @return the signed certificate - * @throws CertificateException - */ - public static X509Certificate generateSignedCertificate(String dn, KeyPair keyPair, - int daysBeforeNow, int daysAfterNow, String issuer, KeyPair parentKeyPair, - String algorithm, boolean isCA, boolean isServerCert, boolean isClientCert) throws CertificateException { - return new CertificateBuilder(0, algorithm).generateSignedCertificate(dn, keyPair, - daysBeforeNow, daysAfterNow, issuer, parentKeyPair, isCA, isServerCert, isClientCert); - } - - public static X509Certificate generateSignedCertificate(String dn, KeyPair keyPair, - int daysBeforeNow, int daysAfterNow, String issuer, KeyPair parentKeyPair, - String algorithm, boolean isCA, boolean isServerCert, boolean isClientCert, - String[] hostNames) throws CertificateException, IOException { - return new CertificateBuilder(0, algorithm).sanDnsNames(hostNames).generateSignedCertificate(dn, keyPair, - daysBeforeNow, daysAfterNow, issuer, parentKeyPair, isCA, isServerCert, isClientCert); - } - - public static KeyPair generateKeyPair(String algorithm) throws NoSuchAlgorithmException { - KeyPairGenerator keyGen = KeyPairGenerator.getInstance(algorithm); - keyGen.initialize(algorithm.equals("EC") ? 256 : 2048); - return keyGen.genKeyPair(); - } - - private static KeyStore createEmptyKeyStore() throws GeneralSecurityException, IOException { - KeyStore ks = KeyStore.getInstance("JKS"); - ks.load(null, null); // initialize - return ks; - } - - private static void saveKeyStore(KeyStore ks, String filename, - Password password) throws GeneralSecurityException, IOException { - try (OutputStream out = Files.newOutputStream(Paths.get(filename))) { - ks.store(out, password.value().toCharArray()); - } - } - - /** - * Creates a keystore with a single key and saves it to a file. - * - * @param filename String file to save - * @param password String store password to set on keystore - * @param keyPassword String key password to set on key - * @param alias String alias to use for the key - * @param privateKey Key to save in keystore - * @param cert Certificate to use as certificate chain associated to key - * @throws GeneralSecurityException for any error with the security APIs - * @throws IOException if there is an I/O error saving the file - */ - public static void createKeyStore(String filename, - Password password, Password keyPassword, String alias, - Key privateKey, Certificate cert) throws GeneralSecurityException, IOException { - KeyStore ks = createEmptyKeyStore(); - ks.setKeyEntry(alias, privateKey, keyPassword.value().toCharArray(), - new Certificate[]{cert}); - saveKeyStore(ks, filename, password); - } - - public static void createTrustStore( - String filename, Password password, Map certs) throws GeneralSecurityException, IOException { - KeyStore ks = KeyStore.getInstance("JKS"); - try (InputStream in = Files.newInputStream(Paths.get(filename))) { - ks.load(in, password.value().toCharArray()); - } catch (EOFException e) { - ks = createEmptyKeyStore(); - } - for (Map.Entry cert : certs.entrySet()) { - ks.setCertificateEntry(cert.getKey(), cert.getValue()); - } - saveKeyStore(ks, filename, password); - } - - public static Map createSslConfig(String keyManagerAlgorithm, String trustManagerAlgorithm, String tlsProtocol) { - Map sslConfigs = new HashMap<>(); - sslConfigs.put(SslConfigs.SSL_PROTOCOL_CONFIG, tlsProtocol); // protocol to create SSLContext - - sslConfigs.put(SslConfigs.SSL_KEYMANAGER_ALGORITHM_CONFIG, keyManagerAlgorithm); - sslConfigs.put(SslConfigs.SSL_TRUSTMANAGER_ALGORITHM_CONFIG, trustManagerAlgorithm); - sslConfigs.put(SslConfigs.SSL_CIPHER_SUITES_CONFIG, List.of()); - - List enabledProtocols = new ArrayList<>(); - enabledProtocols.add(tlsProtocol); - sslConfigs.put(SslConfigs.SSL_ENABLED_PROTOCOLS_CONFIG, enabledProtocols); - - return sslConfigs; - } - - public static Map createSslConfig(boolean useClientCert, boolean trustStore, ConnectionMode connectionMode, File trustStoreFile, String certAlias) - throws IOException, GeneralSecurityException { - return createSslConfig(useClientCert, trustStore, connectionMode, trustStoreFile, certAlias, "localhost"); - } - - public static Map createSslConfig(boolean useClientCert, boolean trustStore, - ConnectionMode connectionMode, File trustStoreFile, String certAlias, String cn) - throws IOException, GeneralSecurityException { - return createSslConfig(useClientCert, trustStore, connectionMode, trustStoreFile, certAlias, cn, new CertificateBuilder()); - } - - public static Map createSslConfig(boolean useClientCert, boolean createTrustStore, - ConnectionMode connectionMode, File trustStoreFile, String certAlias, String cn, CertificateBuilder certBuilder) - throws IOException, GeneralSecurityException { - SslConfigsBuilder builder = new SslConfigsBuilder(connectionMode) - .useClientCert(useClientCert) - .certAlias(certAlias) - .cn(cn) - .certBuilder(certBuilder); - if (createTrustStore) - builder = builder.createNewTrustStore(trustStoreFile); - else - builder = builder.useExistingTrustStore(trustStoreFile); - return builder.build(); - } - - public static void convertToPem(Map sslProps, boolean writeToFile, boolean encryptPrivateKey) throws Exception { - String tsPath = (String) sslProps.get(SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG); - String tsType = (String) sslProps.get(SslConfigs.SSL_TRUSTSTORE_TYPE_CONFIG); - Password tsPassword = (Password) sslProps.remove(SslConfigs.SSL_TRUSTSTORE_PASSWORD_CONFIG); - Password trustCerts = (Password) sslProps.remove(SslConfigs.SSL_TRUSTSTORE_CERTIFICATES_CONFIG); - if (trustCerts == null && tsPath != null) { - trustCerts = exportCertificates(tsPath, tsPassword, tsType); - } - if (trustCerts != null) { - if (tsPath == null) { - tsPath = TestUtils.tempFile("truststore", ".pem").getPath(); - sslProps.put(SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG, tsPath); - } - sslProps.put(SslConfigs.SSL_TRUSTSTORE_TYPE_CONFIG, PEM_TYPE); - if (writeToFile) - writeToFile(tsPath, trustCerts); - else { - sslProps.put(SslConfigs.SSL_TRUSTSTORE_CERTIFICATES_CONFIG, trustCerts); - sslProps.remove(SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG); - } - } - - String ksPath = (String) sslProps.get(SslConfigs.SSL_KEYSTORE_LOCATION_CONFIG); - Password certChain = (Password) sslProps.remove(SslConfigs.SSL_KEYSTORE_CERTIFICATE_CHAIN_CONFIG); - Password key = (Password) sslProps.remove(SslConfigs.SSL_KEYSTORE_KEY_CONFIG); - if (certChain == null && ksPath != null) { - String ksType = (String) sslProps.get(SslConfigs.SSL_KEYSTORE_TYPE_CONFIG); - Password ksPassword = (Password) sslProps.remove(SslConfigs.SSL_KEYSTORE_PASSWORD_CONFIG); - Password keyPassword = (Password) sslProps.get(SslConfigs.SSL_KEY_PASSWORD_CONFIG); - certChain = exportCertificates(ksPath, ksPassword, ksType); - Password pemKeyPassword = encryptPrivateKey ? keyPassword : null; - key = exportPrivateKey(ksPath, ksPassword, keyPassword, ksType, pemKeyPassword); - if (!encryptPrivateKey) - sslProps.remove(SslConfigs.SSL_KEY_PASSWORD_CONFIG); - } - - if (certChain != null) { - if (ksPath == null) { - ksPath = TestUtils.tempFile("keystore", ".pem").getPath(); - sslProps.put(SslConfigs.SSL_KEYSTORE_LOCATION_CONFIG, ksPath); - } - sslProps.put(SslConfigs.SSL_KEYSTORE_TYPE_CONFIG, PEM_TYPE); - if (writeToFile) - writeToFile(ksPath, key, certChain); - else { - sslProps.put(SslConfigs.SSL_KEYSTORE_KEY_CONFIG, key); - sslProps.put(SslConfigs.SSL_KEYSTORE_CERTIFICATE_CHAIN_CONFIG, certChain); - sslProps.remove(SslConfigs.SSL_KEYSTORE_LOCATION_CONFIG); - } - } - } - - private static void writeToFile(String path, Password... entries) throws IOException { - try (FileOutputStream out = new FileOutputStream(path)) { - for (Password entry: entries) { - out.write(entry.value().getBytes(StandardCharsets.UTF_8)); - } - } - } - - public static void convertToPemWithoutFiles(Properties sslProps) throws Exception { - String tsPath = sslProps.getProperty(SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG); - if (tsPath != null) { - Password trustCerts = exportCertificates(tsPath, - (Password) sslProps.get(SslConfigs.SSL_TRUSTSTORE_PASSWORD_CONFIG), - sslProps.getProperty(SslConfigs.SSL_TRUSTSTORE_TYPE_CONFIG)); - sslProps.remove(SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG); - sslProps.remove(SslConfigs.SSL_TRUSTSTORE_PASSWORD_CONFIG); - sslProps.setProperty(SslConfigs.SSL_TRUSTSTORE_TYPE_CONFIG, PEM_TYPE); - sslProps.put(SslConfigs.SSL_TRUSTSTORE_CERTIFICATES_CONFIG, trustCerts); - } - String ksPath = sslProps.getProperty(SslConfigs.SSL_KEYSTORE_LOCATION_CONFIG); - if (ksPath != null) { - String ksType = sslProps.getProperty(SslConfigs.SSL_KEYSTORE_TYPE_CONFIG); - Password ksPassword = (Password) sslProps.get(SslConfigs.SSL_KEYSTORE_PASSWORD_CONFIG); - Password keyPassword = (Password) sslProps.get(SslConfigs.SSL_KEY_PASSWORD_CONFIG); - Password certChain = exportCertificates(ksPath, ksPassword, ksType); - Password key = exportPrivateKey(ksPath, ksPassword, keyPassword, ksType, keyPassword); - sslProps.remove(SslConfigs.SSL_KEYSTORE_LOCATION_CONFIG); - sslProps.remove(SslConfigs.SSL_KEYSTORE_PASSWORD_CONFIG); - sslProps.setProperty(SslConfigs.SSL_KEYSTORE_TYPE_CONFIG, PEM_TYPE); - sslProps.put(SslConfigs.SSL_KEYSTORE_CERTIFICATE_CHAIN_CONFIG, certChain); - sslProps.put(SslConfigs.SSL_KEYSTORE_KEY_CONFIG, key); - } - } - - public static Password exportCertificates(String storePath, Password storePassword, String storeType) throws Exception { - StringBuilder builder = new StringBuilder(); - try (FileInputStream in = new FileInputStream(storePath)) { - KeyStore ks = KeyStore.getInstance(storeType); - ks.load(in, storePassword.value().toCharArray()); - Enumeration aliases = ks.aliases(); - if (!aliases.hasMoreElements()) - throw new IllegalArgumentException("No certificates found in file " + storePath); - while (aliases.hasMoreElements()) { - String alias = aliases.nextElement(); - Certificate[] certs = ks.getCertificateChain(alias); - if (certs != null) { - for (Certificate cert : certs) { - builder.append(pem(cert)); - } - } else { - builder.append(pem(ks.getCertificate(alias))); - } - } - } - return new Password(builder.toString()); - } - - public static Password exportPrivateKey(String storePath, - Password storePassword, - Password keyPassword, - String storeType, - Password pemKeyPassword) throws Exception { - try (FileInputStream in = new FileInputStream(storePath)) { - KeyStore ks = KeyStore.getInstance(storeType); - ks.load(in, storePassword.value().toCharArray()); - String alias = ks.aliases().nextElement(); - return new Password(pem((PrivateKey) ks.getKey(alias, keyPassword.value().toCharArray()), pemKeyPassword)); - } - } - - static String pem(Certificate cert) throws IOException { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - try (PemWriter pemWriter = new PemWriter(new OutputStreamWriter(out, StandardCharsets.UTF_8))) { - pemWriter.writeObject(new JcaMiscPEMGenerator(cert)); - } - return out.toString(StandardCharsets.UTF_8); - } - - static String pem(PrivateKey privateKey, Password password) throws IOException { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - try (PemWriter pemWriter = new PemWriter(new OutputStreamWriter(out, StandardCharsets.UTF_8))) { - if (password == null) { - pemWriter.writeObject(new JcaPKCS8Generator(privateKey, null)); - } else { - JceOpenSSLPKCS8EncryptorBuilder encryptorBuilder = new JceOpenSSLPKCS8EncryptorBuilder(PKCS8Generator.PBE_SHA1_3DES); - encryptorBuilder.setPassword(password.value().toCharArray()); - try { - pemWriter.writeObject(new JcaPKCS8Generator(privateKey, encryptorBuilder.build())); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - } - return out.toString(StandardCharsets.UTF_8); - } - - public static class CertificateBuilder { - private final int days; - private final String algorithm; - private byte[] subjectAltName; - - public CertificateBuilder() { - this(30, "SHA256withRSA"); - } - - public CertificateBuilder(int days, String algorithm) { - this.days = days; - this.algorithm = algorithm; - } - - public CertificateBuilder sanDnsNames(String... hostNames) throws IOException { - if (hostNames.length > 0) { - GeneralName[] altNames = new GeneralName[hostNames.length]; - for (int i = 0; i < hostNames.length; i++) - altNames[i] = new GeneralName(GeneralName.dNSName, hostNames[i]); - subjectAltName = GeneralNames.getInstance(new DERSequence(altNames)).getEncoded(); - } else { - subjectAltName = null; - } - return this; - } - - public CertificateBuilder sanIpAddress(InetAddress hostAddress) throws IOException { - subjectAltName = new GeneralNames(new GeneralName(GeneralName.iPAddress, new DEROctetString(hostAddress.getAddress()))).getEncoded(); - return this; - } - - public X509Certificate generate(String dn, KeyPair keyPair) throws CertificateException { - return generate(new X500Name(dn), keyPair); - } - - public X509Certificate generate(String commonName, String org, boolean utf8, KeyPair keyPair) throws CertificateException { - RDN[] rdns = new RDN[2]; - rdns[0] = new RDN(new AttributeTypeAndValue(BCStyle.CN, utf8 ? new DERUTF8String(commonName) : new DERT61String(commonName))); - rdns[1] = new RDN(new AttributeTypeAndValue(BCStyle.O, utf8 ? new DERUTF8String(org) : new DERT61String(org))); - return generate(new X500Name(rdns), keyPair); - } - - public X509Certificate generate(X500Name dn, KeyPair keyPair) throws CertificateException { - try { - Security.addProvider(new BouncyCastleProvider()); - AlgorithmIdentifier sigAlgId = new DefaultSignatureAlgorithmIdentifierFinder().find(algorithm); - AlgorithmIdentifier digAlgId = new DefaultDigestAlgorithmIdentifierFinder().find(sigAlgId); - AsymmetricKeyParameter privateKeyAsymKeyParam = PrivateKeyFactory.createKey(keyPair.getPrivate().getEncoded()); - SubjectPublicKeyInfo subPubKeyInfo = SubjectPublicKeyInfo.getInstance(keyPair.getPublic().getEncoded()); - BcContentSignerBuilder signerBuilder; - String keyAlgorithm = keyPair.getPublic().getAlgorithm(); - switch (keyAlgorithm) { - case "RSA": - signerBuilder = new BcRSAContentSignerBuilder(sigAlgId, digAlgId); - break; - case "DSA": - signerBuilder = new BcDSAContentSignerBuilder(sigAlgId, digAlgId); - break; - case "EC": - signerBuilder = new BcECContentSignerBuilder(sigAlgId, digAlgId); - break; - default: - throw new IllegalArgumentException("Unsupported algorithm " + keyAlgorithm); - } - ContentSigner sigGen = signerBuilder.build(privateKeyAsymKeyParam); - // Negative numbers for "days" can be used to generate expired certificates - Date now = new Date(); - Date from = (days >= 0) ? now : new Date(now.getTime() + days * 86400000L); - Date to = (days >= 0) ? new Date(now.getTime() + days * 86400000L) : now; - BigInteger sn = new BigInteger(64, new SecureRandom()); - X509v3CertificateBuilder v3CertGen = new X509v3CertificateBuilder(dn, sn, from, to, dn, subPubKeyInfo); - - if (subjectAltName != null) - v3CertGen.addExtension(Extension.subjectAlternativeName, false, subjectAltName); - X509CertificateHolder certificateHolder = v3CertGen.build(sigGen); - return new JcaX509CertificateConverter().setProvider("BC").getCertificate(certificateHolder); - } catch (CertificateException ce) { - throw ce; - } catch (Exception e) { - throw new CertificateException(e); - } - } - - /** - * @param dn The distinguished name to use - * @param keyPair A key pair to use - * @param daysBeforeNow how many days before now the Certificate is valid for - * @param daysAfterNow how many days from now the Certificate is valid for - * @param issuer The issuer name. if null, "dn" is used - * @param parentKeyPair The parent key pair used to sign this certificate. If null, create - * self-signed certificate authority (CA) - * @return A (self-) signed certificate - * @throws CertificateException - */ - public X509Certificate generateSignedCertificate(String dn, KeyPair keyPair, - int daysBeforeNow, int daysAfterNow, String issuer, KeyPair parentKeyPair, boolean isCA, boolean isServerCert, boolean isClientCert) - throws CertificateException { - X500Name issuerOrDn = (issuer != null) ? new X500Name(issuer) : new X500Name(dn); - return generateSignedCertificate(new X500Name(dn), keyPair, daysBeforeNow, daysAfterNow, - issuerOrDn, parentKeyPair, isCA, isServerCert, isClientCert); - } - - /** - * - * @param dn The distinguished name to use - * @param keyPair A key pair to use - * @param daysBeforeNow how many days before now the Certificate is valid for - * @param daysAfterNow how many days from now the Certificate is valid for - * @param issuer The issuer name. if null, "dn" is used - * @param parentKeyPair The parent key pair used to sign this certificate. If null, create - * self-signed certificate authority (CA) - * @return A (self-) signed certificate - * @throws CertificateException - */ - public X509Certificate generateSignedCertificate(X500Name dn, KeyPair keyPair, - int daysBeforeNow, int daysAfterNow, X500Name issuer, KeyPair parentKeyPair, boolean isCA, boolean isServerCert, boolean isClientCert) - throws CertificateException { - try { - Security.addProvider(new BouncyCastleProvider()); - AlgorithmIdentifier sigAlgId = - new DefaultSignatureAlgorithmIdentifierFinder().find(algorithm); - AlgorithmIdentifier digAlgId = - new DefaultDigestAlgorithmIdentifierFinder().find(sigAlgId); - // Create self-signed certificate if no parentKeyPair has been specified, otherwise - // sign with private key of parentKeyPair - KeyPair signingKeyPair = (parentKeyPair != null) ? parentKeyPair : keyPair; - AsymmetricKeyParameter privateKeyAsymKeyParam = - PrivateKeyFactory.createKey(signingKeyPair.getPrivate().getEncoded()); - SubjectPublicKeyInfo subPubKeyInfo = - SubjectPublicKeyInfo.getInstance(keyPair.getPublic().getEncoded()); - BcContentSignerBuilder signerBuilder; - String keyAlgorithm = keyPair.getPublic().getAlgorithm(); - switch (keyAlgorithm) { - case "RSA": - signerBuilder = new BcRSAContentSignerBuilder(sigAlgId, digAlgId); - break; - case "DSA": - signerBuilder = new BcDSAContentSignerBuilder(sigAlgId, digAlgId); - break; - case "EC": - signerBuilder = new BcECContentSignerBuilder(sigAlgId, digAlgId); - break; - default: - throw new IllegalArgumentException("Unsupported algorithm " + keyAlgorithm); - } - ContentSigner sigGen = signerBuilder.build(privateKeyAsymKeyParam); - // Negative numbers for "days" can be used to generate expired certificates - Date now = new Date(); - Date from = new Date(now.getTime() - daysBeforeNow * 86400000L); - Date to = new Date(now.getTime() + daysAfterNow * 86400000L); - BigInteger sn = new BigInteger(64, new SecureRandom()); - X500Name issuerOrDn = (issuer != null) ? issuer : dn; - X509v3CertificateBuilder v3CertGen = - new X509v3CertificateBuilder(issuerOrDn, sn, from, to, dn, subPubKeyInfo); - if (isCA) { - v3CertGen.addExtension(Extension.basicConstraints, true, new BasicConstraints(isCA)); - } - if (isServerCert || isClientCert) { - ASN1EncodableVector purposes = new ASN1EncodableVector(); - if (isServerCert) { - purposes.add(KeyPurposeId.id_kp_serverAuth); - } - if (isClientCert) { - purposes.add(KeyPurposeId.id_kp_clientAuth); - } - v3CertGen.addExtension(Extension.extendedKeyUsage, false, new DERSequence(purposes)); - } - if (subjectAltName != null) { - v3CertGen.addExtension(Extension.subjectAlternativeName, false, subjectAltName); - } - X509CertificateHolder certificateHolder = v3CertGen.build(sigGen); - return new JcaX509CertificateConverter().setProvider("BC") - .getCertificate(certificateHolder); - } catch (CertificateException ce) { - throw ce; - } catch (Exception e) { - throw new CertificateException(e); - } - } - } - - public static class SslConfigsBuilder { - final ConnectionMode connectionMode; - String tlsProtocol; - boolean useClientCert; - boolean createTrustStore; - File trustStoreFile; - Password trustStorePassword; - Password keyStorePassword; - Password keyPassword; - String certAlias; - String cn; - String algorithm; - CertificateBuilder certBuilder; - boolean usePem; - - public SslConfigsBuilder(ConnectionMode connectionMode) { - this.connectionMode = connectionMode; - this.tlsProtocol = DEFAULT_TLS_PROTOCOL_FOR_TESTS; - trustStorePassword = new Password(TRUST_STORE_PASSWORD); - keyStorePassword = connectionMode == ConnectionMode.SERVER ? new Password("ServerPassword") : new Password("ClientPassword"); - keyPassword = keyStorePassword; - this.certBuilder = new CertificateBuilder(); - this.cn = "localhost"; - this.certAlias = connectionMode.name().toLowerCase(Locale.ROOT); - this.algorithm = "RSA"; - this.createTrustStore = true; - } - - public SslConfigsBuilder tlsProtocol(String tlsProtocol) { - this.tlsProtocol = tlsProtocol; - return this; - } - - public SslConfigsBuilder createNewTrustStore(File trustStoreFile) { - this.trustStoreFile = trustStoreFile; - this.createTrustStore = true; - return this; - } - - public SslConfigsBuilder useExistingTrustStore(File trustStoreFile) { - this.trustStoreFile = trustStoreFile; - this.createTrustStore = false; - return this; - } - - public SslConfigsBuilder useClientCert(boolean useClientCert) { - this.useClientCert = useClientCert; - return this; - } - - public SslConfigsBuilder certAlias(String certAlias) { - this.certAlias = certAlias; - return this; - } - - public SslConfigsBuilder cn(String cn) { - this.cn = cn; - return this; - } - - public SslConfigsBuilder algorithm(String algorithm) { - this.algorithm = algorithm; - return this; - } - - public SslConfigsBuilder certBuilder(CertificateBuilder certBuilder) { - this.certBuilder = certBuilder; - return this; - } - - public SslConfigsBuilder usePem(boolean usePem) { - this.usePem = usePem; - return this; - } - - public Map build() throws IOException, GeneralSecurityException { - if (usePem) { - return buildPem(); - } else - return buildJks(); - } - - private Map buildJks() throws IOException, GeneralSecurityException { - Map certs = new HashMap<>(); - File keyStoreFile = null; - - if (connectionMode == ConnectionMode.CLIENT && useClientCert) { - keyStoreFile = TestUtils.tempFile("clientKS", ".jks"); - KeyPair cKP = generateKeyPair(algorithm); - X509Certificate cCert = certBuilder.generate("CN=" + cn + ", O=A client", cKP); - createKeyStore(keyStoreFile.getPath(), keyStorePassword, keyPassword, "client", cKP.getPrivate(), cCert); - certs.put(certAlias, cCert); - } else if (connectionMode == ConnectionMode.SERVER) { - keyStoreFile = TestUtils.tempFile("serverKS", ".jks"); - KeyPair sKP = generateKeyPair(algorithm); - X509Certificate sCert = certBuilder.generate("CN=" + cn + ", O=A server", sKP); - createKeyStore(keyStoreFile.getPath(), keyStorePassword, keyPassword, "server", sKP.getPrivate(), sCert); - certs.put(certAlias, sCert); - keyStoreFile.deleteOnExit(); - } - - if (createTrustStore) { - createTrustStore(trustStoreFile.getPath(), trustStorePassword, certs); - trustStoreFile.deleteOnExit(); - } - - Map sslConfigs = new HashMap<>(); - - sslConfigs.put(SslConfigs.SSL_PROTOCOL_CONFIG, tlsProtocol); // protocol to create SSLContext - - if (connectionMode == ConnectionMode.SERVER || (connectionMode == ConnectionMode.CLIENT && keyStoreFile != null)) { - sslConfigs.put(SslConfigs.SSL_KEYSTORE_LOCATION_CONFIG, keyStoreFile.getPath()); - sslConfigs.put(SslConfigs.SSL_KEYSTORE_TYPE_CONFIG, "JKS"); - sslConfigs.put(SslConfigs.SSL_KEYMANAGER_ALGORITHM_CONFIG, TrustManagerFactory.getDefaultAlgorithm()); - sslConfigs.put(SslConfigs.SSL_KEYSTORE_PASSWORD_CONFIG, keyStorePassword); - sslConfigs.put(SslConfigs.SSL_KEY_PASSWORD_CONFIG, keyPassword); - } - - sslConfigs.put(SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG, trustStoreFile.getPath()); - sslConfigs.put(SslConfigs.SSL_TRUSTSTORE_PASSWORD_CONFIG, trustStorePassword); - sslConfigs.put(SslConfigs.SSL_TRUSTSTORE_TYPE_CONFIG, "JKS"); - sslConfigs.put(SslConfigs.SSL_TRUSTMANAGER_ALGORITHM_CONFIG, TrustManagerFactory.getDefaultAlgorithm()); - sslConfigs.put(SslConfigs.SSL_CIPHER_SUITES_CONFIG, List.of()); - - List enabledProtocols = new ArrayList<>(); - enabledProtocols.add(tlsProtocol); - sslConfigs.put(SslConfigs.SSL_ENABLED_PROTOCOLS_CONFIG, enabledProtocols); - - return sslConfigs; - } - - private Map buildPem() throws IOException, GeneralSecurityException { - if (!createTrustStore) { - throw new IllegalArgumentException("PEM configs cannot be created with existing trust stores"); - } - - Map sslConfigs = new HashMap<>(); - sslConfigs.put(SslConfigs.SSL_PROTOCOL_CONFIG, tlsProtocol); - sslConfigs.put(SslConfigs.SSL_ENABLED_PROTOCOLS_CONFIG, List.of(tlsProtocol)); - sslConfigs.put(SslConfigs.SSL_CIPHER_SUITES_CONFIG, List.of()); - - if (connectionMode != ConnectionMode.CLIENT || useClientCert) { - KeyPair keyPair = generateKeyPair(algorithm); - X509Certificate cert = certBuilder.generate("CN=" + cn + ", O=A " + connectionMode.name().toLowerCase(Locale.ROOT), keyPair); - - Password privateKeyPem = new Password(pem(keyPair.getPrivate(), keyPassword)); - Password certPem = new Password(pem(cert)); - sslConfigs.put(SslConfigs.SSL_KEYSTORE_TYPE_CONFIG, PEM_TYPE); - sslConfigs.put(SslConfigs.SSL_TRUSTSTORE_TYPE_CONFIG, PEM_TYPE); - sslConfigs.put(SslConfigs.SSL_KEYSTORE_KEY_CONFIG, privateKeyPem); - sslConfigs.put(SslConfigs.SSL_KEYSTORE_CERTIFICATE_CHAIN_CONFIG, certPem); - sslConfigs.put(SslConfigs.SSL_KEY_PASSWORD_CONFIG, keyPassword); - sslConfigs.put(SslConfigs.SSL_TRUSTSTORE_CERTIFICATES_CONFIG, certPem); - } - return sslConfigs; - } - } - - public static final class TestSslEngineFactory implements SslEngineFactory { - - public boolean closed = false; - - DefaultSslEngineFactory defaultSslEngineFactory = new DefaultSslEngineFactory(); - - @Override - public SSLEngine createClientSslEngine(String peerHost, int peerPort, String endpointIdentification) { - return defaultSslEngineFactory.createClientSslEngine(peerHost, peerPort, endpointIdentification); - } - - @Override - public SSLEngine createServerSslEngine(String peerHost, int peerPort) { - return defaultSslEngineFactory.createServerSslEngine(peerHost, peerPort); - } - - @Override - public boolean shouldBeRebuilt(Map nextConfigs) { - return defaultSslEngineFactory.shouldBeRebuilt(nextConfigs); - } - - @Override - public Set reconfigurableConfigs() { - return defaultSslEngineFactory.reconfigurableConfigs(); - } - - @Override - public KeyStore keystore() { - return defaultSslEngineFactory.keystore(); - } - - @Override - public KeyStore truststore() { - return defaultSslEngineFactory.truststore(); - } - - @Override - public void close() throws IOException { - defaultSslEngineFactory.close(); - closed = true; - } - - @Override - public void configure(Map configs) { - defaultSslEngineFactory.configure(configs); - } - } - - /** - * method to generate ssl configs for keystore with large number of entries. This is used to verify large key stores and - * post-handshake messages in SslEngineValidator with TLSv3/JDK17+ - * @param tlsProtocol - * @return ssl configs - * @throws Exception - */ - public static Map generateConfigsWithCertificateChains(String tlsProtocol) throws Exception { - int nrOfCerts = 10; - KeyPair[] keyPairs = new KeyPair[nrOfCerts]; - for (int i = 0; i < nrOfCerts; i++) { - keyPairs[i] = TestSslUtils.generateKeyPair("RSA"); - } - - //add a bunch of hostNames to keystore to increase the keystore size - String[] hostNames = new String[150]; - for (int i = 0; i < hostNames.length; i++) { - hostNames[i] = "hostName" + i; - } - - X509Certificate[] certs = new X509Certificate[nrOfCerts]; - // Generate root CA - int caIndex = nrOfCerts - 1; - certs[caIndex] = TestSslUtils.generateSignedCertificate("CN=CA", keyPairs[caIndex], 365, - 365, null, null, "SHA512withRSA", true, false, false, hostNames); - - //Generate Intermediate certificates - for (int intermediateCertIndex = caIndex - 1; intermediateCertIndex > 0; intermediateCertIndex--) { - certs[intermediateCertIndex] = TestSslUtils.generateSignedCertificate("CN=Intermediate CA" + intermediateCertIndex, - keyPairs[intermediateCertIndex], 365, 365, certs[intermediateCertIndex + 1].getSubjectX500Principal().getName(), - keyPairs[intermediateCertIndex + 1], "SHA512withRSA", true, false, false, hostNames); - } - - // Generate a valid end certificate - certs[0] = TestSslUtils.generateSignedCertificate("CN=kafka", keyPairs[0], 1, 1, - certs[1].getSubjectX500Principal().getName(), keyPairs[1], "SHA512withRSA", false, true, true, hostNames); - - File keystoreStoreFile = TestUtils.tempFile("keystore", ".jks"); - Password keyStorePassword = new Password("password"); - KeyStore keyStore = KeyStore.getInstance("PKCS12"); - keyStore.load(null, null); - keyStore.setKeyEntry("issued-cert", keyPairs[0].getPrivate(), keyStorePassword.value().toCharArray(), certs); - saveKeyStore(keyStore, keystoreStoreFile.getPath(), keyStorePassword); - - File trustStoreFile = TestUtils.tempFile("truststore", ".jks"); - Password trustStorePassword = new Password("password"); - KeyStore trustStore = KeyStore.getInstance("PKCS12"); - trustStore.load(null, null); - for (X509Certificate cert : certs) { - trustStore.setCertificateEntry(cert.getSubjectX500Principal().getName(), cert); - } - saveKeyStore(trustStore, trustStoreFile.getPath(), trustStorePassword); - - Map sslConfigs = new HashMap<>(); - - sslConfigs.put(SslConfigs.SSL_PROTOCOL_CONFIG, tlsProtocol); // protocol to create SSLContext - sslConfigs.put(SslConfigs.SSL_KEYSTORE_LOCATION_CONFIG, keystoreStoreFile.getPath()); - sslConfigs.put(SslConfigs.SSL_KEYSTORE_TYPE_CONFIG, "JKS"); - sslConfigs.put(SslConfigs.SSL_KEYMANAGER_ALGORITHM_CONFIG, TrustManagerFactory.getDefaultAlgorithm()); - sslConfigs.put(SslConfigs.SSL_KEYSTORE_PASSWORD_CONFIG, keyStorePassword); - sslConfigs.put(SslConfigs.SSL_KEY_PASSWORD_CONFIG, keyStorePassword); - - sslConfigs.put(SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG, trustStoreFile.getPath()); - sslConfigs.put(SslConfigs.SSL_TRUSTSTORE_PASSWORD_CONFIG, trustStorePassword); - sslConfigs.put(SslConfigs.SSL_TRUSTSTORE_TYPE_CONFIG, "JKS"); - sslConfigs.put(SslConfigs.SSL_TRUSTMANAGER_ALGORITHM_CONFIG, TrustManagerFactory.getDefaultAlgorithm()); - - List enabledProtocols = new ArrayList<>(); - enabledProtocols.add(tlsProtocol); - sslConfigs.put(SslConfigs.SSL_ENABLED_PROTOCOLS_CONFIG, enabledProtocols); - sslConfigs.put(SslConfigs.SSL_CIPHER_SUITES_CONFIG, List.of()); - - return sslConfigs; - } - -} diff --git a/clients/src/test/java/org/apache/kafka/test/TestUtils.java b/clients/src/test/java/org/apache/kafka/test/TestUtils.java deleted file mode 100644 index 871fe764817f9..0000000000000 --- a/clients/src/test/java/org/apache/kafka/test/TestUtils.java +++ /dev/null @@ -1,754 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.kafka.test; - -import org.apache.kafka.clients.MetadataSnapshot; -import org.apache.kafka.clients.consumer.ConsumerConfig; -import org.apache.kafka.clients.producer.ProducerConfig; -import org.apache.kafka.common.Cluster; -import org.apache.kafka.common.Node; -import org.apache.kafka.common.PartitionInfo; -import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.feature.Features; -import org.apache.kafka.common.feature.SupportedVersionRange; -import org.apache.kafka.common.message.ApiMessageType; -import org.apache.kafka.common.message.ApiVersionsResponseData; -import org.apache.kafka.common.network.NetworkReceive; -import org.apache.kafka.common.network.Send; -import org.apache.kafka.common.protocol.ApiKeys; -import org.apache.kafka.common.protocol.Errors; -import org.apache.kafka.common.record.internal.UnalignedRecords; -import org.apache.kafka.common.requests.ApiVersionsResponse; -import org.apache.kafka.common.requests.ByteBufferChannel; -import org.apache.kafka.common.requests.MetadataResponse.PartitionMetadata; -import org.apache.kafka.common.requests.RequestHeader; -import org.apache.kafka.common.serialization.StringDeserializer; -import org.apache.kafka.common.utils.Utils; -import org.apache.kafka.common.utils.internals.Exit; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.File; -import java.io.IOException; -import java.lang.reflect.Field; -import java.nio.ByteBuffer; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Base64; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Properties; -import java.util.Random; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.CancellationException; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import java.util.function.Consumer; -import java.util.function.Supplier; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import static java.util.Arrays.asList; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - -/** - * Helper functions for writing unit tests - */ -public class TestUtils { - private static final Logger log = LoggerFactory.getLogger(TestUtils.class); - - public static final File IO_TMP_DIR = new File(System.getProperty("java.io.tmpdir")); - - public static final String LETTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; - public static final String DIGITS = "0123456789"; - public static final String LETTERS_AND_DIGITS = LETTERS + DIGITS; - - /* A consistent random number generator to make tests repeatable */ - public static final Random SEEDED_RANDOM = new Random(192348092834L); - public static final Random RANDOM = new Random(); - public static final long DEFAULT_POLL_INTERVAL_MS = 100; - public static final long DEFAULT_MAX_WAIT_MS = 15000; - - public static Cluster singletonCluster() { - return clusterWith(1); - } - - public static Cluster singletonCluster(final String topic, final int partitions) { - return clusterWith(1, topic, partitions); - } - - public static Cluster clusterWith(int nodes) { - return clusterWith(nodes, new HashMap<>()); - } - - public static Cluster clusterWith(final int nodes, final Map topicPartitionCounts) { - final Node[] ns = new Node[nodes]; - for (int i = 0; i < nodes; i++) - ns[i] = new Node(i, "localhost", 1969); - final List parts = new ArrayList<>(); - for (final Map.Entry topicPartition : topicPartitionCounts.entrySet()) { - final String topic = topicPartition.getKey(); - final int partitions = topicPartition.getValue(); - for (int i = 0; i < partitions; i++) - parts.add(new PartitionInfo(topic, i, ns[i % ns.length], ns, ns)); - } - return new Cluster("kafka-cluster", asList(ns), parts, Collections.emptySet(), Collections.emptySet()); - } - - public static Cluster clusterWith(final int nodes, final String topic, final int partitions) { - return clusterWith(nodes, Collections.singletonMap(topic, partitions)); - } - - /** - * Test utility function to get MetadataSnapshot with configured nodes and partitions. - * @param nodes number of nodes in the cluster - * @param topicPartitionCounts map of topic -> # of partitions - * @return a MetadataSnapshot with number of nodes, partitions as per the input. - */ - - public static MetadataSnapshot metadataSnapshotWith(final int nodes, final Map topicPartitionCounts) { - final Node[] ns = new Node[nodes]; - Map nodesById = new HashMap<>(); - for (int i = 0; i < nodes; i++) { - ns[i] = new Node(i, "localhost", 1969); - nodesById.put(ns[i].id(), ns[i]); - } - final List partsMetadatas = new ArrayList<>(); - for (final Map.Entry topicPartition : topicPartitionCounts.entrySet()) { - final String topic = topicPartition.getKey(); - final int partitions = topicPartition.getValue(); - for (int i = 0; i < partitions; i++) { - TopicPartition tp = new TopicPartition(topic, partitions); - Node node = ns[i % ns.length]; - partsMetadatas.add(new PartitionMetadata(Errors.NONE, tp, Optional.of(node.id()), Optional.empty(), null, null, null)); - } - } - return new MetadataSnapshot("kafka-cluster", nodesById, partsMetadatas, Collections.emptySet(), Collections.emptySet(), Collections.emptySet(), null, Collections.emptyMap()); - } - - /** - * Asserts that there are no leaked threads with a specified name prefix and daemon status. - * This method checks all threads in the JVM, filters them by the provided thread name prefix - * and daemon status, and verifies that no matching threads are alive. - * Use the {@link #waitForCondition(TestCondition, String) waitForCondition} to retry the check at a regular interval - * until either no matching threads are found or the timeout is exceeded. - * If any matching, alive threads are found after the timeout has elapsed, the assertion will fail. - * - * @param threadName The prefix of the thread names to check. Only threads whose names - * start with this prefix will be considered. - * @param isDaemon The daemon status to check. Only threads with the specified - * daemon status (either true for daemon threads or false for non-daemon threads) - * will be considered. - * - * @throws AssertionError If any thread with the specified name prefix and daemon status are found after the timeout. - */ - public static void assertNoLeakedThreadsWithNameAndDaemonStatus(String threadName, boolean isDaemon) throws InterruptedException { - waitForCondition(() -> Thread.getAllStackTraces().keySet().stream() - .noneMatch(t -> t.isDaemon() == isDaemon && t.isAlive() && t.getName().startsWith(threadName)), String.format("Thread leak detected: %s", threadName)); - } - - /** - * Test utility function to get MetadataSnapshot of cluster with configured, and 0 partitions. - * @param nodes number of nodes in the cluster. - * @return a MetadataSnapshot of cluster with number of nodes in the input. - */ - public static MetadataSnapshot metadataSnapshotWith(int nodes) { - return metadataSnapshotWith(nodes, new HashMap<>()); - } - - /** - * Generate an array of random bytes - * - * @param size The size of the array - */ - public static byte[] randomBytes(final int size) { - final byte[] bytes = new byte[size]; - SEEDED_RANDOM.nextBytes(bytes); - return bytes; - } - - /** - * Generate a random string of letters and digits of the given length - * - * @param len The length of the string - * @return The random string - */ - public static String randomString(final int len) { - final StringBuilder b = new StringBuilder(); - for (int i = 0; i < len; i++) - b.append(LETTERS_AND_DIGITS.charAt(SEEDED_RANDOM.nextInt(LETTERS_AND_DIGITS.length()))); - return b.toString(); - } - - /** - * Select a random element from collections - * - * @param elements A collection we can select - * @return A element from collection - */ - public static T randomSelect(final Collection elements) { - List elementsCopy = new ArrayList<>(elements); - return elementsCopy.get(SEEDED_RANDOM.nextInt(elementsCopy.size())); - } - - /** - * Create an empty file in the default temporary-file directory, using the given prefix and suffix - * to generate its name. - * @throws IOException - */ - public static File tempFile(final String prefix, final String suffix) throws IOException { - final File file = Files.createTempFile(prefix, suffix).toFile(); - file.deleteOnExit(); - return file; - } - - /** - * Create an empty file in the default temporary-file directory, using `kafka` as the prefix and `tmp` as the - * suffix to generate its name. - */ - public static File tempFile() throws IOException { - return tempFile("kafka", ".tmp"); - } - - /** - * Create a file with the given contents in the default temporary-file directory, - * using `kafka` as the prefix and `tmp` as the suffix to generate its name. - */ - public static File tempFile(final String contents) throws IOException { - final File file = tempFile(); - Files.write(file.toPath(), contents.getBytes(StandardCharsets.UTF_8)); - return file; - } - - /** - * Create a temporary relative directory in the default temporary-file directory with the given prefix. - * - * @param prefix The prefix of the temporary directory, if null using "kafka-" as default prefix - */ - public static File tempDirectory(final String prefix) { - return tempDirectory(null, prefix); - } - - /** - * Create a temporary relative directory in the default temporary-file directory with a - * prefix of "kafka-" - * - * @return the temporary directory just created. - */ - public static File tempDirectory() { - return tempDirectory(null); - } - - /** - * Create a temporary directory under the given root directory. - * The root directory is removed on JVM exit if it doesn't already exist - * when this function is invoked. - * - * @param root path to create temporary directory under - * @return the temporary directory created within {@code root} - */ - public static File tempRelativeDir(String root) { - File rootFile = new File(root); - if (rootFile.mkdir()) { - rootFile.deleteOnExit(); - } - return tempDirectory(rootFile.toPath(), null); - } - - /** - * Create a temporary relative directory in the specified parent directory with the given prefix. - * - * @param parent The parent folder path name, if null using the default temporary-file directory - * @param prefix The prefix of the temporary directory, if null using "kafka-" as default prefix - */ - public static File tempDirectory(final Path parent, String prefix) { - final File file; - prefix = prefix == null ? "kafka-" : prefix; - try { - file = parent == null ? - Files.createTempDirectory(prefix).toFile() : Files.createTempDirectory(parent, prefix).toFile(); - } catch (final IOException ex) { - throw new RuntimeException("Failed to create a temp dir", ex); - } - - Exit.addShutdownHook("delete-temp-file-shutdown-hook", () -> { - try { - Utils.delete(file); - } catch (IOException e) { - log.error("Error deleting {}", file.getAbsolutePath(), e); - } - }); - - return file; - } - - /** - * Create a random log directory in the format - used for Kafka partition logs. - * It is the responsibility of the caller to set up a shutdown hook for deletion of the directory. - */ - public static File randomPartitionLogDir(File parentDir) { - int attempts = 1000; - while (attempts > 0) { - File f = new File(parentDir, "kafka-" + RANDOM.nextInt(1000000)); - if (f.mkdir()) { - f.deleteOnExit(); - return f; - } - attempts--; - } - throw new RuntimeException("Failed to create directory after 1000 attempts"); - } - - public static Properties producerConfig(final String bootstrapServers, - final Class keySerializer, - final Class valueSerializer, - final Properties additional) { - final Properties properties = new Properties(); - properties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers); - properties.put(ProducerConfig.ACKS_CONFIG, "all"); - properties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, keySerializer); - properties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, valueSerializer); - properties.putAll(additional); - return properties; - } - - public static Properties producerConfig(final String bootstrapServers, final Class keySerializer, final Class valueSerializer) { - return producerConfig(bootstrapServers, keySerializer, valueSerializer, new Properties()); - } - - public static Properties requiredConsumerConfig() { - final Properties consumerConfig = new Properties(); - consumerConfig.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9091"); - consumerConfig.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class); - consumerConfig.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class); - return consumerConfig; - } - - public static Properties consumerConfig(final String bootstrapServers, - final String groupId, - final Class keyDeserializer, - final Class valueDeserializer, - final Properties additional) { - - final Properties consumerConfig = new Properties(); - consumerConfig.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers); - consumerConfig.put(ConsumerConfig.GROUP_ID_CONFIG, groupId); - consumerConfig.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest"); - consumerConfig.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, keyDeserializer); - consumerConfig.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, valueDeserializer); - consumerConfig.putAll(additional); - return consumerConfig; - } - - public static Properties consumerConfig(final String bootstrapServers, - final String groupId, - final Class keyDeserializer, - final Class valueDeserializer) { - return consumerConfig(bootstrapServers, - groupId, - keyDeserializer, - valueDeserializer, - new Properties()); - } - - /** - * returns consumer config with random UUID for the Group ID - */ - public static Properties consumerConfig(final String bootstrapServers, final Class keyDeserializer, final Class valueDeserializer) { - return consumerConfig(bootstrapServers, - UUID.randomUUID().toString(), - keyDeserializer, - valueDeserializer, - new Properties()); - } - - /** - * uses default value of 15 seconds for timeout - */ - public static void waitForCondition(final TestCondition testCondition, final String conditionDetails) throws InterruptedException { - waitForCondition(testCondition, DEFAULT_MAX_WAIT_MS, () -> conditionDetails); - } - - /** - * uses default value of 15 seconds for timeout - */ - public static void waitForCondition(final TestCondition testCondition, final Supplier conditionDetailsSupplier) throws InterruptedException { - waitForCondition(testCondition, DEFAULT_MAX_WAIT_MS, conditionDetailsSupplier); - } - - /** - * Wait for condition to be met for at most {@code maxWaitMs} and throw assertion failure otherwise. - * This should be used instead of {@code Thread.sleep} whenever possible as it allows a longer timeout to be used - * without unnecessarily increasing test time (as the condition is checked frequently). The longer timeout is needed to - * avoid transient failures due to slow or overloaded machines. - */ - public static void waitForCondition(final TestCondition testCondition, final long maxWaitMs, String conditionDetails) throws InterruptedException { - waitForCondition(testCondition, maxWaitMs, () -> conditionDetails); - } - - /** - * Wait for condition to be met for at most {@code maxWaitMs} and throw assertion failure otherwise. - * This should be used instead of {@code Thread.sleep} whenever possible as it allows a longer timeout to be used - * without unnecessarily increasing test time (as the condition is checked frequently). The longer timeout is needed to - * avoid transient failures due to slow or overloaded machines. - */ - public static void waitForCondition(final TestCondition testCondition, final long maxWaitMs, Supplier conditionDetailsSupplier) throws InterruptedException { - waitForCondition(testCondition, maxWaitMs, DEFAULT_POLL_INTERVAL_MS, conditionDetailsSupplier); - } - - /** - * Wait for condition to be met for at most {@code maxWaitMs} with a polling interval of {@code pollIntervalMs} - * and throw assertion failure otherwise. This should be used instead of {@code Thread.sleep} whenever possible - * as it allows a longer timeout to be used without unnecessarily increasing test time (as the condition is - * checked frequently). The longer timeout is needed to avoid transient failures due to slow or overloaded - * machines. - */ - public static void waitForCondition( - final TestCondition testCondition, - final long maxWaitMs, - final long pollIntervalMs, - Supplier conditionDetailsSupplier - ) throws InterruptedException { - retryOnExceptionWithTimeout(maxWaitMs, pollIntervalMs, () -> { - String conditionDetailsSupplied = conditionDetailsSupplier != null ? conditionDetailsSupplier.get() : null; - String conditionDetails = conditionDetailsSupplied != null ? conditionDetailsSupplied : ""; - assertTrue(testCondition.conditionMet(), - "Condition not met within timeout " + maxWaitMs + ". " + conditionDetails); - }); - } - - /** - * Wait for the given runnable to complete successfully, i.e. throw now {@link Exception}s or - * {@link AssertionError}s, or for the given timeout to expire. If the timeout expires then the - * last exception or assertion failure will be thrown thus providing context for the failure. - * - * @param timeoutMs the total time in milliseconds to wait for {@code runnable} to complete successfully. - * @param runnable the code to attempt to execute successfully. - * @throws InterruptedException if the current thread is interrupted while waiting for {@code runnable} to complete successfully. - */ - public static void retryOnExceptionWithTimeout(final long timeoutMs, - final ValuelessCallable runnable) throws InterruptedException { - retryOnExceptionWithTimeout(timeoutMs, DEFAULT_POLL_INTERVAL_MS, runnable); - } - - /** - * Wait for the given runnable to complete successfully, i.e. throw now {@link Exception}s or - * {@link AssertionError}s, or for the default timeout to expire. If the timeout expires then the - * last exception or assertion failure will be thrown thus providing context for the failure. - * - * @param runnable the code to attempt to execute successfully. - * @throws InterruptedException if the current thread is interrupted while waiting for {@code runnable} to complete successfully. - */ - public static void retryOnExceptionWithTimeout(final ValuelessCallable runnable) throws InterruptedException { - retryOnExceptionWithTimeout(DEFAULT_MAX_WAIT_MS, DEFAULT_POLL_INTERVAL_MS, runnable); - } - - /** - * Wait for the given runnable to complete successfully, i.e. throw now {@link Exception}s or - * {@link AssertionError}s, or for the given timeout to expire. If the timeout expires then the - * last exception or assertion failure will be thrown thus providing context for the failure. - * - * @param timeoutMs the total time in milliseconds to wait for {@code runnable} to complete successfully. - * @param pollIntervalMs the interval in milliseconds to wait between invoking {@code runnable}. - * @param runnable the code to attempt to execute successfully. - * @throws InterruptedException if the current thread is interrupted while waiting for {@code runnable} to complete successfully. - */ - public static void retryOnExceptionWithTimeout(final long timeoutMs, - final long pollIntervalMs, - final ValuelessCallable runnable) throws InterruptedException { - final long expectedEnd = System.currentTimeMillis() + timeoutMs; - - while (true) { - try { - runnable.call(); - return; - } catch (final NoRetryException e) { - throw e; - } catch (final AssertionError t) { - if (expectedEnd <= System.currentTimeMillis()) { - throw t; - } - } catch (final Exception e) { - if (expectedEnd <= System.currentTimeMillis()) { - throw new AssertionError(String.format("Assertion failed with an exception after %s ms", timeoutMs), e); - } - } - Thread.sleep(Math.min(pollIntervalMs, timeoutMs)); - } - } - - /** - * Checks if a cluster id is valid. - * @param clusterId - */ - public static void isValidClusterId(String clusterId) { - assertNotNull(clusterId); - - // Base 64 encoded value is 22 characters - assertEquals(22, clusterId.length()); - - Pattern clusterIdPattern = Pattern.compile("[a-zA-Z0-9_\\-]+"); - Matcher matcher = clusterIdPattern.matcher(clusterId); - assertTrue(matcher.matches()); - - // Convert into normal variant and add padding at the end. - String originalClusterId = String.format("%s==", clusterId.replace("_", "/").replace("-", "+")); - byte[] decodedUuid = Base64.getDecoder().decode(originalClusterId); - - // We expect 16 bytes, same as the input UUID. - assertEquals(16, decodedUuid.length); - - //Check if it can be converted back to a UUID. - try { - ByteBuffer uuidBuffer = ByteBuffer.wrap(decodedUuid); - new UUID(uuidBuffer.getLong(), uuidBuffer.getLong()).toString(); - } catch (Exception e) { - fail(clusterId + " cannot be converted back to UUID."); - } - } - - /** - * Checks the two iterables for equality by first converting both to a list. - */ - public static void checkEquals(Iterable it1, Iterable it2) { - assertEquals(toList(it1), toList(it2)); - } - - public static void checkEquals(Iterator it1, Iterator it2) { - assertEquals(Utils.toList(it1), Utils.toList(it2)); - } - - public static void checkEquals(Set c1, Set c2, String firstDesc, String secondDesc) { - if (!c1.equals(c2)) { - Set missing1 = new HashSet<>(c2); - missing1.removeAll(c1); - Set missing2 = new HashSet<>(c1); - missing2.removeAll(c2); - fail(String.format("Sets not equal, missing %s=%s, missing %s=%s", firstDesc, missing1, secondDesc, missing2)); - } - } - - public static List toList(Iterable iterable) { - List list = new ArrayList<>(); - for (T item : iterable) - list.add(item); - return list; - } - - public static ByteBuffer toBuffer(Send send) { - ByteBufferChannel channel = new ByteBufferChannel(send.size()); - try { - assertEquals(send.size(), send.writeTo(channel)); - channel.close(); - return channel.buffer(); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - public static ByteBuffer toBuffer(UnalignedRecords records) { - return toBuffer(records.toSend()); - } - - /** - * Assert that a future raises an expected exception cause type. - * This method will wait for the future to complete or timeout(15000 milliseconds). - * - * @param Exception cause type parameter - * @param exceptionCauseClass Class of the expected exception cause - * @param future The future to await - * @return The caught exception cause - */ - public static T assertFutureThrows(Class exceptionCauseClass, Future future) { - try { - future.get(DEFAULT_MAX_WAIT_MS, TimeUnit.MILLISECONDS); - fail("Should throw expected exception " + exceptionCauseClass.getSimpleName() + " but nothing was thrown."); - } catch (InterruptedException | ExecutionException | CancellationException e) { - Throwable cause = e instanceof ExecutionException ? e.getCause() : e; - // Enable strict type checking. - // This ensures we're testing for the exact exception type, not its subclasses. - assertEquals( - exceptionCauseClass, - cause.getClass(), - "Expected " + exceptionCauseClass.getSimpleName() + ", but got " + cause.getClass().getSimpleName() - ); - return exceptionCauseClass.cast(cause); - } catch (TimeoutException e) { - fail("Future is not completed within " + DEFAULT_MAX_WAIT_MS + " milliseconds."); - } catch (Exception e) { - fail("Expected " + exceptionCauseClass.getSimpleName() + ", but got " + e.getClass().getSimpleName()); - } - return null; - } - - public static void assertFutureThrows( - Class expectedCauseClassApiException, - Future future, - String expectedMessage - ) { - T receivedException = assertFutureThrows(expectedCauseClassApiException, future); - assertEquals(expectedMessage, receivedException.getMessage()); - } - - public static void assertFutureThrowsWithMessageContaining( - Class expectedCauseClassApiException, - Future future, - String expectedMessage - ) { - T receivedException = assertFutureThrows(expectedCauseClassApiException, future); - assertTrue(receivedException.getMessage().contains(expectedMessage)); - } - - public static ApiKeys apiKeyFrom(NetworkReceive networkReceive) { - return RequestHeader.parse(networkReceive.payload().duplicate()).apiKey(); - } - - public static void assertOptional(Optional optional, Consumer assertion) { - if (optional.isPresent()) { - assertion.accept(optional.get()); - } else { - fail("Missing value from Optional"); - } - } - - @SuppressWarnings("unchecked") - public static T fieldValue(Object o, Class clazz, String fieldName) { - try { - Field field = clazz.getDeclaredField(fieldName); - field.setAccessible(true); - return (T) field.get(o); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - public static void setFieldValue(Object obj, String fieldName, Object value) throws Exception { - Field field = obj.getClass().getDeclaredField(fieldName); - field.setAccessible(true); - field.set(obj, value); - } - - /** - * Returns true if both iterators have same elements in the same order. - * - * @param iterator1 first iterator. - * @param iterator2 second iterator. - * @param type of element in the iterators. - */ - public static boolean sameElementsWithOrder(Iterator iterator1, - Iterator iterator2) { - while (iterator1.hasNext()) { - if (!iterator2.hasNext()) { - return false; - } - - if (!Objects.equals(iterator1.next(), iterator2.next())) { - return false; - } - } - - return !iterator2.hasNext(); - } - - /** - * Returns true if both the iterators have same set of elements irrespective of order and duplicates. - * - * @param iterator1 first iterator. - * @param iterator2 second iterator. - * @param type of element in the iterators. - */ - public static boolean sameElementsWithoutOrder(Iterator iterator1, - Iterator iterator2) { - // Check both the iterators have the same set of elements irrespective of order and duplicates. - Set allSegmentsSet = new HashSet<>(); - iterator1.forEachRemaining(allSegmentsSet::add); - Set expectedSegmentsSet = new HashSet<>(); - iterator2.forEachRemaining(expectedSegmentsSet::add); - - return allSegmentsSet.equals(expectedSegmentsSet); - } - - public static ApiVersionsResponse defaultApiVersionsResponse( - ApiMessageType.ListenerType listenerType - ) { - return defaultApiVersionsResponse(0, listenerType); - } - - public static ApiVersionsResponse defaultApiVersionsResponse( - int throttleTimeMs, - ApiMessageType.ListenerType listenerType - ) { - return createApiVersionsResponse( - throttleTimeMs, - ApiVersionsResponse.filterApis(listenerType, true, true), - Features.emptySupportedFeatures(), - false - ); - } - - public static ApiVersionsResponse defaultApiVersionsResponse( - int throttleTimeMs, - ApiMessageType.ListenerType listenerType, - boolean enableUnstableLastVersion - ) { - return createApiVersionsResponse( - throttleTimeMs, - ApiVersionsResponse.filterApis(listenerType, enableUnstableLastVersion, true), - Features.emptySupportedFeatures(), - false - ); - } - - public static ApiVersionsResponse createApiVersionsResponse( - int throttleTimeMs, - ApiVersionsResponseData.ApiVersionCollection apiVersions - ) { - return createApiVersionsResponse(throttleTimeMs, apiVersions, Features.emptySupportedFeatures(), false); - } - - public static ApiVersionsResponse createApiVersionsResponse( - int throttleTimeMs, - ApiVersionsResponseData.ApiVersionCollection apiVersions, - Features latestSupportedFeatures, - boolean zkMigrationEnabled - ) { - return new ApiVersionsResponse.Builder(). - setThrottleTimeMs(throttleTimeMs). - setApiVersions(apiVersions). - setSupportedFeatures(latestSupportedFeatures). - setFinalizedFeatures(Collections.emptyMap()). - setFinalizedFeaturesEpoch(ApiVersionsResponse.UNKNOWN_FINALIZED_FEATURES_EPOCH). - setZkMigrationEnabled(zkMigrationEnabled). - build(); - } -} diff --git a/clients/src/test/java/org/apache/kafka/test/ValuelessCallable.java b/clients/src/test/java/org/apache/kafka/test/ValuelessCallable.java deleted file mode 100644 index 62863b3f65ffe..0000000000000 --- a/clients/src/test/java/org/apache/kafka/test/ValuelessCallable.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.kafka.test; - -/** - * Like a {@link Runnable} that allows exceptions to be thrown or a {@link java.util.concurrent.Callable} - * that does not return a value. - */ -public interface ValuelessCallable { - void call() throws Exception; -} diff --git a/connect/basic-auth-extension/src/test/java/org/apache/kafka/connect/rest/basic/auth/extension/JaasBasicAuthFilterTest.java b/connect/basic-auth-extension/src/test/java/org/apache/kafka/connect/rest/basic/auth/extension/JaasBasicAuthFilterTest.java index d168e6466db2d..5d915d7b2c9b2 100644 --- a/connect/basic-auth-extension/src/test/java/org/apache/kafka/connect/rest/basic/auth/extension/JaasBasicAuthFilterTest.java +++ b/connect/basic-auth-extension/src/test/java/org/apache/kafka/connect/rest/basic/auth/extension/JaasBasicAuthFilterTest.java @@ -17,9 +17,9 @@ package org.apache.kafka.connect.rest.basic.auth.extension; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.security.authenticator.TestJaasConfig; import org.apache.kafka.connect.errors.ConnectException; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; diff --git a/connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSinkConnectorIntegrationTest.java b/connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSinkConnectorIntegrationTest.java index f6a1719a97f89..15ebf341ed747 100644 --- a/connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSinkConnectorIntegrationTest.java +++ b/connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSinkConnectorIntegrationTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.connect.file.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.connect.file.FileStreamSinkConnector; import org.apache.kafka.connect.util.clusters.EmbeddedConnectCluster; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSourceConnectorIntegrationTest.java b/connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSourceConnectorIntegrationTest.java index 51096d32107ba..e789363816589 100644 --- a/connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSourceConnectorIntegrationTest.java +++ b/connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSourceConnectorIntegrationTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.connect.file.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.connect.file.FileStreamSourceConnector; import org.apache.kafka.connect.util.clusters.EmbeddedConnectCluster; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/DedicatedMirrorIntegrationTest.java b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/DedicatedMirrorIntegrationTest.java index 1d1dd0feea341..c89d12d5300f3 100644 --- a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/DedicatedMirrorIntegrationTest.java +++ b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/DedicatedMirrorIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.connect.mirror.integration; +import org.apache.kafka.base.test.NoRetryException; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.TopicDescription; import org.apache.kafka.clients.consumer.Consumer; @@ -35,7 +36,6 @@ import org.apache.kafka.connect.source.SourceConnector; import org.apache.kafka.connect.util.FutureCallback; import org.apache.kafka.connect.util.clusters.EmbeddedKafkaCluster; -import org.apache.kafka.test.NoRetryException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -57,9 +57,9 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Predicate; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.clients.consumer.ConsumerConfig.AUTO_OFFSET_RESET_CONFIG; import static org.apache.kafka.connect.mirror.MirrorMaker.CONNECTOR_CLASSES; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertTrue; @Tag("integration") diff --git a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationBaseTest.java b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationBaseTest.java index d73caf9630773..39d600886b99d 100644 --- a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationBaseTest.java +++ b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationBaseTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.connect.mirror.integration; +import org.apache.kafka.base.test.TestCondition; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; @@ -63,7 +64,6 @@ import org.apache.kafka.connect.util.clusters.EmbeddedKafkaCluster; import org.apache.kafka.connect.util.clusters.UngracefulShutdownException; import org.apache.kafka.test.MockMetricsReporter; -import org.apache.kafka.test.TestCondition; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -95,12 +95,12 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.clients.consumer.ConsumerConfig.AUTO_OFFSET_RESET_CONFIG; import static org.apache.kafka.connect.mirror.MirrorConnectorConfig.METRIC_NAMES_LEGACY; import static org.apache.kafka.connect.mirror.MirrorConnectorConfig.METRIC_NAMES_NEW; import static org.apache.kafka.connect.mirror.MirrorConnectorConfig.OFFSET_SYNCS_CLIENT_ROLE_PREFIX; import static org.apache.kafka.connect.mirror.MirrorConnectorConfig.OFFSET_SYNCS_TOPIC_CONFIG_PREFIX; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationSSLTest.java b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationSSLTest.java index afebb626e9d18..4046a4c0552ec 100644 --- a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationSSLTest.java +++ b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationSSLTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.connect.mirror.integration; +import org.apache.kafka.base.test.TestSslUtils; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.common.config.SslConfigs; import org.apache.kafka.common.config.types.Password; import org.apache.kafka.common.network.ConnectionMode; import org.apache.kafka.network.SocketServerConfigs; -import org.apache.kafka.test.TestSslUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; diff --git a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsWithCustomForwardingAdminIntegrationTest.java b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsWithCustomForwardingAdminIntegrationTest.java index 0d189b5c4d1a1..bf88b00b26eaf 100644 --- a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsWithCustomForwardingAdminIntegrationTest.java +++ b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsWithCustomForwardingAdminIntegrationTest.java @@ -50,11 +50,11 @@ import java.util.Set; import java.util.stream.Collectors; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.connect.mirror.MirrorConnectorConfig.FORWARDING_ADMIN_CLASS; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLIENT_ADMIN_OVERRIDES_PREFIX; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLIENT_CONSUMER_OVERRIDES_PREFIX; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLIENT_PRODUCER_OVERRIDES_PREFIX; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/cli/ConnectStandaloneTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/cli/ConnectStandaloneTest.java index f14f45b96915c..e6ddf230d6fa4 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/cli/ConnectStandaloneTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/cli/ConnectStandaloneTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.connect.cli; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.connect.runtime.rest.entities.CreateConnectorRequest; -import org.apache.kafka.test.TestUtils; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ConnectWorkerIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ConnectWorkerIntegrationTest.java index d46d76c3606ef..6fd3f03e7dd19 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ConnectWorkerIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ConnectWorkerIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.connect.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.MetadataRecoveryStrategy; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.config.ConfigDef; @@ -43,7 +44,6 @@ import org.apache.kafka.connect.util.SinkUtils; import org.apache.kafka.connect.util.clusters.EmbeddedConnectCluster; import org.apache.kafka.connect.util.clusters.WorkerHandle; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -72,6 +72,7 @@ import jakarta.ws.rs.core.Response; import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.clients.CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG; import static org.apache.kafka.clients.CommonClientConfigs.METADATA_RECOVERY_STRATEGY_CONFIG; import static org.apache.kafka.common.config.AbstractConfig.CONFIG_PROVIDERS_CONFIG; @@ -100,7 +101,6 @@ import static org.apache.kafka.connect.runtime.distributed.DistributedConfig.REBALANCE_TIMEOUT_MS_CONFIG; import static org.apache.kafka.connect.runtime.distributed.DistributedConfig.SCHEDULED_REBALANCE_MAX_DELAY_MS_CONFIG; import static org.apache.kafka.connect.util.clusters.ConnectAssertions.CONNECTOR_SETUP_DURATION_MS; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertInstanceOf; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ErrorHandlingIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ErrorHandlingIntegrationTest.java index fd7f14d122d3f..a94f269628556 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ErrorHandlingIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ErrorHandlingIntegrationTest.java @@ -42,6 +42,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLIENT_CONSUMER_OVERRIDES_PREFIX; import static org.apache.kafka.connect.runtime.ConnectorConfig.ERRORS_LOG_ENABLE_CONFIG; @@ -59,7 +60,6 @@ import static org.apache.kafka.connect.runtime.errors.DeadLetterQueueReporter.ERROR_HEADER_EXCEPTION; import static org.apache.kafka.connect.runtime.errors.DeadLetterQueueReporter.ERROR_HEADER_EXCEPTION_MESSAGE; import static org.apache.kafka.connect.runtime.errors.DeadLetterQueueReporter.ERROR_HEADER_ORIG_TOPIC; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ExactlyOnceSourceIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ExactlyOnceSourceIntegrationTest.java index 9c8df7b079e58..5abf17e03e0cb 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ExactlyOnceSourceIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ExactlyOnceSourceIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.connect.integration; +import org.apache.kafka.base.test.NoRetryException; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -55,7 +56,6 @@ import org.apache.kafka.network.SocketServerConfigs; import org.apache.kafka.raft.KRaftConfigs; import org.apache.kafka.server.config.ServerConfigs; -import org.apache.kafka.test.NoRetryException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -79,6 +79,7 @@ import java.util.stream.IntStream; import java.util.stream.LongStream; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.clients.producer.ProducerConfig.BOOTSTRAP_SERVERS_CONFIG; import static org.apache.kafka.clients.producer.ProducerConfig.CLIENT_ID_CONFIG; import static org.apache.kafka.clients.producer.ProducerConfig.ENABLE_IDEMPOTENCE_CONFIG; @@ -104,7 +105,6 @@ import static org.apache.kafka.connect.source.SourceTask.TransactionBoundary.CONNECTOR; import static org.apache.kafka.connect.source.SourceTask.TransactionBoundary.INTERVAL; import static org.apache.kafka.connect.source.SourceTask.TransactionBoundary.POLL; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertInstanceOf; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ExampleConnectIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ExampleConnectIntegrationTest.java index 6263c8ab96cc1..35f48e2cbdd6a 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ExampleConnectIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ExampleConnectIntegrationTest.java @@ -32,6 +32,7 @@ import java.util.Properties; import java.util.concurrent.TimeUnit; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.KEY_CONVERTER_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.TASKS_MAX_CONFIG; @@ -41,7 +42,6 @@ import static org.apache.kafka.connect.runtime.TopicCreationConfig.PARTITIONS_CONFIG; import static org.apache.kafka.connect.runtime.TopicCreationConfig.REPLICATION_FACTOR_CONFIG; import static org.apache.kafka.connect.runtime.WorkerConfig.OFFSET_COMMIT_INTERVAL_MS_CONFIG; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/MonitorableSinkIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/MonitorableSinkIntegrationTest.java index e9d74836e0101..0e2ce1f29a144 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/MonitorableSinkIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/MonitorableSinkIntegrationTest.java @@ -33,12 +33,12 @@ import java.util.Map; import java.util.concurrent.TimeUnit; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.KEY_CONVERTER_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.TASKS_MAX_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.VALUE_CONVERTER_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.SinkConnectorConfig.TOPICS_CONFIG; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/OffsetsApiIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/OffsetsApiIntegrationTest.java index c9edd6093bdf4..0d4bf401f9428 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/OffsetsApiIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/OffsetsApiIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.connect.integration; +import org.apache.kafka.base.test.NoRetryException; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.GroupListing; @@ -31,7 +32,6 @@ import org.apache.kafka.connect.util.SinkUtils; import org.apache.kafka.connect.util.clusters.EmbeddedConnectCluster; import org.apache.kafka.connect.util.clusters.EmbeddedKafkaCluster; -import org.apache.kafka.test.NoRetryException; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; @@ -58,6 +58,7 @@ import jakarta.ws.rs.core.Response; import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.connect.integration.TestableSourceConnector.TOPIC_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.TASKS_MAX_CONFIG; @@ -68,7 +69,6 @@ import static org.apache.kafka.connect.runtime.WorkerConfig.KEY_CONVERTER_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.WorkerConfig.OFFSET_COMMIT_INTERVAL_MS_CONFIG; import static org.apache.kafka.connect.runtime.WorkerConfig.VALUE_CONVERTER_CLASS_CONFIG; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RebalanceSourceConnectorsIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RebalanceSourceConnectorsIntegrationTest.java index 513e064ddb682..8f89723c7cefd 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RebalanceSourceConnectorsIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RebalanceSourceConnectorsIntegrationTest.java @@ -37,6 +37,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.IntStream; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.connect.integration.TestableSourceConnector.TOPIC_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.KEY_CONVERTER_CLASS_CONFIG; @@ -49,7 +50,6 @@ import static org.apache.kafka.connect.runtime.distributed.ConnectProtocolCompatibility.COMPATIBLE; import static org.apache.kafka.connect.runtime.distributed.DistributedConfig.CONNECT_PROTOCOL_CONFIG; import static org.apache.kafka.connect.runtime.distributed.DistributedConfig.SCHEDULED_REBALANCE_MAX_DELAY_MS_CONFIG; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RestExtensionIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RestExtensionIntegrationTest.java index 0e0cfa6a1ce9c..9596f1a290f55 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RestExtensionIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RestExtensionIntegrationTest.java @@ -40,12 +40,12 @@ import jakarta.ws.rs.core.Response; import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.NAME_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.TASKS_MAX_CONFIG; import static org.apache.kafka.connect.runtime.SinkConnectorConfig.TOPICS_CONFIG; import static org.apache.kafka.connect.runtime.rest.RestServerConfig.REST_EXTENSION_CLASSES_CONFIG; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RestForwardingIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RestForwardingIntegrationTest.java index 3831eb8f24685..aa34fa33434eb 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RestForwardingIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RestForwardingIntegrationTest.java @@ -16,6 +16,8 @@ */ package org.apache.kafka.connect.integration; +import org.apache.kafka.base.test.TestSslUtils; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.common.config.types.Password; import org.apache.kafka.common.network.ConnectionMode; @@ -34,8 +36,6 @@ import org.apache.kafka.connect.runtime.rest.entities.ConnectorType; import org.apache.kafka.connect.runtime.rest.util.SSLUtils; import org.apache.kafka.connect.util.Callback; -import org.apache.kafka.test.TestSslUtils; -import org.apache.kafka.test.TestUtils; import org.apache.http.HttpHost; import org.apache.http.HttpRequest; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/SinkConnectorsIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/SinkConnectorsIntegrationTest.java index 2b27f790f7eed..6e5eb073b5f92 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/SinkConnectorsIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/SinkConnectorsIntegrationTest.java @@ -38,6 +38,7 @@ import java.util.Set; import java.util.function.Consumer; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.clients.consumer.ConsumerConfig.DEFAULT_API_TIMEOUT_MS_CONFIG; import static org.apache.kafka.clients.consumer.ConsumerConfig.PARTITION_ASSIGNMENT_STRATEGY_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLASS_CONFIG; @@ -47,7 +48,6 @@ import static org.apache.kafka.connect.runtime.WorkerConfig.CONNECTOR_CLIENT_POLICY_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.WorkerConfig.KEY_CONVERTER_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.WorkerConfig.VALUE_CONVERTER_CLASS_CONFIG; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/StandaloneWorkerIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/StandaloneWorkerIntegrationTest.java index fd4438e750ff4..382764f04c99c 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/StandaloneWorkerIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/StandaloneWorkerIntegrationTest.java @@ -40,6 +40,7 @@ import jakarta.ws.rs.core.Response; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.connect.integration.BlockingConnectorTest.Block.BLOCK_CONFIG; import static org.apache.kafka.connect.integration.BlockingConnectorTest.CONNECTOR_START; import static org.apache.kafka.connect.integration.BlockingConnectorTest.CONNECTOR_TASK_CONFIGS; @@ -52,7 +53,6 @@ import static org.apache.kafka.connect.runtime.TopicCreationConfig.DEFAULT_TOPIC_CREATION_PREFIX; import static org.apache.kafka.connect.runtime.TopicCreationConfig.PARTITIONS_CONFIG; import static org.apache.kafka.connect.runtime.TopicCreationConfig.REPLICATION_FACTOR_CONFIG; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/TransformationIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/TransformationIntegrationTest.java index 5eca2c24e8401..ba2f079a5d3af 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/TransformationIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/TransformationIntegrationTest.java @@ -34,6 +34,7 @@ import java.util.Properties; import java.util.concurrent.TimeUnit; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.KEY_CONVERTER_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.PREDICATES_CONFIG; @@ -45,7 +46,6 @@ import static org.apache.kafka.connect.runtime.TopicCreationConfig.PARTITIONS_CONFIG; import static org.apache.kafka.connect.runtime.TopicCreationConfig.REPLICATION_FACTOR_CONFIG; import static org.apache.kafka.connect.runtime.WorkerConfig.OFFSET_COMMIT_INTERVAL_MS_CONFIG; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/util/clusters/ConnectAssertions.java b/connect/runtime/src/test/java/org/apache/kafka/connect/util/clusters/ConnectAssertions.java index 9b8156a4ce2ed..c7b1ad97ce704 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/util/clusters/ConnectAssertions.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/util/clusters/ConnectAssertions.java @@ -38,7 +38,7 @@ import jakarta.ws.rs.core.Response; -import static org.apache.kafka.test.TestUtils.waitForCondition; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; /** * A set of common assertions that can be applied to a Connect cluster during integration testing diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/util/clusters/EmbeddedConnectStandalone.java b/connect/runtime/src/test/java/org/apache/kafka/connect/util/clusters/EmbeddedConnectStandalone.java index 230d293b51b6d..21a5aef641c6f 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/util/clusters/EmbeddedConnectStandalone.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/util/clusters/EmbeddedConnectStandalone.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.connect.util.clusters; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.connect.cli.ConnectStandalone; import org.apache.kafka.connect.runtime.Connect; import org.apache.kafka.connect.runtime.ConnectMetrics; import org.apache.kafka.connect.runtime.standalone.StandaloneHerder; -import org.apache.kafka.test.TestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorLoaderImplTest.java b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorLoaderImplTest.java index 54b996025adca..835ac77770420 100644 --- a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorLoaderImplTest.java +++ b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorLoaderImplTest.java @@ -50,7 +50,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Function; -import static org.apache.kafka.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorRuntimeTest.java b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorRuntimeTest.java index f9bec9d3ad89d..626706afd6c93 100644 --- a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorRuntimeTest.java +++ b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorRuntimeTest.java @@ -67,6 +67,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; import static org.apache.kafka.coordinator.common.runtime.CoordinatorRuntime.CoordinatorState.ACTIVE; import static org.apache.kafka.coordinator.common.runtime.CoordinatorRuntime.CoordinatorState.CLOSED; import static org.apache.kafka.coordinator.common.runtime.CoordinatorRuntime.CoordinatorState.FAILED; @@ -77,7 +78,6 @@ import static org.apache.kafka.coordinator.common.runtime.TestUtil.endTransactionMarker; import static org.apache.kafka.coordinator.common.runtime.TestUtil.records; import static org.apache.kafka.coordinator.common.runtime.TestUtil.transactionalRecords; -import static org.apache.kafka.test.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/MultiThreadedEventProcessorTest.java b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/MultiThreadedEventProcessorTest.java index 6018055c602ab..faff0e00eac5c 100644 --- a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/MultiThreadedEventProcessorTest.java +++ b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/MultiThreadedEventProcessorTest.java @@ -36,8 +36,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; -import static org.apache.kafka.test.TestUtils.DEFAULT_MAX_WAIT_MS; -import static org.apache.kafka.test.TestUtils.waitForCondition; +import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/core/src/test/java/kafka/security/JaasTestUtils.java b/core/src/test/java/kafka/security/JaasTestUtils.java index 8a3b843396145..3ba9c7212865e 100644 --- a/core/src/test/java/kafka/security/JaasTestUtils.java +++ b/core/src/test/java/kafka/security/JaasTestUtils.java @@ -18,13 +18,13 @@ import kafka.utils.TestUtils; +import org.apache.kafka.base.test.TestSslUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.ScramMechanism; import org.apache.kafka.common.config.SaslConfigs; import org.apache.kafka.common.network.ConnectionMode; import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.common.utils.internals.Java; -import org.apache.kafka.test.TestSslUtils; import java.io.BufferedWriter; import java.io.File; diff --git a/core/src/test/java/kafka/server/share/ShareFetchUtilsTest.java b/core/src/test/java/kafka/server/share/ShareFetchUtilsTest.java index 08ce763b8ad44..0673e43a4f8d2 100644 --- a/core/src/test/java/kafka/server/share/ShareFetchUtilsTest.java +++ b/core/src/test/java/kafka/server/share/ShareFetchUtilsTest.java @@ -18,6 +18,7 @@ import kafka.server.ReplicaManager; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.internals.ShareAcquireMode; import org.apache.kafka.common.TopicIdPartition; import org.apache.kafka.common.TopicPartition; @@ -43,7 +44,6 @@ import org.apache.kafka.server.storage.log.FetchPartitionData; import org.apache.kafka.storage.internals.log.OffsetResultHolder; import org.apache.kafka.storage.log.metrics.BrokerTopicStats; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtensionContext; diff --git a/core/src/test/java/kafka/server/share/SharePartitionManagerTest.java b/core/src/test/java/kafka/server/share/SharePartitionManagerTest.java index 45d29fd79b327..90f1179cf90ea 100644 --- a/core/src/test/java/kafka/server/share/SharePartitionManagerTest.java +++ b/core/src/test/java/kafka/server/share/SharePartitionManagerTest.java @@ -20,6 +20,7 @@ import kafka.server.ReplicaManager; import kafka.server.share.SharePartitionManager.SharePartitionListener; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.AcknowledgeType; import org.apache.kafka.clients.consumer.internals.ShareAcquireMode; import org.apache.kafka.common.TopicIdPartition; @@ -90,7 +91,6 @@ import org.apache.kafka.storage.internals.log.OffsetResultHolder; import org.apache.kafka.storage.log.metrics.BrokerTopicMetrics; import org.apache.kafka.storage.log.metrics.BrokerTopicStats; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/core/src/test/java/kafka/server/share/SharePartitionTest.java b/core/src/test/java/kafka/server/share/SharePartitionTest.java index 2cbb103349ad0..7375f1237955b 100644 --- a/core/src/test/java/kafka/server/share/SharePartitionTest.java +++ b/core/src/test/java/kafka/server/share/SharePartitionTest.java @@ -21,6 +21,7 @@ import kafka.server.share.SharePartition.SharePartitionState; import kafka.server.share.SharePartitionManager.SharePartitionListener; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.AcknowledgeType; import org.apache.kafka.clients.consumer.internals.ShareAcquireMode; import org.apache.kafka.common.TopicIdPartition; @@ -76,7 +77,6 @@ import org.apache.kafka.server.util.timer.Timer; import org.apache.kafka.server.util.timer.TimerTask; import org.apache.kafka.storage.internals.log.OffsetResultHolder; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -99,10 +99,10 @@ import java.util.function.Supplier; import static kafka.server.share.SharePartition.EMPTY_MEMBER_ID; +import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; import static org.apache.kafka.server.share.fetch.ShareFetchTestUtils.memoryRecordsBuilder; import static org.apache.kafka.server.util.ServerTestUtils.clearYammerMetrics; import static org.apache.kafka.server.util.ServerTestUtils.yammerMetricValue; -import static org.apache.kafka.test.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/core/src/test/scala/integration/kafka/api/AbstractConsumerTest.scala b/core/src/test/scala/integration/kafka/api/AbstractConsumerTest.scala index 6a60621308bc2..1268a47f4ec43 100644 --- a/core/src/test/scala/integration/kafka/api/AbstractConsumerTest.scala +++ b/core/src/test/scala/integration/kafka/api/AbstractConsumerTest.scala @@ -23,7 +23,7 @@ import org.apache.kafka.clients.consumer._ import org.apache.kafka.clients.producer.{ProducerConfig, ProducerRecord} import org.apache.kafka.common.record.TimestampType import org.apache.kafka.common.TopicPartition -import org.apache.kafka.test.{TestUtils => JTestUtils} +import org.apache.kafka.base.test.{TestUtils => JTestUtils} import kafka.utils.TestUtils import kafka.server.BaseRequestTest import org.junit.jupiter.api.Assertions._ diff --git a/core/src/test/scala/integration/kafka/api/AuthorizerIntegrationTest.scala b/core/src/test/scala/integration/kafka/api/AuthorizerIntegrationTest.scala index 161a6bf245db0..9499d0fc77a12 100644 --- a/core/src/test/scala/integration/kafka/api/AuthorizerIntegrationTest.scala +++ b/core/src/test/scala/integration/kafka/api/AuthorizerIntegrationTest.scala @@ -49,7 +49,7 @@ import org.apache.kafka.common.resource.{PatternType, Resource, ResourcePattern, import org.apache.kafka.common.security.auth.KafkaPrincipal import org.apache.kafka.common.utils.Utils import org.apache.kafka.common.{ElectionType, IsolationLevel, KafkaException, TopicIdPartition, TopicPartition, Uuid, requests} -import org.apache.kafka.test.{TestUtils => JTestUtils} +import org.apache.kafka.base.test.{TestUtils => JTestUtils} import org.apache.kafka.security.authorizer.AclEntry import org.apache.kafka.security.authorizer.AclEntry.WILDCARD_HOST import org.junit.jupiter.api.Assertions._ diff --git a/core/src/test/scala/integration/kafka/api/BaseAdminIntegrationTest.scala b/core/src/test/scala/integration/kafka/api/BaseAdminIntegrationTest.scala index 16dec9dc00800..da042f60c9384 100644 --- a/core/src/test/scala/integration/kafka/api/BaseAdminIntegrationTest.scala +++ b/core/src/test/scala/integration/kafka/api/BaseAdminIntegrationTest.scala @@ -30,7 +30,7 @@ import org.apache.kafka.common.resource.ResourceType import org.apache.kafka.common.utils.Utils import org.apache.kafka.coordinator.group.GroupCoordinatorConfig import org.apache.kafka.security.authorizer.AclEntry -import org.apache.kafka.test.TestUtils.assertFutureThrows +import org.apache.kafka.base.test.TestUtils.assertFutureThrows import org.apache.kafka.server.config.{ReplicationConfigs, ServerConfigs, ServerLogConfigs} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Test, TestInfo, Timeout} diff --git a/core/src/test/scala/integration/kafka/api/ClientOAuthIntegrationTest.scala b/core/src/test/scala/integration/kafka/api/ClientOAuthIntegrationTest.scala index d1b2161f7cb30..de9661d99593b 100644 --- a/core/src/test/scala/integration/kafka/api/ClientOAuthIntegrationTest.scala +++ b/core/src/test/scala/integration/kafka/api/ClientOAuthIntegrationTest.scala @@ -34,7 +34,7 @@ import org.apache.kafka.common.errors.SaslAuthenticationException import org.apache.kafka.common.security.auth.SecurityProtocol import org.apache.kafka.common.security.oauthbearer.{JwtRetriever, OAuthBearerLoginCallbackHandler, OAuthBearerLoginModule, OAuthBearerValidatorCallbackHandler} import org.apache.kafka.common.utils.Utils -import org.apache.kafka.test.TestUtils +import org.apache.kafka.base.test.TestUtils import org.junit.jupiter.api.Assertions.{assertDoesNotThrow, assertEquals, assertNotNull, assertThrows} import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.MethodSource diff --git a/core/src/test/scala/integration/kafka/api/GroupCoordinatorIntegrationTest.scala b/core/src/test/scala/integration/kafka/api/GroupCoordinatorIntegrationTest.scala index 2d1919b755936..0e0d500478943 100644 --- a/core/src/test/scala/integration/kafka/api/GroupCoordinatorIntegrationTest.scala +++ b/core/src/test/scala/integration/kafka/api/GroupCoordinatorIntegrationTest.scala @@ -31,7 +31,7 @@ import org.apache.kafka.server.config.ServerConfigs import org.apache.kafka.streams.{KafkaStreams, StreamsBuilder, StreamsConfig} import org.apache.kafka.streams.{GroupProtocol => StreamsGroupProtocol} import org.apache.kafka.storage.internals.log.UnifiedLog -import org.apache.kafka.test.{TestUtils => JTestUtils} +import org.apache.kafka.base.test.{TestUtils => JTestUtils} import org.junit.jupiter.api.Timeout import java.time.Duration diff --git a/core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala b/core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala index b118a4ec02d74..02cb5d58a5288 100644 --- a/core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala +++ b/core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala @@ -57,7 +57,7 @@ import org.apache.kafka.server.common.{EligibleLeaderReplicasVersion, MetadataVe import org.apache.kafka.server.config.{QuotaConfig, ServerConfigs, ServerLogConfigs} import org.apache.kafka.server.logger.LoggingController import org.apache.kafka.storage.internals.log.{CleanerConfig, LogConfig, LogFileUtils} -import org.apache.kafka.test.TestUtils.{DEFAULT_MAX_WAIT_MS, assertFutureThrows} +import org.apache.kafka.base.test.TestUtils.{DEFAULT_MAX_WAIT_MS, assertFutureThrows} import org.apache.logging.log4j.core.config.Configurator import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{BeforeEach, Test, TestInfo, Timeout} diff --git a/core/src/test/scala/integration/kafka/api/SaslPlainSslEndToEndAuthorizationTest.scala b/core/src/test/scala/integration/kafka/api/SaslPlainSslEndToEndAuthorizationTest.scala index 5147480928cb2..8bd3140e4336c 100644 --- a/core/src/test/scala/integration/kafka/api/SaslPlainSslEndToEndAuthorizationTest.scala +++ b/core/src/test/scala/integration/kafka/api/SaslPlainSslEndToEndAuthorizationTest.scala @@ -26,7 +26,7 @@ import org.apache.kafka.common.network.ConnectionMode import org.apache.kafka.common.security.auth._ import org.apache.kafka.common.security.authenticator.DefaultKafkaPrincipalBuilder import org.apache.kafka.common.security.plain.PlainAuthenticateCallback -import org.apache.kafka.test.TestSslUtils +import org.apache.kafka.base.test.TestSslUtils import org.junit.jupiter.api.Assertions.assertTrue import java.util diff --git a/core/src/test/scala/integration/kafka/api/SaslScramSslEndToEndAuthorizationTest.scala b/core/src/test/scala/integration/kafka/api/SaslScramSslEndToEndAuthorizationTest.scala index 8bff9b25e1734..24b2447539693 100644 --- a/core/src/test/scala/integration/kafka/api/SaslScramSslEndToEndAuthorizationTest.scala +++ b/core/src/test/scala/integration/kafka/api/SaslScramSslEndToEndAuthorizationTest.scala @@ -23,7 +23,7 @@ import kafka.utils._ import org.apache.kafka.common.security.auth.KafkaPrincipal import org.apache.kafka.common.security.scram.internals.ScramMechanism import org.apache.kafka.metadata.storage.Formatter -import org.apache.kafka.test.TestSslUtils +import org.apache.kafka.base.test.TestSslUtils import scala.jdk.CollectionConverters._ import org.junit.jupiter.api.Assertions._ diff --git a/core/src/test/scala/integration/kafka/api/SaslSslAdminIntegrationTest.scala b/core/src/test/scala/integration/kafka/api/SaslSslAdminIntegrationTest.scala index fe5f1643d39c6..e80aa02e7005b 100644 --- a/core/src/test/scala/integration/kafka/api/SaslSslAdminIntegrationTest.scala +++ b/core/src/test/scala/integration/kafka/api/SaslSslAdminIntegrationTest.scala @@ -34,7 +34,7 @@ import org.apache.kafka.security.authorizer.AclEntry.{WILDCARD_HOST, WILDCARD_PR import org.apache.kafka.server.config.{DelegationTokenManagerConfigs, ServerConfigs, ServerLogConfigs} import org.apache.kafka.metadata.authorizer.StandardAuthorizer import org.apache.kafka.server.authorizer.{Authorizer => JAuthorizer} -import org.apache.kafka.test.TestUtils.assertFutureThrows +import org.apache.kafka.base.test.TestUtils.assertFutureThrows import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Test, TestInfo, Timeout} diff --git a/core/src/test/scala/integration/kafka/api/TransactionsTest.scala b/core/src/test/scala/integration/kafka/api/TransactionsTest.scala index 5040f23f93c69..28e0cc76fd925 100644 --- a/core/src/test/scala/integration/kafka/api/TransactionsTest.scala +++ b/core/src/test/scala/integration/kafka/api/TransactionsTest.scala @@ -850,7 +850,7 @@ class TransactionsTest extends IntegrationTestHarness { Thread.sleep(6000) // Wait for the record to time out restartDeadBrokers() - org.apache.kafka.test.TestUtils.assertFutureThrows(classOf[TimeoutException], failedFuture) + org.apache.kafka.base.test.TestUtils.assertFutureThrows(classOf[TimeoutException], failedFuture) // Ensure the producer transitions to abortable_error state. TestUtils.waitUntilTrue(() => { var failed = false @@ -935,7 +935,7 @@ class TransactionsTest extends IntegrationTestHarness { Thread.sleep(6000) // Wait for the record to time out restartDeadBrokers() - org.apache.kafka.test.TestUtils.assertFutureThrows(classOf[TimeoutException], failedFuture) + org.apache.kafka.base.test.TestUtils.assertFutureThrows(classOf[TimeoutException], failedFuture) producer.abortTransaction() // Third transaction: commit diff --git a/core/src/test/scala/integration/kafka/server/DynamicBrokerReconfigurationTest.scala b/core/src/test/scala/integration/kafka/server/DynamicBrokerReconfigurationTest.scala index a99561508ff7c..d0c600eba92b4 100644 --- a/core/src/test/scala/integration/kafka/server/DynamicBrokerReconfigurationTest.scala +++ b/core/src/test/scala/integration/kafka/server/DynamicBrokerReconfigurationTest.scala @@ -63,7 +63,7 @@ import org.apache.kafka.server.record.BrokerCompressionType import org.apache.kafka.server.util.ShutdownableThread import org.apache.kafka.server.quota.{ClientQuotaEntity, ClientQuotaManager} import org.apache.kafka.storage.internals.log.{CleanerConfig, LogConfig, UnifiedLog} -import org.apache.kafka.test.TestSslUtils +import org.apache.kafka.base.test.TestSslUtils import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, TestInfo} import org.junit.jupiter.params.ParameterizedTest diff --git a/core/src/test/scala/integration/kafka/server/GssapiAuthenticationTest.scala b/core/src/test/scala/integration/kafka/server/GssapiAuthenticationTest.scala index fe7d8fb441b00..f25357ee41118 100644 --- a/core/src/test/scala/integration/kafka/server/GssapiAuthenticationTest.scala +++ b/core/src/test/scala/integration/kafka/server/GssapiAuthenticationTest.scala @@ -268,7 +268,7 @@ class GssapiAuthenticationTest extends IntegrationTestHarness with SaslSetup { val jaasContexts = java.util.Map.of("GSSAPI", JaasContext.loadClientContext(config.values())) val channelBuilder = new SaslChannelBuilder(ConnectionMode.CLIENT, jaasContexts, securityProtocol, null, false, kafkaClientSaslMechanism, null, null, null, time, new LogContext(), - _ => org.apache.kafka.test.TestUtils.defaultApiVersionsResponse(ListenerType.BROKER)) { + _ => org.apache.kafka.base.test.TestUtils.defaultApiVersionsResponse(ListenerType.BROKER)) { override protected def defaultLoginClass(): Class[_ <: Login] = classOf[TestableKerberosLogin] } channelBuilder.configure(config.values()) diff --git a/core/src/test/scala/unit/kafka/coordinator/group/CoordinatorPartitionWriterTest.scala b/core/src/test/scala/unit/kafka/coordinator/group/CoordinatorPartitionWriterTest.scala index 6872eafe370ea..40cddfafbbbf9 100644 --- a/core/src/test/scala/unit/kafka/coordinator/group/CoordinatorPartitionWriterTest.scala +++ b/core/src/test/scala/unit/kafka/coordinator/group/CoordinatorPartitionWriterTest.scala @@ -28,7 +28,7 @@ import org.apache.kafka.server.LogAppendResult import org.apache.kafka.server.LogAppendResult.LogAppendSummary import org.apache.kafka.server.common.TransactionVersion import org.apache.kafka.storage.internals.log.{AppendOrigin, LogAppendInfo, LogConfig, RecordValidationStats, VerificationGuard} -import org.apache.kafka.test.TestUtils.assertFutureThrows +import org.apache.kafka.base.test.TestUtils.assertFutureThrows import org.junit.jupiter.api.Assertions.{assertEquals, assertNull, assertThrows, assertTrue} import org.junit.jupiter.api.Test import org.junit.jupiter.params.ParameterizedTest diff --git a/core/src/test/scala/unit/kafka/network/RequestChannelTest.scala b/core/src/test/scala/unit/kafka/network/RequestChannelTest.scala index df10430ad7246..a5293e1212dbe 100644 --- a/core/src/test/scala/unit/kafka/network/RequestChannelTest.scala +++ b/core/src/test/scala/unit/kafka/network/RequestChannelTest.scala @@ -36,7 +36,6 @@ import org.apache.kafka.common.security.auth.{KafkaPrincipal, KafkaPrincipalSerd import org.apache.kafka.common.utils.{SecurityUtils, Utils} import org.apache.kafka.network.RequestConvertToJson import org.apache.kafka.network.metrics.RequestChannelMetrics -import org.apache.kafka.test import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api._ import org.junit.jupiter.params.ParameterizedTest @@ -327,7 +326,7 @@ class RequestChannelTest { val envelope = unwrapped.envelope.get val send = unwrapped.buildResponseSend(response) - val sendBytes = test.TestUtils.toBuffer(send) + val sendBytes = ByteBufferChannel.toBuffer(send) // We need to read the size field before `parseResponse` below val size = sendBytes.getInt diff --git a/core/src/test/scala/unit/kafka/network/SocketServerTest.scala b/core/src/test/scala/unit/kafka/network/SocketServerTest.scala index a90590d04f410..e773982562990 100644 --- a/core/src/test/scala/unit/kafka/network/SocketServerTest.scala +++ b/core/src/test/scala/unit/kafka/network/SocketServerTest.scala @@ -45,7 +45,8 @@ import org.apache.kafka.server.metrics.KafkaYammerMetrics import org.apache.kafka.server.network.ConnectionDisconnectListener import org.apache.kafka.server.quota.{ThrottleCallback, ThrottledChannel} import org.apache.kafka.server.util.ServerTestUtils -import org.apache.kafka.test.{TestSslUtils, TestUtils => JTestUtils} +import org.apache.kafka.base.test.TestSslUtils +import org.apache.kafka.base.test.ReflectionUtils import org.apache.logging.log4j.{Level, LogManager} import org.apache.logging.log4j.core.config.Configurator import org.junit.jupiter.api.Assertions._ @@ -557,15 +558,15 @@ class SocketServerTest { val connectionId = request1.context.connectionId val channel = server.dataPlaneAcceptor(listener).get.processors(0).channel(connectionId).getOrElse(throw new IllegalStateException("Channel not found")) - val transportLayer: SslTransportLayer = JTestUtils.fieldValue(channel, classOf[KafkaChannel], "transportLayer") - val netReadBuffer: ByteBuffer = JTestUtils.fieldValue(transportLayer, classOf[SslTransportLayer], "netReadBuffer") + val transportLayer: SslTransportLayer = ReflectionUtils.fieldValue(channel, classOf[KafkaChannel], "transportLayer") + val netReadBuffer: ByteBuffer = ReflectionUtils.fieldValue(transportLayer, classOf[SslTransportLayer], "netReadBuffer") proxyServer.enableBuffering(netReadBuffer) (1 to numBufferedRequests).foreach { _ => sendRequest(socket, requestBytes) } - val keysWithBufferedRead: util.Set[SelectionKey] = JTestUtils.fieldValue(serverSelector, classOf[Selector], "keysWithBufferedRead") + val keysWithBufferedRead: util.Set[SelectionKey] = ReflectionUtils.fieldValue(serverSelector, classOf[Selector], "keysWithBufferedRead") keysWithBufferedRead.add(channel.selectionKey) - JTestUtils.setFieldValue(transportLayer, "hasBytesBuffered", true) + ReflectionUtils.setFieldValue(transportLayer, "hasBytesBuffered", true) (socket, request1) } @@ -1458,9 +1459,9 @@ class SocketServerTest { // Truncates the last request in the SSL buffers by directly updating the buffers to simulate partial buffered request def truncateBufferedRequest(channel: KafkaChannel): Unit = { - val transportLayer: SslTransportLayer = JTestUtils.fieldValue(channel, classOf[KafkaChannel], "transportLayer") - val netReadBuffer: ByteBuffer = JTestUtils.fieldValue(transportLayer, classOf[SslTransportLayer], "netReadBuffer") - val appReadBuffer: ByteBuffer = JTestUtils.fieldValue(transportLayer, classOf[SslTransportLayer], "appReadBuffer") + val transportLayer: SslTransportLayer = ReflectionUtils.fieldValue(channel, classOf[KafkaChannel], "transportLayer") + val netReadBuffer: ByteBuffer = ReflectionUtils.fieldValue(transportLayer, classOf[SslTransportLayer], "netReadBuffer") + val appReadBuffer: ByteBuffer = ReflectionUtils.fieldValue(transportLayer, classOf[SslTransportLayer], "appReadBuffer") if (appReadBuffer.position() > 4) { appReadBuffer.position(4) netReadBuffer.position(0) @@ -1582,7 +1583,7 @@ class SocketServerTest { val (socket, request) = makeSocketWithBufferedRequests(testableServer, testableSelector, proxyServer) testableSelector.operationCounts.clear() testableSelector.waitForOperations(SelectorOperation.Poll, 1) - val keysWithBufferedRead: util.Set[SelectionKey] = JTestUtils.fieldValue(testableSelector, classOf[Selector], "keysWithBufferedRead") + val keysWithBufferedRead: util.Set[SelectionKey] = ReflectionUtils.fieldValue(testableSelector, classOf[Selector], "keysWithBufferedRead") assertEquals(Set.empty, keysWithBufferedRead.asScala) processRequest(testableServer.dataPlaneRequestChannel, request) // buffered requests should be processed after channel is unmuted @@ -2206,7 +2207,7 @@ class SocketServerTest { } class CompletedReceivesPollData(selector: TestableSelector) extends PollData[NetworkReceive] { - val completedReceivesMap: util.Map[String, NetworkReceive] = JTestUtils.fieldValue(selector, classOf[Selector], "completedReceives") + val completedReceivesMap: util.Map[String, NetworkReceive] = ReflectionUtils.fieldValue(selector, classOf[Selector], "completedReceives") override def updateResults(): Unit = { val currentReceives = update(selector.completedReceives.asScala.toBuffer) @@ -2359,8 +2360,8 @@ class SocketServerTest { } private def makeClosing(channel: KafkaChannel): Unit = { - val channels: util.Map[String, KafkaChannel] = JTestUtils.fieldValue(this, classOf[Selector], "channels") - val closingChannels: util.Map[String, KafkaChannel] = JTestUtils.fieldValue(this, classOf[Selector], "closingChannels") + val channels: util.Map[String, KafkaChannel] = ReflectionUtils.fieldValue(this, classOf[Selector], "channels") + val closingChannels: util.Map[String, KafkaChannel] = ReflectionUtils.fieldValue(this, classOf[Selector], "closingChannels") closingChannels.put(channel.id, channel) channels.remove(channel.id) } diff --git a/core/src/test/scala/unit/kafka/server/AbstractApiVersionsRequestTest.scala b/core/src/test/scala/unit/kafka/server/AbstractApiVersionsRequestTest.scala index 28426e825efc2..ec01e2468b2ca 100644 --- a/core/src/test/scala/unit/kafka/server/AbstractApiVersionsRequestTest.scala +++ b/core/src/test/scala/unit/kafka/server/AbstractApiVersionsRequestTest.scala @@ -27,7 +27,7 @@ import org.apache.kafka.common.test.ClusterInstance import org.apache.kafka.common.utils.Utils import org.apache.kafka.server.IntegrationTestUtils import org.apache.kafka.server.common.{EligibleLeaderReplicasVersion, GroupVersion, MetadataVersion, ShareVersion, StreamsVersion, TransactionVersion} -import org.apache.kafka.test.TestUtils +import org.apache.kafka.base.test.TestUtils import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.Tag diff --git a/core/src/test/scala/unit/kafka/server/ControllerApisTest.scala b/core/src/test/scala/unit/kafka/server/ControllerApisTest.scala index 0e14f2f414a75..9c1acc489d0f1 100644 --- a/core/src/test/scala/unit/kafka/server/ControllerApisTest.scala +++ b/core/src/test/scala/unit/kafka/server/ControllerApisTest.scala @@ -61,7 +61,7 @@ import org.apache.kafka.server.common.{ApiMessageAndVersion, FinalizedFeatures, import org.apache.kafka.server.config.ServerConfigs import org.apache.kafka.server.quota.{ClientQuotaManager, ControllerMutationQuota, ControllerMutationQuotaManager, ReplicationQuotaManager} import org.apache.kafka.storage.internals.log.CleanerConfig -import org.apache.kafka.test.TestUtils +import org.apache.kafka.base.test.TestUtils import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, Test} import org.junit.jupiter.params.ParameterizedTest diff --git a/core/src/test/scala/unit/kafka/server/ControllerMutationQuotaTest.scala b/core/src/test/scala/unit/kafka/server/ControllerMutationQuotaTest.scala index 516b5edd082f3..ec74399ffb11c 100644 --- a/core/src/test/scala/unit/kafka/server/ControllerMutationQuotaTest.scala +++ b/core/src/test/scala/unit/kafka/server/ControllerMutationQuotaTest.scala @@ -44,7 +44,7 @@ import org.apache.kafka.common.security.authenticator.DefaultKafkaPrincipalBuild import org.apache.kafka.server.config.{QuotaConfig, ServerConfigs} import org.apache.kafka.server.quota.{ClientQuotaManager, QuotaType} import org.apache.kafka.coordinator.group.GroupCoordinatorConfig -import org.apache.kafka.test.{TestUtils => JTestUtils} +import org.apache.kafka.base.test.{TestUtils => JTestUtils} import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Assertions.fail diff --git a/core/src/test/scala/unit/kafka/server/ControllerRegistrationManagerTest.scala b/core/src/test/scala/unit/kafka/server/ControllerRegistrationManagerTest.scala index 833df332b1f78..d4484ac187891 100644 --- a/core/src/test/scala/unit/kafka/server/ControllerRegistrationManagerTest.scala +++ b/core/src/test/scala/unit/kafka/server/ControllerRegistrationManagerTest.scala @@ -31,7 +31,7 @@ import org.apache.kafka.raft.{KRaftConfigs, LeaderAndEpoch, QuorumConfig} import org.apache.kafka.server.common.MetadataVersion import org.apache.kafka.server.config.ServerLogConfigs import org.apache.kafka.server.controller.ControllerRegistrationManager -import org.apache.kafka.test.TestUtils +import org.apache.kafka.base.test.TestUtils import org.junit.jupiter.api.Assertions.{assertEquals, assertFalse, assertTrue} import org.junit.jupiter.api.{Test, Timeout} import org.junit.jupiter.params.ParameterizedTest diff --git a/core/src/test/scala/unit/kafka/server/DynamicConfigChangeTest.scala b/core/src/test/scala/unit/kafka/server/DynamicConfigChangeTest.scala index 0f510d1a06a8a..eb15b7bb81447 100644 --- a/core/src/test/scala/unit/kafka/server/DynamicConfigChangeTest.scala +++ b/core/src/test/scala/unit/kafka/server/DynamicConfigChangeTest.scala @@ -40,7 +40,7 @@ import org.apache.kafka.server.log.remote.TopicPartitionLog import org.apache.kafka.server.log.remote.storage.RemoteLogManager import org.apache.kafka.server.quota.ReplicationQuotaManager import org.apache.kafka.storage.internals.log.{LogConfig, UnifiedLog} -import org.apache.kafka.test.TestUtils.assertFutureThrows +import org.apache.kafka.base.test.TestUtils.assertFutureThrows import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{Test, Timeout} import org.mockito.ArgumentCaptor diff --git a/core/src/test/scala/unit/kafka/server/KafkaMetricsReporterTest.scala b/core/src/test/scala/unit/kafka/server/KafkaMetricsReporterTest.scala index e4bcb3d49a5a3..e84b116e1793d 100644 --- a/core/src/test/scala/unit/kafka/server/KafkaMetricsReporterTest.scala +++ b/core/src/test/scala/unit/kafka/server/KafkaMetricsReporterTest.scala @@ -23,7 +23,7 @@ import org.apache.kafka.common.metrics.{KafkaMetric, MetricsContext, MetricsRepo import org.apache.kafka.common.utils.Utils import org.apache.kafka.server.config.ServerConfigs import org.apache.kafka.server.metrics.MetricConfigs -import org.apache.kafka.test.{TestUtils => JTestUtils} +import org.apache.kafka.base.test.{TestUtils => JTestUtils} import org.junit.jupiter.api.{AfterEach, BeforeEach, Test, TestInfo} import org.junit.jupiter.api.Assertions._ diff --git a/core/src/test/scala/unit/kafka/server/KafkaRaftServerTest.scala b/core/src/test/scala/unit/kafka/server/KafkaRaftServerTest.scala index a2783cb5015a4..322f954076fff 100644 --- a/core/src/test/scala/unit/kafka/server/KafkaRaftServerTest.scala +++ b/core/src/test/scala/unit/kafka/server/KafkaRaftServerTest.scala @@ -28,7 +28,7 @@ import org.apache.kafka.network.SocketServerConfigs import org.apache.kafka.server.config.ServerLogConfigs import org.apache.kafka.server.common.MetadataVersion import org.apache.kafka.storage.internals.log.UnifiedLog -import org.apache.kafka.test.TestUtils +import org.apache.kafka.base.test.TestUtils import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.Test diff --git a/core/src/test/scala/unit/kafka/server/LogRecoveryTest.scala b/core/src/test/scala/unit/kafka/server/LogRecoveryTest.scala index 5db1e0873a3d2..e844bcff9000a 100755 --- a/core/src/test/scala/unit/kafka/server/LogRecoveryTest.scala +++ b/core/src/test/scala/unit/kafka/server/LogRecoveryTest.scala @@ -260,7 +260,7 @@ class LogRecoveryTest extends QuorumTestHarness { private def getLeaderIdForPartition[B <: KafkaBroker]( brokers: Seq[B], tp: TopicPartition, - timeout: Long = org.apache.kafka.test.TestUtils.DEFAULT_MAX_WAIT_MS): Int = { + timeout: Long = org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS): Int = { def leaderExists: Option[Int] = { brokers.find { broker => broker.replicaManager.onlinePartition(tp).exists(_.leaderLogIfLocal.isDefined) diff --git a/core/src/test/scala/unit/kafka/server/epoch/LeaderEpochIntegrationTest.scala b/core/src/test/scala/unit/kafka/server/epoch/LeaderEpochIntegrationTest.scala index f1ba2c7ac5ed6..560c8988348c0 100644 --- a/core/src/test/scala/unit/kafka/server/epoch/LeaderEpochIntegrationTest.scala +++ b/core/src/test/scala/unit/kafka/server/epoch/LeaderEpochIntegrationTest.scala @@ -33,7 +33,7 @@ import org.apache.kafka.common.security.auth.SecurityProtocol import org.apache.kafka.common.serialization.StringSerializer import org.apache.kafka.common.utils.{LogContext, Time} import org.apache.kafka.server.network.BrokerEndPoint -import org.apache.kafka.test.{TestUtils => JTestUtils} +import org.apache.kafka.base.test.{TestUtils => JTestUtils} import org.junit.jupiter.api.{AfterEach, Test} import org.junit.jupiter.api.Assertions._ diff --git a/core/src/test/scala/unit/kafka/utils/TestUtils.scala b/core/src/test/scala/unit/kafka/utils/TestUtils.scala index fc1f10fbbd73d..a1dbb9ec3d472 100755 --- a/core/src/test/scala/unit/kafka/utils/TestUtils.scala +++ b/core/src/test/scala/unit/kafka/utils/TestUtils.scala @@ -57,7 +57,7 @@ import org.apache.kafka.server.util.MockTime import org.apache.kafka.storage.internals.checkpoint.OffsetCheckpointFile import org.apache.kafka.storage.internals.log.{CleanerConfig, LogCleaner, LogConfig, LogDirFailureChannel, LogManager, ProducerStateManagerConfig, UnifiedLog} import org.apache.kafka.storage.log.metrics.BrokerTopicStats -import org.apache.kafka.test.{TestUtils => JTestUtils} +import org.apache.kafka.base.test.{TestUtils => JTestUtils} import org.junit.jupiter.api.Assertions._ import org.mockito.ArgumentMatchers.{any, anyBoolean} import org.mockito.Mockito diff --git a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorServiceTest.java b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorServiceTest.java index b879f8ff152ec..a7bb185ae4a46 100644 --- a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorServiceTest.java +++ b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorServiceTest.java @@ -142,12 +142,12 @@ import java.util.concurrent.TimeoutException; import java.util.stream.Stream; +import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; import static org.apache.kafka.common.requests.ConsumerGroupHeartbeatRequest.LEAVE_GROUP_STATIC_MEMBER_EPOCH; import static org.apache.kafka.common.requests.JoinGroupRequest.UNKNOWN_MEMBER_ID; import static org.apache.kafka.coordinator.common.runtime.TestUtil.requestContext; import static org.apache.kafka.coordinator.group.GroupConfigManagerTest.createConfigManager; import static org.apache.kafka.server.share.persister.DeleteShareGroupStateParameters.EMPTY_PARAMS; -import static org.apache.kafka.test.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/log/StressTestLog.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/log/StressTestLog.java index 310ecc907b7d6..fa5d9a7fa01f2 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/log/StressTestLog.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/log/StressTestLog.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.jmh.log; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.OffsetOutOfRangeException; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.config.TopicConfig; @@ -40,7 +41,6 @@ import org.apache.kafka.storage.internals.log.UnifiedLog; import org.apache.kafka.storage.internals.log.VerificationGuard; import org.apache.kafka.storage.log.metrics.BrokerTopicStats; -import org.apache.kafka.test.TestUtils; import java.io.File; import java.nio.charset.StandardCharsets; diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/util/BenchmarkConfigUtils.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/util/BenchmarkConfigUtils.java index 1a9fbbc30e2aa..7cc75751440fb 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/util/BenchmarkConfigUtils.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/util/BenchmarkConfigUtils.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.jmh.util; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; import org.apache.kafka.network.SocketServerConfigs; import org.apache.kafka.raft.KRaftConfigs; @@ -24,7 +25,6 @@ import org.apache.kafka.server.config.ServerConfigs; import org.apache.kafka.server.config.ServerLogConfigs; import org.apache.kafka.storage.internals.log.CleanerConfig; -import org.apache.kafka.test.TestUtils; import java.io.File; import java.util.Properties; diff --git a/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTest.java b/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTest.java index 4217bd4ed2602..27ed6a7f4da04 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTest.java @@ -17,10 +17,10 @@ package org.apache.kafka.controller; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.metadata.RegisterBrokerRecord; import org.apache.kafka.raft.LeaderAndEpoch; import org.apache.kafka.server.common.ApiMessageAndVersion; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTestEnv.java b/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTestEnv.java index 6d1e741d1d82d..e92814dd734f7 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTestEnv.java +++ b/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTestEnv.java @@ -17,6 +17,7 @@ package org.apache.kafka.controller; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Utils; @@ -27,7 +28,6 @@ import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.server.common.KRaftVersion; import org.apache.kafka.snapshot.RawSnapshotReader; -import org.apache.kafka.test.TestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerMetricsIntegrationTest.java b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerMetricsIntegrationTest.java index 894a7f739c468..8ac3b22ff99d8 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerMetricsIntegrationTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerMetricsIntegrationTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.controller; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.message.BrokerHeartbeatRequestData; import org.apache.kafka.common.message.RequestHeaderData; @@ -24,7 +25,6 @@ import org.apache.kafka.common.utils.Time; import org.apache.kafka.controller.metrics.QuorumControllerMetrics; import org.apache.kafka.metadata.BrokerHeartbeatReply; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java index 85c04d669e5fd..af2b577bc619c 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.controller; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.config.ConfigResource; import org.apache.kafka.common.config.TopicConfig; @@ -110,7 +111,6 @@ import org.apache.kafka.server.common.TopicIdPartition; import org.apache.kafka.snapshot.FileRawSnapshotReader; import org.apache.kafka.snapshot.Snapshots; -import org.apache.kafka.test.TestUtils; import org.apache.kafka.timeline.SnapshotRegistry; import org.junit.jupiter.api.Test; diff --git a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTestEnv.java b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTestEnv.java index e6ececd2ba19c..43bf2e156037a 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTestEnv.java +++ b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTestEnv.java @@ -17,13 +17,13 @@ package org.apache.kafka.controller; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.metadata.FakeKafkaConfigSchema; import org.apache.kafka.metadata.bootstrap.BootstrapMetadata; import org.apache.kafka.raft.LeaderAndEpoch; import org.apache.kafka.server.common.EligibleLeaderReplicasVersion; import org.apache.kafka.server.common.MetadataVersion; import org.apache.kafka.server.fault.MockFaultHandler; -import org.apache.kafka.test.TestUtils; import java.util.ArrayList; import java.util.HashMap; diff --git a/metadata/src/test/java/org/apache/kafka/image/loader/MetadataLoaderTest.java b/metadata/src/test/java/org/apache/kafka/image/loader/MetadataLoaderTest.java index acbc47cac0007..3dec0b726a64a 100644 --- a/metadata/src/test/java/org/apache/kafka/image/loader/MetadataLoaderTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/loader/MetadataLoaderTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.image.loader; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.config.ConfigResource; import org.apache.kafka.common.message.KRaftVersionRecord; @@ -45,7 +46,6 @@ import org.apache.kafka.server.common.OffsetAndEpoch; import org.apache.kafka.server.fault.MockFaultHandler; import org.apache.kafka.snapshot.SnapshotReader; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/image/publisher/SnapshotGeneratorTest.java b/metadata/src/test/java/org/apache/kafka/image/publisher/SnapshotGeneratorTest.java index a6b1bb785807f..b19490f834ce0 100644 --- a/metadata/src/test/java/org/apache/kafka/image/publisher/SnapshotGeneratorTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/publisher/SnapshotGeneratorTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.image.publisher; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.image.MetadataDelta; import org.apache.kafka.image.MetadataImage; @@ -26,7 +27,6 @@ import org.apache.kafka.raft.LeaderAndEpoch; import org.apache.kafka.server.fault.FaultHandlerException; import org.apache.kafka.server.fault.MockFaultHandler; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapDirectoryTest.java b/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapDirectoryTest.java index 97240b227bb24..1c336879b4e90 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapDirectoryTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapDirectoryTest.java @@ -17,12 +17,12 @@ package org.apache.kafka.metadata.bootstrap; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.metadata.FeatureLevelRecord; import org.apache.kafka.common.metadata.NoOpRecord; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.server.common.MetadataVersion; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/storage/FormatterTest.java b/metadata/src/test/java/org/apache/kafka/metadata/storage/FormatterTest.java index dcfba4328aeb7..5778eb14315c6 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/storage/FormatterTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/storage/FormatterTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.metadata.storage; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.metadata.FeatureLevelRecord; import org.apache.kafka.common.metadata.UserScramCredentialRecord; @@ -38,7 +39,6 @@ import org.apache.kafka.server.common.StreamsVersion; import org.apache.kafka.server.common.TestFeatureVersion; import org.apache.kafka.server.common.TransactionVersion; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/storage/ScramParserTest.java b/metadata/src/test/java/org/apache/kafka/metadata/storage/ScramParserTest.java index 12a219dbacfb6..c342fc87ffbdd 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/storage/ScramParserTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/storage/ScramParserTest.java @@ -17,11 +17,11 @@ package org.apache.kafka.metadata.storage; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.metadata.UserScramCredentialRecord; import org.apache.kafka.common.security.scram.internals.ScramFormatter; import org.apache.kafka.common.security.scram.internals.ScramMechanism; import org.apache.kafka.metadata.storage.ScramParser.PerMechanismData; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/util/BatchFileWriterReaderTest.java b/metadata/src/test/java/org/apache/kafka/metadata/util/BatchFileWriterReaderTest.java index 3c32a320e21f7..85d83dd655ce8 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/util/BatchFileWriterReaderTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/util/BatchFileWriterReaderTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.metadata.util; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.message.SnapshotFooterRecord; import org.apache.kafka.common.message.SnapshotHeaderRecord; @@ -24,7 +25,6 @@ import org.apache.kafka.metadata.util.BatchFileReader.BatchAndType; import org.apache.kafka.raft.Batch; import org.apache.kafka.server.common.ApiMessageAndVersion; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; diff --git a/raft/src/test/java/org/apache/kafka/raft/FileQuorumStateStoreTest.java b/raft/src/test/java/org/apache/kafka/raft/FileQuorumStateStoreTest.java index 9571e9aa50571..703a41e1990c8 100644 --- a/raft/src/test/java/org/apache/kafka/raft/FileQuorumStateStoreTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/FileQuorumStateStoreTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.raft; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.protocol.types.TaggedFields; import org.apache.kafka.raft.generated.QuorumStateData; import org.apache.kafka.server.common.KRaftVersion; -import org.apache.kafka.test.TestUtils; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientTest.java b/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientTest.java index e4d879c64edf3..a0bfc60363706 100644 --- a/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.raft; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.errors.RecordBatchTooLargeException; import org.apache.kafka.common.memory.MemoryPool; @@ -40,7 +41,6 @@ import org.apache.kafka.raft.errors.BufferAllocationException; import org.apache.kafka.raft.errors.NotLeaderException; import org.apache.kafka.server.common.KRaftVersion; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -64,9 +64,9 @@ import java.util.concurrent.TimeoutException; import java.util.stream.Stream; +import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; import static org.apache.kafka.raft.RaftClientTestContext.Builder.DEFAULT_ELECTION_TIMEOUT_MS; import static org.apache.kafka.raft.RaftClientTestContext.RaftProtocol.KIP_853_PROTOCOL; -import static org.apache.kafka.test.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/raft/src/test/java/org/apache/kafka/raft/MockExpirationServiceTest.java b/raft/src/test/java/org/apache/kafka/raft/MockExpirationServiceTest.java index 887fc40868e3c..189c0421bc88a 100644 --- a/raft/src/test/java/org/apache/kafka/raft/MockExpirationServiceTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/MockExpirationServiceTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.raft; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.utils.MockTime; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; diff --git a/raft/src/test/java/org/apache/kafka/raft/RaftClientTestContext.java b/raft/src/test/java/org/apache/kafka/raft/RaftClientTestContext.java index 2b01c15325471..854824aba12dc 100644 --- a/raft/src/test/java/org/apache/kafka/raft/RaftClientTestContext.java +++ b/raft/src/test/java/org/apache/kafka/raft/RaftClientTestContext.java @@ -16,6 +16,8 @@ */ package org.apache.kafka.raft; +import org.apache.kafka.base.test.TestCondition; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.Node; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; @@ -72,8 +74,6 @@ import org.apache.kafka.snapshot.RecordsSnapshotWriter; import org.apache.kafka.snapshot.SnapshotReader; import org.apache.kafka.snapshot.Snapshots; -import org.apache.kafka.test.TestCondition; -import org.apache.kafka.test.TestUtils; import org.mockito.Mockito; diff --git a/raft/src/test/java/org/apache/kafka/raft/internals/KafkaRaftLogTest.java b/raft/src/test/java/org/apache/kafka/raft/internals/KafkaRaftLogTest.java index ba3f39cdeb0fa..2e60c77d24efe 100644 --- a/raft/src/test/java/org/apache/kafka/raft/internals/KafkaRaftLogTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/internals/KafkaRaftLogTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.raft.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.config.AbstractConfig; @@ -53,7 +54,6 @@ import org.apache.kafka.storage.internals.log.LogConfig; import org.apache.kafka.storage.internals.log.LogStartOffsetIncrementReason; import org.apache.kafka.storage.internals.log.UnifiedLog; -import org.apache.kafka.test.TestUtils; import net.jqwik.api.AfterFailureMode; import net.jqwik.api.ForAll; @@ -79,7 +79,7 @@ import java.util.Optional; import java.util.Properties; -import static org.apache.kafka.test.TestUtils.assertOptional; +import static org.apache.kafka.base.test.TestUtils.assertOptional; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/raft/src/test/java/org/apache/kafka/raft/internals/RecordsBatchReaderTest.java b/raft/src/test/java/org/apache/kafka/raft/internals/RecordsBatchReaderTest.java index ae07e70e28aff..6040f9098c393 100644 --- a/raft/src/test/java/org/apache/kafka/raft/internals/RecordsBatchReaderTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/internals/RecordsBatchReaderTest.java @@ -40,7 +40,7 @@ import java.util.NoSuchElementException; import java.util.Set; -import static org.apache.kafka.test.TestUtils.tempFile; +import static org.apache.kafka.base.test.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/raft/src/test/java/org/apache/kafka/raft/internals/RecordsIteratorTest.java b/raft/src/test/java/org/apache/kafka/raft/internals/RecordsIteratorTest.java index 06837a2d19a46..e8c31a10fd354 100644 --- a/raft/src/test/java/org/apache/kafka/raft/internals/RecordsIteratorTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/internals/RecordsIteratorTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.raft.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.errors.CorruptRecordException; import org.apache.kafka.common.message.KRaftVersionRecord; @@ -48,7 +49,6 @@ import org.apache.kafka.server.common.serialization.RecordSerde; import org.apache.kafka.snapshot.MockRawSnapshotWriter; import org.apache.kafka.snapshot.RecordsSnapshotWriter; -import org.apache.kafka.test.TestUtils; import net.jqwik.api.ForAll; import net.jqwik.api.Property; diff --git a/raft/src/test/java/org/apache/kafka/raft/internals/ThresholdPurgatoryTest.java b/raft/src/test/java/org/apache/kafka/raft/internals/ThresholdPurgatoryTest.java index 6860e8181c232..79ac82dfdc9ff 100644 --- a/raft/src/test/java/org/apache/kafka/raft/internals/ThresholdPurgatoryTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/internals/ThresholdPurgatoryTest.java @@ -25,7 +25,7 @@ import java.util.concurrent.CompletableFuture; -import static org.apache.kafka.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/raft/src/test/java/org/apache/kafka/snapshot/FileRawSnapshotTest.java b/raft/src/test/java/org/apache/kafka/snapshot/FileRawSnapshotTest.java index 73d88d1d09fdd..278758c87b88d 100644 --- a/raft/src/test/java/org/apache/kafka/snapshot/FileRawSnapshotTest.java +++ b/raft/src/test/java/org/apache/kafka/snapshot/FileRawSnapshotTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.snapshot; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.record.internal.MemoryRecords; import org.apache.kafka.common.record.internal.Record; @@ -23,10 +24,10 @@ import org.apache.kafka.common.record.internal.SimpleRecord; import org.apache.kafka.common.record.internal.UnalignedFileRecords; import org.apache.kafka.common.record.internal.UnalignedMemoryRecords; +import org.apache.kafka.common.requests.ByteBufferChannel; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.BufferSupplier.GrowableBufferSupplier; import org.apache.kafka.server.common.OffsetAndEpoch; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -157,12 +158,12 @@ public void testPartialWriteReadSnapshot() { UnalignedFileRecords record1 = (UnalignedFileRecords) snapshot.slice(0, totalSize / 2); UnalignedFileRecords record2 = (UnalignedFileRecords) snapshot.slice(totalSize / 2, totalSize - totalSize / 2); - assertEquals(buffer1, TestUtils.toBuffer(record1)); - assertEquals(buffer2, TestUtils.toBuffer(record2)); + assertEquals(buffer1, ByteBufferChannel.toBuffer(record1)); + assertEquals(buffer2, ByteBufferChannel.toBuffer(record2)); ByteBuffer readBuffer = ByteBuffer.allocate(record1.sizeInBytes() + record2.sizeInBytes()); - readBuffer.put(TestUtils.toBuffer(record1)); - readBuffer.put(TestUtils.toBuffer(record2)); + readBuffer.put(ByteBufferChannel.toBuffer(record1)); + readBuffer.put(ByteBufferChannel.toBuffer(record2)); readBuffer.flip(); assertEquals(expectedBuffer, readBuffer); } diff --git a/raft/src/test/java/org/apache/kafka/snapshot/SnapshotsTest.java b/raft/src/test/java/org/apache/kafka/snapshot/SnapshotsTest.java index 36c537ddb5f43..4708152ba3d57 100644 --- a/raft/src/test/java/org/apache/kafka/snapshot/SnapshotsTest.java +++ b/raft/src/test/java/org/apache/kafka/snapshot/SnapshotsTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.snapshot; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.server.common.OffsetAndEpoch; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/server-common/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesEnsembleTest.java b/server-common/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesEnsembleTest.java index 13daec70fa6ef..84e0e10c609f0 100644 --- a/server-common/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesEnsembleTest.java +++ b/server-common/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesEnsembleTest.java @@ -17,8 +17,8 @@ package org.apache.kafka.metadata.properties; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.Uuid; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; diff --git a/server-common/src/test/java/org/apache/kafka/metadata/properties/PropertiesUtilsTest.java b/server-common/src/test/java/org/apache/kafka/metadata/properties/PropertiesUtilsTest.java index 9789a17faa127..0b0598b521bbc 100644 --- a/server-common/src/test/java/org/apache/kafka/metadata/properties/PropertiesUtilsTest.java +++ b/server-common/src/test/java/org/apache/kafka/metadata/properties/PropertiesUtilsTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.metadata.properties; -import org.apache.kafka.test.TestUtils; +import org.apache.kafka.base.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/server-common/src/test/java/org/apache/kafka/queue/KafkaEventQueueTest.java b/server-common/src/test/java/org/apache/kafka/queue/KafkaEventQueueTest.java index ba4b562ae5c6e..fe02984db7a0e 100644 --- a/server-common/src/test/java/org/apache/kafka/queue/KafkaEventQueueTest.java +++ b/server-common/src/test/java/org/apache/kafka/queue/KafkaEventQueueTest.java @@ -17,11 +17,11 @@ package org.apache.kafka.queue; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; diff --git a/server-common/src/test/java/org/apache/kafka/server/share/persister/DefaultStatePersisterTest.java b/server-common/src/test/java/org/apache/kafka/server/share/persister/DefaultStatePersisterTest.java index 51a617c43db63..7a075aa8d9211 100644 --- a/server-common/src/test/java/org/apache/kafka/server/share/persister/DefaultStatePersisterTest.java +++ b/server-common/src/test/java/org/apache/kafka/server/share/persister/DefaultStatePersisterTest.java @@ -57,7 +57,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; -import static org.apache.kafka.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; diff --git a/server-common/src/test/java/org/apache/kafka/server/share/persister/PersisterStateManagerTest.java b/server-common/src/test/java/org/apache/kafka/server/share/persister/PersisterStateManagerTest.java index fec9cb6548363..8d1957fbf411a 100644 --- a/server-common/src/test/java/org/apache/kafka/server/share/persister/PersisterStateManagerTest.java +++ b/server-common/src/test/java/org/apache/kafka/server/share/persister/PersisterStateManagerTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.server.share.persister; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.ClientResponse; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.KafkaClient; @@ -53,7 +54,6 @@ import org.apache.kafka.server.util.timer.SystemTimer; import org.apache.kafka.server.util.timer.SystemTimerReaper; import org.apache.kafka.server.util.timer.Timer; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/server-common/src/test/java/org/apache/kafka/server/util/FileLockTest.java b/server-common/src/test/java/org/apache/kafka/server/util/FileLockTest.java index b477f836aa5c5..a999c0633cb26 100644 --- a/server-common/src/test/java/org/apache/kafka/server/util/FileLockTest.java +++ b/server-common/src/test/java/org/apache/kafka/server/util/FileLockTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.util; -import org.apache.kafka.test.TestUtils; +import org.apache.kafka.base.test.TestUtils; import org.junit.jupiter.api.Test; diff --git a/server-common/src/test/java/org/apache/kafka/server/util/ShutdownableThreadTest.java b/server-common/src/test/java/org/apache/kafka/server/util/ShutdownableThreadTest.java index 4f7bc15d50866..25227c1355ac0 100644 --- a/server-common/src/test/java/org/apache/kafka/server/util/ShutdownableThreadTest.java +++ b/server-common/src/test/java/org/apache/kafka/server/util/ShutdownableThreadTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.server.util; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.internals.FatalExitError; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.Exit; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/server-common/src/test/java/org/apache/kafka/server/util/timer/SystemTimerReaperTest.java b/server-common/src/test/java/org/apache/kafka/server/util/timer/SystemTimerReaperTest.java index c8ae54e02d518..9c4c0444000d8 100644 --- a/server-common/src/test/java/org/apache/kafka/server/util/timer/SystemTimerReaperTest.java +++ b/server-common/src/test/java/org/apache/kafka/server/util/timer/SystemTimerReaperTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.server.util.timer; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.errors.TimeoutException; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/server-common/src/test/java/org/apache/kafka/server/util/timer/TimerTest.java b/server-common/src/test/java/org/apache/kafka/server/util/timer/TimerTest.java index 8f3a8f8b2dbbe..8e8d3d8318192 100644 --- a/server-common/src/test/java/org/apache/kafka/server/util/timer/TimerTest.java +++ b/server-common/src/test/java/org/apache/kafka/server/util/timer/TimerTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.server.util.timer; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.utils.Time; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/server/src/test/java/org/apache/kafka/api/EndToEndClusterIdTest.java b/server/src/test/java/org/apache/kafka/api/EndToEndClusterIdTest.java index 6c48f138a3f20..4fd693c3feae9 100644 --- a/server/src/test/java/org/apache/kafka/api/EndToEndClusterIdTest.java +++ b/server/src/test/java/org/apache/kafka/api/EndToEndClusterIdTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.api; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; @@ -37,7 +38,6 @@ import org.apache.kafka.test.MockMetricsReporter; import org.apache.kafka.test.MockProducerInterceptor; import org.apache.kafka.test.MockSerializer; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; @@ -47,7 +47,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import static org.apache.kafka.test.TestUtils.isValidClusterId; +import static org.apache.kafka.base.test.TestUtils.isValidClusterId; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java b/server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java index 7534fe9ad838d..52042119aee63 100644 --- a/server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java +++ b/server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.server; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.ClientResponse; import org.apache.kafka.clients.NodeApiVersions; import org.apache.kafka.common.Uuid; @@ -42,7 +43,6 @@ import org.apache.kafka.server.common.MetadataVersion; import org.apache.kafka.server.common.NodeToControllerChannelManager; import org.apache.kafka.server.common.TopicIdPartition; -import org.apache.kafka.test.TestUtils; import com.yammer.metrics.core.Gauge; import com.yammer.metrics.core.Metric; diff --git a/server/src/test/java/org/apache/kafka/server/BootstrapControllersIntegrationTest.java b/server/src/test/java/org/apache/kafka/server/BootstrapControllersIntegrationTest.java index 1ca1f6924b50d..203c70da9b251 100644 --- a/server/src/test/java/org/apache/kafka/server/BootstrapControllersIntegrationTest.java +++ b/server/src/test/java/org/apache/kafka/server/BootstrapControllersIntegrationTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.server; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterConfigOp; import org.apache.kafka.clients.admin.Config; @@ -62,7 +63,6 @@ import org.apache.kafka.network.SocketServerConfigs; import org.apache.kafka.server.common.MetadataVersion; import org.apache.kafka.server.config.QuotaConfig; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Timeout; diff --git a/server/src/test/java/org/apache/kafka/server/ClientMetricsManagerTest.java b/server/src/test/java/org/apache/kafka/server/ClientMetricsManagerTest.java index 3a5d41a592bd4..5f173d135ddd3 100644 --- a/server/src/test/java/org/apache/kafka/server/ClientMetricsManagerTest.java +++ b/server/src/test/java/org/apache/kafka/server/ClientMetricsManagerTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.server; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.errors.InvalidRequestException; @@ -36,7 +37,6 @@ import org.apache.kafka.server.metrics.ClientMetricsTestUtils; import org.apache.kafka.server.metrics.ClientTelemetryExporterPlugin; import org.apache.kafka.server.util.timer.SystemTimer; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/server/src/test/java/org/apache/kafka/server/CordonedLogDirsIntegrationTest.java b/server/src/test/java/org/apache/kafka/server/CordonedLogDirsIntegrationTest.java index def1cbbe1914d..f5655dfb5ee43 100644 --- a/server/src/test/java/org/apache/kafka/server/CordonedLogDirsIntegrationTest.java +++ b/server/src/test/java/org/apache/kafka/server/CordonedLogDirsIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.server; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterConfigOp; import org.apache.kafka.clients.admin.Config; @@ -40,7 +41,6 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.server.common.MetadataVersion; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; diff --git a/server/src/test/java/org/apache/kafka/server/EligibleLeaderReplicasIntegrationTest.java b/server/src/test/java/org/apache/kafka/server/EligibleLeaderReplicasIntegrationTest.java index 8a335fc626db2..a2dfc0be38086 100644 --- a/server/src/test/java/org/apache/kafka/server/EligibleLeaderReplicasIntegrationTest.java +++ b/server/src/test/java/org/apache/kafka/server/EligibleLeaderReplicasIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.server; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterConfigOp; import org.apache.kafka.clients.admin.ConfigEntry; @@ -44,7 +45,6 @@ import org.apache.kafka.server.config.ReplicationConfigs; import org.apache.kafka.server.config.ServerConfigs; import org.apache.kafka.storage.internals.checkpoint.CleanShutdownFileHandler; -import org.apache.kafka.test.TestUtils; import java.io.File; import java.time.Duration; @@ -57,7 +57,7 @@ import java.util.function.BiFunction; import java.util.stream.Collectors; -import static org.apache.kafka.test.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/server/src/test/java/org/apache/kafka/server/KRaftClusterTest.java b/server/src/test/java/org/apache/kafka/server/KRaftClusterTest.java index cca9562d8cc83..3b4e0764e83d3 100644 --- a/server/src/test/java/org/apache/kafka/server/KRaftClusterTest.java +++ b/server/src/test/java/org/apache/kafka/server/KRaftClusterTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.server; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.AlterClientQuotasResult; @@ -85,7 +86,6 @@ import org.apache.kafka.server.quota.ClientQuotaCallback; import org.apache.kafka.server.quota.ClientQuotaType; import org.apache.kafka.storage.internals.log.UnifiedLog; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/server/src/test/java/org/apache/kafka/server/LogManagerIntegrationTest.java b/server/src/test/java/org/apache/kafka/server/LogManagerIntegrationTest.java index 36f035c80f7db..5d7982208c195 100644 --- a/server/src/test/java/org/apache/kafka/server/LogManagerIntegrationTest.java +++ b/server/src/test/java/org/apache/kafka/server/LogManagerIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.server; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.consumer.Consumer; @@ -36,7 +37,6 @@ import org.apache.kafka.common.test.api.Type; import org.apache.kafka.storage.internals.checkpoint.CleanShutdownFileHandler; import org.apache.kafka.storage.internals.checkpoint.PartitionMetadataFile; -import org.apache.kafka.test.TestUtils; import java.io.File; import java.io.IOException; diff --git a/server/src/test/java/org/apache/kafka/server/MetadataRequestTest.java b/server/src/test/java/org/apache/kafka/server/MetadataRequestTest.java index 95b157001da22..ea4efb19f0685 100644 --- a/server/src/test/java/org/apache/kafka/server/MetadataRequestTest.java +++ b/server/src/test/java/org/apache/kafka/server/MetadataRequestTest.java @@ -19,6 +19,7 @@ import kafka.network.SocketServer; import kafka.server.KafkaBroker; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.Cluster; import org.apache.kafka.common.Node; import org.apache.kafka.common.PartitionInfo; @@ -39,7 +40,6 @@ import org.apache.kafka.metadata.BrokerState; import org.apache.kafka.metadata.LeaderAndIsr; import org.apache.kafka.server.config.ReplicationConfigs; -import org.apache.kafka.test.TestUtils; import java.io.IOException; import java.util.Collection; diff --git a/server/src/test/java/org/apache/kafka/server/ReconfigurableQuorumIntegrationTest.java b/server/src/test/java/org/apache/kafka/server/ReconfigurableQuorumIntegrationTest.java index f89ce62c3d87e..ccde05c0edf04 100644 --- a/server/src/test/java/org/apache/kafka/server/ReconfigurableQuorumIntegrationTest.java +++ b/server/src/test/java/org/apache/kafka/server/ReconfigurableQuorumIntegrationTest.java @@ -40,8 +40,8 @@ import java.util.Set; import java.util.TreeMap; -import static org.apache.kafka.test.TestUtils.assertFutureThrows; -import static org.apache.kafka.test.TestUtils.retryOnExceptionWithTimeout; +import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.base.test.TestUtils.retryOnExceptionWithTimeout; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/server/src/test/java/org/apache/kafka/server/TestUtils.java b/server/src/test/java/org/apache/kafka/server/TestUtils.java index fee482fdcbb52..f2687e6111be7 100644 --- a/server/src/test/java/org/apache/kafka/server/TestUtils.java +++ b/server/src/test/java/org/apache/kafka/server/TestUtils.java @@ -42,8 +42,8 @@ import java.util.function.Function; import java.util.function.Supplier; -import static org.apache.kafka.test.TestUtils.DEFAULT_MAX_WAIT_MS; -import static org.apache.kafka.test.TestUtils.waitForCondition; +import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; public class TestUtils { diff --git a/server/src/test/java/org/apache/kafka/server/UncleanLeaderElectionTest.java b/server/src/test/java/org/apache/kafka/server/UncleanLeaderElectionTest.java index aa7ee17577fb6..5f9fb0bae6a82 100644 --- a/server/src/test/java/org/apache/kafka/server/UncleanLeaderElectionTest.java +++ b/server/src/test/java/org/apache/kafka/server/UncleanLeaderElectionTest.java @@ -65,11 +65,11 @@ import java.util.Set; import java.util.concurrent.ExecutionException; +import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.server.TestUtils.awaitLeaderChange; import static org.apache.kafka.server.TestUtils.produceMessage; import static org.apache.kafka.server.TestUtils.waitForPartitionMetadata; -import static org.apache.kafka.test.TestUtils.DEFAULT_MAX_WAIT_MS; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/server/src/test/java/org/apache/kafka/server/config/DynamicConfigTest.java b/server/src/test/java/org/apache/kafka/server/config/DynamicConfigTest.java index 4521221af1d4e..4f8c886022c98 100644 --- a/server/src/test/java/org/apache/kafka/server/config/DynamicConfigTest.java +++ b/server/src/test/java/org/apache/kafka/server/config/DynamicConfigTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.server.config; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterConfigOp; import org.apache.kafka.clients.admin.ConfigEntry; @@ -23,7 +24,6 @@ import org.apache.kafka.common.config.ConfigResource; import org.apache.kafka.common.test.ClusterInstance; import org.apache.kafka.common.test.api.ClusterTest; -import org.apache.kafka.test.TestUtils; import java.util.List; import java.util.Map; diff --git a/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsTestUtils.java b/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsTestUtils.java index 8e8bb21b7da81..efb7d352e98c6 100644 --- a/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsTestUtils.java +++ b/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsTestUtils.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.server.metrics; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.network.ClientInformation; import org.apache.kafka.common.network.ListenerName; import org.apache.kafka.common.protocol.ApiKeys; @@ -30,7 +31,6 @@ import org.apache.kafka.server.telemetry.ClientTelemetryExporterProvider; import org.apache.kafka.server.telemetry.ClientTelemetryPayload; import org.apache.kafka.server.telemetry.ClientTelemetryReceiver; -import org.apache.kafka.test.TestUtils; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/server/src/test/java/org/apache/kafka/server/metrics/LinuxIoMetricsCollectorTest.java b/server/src/test/java/org/apache/kafka/server/metrics/LinuxIoMetricsCollectorTest.java index 8c96c5c5c10ee..1df0a0bb5d009 100644 --- a/server/src/test/java/org/apache/kafka/server/metrics/LinuxIoMetricsCollectorTest.java +++ b/server/src/test/java/org/apache/kafka/server/metrics/LinuxIoMetricsCollectorTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.server.metrics; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/server/src/test/java/org/apache/kafka/server/partition/AlterPartitionManagerTest.java b/server/src/test/java/org/apache/kafka/server/partition/AlterPartitionManagerTest.java index e30a7702ab5f7..8d574157dfba9 100644 --- a/server/src/test/java/org/apache/kafka/server/partition/AlterPartitionManagerTest.java +++ b/server/src/test/java/org/apache/kafka/server/partition/AlterPartitionManagerTest.java @@ -57,7 +57,7 @@ import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; -import static org.apache.kafka.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/server/src/test/java/org/apache/kafka/server/purgatory/DelayedFutureTest.java b/server/src/test/java/org/apache/kafka/server/purgatory/DelayedFutureTest.java index db3a74055a031..8c76e53eb468d 100644 --- a/server/src/test/java/org/apache/kafka/server/purgatory/DelayedFutureTest.java +++ b/server/src/test/java/org/apache/kafka/server/purgatory/DelayedFutureTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.server.purgatory; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.utils.Time; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; diff --git a/server/src/test/java/org/apache/kafka/server/quota/ClientQuotasRequestTest.java b/server/src/test/java/org/apache/kafka/server/quota/ClientQuotasRequestTest.java index f6548446f561f..7188fa752a287 100644 --- a/server/src/test/java/org/apache/kafka/server/quota/ClientQuotasRequestTest.java +++ b/server/src/test/java/org/apache/kafka/server/quota/ClientQuotasRequestTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.server.quota; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterClientQuotasOptions; import org.apache.kafka.clients.admin.AlterUserScramCredentialsResult; @@ -32,7 +33,6 @@ import org.apache.kafka.common.test.ClusterInstance; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.server.config.QuotaConfig; -import org.apache.kafka.test.TestUtils; import java.net.InetAddress; import java.util.Collections; diff --git a/server/src/test/java/org/apache/kafka/server/share/fetch/ShareFetchTestUtils.java b/server/src/test/java/org/apache/kafka/server/share/fetch/ShareFetchTestUtils.java index 0687c957fa15f..b662da15658fb 100644 --- a/server/src/test/java/org/apache/kafka/server/share/fetch/ShareFetchTestUtils.java +++ b/server/src/test/java/org/apache/kafka/server/share/fetch/ShareFetchTestUtils.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.server.share.fetch; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.TopicIdPartition; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.message.ShareFetchResponseData.AcquiredRecords; @@ -23,7 +24,6 @@ import org.apache.kafka.common.record.internal.FileRecords; import org.apache.kafka.common.record.internal.MemoryRecords; import org.apache.kafka.common.record.internal.MemoryRecordsBuilder; -import org.apache.kafka.test.TestUtils; import java.io.IOException; import java.nio.ByteBuffer; @@ -31,7 +31,7 @@ import java.util.Map; import java.util.Map.Entry; -import static org.apache.kafka.test.TestUtils.tempFile; +import static org.apache.kafka.base.test.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertArrayEquals; /** diff --git a/server/src/test/java/org/apache/kafka/server/share/session/ShareSessionCacheTest.java b/server/src/test/java/org/apache/kafka/server/share/session/ShareSessionCacheTest.java index aecb35d8990fc..17d38ee25f4db 100644 --- a/server/src/test/java/org/apache/kafka/server/share/session/ShareSessionCacheTest.java +++ b/server/src/test/java/org/apache/kafka/server/share/session/ShareSessionCacheTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.server.share.session; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.utils.internals.ImplicitLinkedHashCollection; import org.apache.kafka.server.share.CachedSharePartition; import org.apache.kafka.server.share.ShareGroupListener; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/server/src/test/java/org/apache/kafka/server/util/SchedulerTest.java b/server/src/test/java/org/apache/kafka/server/util/SchedulerTest.java index 99fda4f9762d0..9f3748c70a6cf 100644 --- a/server/src/test/java/org/apache/kafka/server/util/SchedulerTest.java +++ b/server/src/test/java/org/apache/kafka/server/util/SchedulerTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.server.util; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.coordinator.transaction.TransactionLogConfig; import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache; @@ -30,7 +31,6 @@ import org.apache.kafka.storage.internals.log.ProducerStateManagerConfig; import org.apache.kafka.storage.internals.log.UnifiedLog; import org.apache.kafka.storage.log.metrics.BrokerTopicStats; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/storage/api/src/test/java/org/apache/kafka/server/log/remote/storage/LogSegmentDataTest.java b/storage/api/src/test/java/org/apache/kafka/server/log/remote/storage/LogSegmentDataTest.java index 8959cbf9e6a99..9a47d1eb39033 100644 --- a/storage/api/src/test/java/org/apache/kafka/server/log/remote/storage/LogSegmentDataTest.java +++ b/storage/api/src/test/java/org/apache/kafka/server/log/remote/storage/LogSegmentDataTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.log.remote.storage; -import org.apache.kafka.test.TestUtils; +import org.apache.kafka.base.test.TestUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/storage/src/test/java/org/apache/kafka/admin/RemoteTopicCrudTest.java b/storage/src/test/java/org/apache/kafka/admin/RemoteTopicCrudTest.java index e5b06e05d09e0..46596ea9a793d 100644 --- a/storage/src/test/java/org/apache/kafka/admin/RemoteTopicCrudTest.java +++ b/storage/src/test/java/org/apache/kafka/admin/RemoteTopicCrudTest.java @@ -17,6 +17,8 @@ package org.apache.kafka.admin; +import org.apache.kafka.base.test.TestCondition; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.AlterConfigOp; import org.apache.kafka.clients.admin.ConfigEntry; import org.apache.kafka.clients.admin.NewTopic; @@ -40,8 +42,6 @@ import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentId; import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentMetadata; import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentState; -import org.apache.kafka.test.TestCondition; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.TestInfo; @@ -59,7 +59,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import static org.apache.kafka.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/storage/src/test/java/org/apache/kafka/server/log/LogAppendTimeTest.java b/storage/src/test/java/org/apache/kafka/server/log/LogAppendTimeTest.java index bd26f99848be8..ad19f11e51ad6 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/LogAppendTimeTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/LogAppendTimeTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.server.log; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.consumer.Consumer; @@ -32,7 +33,6 @@ import org.apache.kafka.common.test.api.ClusterConfigProperty; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.Type; -import org.apache.kafka.test.TestUtils; import java.time.Duration; import java.util.ArrayList; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogMetadataManagerTestUtils.java b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogMetadataManagerTestUtils.java index fb8812d6b799e..128182caca11a 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogMetadataManagerTestUtils.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogMetadataManagerTestUtils.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.server.log.remote.metadata.storage; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; -import org.apache.kafka.test.TestUtils; import java.util.HashMap; import java.util.Map; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogSegmentLifecycleTest.java b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogSegmentLifecycleTest.java index 026111b377929..d8696e189ab29 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogSegmentLifecycleTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogSegmentLifecycleTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.server.log.remote.metadata.storage; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.TopicIdPartition; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; @@ -30,7 +31,6 @@ import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentState; import org.apache.kafka.server.log.remote.storage.RemoteStorageException; import org.apache.kafka.storage.internals.log.EpochEntry; -import org.apache.kafka.test.TestUtils; import java.util.HashMap; import java.util.Iterator; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerConfigTest.java b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerConfigTest.java index bad522ff51e91..1e218a3e54152 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerConfigTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerConfigTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.server.log.remote.metadata.storage; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.config.SaslConfigs; import org.apache.kafka.common.config.SslConfigs; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerRestartTest.java b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerRestartTest.java index a407882e42a4d..2d5fdcdc6169f 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerRestartTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerRestartTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.server.log.remote.metadata.storage; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.common.TopicIdPartition; @@ -26,7 +27,6 @@ import org.apache.kafka.common.utils.Time; import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentId; import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentMetadata; -import org.apache.kafka.test.TestUtils; import java.util.List; import java.util.Map; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerTest.java b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerTest.java index 77233e15a2aec..0d4e88d0b8299 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.server.log.remote.metadata.storage; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.Config; import org.apache.kafka.clients.admin.ConfigEntry; @@ -38,7 +39,6 @@ import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentMetadata; import org.apache.kafka.server.log.remote.storage.RemoteResourceNotFoundException; import org.apache.kafka.server.log.remote.storage.RemoteStorageException; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorage.java b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorage.java index 69cca4d63e00c..4f9884dd48b1e 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorage.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorage.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.server.log.remote.storage; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.TopicIdPartition; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.errors.InvalidConfigurationException; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.server.log.remote.storage.LocalTieredStorageListener.LocalTieredStorageListeners; import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentMetadata.CustomMetadata; -import org.apache.kafka.test.TestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogManagerTest.java b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogManagerTest.java index bd75c8f88851b..bbdc31d724546 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogManagerTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogManagerTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.server.log.remote.storage; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.Endpoint; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.TopicIdPartition; @@ -64,7 +65,6 @@ import org.apache.kafka.storage.internals.log.TransactionIndex; import org.apache.kafka.storage.internals.log.UnifiedLog; import org.apache.kafka.storage.log.metrics.BrokerTopicStats; -import org.apache.kafka.test.TestUtils; import com.yammer.metrics.core.MetricName; @@ -118,6 +118,7 @@ import java.util.function.Supplier; import java.util.stream.Collectors; +import static org.apache.kafka.base.test.TestUtils.tempFile; import static org.apache.kafka.common.record.TimestampType.CREATE_TIME; import static org.apache.kafka.server.log.remote.metadata.storage.TopicBasedRemoteLogMetadataManagerConfig.REMOTE_LOG_METADATA_COMMON_CLIENT_PREFIX; import static org.apache.kafka.server.log.remote.metadata.storage.TopicBasedRemoteLogMetadataManagerConfig.REMOTE_LOG_METADATA_CONSUMER_PREFIX; @@ -137,7 +138,6 @@ import static org.apache.kafka.server.log.remote.storage.RemoteStorageMetrics.REMOTE_STORAGE_THREAD_POOL_METRICS; import static org.apache.kafka.server.util.ServerTestUtils.clearYammerMetrics; import static org.apache.kafka.server.util.ServerTestUtils.yammerMetricValue; -import static org.apache.kafka.test.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogOffsetReaderTest.java b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogOffsetReaderTest.java index 5503c541b281e..fec5a030c4b08 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogOffsetReaderTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogOffsetReaderTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.server.log.remote.storage; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.config.AbstractConfig; import org.apache.kafka.common.metrics.Metrics; @@ -27,7 +28,6 @@ import org.apache.kafka.storage.internals.log.LogDirFailureChannel; import org.apache.kafka.storage.internals.log.OffsetResultHolder; import org.apache.kafka.storage.log.metrics.BrokerTopicStats; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/LeaderEpochCheckpointFileWithFailureHandlerTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/LeaderEpochCheckpointFileWithFailureHandlerTest.java index dc754ff48908a..3ca415de7c519 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/LeaderEpochCheckpointFileWithFailureHandlerTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/LeaderEpochCheckpointFileWithFailureHandlerTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.storage.internals.checkpoint; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.storage.internals.log.EpochEntry; import org.apache.kafka.storage.internals.log.LogDirFailureChannel; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/OffsetCheckpointFileWithFailureHandlerTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/OffsetCheckpointFileWithFailureHandlerTest.java index 04131c0566b8f..0b0ec8a1c61a6 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/OffsetCheckpointFileWithFailureHandlerTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/OffsetCheckpointFileWithFailureHandlerTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.storage.internals.checkpoint; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.KafkaStorageException; import org.apache.kafka.storage.internals.log.EpochEntry; import org.apache.kafka.storage.internals.log.LogDirFailureChannel; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/PartitionMetadataFileTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/PartitionMetadataFileTest.java index febcc13a3564c..11bb29bb09a9c 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/PartitionMetadataFileTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/PartitionMetadataFileTest.java @@ -17,10 +17,10 @@ package org.apache.kafka.storage.internals.checkpoint; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.errors.InconsistentTopicIdException; import org.apache.kafka.storage.internals.log.LogDirFailureChannel; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/AbstractIndexTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/AbstractIndexTest.java index f6b28345b932e..dd4035b6fe176 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/AbstractIndexTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/AbstractIndexTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.test.TestUtils; +import org.apache.kafka.base.test.TestUtils; import org.junit.jupiter.api.Test; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/BrokerCompressionTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/BrokerCompressionTest.java index 95cf2c514b06f..d373926a9ad2e 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/BrokerCompressionTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/BrokerCompressionTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.storage.internals.log; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.config.TopicConfig; import org.apache.kafka.common.record.internal.CompressionType; @@ -29,7 +30,6 @@ import org.apache.kafka.server.storage.log.FetchIsolation; import org.apache.kafka.server.util.MockTime; import org.apache.kafka.storage.log.metrics.BrokerTopicStats; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.params.ParameterizedTest; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/LocalLogTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/LocalLogTest.java index e91058e6b1432..cd16c665e7ee8 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/LocalLogTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/LocalLogTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.storage.internals.log; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.compress.Compression; @@ -26,7 +27,6 @@ import org.apache.kafka.common.record.internal.SimpleRecord; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.server.util.MockTime; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogCleanerIntegrationTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogCleanerIntegrationTest.java index d549fb429275f..9d851cdaa509c 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogCleanerIntegrationTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogCleanerIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.storage.internals.log; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.config.AbstractConfig; @@ -37,7 +38,6 @@ import org.apache.kafka.server.util.ShutdownableThread; import org.apache.kafka.storage.internals.checkpoint.OffsetCheckpointFile; import org.apache.kafka.storage.log.metrics.BrokerTopicStats; -import org.apache.kafka.test.TestUtils; import com.yammer.metrics.core.Gauge; import com.yammer.metrics.core.Metric; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogCleanerManagerTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogCleanerManagerTest.java index c0be8d35aedb8..7341ff2820d5d 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogCleanerManagerTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogCleanerManagerTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.storage.internals.log; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.compress.Compression; @@ -33,7 +34,6 @@ import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache; import org.apache.kafka.storage.internals.log.LogCleanerManager.OffsetsToClean; import org.apache.kafka.storage.log.metrics.BrokerTopicStats; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogConcurrencyTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogConcurrencyTest.java index dec3f9e53fc03..b91ed7df00d45 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogConcurrencyTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogConcurrencyTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.storage.internals.log; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.record.internal.MemoryRecords; import org.apache.kafka.common.record.internal.RecordBatch; @@ -27,7 +28,6 @@ import org.apache.kafka.server.storage.log.FetchIsolation; import org.apache.kafka.server.util.KafkaScheduler; import org.apache.kafka.storage.log.metrics.BrokerTopicStats; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogSegmentTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogSegmentTest.java index 9af969fe82de5..c08f9829f9f94 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogSegmentTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogSegmentTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.storage.internals.log; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.config.TopicConfig; @@ -37,7 +38,6 @@ import org.apache.kafka.server.util.MockScheduler; import org.apache.kafka.storage.internals.checkpoint.LeaderEpochCheckpointFile; import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogSegmentsTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogSegmentsTest.java index 4136a76995aec..1c1b9c485b39f 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogSegmentsTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogSegmentsTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.storage.internals.log; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogValidatorTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogValidatorTest.java index d21ec04e0a41c..f3fefdafcce6e 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogValidatorTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogValidatorTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.storage.internals.log; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.InvalidRecordException; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.compress.Compression; @@ -39,7 +40,6 @@ import org.apache.kafka.server.common.RequestLocal; import org.apache.kafka.server.util.MockTime; import org.apache.kafka.storage.internals.log.LogValidator.ValidationResult; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/OffsetIndexTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/OffsetIndexTest.java index 578cb4ac243c5..1a79b9ef800fb 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/OffsetIndexTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/OffsetIndexTest.java @@ -17,8 +17,8 @@ package org.apache.kafka.storage.internals.log; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.errors.InvalidOffsetException; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/ProducerStateManagerTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/ProducerStateManagerTest.java index c1a2d7007baa8..ce0597202d07e 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/ProducerStateManagerTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/ProducerStateManagerTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.storage.internals.log; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.InvalidProducerEpochException; import org.apache.kafka.common.errors.InvalidTxnStateException; @@ -27,7 +28,6 @@ import org.apache.kafka.common.record.internal.RecordBatch; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.server.util.MockTime; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/RemoteIndexCacheTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/RemoteIndexCacheTest.java index dc9c07839c96b..c41ed024c8c71 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/RemoteIndexCacheTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/RemoteIndexCacheTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.storage.internals.log; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.TopicIdPartition; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; @@ -28,7 +29,6 @@ import org.apache.kafka.server.log.remote.storage.RemoteStorageManager; import org.apache.kafka.server.log.remote.storage.RemoteStorageManager.IndexType; import org.apache.kafka.server.util.MockTime; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/TimeIndexTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/TimeIndexTest.java index 7cb7a0d589616..91908e28cf51f 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/TimeIndexTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/TimeIndexTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.storage.internals.log; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.errors.InvalidOffsetException; import org.apache.kafka.common.record.internal.RecordBatch; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/TransactionIndexTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/TransactionIndexTest.java index 803122ac4568e..45e7d686203b1 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/TransactionIndexTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/TransactionIndexTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.storage.internals.log; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.message.AbortedTxn; import org.apache.kafka.common.protocol.MessageUtil; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/UnifiedLogTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/UnifiedLogTest.java index 48953d133a5f7..eedd21a6a615e 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/UnifiedLogTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/UnifiedLogTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.storage.internals.log; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.InvalidRecordException; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; @@ -77,7 +78,6 @@ import org.apache.kafka.storage.internals.utils.Throttler; import org.apache.kafka.storage.log.metrics.BrokerTopicMetrics; import org.apache.kafka.storage.log.metrics.BrokerTopicStats; -import org.apache.kafka.test.TestUtils; import com.yammer.metrics.core.Meter; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestHarness.java b/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestHarness.java index 40334a1726d47..f17f0c0a23012 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestHarness.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestHarness.java @@ -19,6 +19,7 @@ import kafka.api.IntegrationTestHarness; import kafka.server.KafkaBroker; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.replica.ReplicaSelector; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.server.config.ReplicationConfigs; @@ -27,7 +28,6 @@ import org.apache.kafka.server.log.remote.storage.LocalTieredStorage; import org.apache.kafka.server.log.remote.storage.RemoteLogManager; import org.apache.kafka.server.log.remote.storage.RemoteStorageManager; -import org.apache.kafka.test.TestUtils; import org.apache.kafka.tiered.storage.utils.BrokerLocalStorage; import org.junit.jupiter.api.AfterEach; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/AlterLogDirAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/AlterLogDirAction.java index a4dc285600aae..fff935a080a87 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/AlterLogDirAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/AlterLogDirAction.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.tiered.storage.actions; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.AlterReplicaLogDirsResult; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.TopicPartitionReplica; -import org.apache.kafka.test.TestUtils; import org.apache.kafka.tiered.storage.TieredStorageTestAction; import org.apache.kafka.tiered.storage.TieredStorageTestContext; import org.apache.kafka.tiered.storage.utils.BrokerLocalStorage; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectBrokerInISRAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectBrokerInISRAction.java index 0c4a8b926d235..276e5b2893fcd 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectBrokerInISRAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectBrokerInISRAction.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.tiered.storage.actions; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.TopicDescription; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.TopicPartitionInfo; -import org.apache.kafka.test.TestUtils; import org.apache.kafka.tiered.storage.TieredStorageTestAction; import org.apache.kafka.tiered.storage.TieredStorageTestContext; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectEmptyRemoteStorageAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectEmptyRemoteStorageAction.java index 01de48284b0d3..28a4edc76da9d 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectEmptyRemoteStorageAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectEmptyRemoteStorageAction.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.tiered.storage.actions; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.server.log.remote.storage.LocalTieredStorageSnapshot; -import org.apache.kafka.test.TestUtils; import org.apache.kafka.tiered.storage.TieredStorageTestAction; import org.apache.kafka.tiered.storage.TieredStorageTestContext; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderAction.java index 0caf4cd4fad28..e5d9702e6d3e2 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderAction.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.tiered.storage.actions; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.AlterPartitionReassignmentsResult; import org.apache.kafka.clients.admin.NewPartitionReassignment; import org.apache.kafka.clients.admin.TopicDescription; @@ -24,7 +25,6 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.TopicPartitionInfo; import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; -import org.apache.kafka.test.TestUtils; import org.apache.kafka.tiered.storage.TieredStorageTestAction; import org.apache.kafka.tiered.storage.TieredStorageTestContext; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderEpochCheckpointAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderEpochCheckpointAction.java index af9da3742d1b3..3974a9ea272e2 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderEpochCheckpointAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderEpochCheckpointAction.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.tiered.storage.actions; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache; import org.apache.kafka.storage.internals.log.EpochEntry; import org.apache.kafka.storage.internals.log.UnifiedLog; -import org.apache.kafka.test.TestUtils; import org.apache.kafka.tiered.storage.TieredStorageTestAction; import org.apache.kafka.tiered.storage.TieredStorageTestContext; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ReassignReplicaAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ReassignReplicaAction.java index d4b5739baf9d8..ed38d98ed0863 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ReassignReplicaAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ReassignReplicaAction.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.tiered.storage.actions; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.NewPartitionReassignment; import org.apache.kafka.clients.admin.TopicDescription; import org.apache.kafka.common.Node; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; -import org.apache.kafka.test.TestUtils; import org.apache.kafka.tiered.storage.TieredStorageTestAction; import org.apache.kafka.tiered.storage.TieredStorageTestContext; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ShrinkReplicaAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ShrinkReplicaAction.java index 95cb584afda46..146aac569aa21 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ShrinkReplicaAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ShrinkReplicaAction.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.tiered.storage.actions; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.NewPartitionReassignment; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.TopicPartitionInfo; -import org.apache.kafka.test.TestUtils; import org.apache.kafka.tiered.storage.TieredStorageTestAction; import org.apache.kafka.tiered.storage.TieredStorageTestContext; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/integration/TransactionsWithTieredStoreTest.java b/storage/src/test/java/org/apache/kafka/tiered/storage/integration/TransactionsWithTieredStoreTest.java index 95160f68c89e9..dd1b71321a790 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/integration/TransactionsWithTieredStoreTest.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/integration/TransactionsWithTieredStoreTest.java @@ -19,9 +19,9 @@ import kafka.api.TransactionsTest; import kafka.server.KafkaBroker; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.server.HostedPartition; -import org.apache.kafka.test.TestUtils; import org.apache.kafka.tiered.storage.utils.BrokerLocalStorage; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/examples/src/test/java/org/apache/kafka/streams/examples/wordcount/WordCountDemoTest.java b/streams/examples/src/test/java/org/apache/kafka/streams/examples/wordcount/WordCountDemoTest.java index 8435a0ae85a0b..e13cbbf49eeea 100644 --- a/streams/examples/src/test/java/org/apache/kafka/streams/examples/wordcount/WordCountDemoTest.java +++ b/streams/examples/src/test/java/org/apache/kafka/streams/examples/wordcount/WordCountDemoTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.examples.wordcount; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.common.serialization.LongDeserializer; import org.apache.kafka.common.serialization.StringDeserializer; @@ -25,7 +26,6 @@ import org.apache.kafka.streams.TestInputTopic; import org.apache.kafka.streams.TestOutputTopic; import org.apache.kafka.streams.TopologyTestDriver; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AbstractJoinIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AbstractJoinIntegrationTest.java index d9dfc41c5118e..e762374e5276e 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AbstractJoinIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AbstractJoinIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.LongDeserializer; import org.apache.kafka.common.serialization.LongSerializer; @@ -34,7 +35,6 @@ import org.apache.kafka.streams.state.ReadOnlyKeyValueStore; import org.apache.kafka.streams.state.ValueAndTimestamp; import org.apache.kafka.streams.test.TestRecord; -import org.apache.kafka.test.TestUtils; import java.util.Arrays; import java.util.Collections; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AdjustStreamThreadCountTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AdjustStreamThreadCountTest.java index d9779b5a9c564..8c3642d7d2abb 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AdjustStreamThreadCountTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AdjustStreamThreadCountTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerConfig; @@ -39,7 +40,6 @@ import org.apache.kafka.streams.processor.api.ProcessorContext; import org.apache.kafka.streams.processor.api.Record; import org.apache.kafka.streams.processor.internals.StreamThread; -import org.apache.kafka.test.TestUtils; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterAll; @@ -65,12 +65,12 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.common.utils.Utils.mkEntry; import static org.apache.kafka.common.utils.Utils.mkMap; import static org.apache.kafka.common.utils.Utils.mkObjectProperties; import static org.apache.kafka.streams.integration.utils.IntegrationTestUtils.purgeLocalStreamsState; import static org.apache.kafka.streams.utils.TestUtils.safeUniqueTestName; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AtLeastOnceDeliveryMessageLossIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AtLeastOnceDeliveryMessageLossIntegrationTest.java index 59753b3921a1b..7cb70b6ca52f1 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AtLeastOnceDeliveryMessageLossIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AtLeastOnceDeliveryMessageLossIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.producer.ProducerConfig; @@ -32,7 +33,6 @@ import org.apache.kafka.streams.integration.utils.EmbeddedKafkaCluster; import org.apache.kafka.streams.integration.utils.IntegrationTestUtils; import org.apache.kafka.streams.kstream.KStream; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; @@ -52,6 +52,9 @@ import java.util.List; import java.util.Properties; +import static org.apache.kafka.base.test.TestUtils.consumerConfig; +import static org.apache.kafka.base.test.TestUtils.producerConfig; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.common.utils.Utils.mkEntry; import static org.apache.kafka.common.utils.Utils.mkMap; import static org.apache.kafka.streams.integration.utils.IntegrationTestUtils.DEFAULT_TIMEOUT; @@ -60,9 +63,6 @@ import static org.apache.kafka.streams.integration.utils.IntegrationTestUtils.startApplicationAndWaitUntilRunning; import static org.apache.kafka.streams.integration.utils.IntegrationTestUtils.waitUntilMinKeyValueRecordsReceived; import static org.apache.kafka.streams.utils.TestUtils.safeUniqueTestName; -import static org.apache.kafka.test.TestUtils.consumerConfig; -import static org.apache.kafka.test.TestUtils.producerConfig; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/ConsistencyVectorIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/ConsistencyVectorIntegrationTest.java index 7b1c02e5d22ce..8e19eeb6011ae 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/ConsistencyVectorIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/ConsistencyVectorIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.IntegerSerializer; @@ -38,7 +39,6 @@ import org.apache.kafka.streams.query.StateQueryRequest; import org.apache.kafka.streams.query.StateQueryResult; import org.apache.kafka.streams.state.KeyValueStore; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/DeadLetterQueueIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/DeadLetterQueueIntegrationTest.java index 3d7f91e4fc7e5..1cd1900d012a1 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/DeadLetterQueueIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/DeadLetterQueueIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.serialization.ByteArrayDeserializer; @@ -39,7 +40,6 @@ import org.apache.kafka.streams.processor.api.ContextualProcessor; import org.apache.kafka.streams.processor.api.Record; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EOSUncleanShutdownIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EOSUncleanShutdownIntegrationTest.java index 32f5dd69b75ed..07a0e640e69a4 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EOSUncleanShutdownIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EOSUncleanShutdownIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.Serdes; @@ -31,7 +32,6 @@ import org.apache.kafka.streams.kstream.KStream; import org.apache.kafka.streams.kstream.KTable; import org.apache.kafka.streams.kstream.Materialized; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EmitOnChangeIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EmitOnChangeIntegrationTest.java index 020436be41997..8a910a7767b00 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EmitOnChangeIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EmitOnChangeIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.IntegerDeserializer; import org.apache.kafka.common.serialization.IntegerSerializer; @@ -30,7 +31,6 @@ import org.apache.kafka.streams.integration.utils.EmbeddedKafkaCluster; import org.apache.kafka.streams.integration.utils.IntegrationTestUtils; import org.apache.kafka.streams.kstream.Materialized; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EosIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EosIntegrationTest.java index a6cb68f5283f6..3cd4437a3b1cf 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EosIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EosIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.Consumer; @@ -66,7 +67,6 @@ import org.apache.kafka.streams.state.Stores; import org.apache.kafka.streams.state.internals.OffsetCheckpoint; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -102,6 +102,8 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; +import static org.apache.kafka.base.test.TestUtils.consumerConfig; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.common.utils.Utils.mkEntry; import static org.apache.kafka.common.utils.Utils.mkMap; import static org.apache.kafka.streams.integration.utils.IntegrationTestUtils.DEFAULT_TIMEOUT; @@ -111,8 +113,6 @@ import static org.apache.kafka.streams.integration.utils.IntegrationTestUtils.waitUntilMinRecordsReceived; import static org.apache.kafka.streams.query.StateQueryRequest.inStore; import static org.apache.kafka.streams.utils.TestUtils.waitForApplicationState; -import static org.apache.kafka.test.TestUtils.consumerConfig; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/FineGrainedAutoResetIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/FineGrainedAutoResetIntegrationTest.java index 7f2459cab3150..d5148b0fd5616 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/FineGrainedAutoResetIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/FineGrainedAutoResetIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.clients.consumer.OffsetAndMetadata; @@ -38,7 +39,6 @@ import org.apache.kafka.streams.kstream.KStream; import org.apache.kafka.streams.kstream.Produced; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -58,8 +58,8 @@ import java.util.Properties; import java.util.regex.Pattern; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.common.utils.Utils.mkProperties; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalKTableEOSIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalKTableEOSIntegrationTest.java index 5f0925dca91d2..c09fd28e8f747 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalKTableEOSIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalKTableEOSIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.LongSerializer; @@ -42,7 +43,6 @@ import org.apache.kafka.streams.state.QueryableStoreTypes; import org.apache.kafka.streams.state.ReadOnlyKeyValueStore; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalKTableIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalKTableIntegrationTest.java index b4a73ccb60304..62526b2a147c8 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalKTableIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalKTableIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.Serdes; @@ -48,7 +49,6 @@ import org.apache.kafka.streams.state.ValueAndTimestamp; import org.apache.kafka.test.MockApiProcessorSupplier; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalStateReprocessTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalStateReprocessTest.java index a8ff5cd94ec2c..47ccfdee64b1b 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalStateReprocessTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalStateReprocessTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.Serdes; @@ -39,7 +40,6 @@ import org.apache.kafka.streams.state.ReadOnlyKeyValueStore; import org.apache.kafka.streams.state.Stores; import org.apache.kafka.streams.state.internals.KeyValueStoreBuilder; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalThreadShutDownOrderTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalThreadShutDownOrderTest.java index 55dcec4b839ce..80f6118a01ced 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalThreadShutDownOrderTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalThreadShutDownOrderTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.Serdes; @@ -38,7 +39,6 @@ import org.apache.kafka.streams.state.KeyValueStore; import org.apache.kafka.streams.state.Stores; import org.apache.kafka.streams.state.internals.KeyValueStoreBuilder; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HandlingSourceTopicDeletionIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HandlingSourceTopicDeletionIntegrationTest.java index f31e79c53992f..089f864b3029a 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HandlingSourceTopicDeletionIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HandlingSourceTopicDeletionIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KafkaStreams.State; @@ -26,7 +27,6 @@ import org.apache.kafka.streams.integration.utils.EmbeddedKafkaCluster; import org.apache.kafka.streams.kstream.Consumed; import org.apache.kafka.streams.kstream.Produced; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HeadersStoreUpgradeIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HeadersStoreUpgradeIntegrationTest.java index bd5d5b87a5697..cfbe7c64ae775 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HeadersStoreUpgradeIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HeadersStoreUpgradeIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; @@ -51,7 +52,6 @@ import org.apache.kafka.streams.state.ValueAndTimestamp; import org.apache.kafka.streams.state.ValueTimestampHeaders; import org.apache.kafka.streams.state.WindowStore; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HighAvailabilityTaskAssignorIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HighAvailabilityTaskAssignorIntegrationTest.java index 42ad0277d5dd2..8c6c35a103469 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HighAvailabilityTaskAssignorIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HighAvailabilityTaskAssignorIntegrationTest.java @@ -16,6 +16,8 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.NoRetryException; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -43,8 +45,6 @@ import org.apache.kafka.streams.processor.internals.assignment.HighAvailabilityTaskAssignor; import org.apache.kafka.streams.state.KeyValueStore; import org.apache.kafka.streams.state.Stores; -import org.apache.kafka.test.NoRetryException; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2EndpointToPartitionsIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2EndpointToPartitionsIntegrationTest.java index 5b3b789ab10de..9411cc7e0ffcf 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2EndpointToPartitionsIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2EndpointToPartitionsIntegrationTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.serialization.Serdes; @@ -33,7 +34,6 @@ import org.apache.kafka.streams.kstream.Grouped; import org.apache.kafka.streams.kstream.Materialized; import org.apache.kafka.streams.kstream.Produced; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Tag; @@ -51,8 +51,8 @@ import java.util.Set; import java.util.stream.Stream; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.streams.utils.TestUtils.safeUniqueTestName; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2IntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2IntegrationTest.java index c2b532afc7724..792131cb1ac82 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2IntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2IntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.Producer; @@ -53,7 +54,6 @@ import org.apache.kafka.streams.state.KeyValueStore; import org.apache.kafka.streams.state.ValueAndTimestamp; import org.apache.kafka.streams.state.internals.StoreQueryUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2StoreIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2StoreIntegrationTest.java index be94882885a15..d662a91a914d6 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2StoreIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2StoreIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.Producer; @@ -68,7 +69,6 @@ import org.apache.kafka.streams.state.WindowStore; import org.apache.kafka.streams.state.WindowStoreIterator; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/InternalTopicIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/InternalTopicIntegrationTest.java index f8cb0267bf491..d30a58e937a70 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/InternalTopicIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/InternalTopicIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.Config; @@ -43,7 +44,6 @@ import org.apache.kafka.streams.state.WindowStore; import org.apache.kafka.test.MockMapper; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinGracePeriodDurabilityIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinGracePeriodDurabilityIntegrationTest.java index d8a09e12ca05b..2f0cda3c65624 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinGracePeriodDurabilityIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinGracePeriodDurabilityIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.Deserializer; @@ -38,7 +39,6 @@ import org.apache.kafka.streams.state.Stores; import org.apache.kafka.test.MockValueJoiner; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinStoreIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinStoreIntegrationTest.java index 432cbaf7c3531..ebeeb7b9d594e 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinStoreIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinStoreIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -33,7 +34,6 @@ import org.apache.kafka.streams.kstream.KStream; import org.apache.kafka.streams.kstream.StreamJoined; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinWithIncompleteMetadataIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinWithIncompleteMetadataIntegrationTest.java index 36d48491ceb07..5f278c2d17367 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinWithIncompleteMetadataIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinWithIncompleteMetadataIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.streams.GroupProtocol; @@ -26,7 +27,6 @@ import org.apache.kafka.streams.kstream.KStream; import org.apache.kafka.streams.kstream.KTable; import org.apache.kafka.streams.kstream.ValueJoiner; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamAggregationDedupIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamAggregationDedupIntegrationTest.java index a63cb04562e48..7d679fc183a20 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamAggregationDedupIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamAggregationDedupIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.IntegerSerializer; @@ -42,7 +43,6 @@ import org.apache.kafka.streams.kstream.TimeWindows; import org.apache.kafka.test.MockMapper; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamAggregationIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamAggregationIntegrationTest.java index 48e9ce88b9af8..ec151ff930bdc 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamAggregationIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamAggregationIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeader; @@ -62,7 +63,6 @@ import org.apache.kafka.streams.state.ReadOnlySessionStore; import org.apache.kafka.test.MockMapper; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.apache.kafka.tools.consumer.ConsoleConsumer; import org.apache.kafka.tools.consumer.ConsoleConsumerOptions; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamKStreamIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamKStreamIntegrationTest.java index 23504ef4490d2..12cead5f89e50 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamKStreamIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamKStreamIntegrationTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.Serdes; @@ -33,7 +34,6 @@ import org.apache.kafka.streams.kstream.JoinWindows; import org.apache.kafka.streams.kstream.KStream; import org.apache.kafka.streams.kstream.ValueJoiner; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamRepartitionIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamRepartitionIntegrationTest.java index a008971d399b9..bf983b5a93e47 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamRepartitionIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamRepartitionIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.TopicDescription; @@ -41,7 +42,6 @@ import org.apache.kafka.streams.kstream.Named; import org.apache.kafka.streams.kstream.Repartitioned; import org.apache.kafka.streams.processor.StreamPartitioner; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableEfficientRangeQueryTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableEfficientRangeQueryTest.java index ec59ff6267ef9..bc9844b06b807 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableEfficientRangeQueryTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableEfficientRangeQueryTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.common.utils.Bytes; @@ -32,7 +33,6 @@ import org.apache.kafka.streams.state.KeyValueStore; import org.apache.kafka.streams.state.ReadOnlyKeyValueStore; import org.apache.kafka.streams.state.Stores; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Timeout; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinCustomPartitionerIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinCustomPartitionerIntegrationTest.java index 5740103078d0a..197e4b020364f 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinCustomPartitionerIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinCustomPartitionerIntegrationTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.Serdes; @@ -43,7 +44,6 @@ import org.apache.kafka.streams.state.KeyValueStore; import org.apache.kafka.streams.utils.UniqueTopicSerdeScope; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java index 0675938e579e4..0afca772a8b60 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.FloatSerializer; @@ -41,7 +42,6 @@ import org.apache.kafka.streams.state.KeyValueStore; import org.apache.kafka.streams.utils.UniqueTopicSerdeScope; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinDistributedTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinDistributedTest.java index c7e62ba24e4a5..571cfd7dec4a2 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinDistributedTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinDistributedTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.Serdes; @@ -33,7 +34,6 @@ import org.apache.kafka.streams.kstream.KTable; import org.apache.kafka.streams.kstream.ValueJoiner; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinIntegrationTest.java index c6daa0420c178..7525e98de4228 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; @@ -38,7 +39,6 @@ import org.apache.kafka.streams.state.ValueAndTimestamp; import org.apache.kafka.streams.utils.UniqueTopicSerdeScope; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinMaterializationIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinMaterializationIntegrationTest.java index 77d738a156c13..f8a9d05a2b4cf 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinMaterializationIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinMaterializationIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; @@ -33,7 +34,6 @@ import org.apache.kafka.streams.kstream.ValueJoiner; import org.apache.kafka.streams.state.KeyValueStore; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableSourceTopicRestartIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableSourceTopicRestartIntegrationTest.java index 52dd78ec17eb8..f7d72c08bcac9 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableSourceTopicRestartIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableSourceTopicRestartIntegrationTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.TopicPartition; @@ -33,7 +34,6 @@ import org.apache.kafka.streams.kstream.Materialized; import org.apache.kafka.streams.processor.StateRestoreListener; import org.apache.kafka.streams.processor.WallclockTimestampExtractor; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsCloseOptionsIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsCloseOptionsIntegrationTest.java index 5f690a794f297..9615e4d78ba2b 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsCloseOptionsIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsCloseOptionsIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -38,7 +39,6 @@ import org.apache.kafka.streams.integration.utils.IntegrationTestUtils; import org.apache.kafka.streams.kstream.KStream; import org.apache.kafka.streams.kstream.Produced; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsTelemetryIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsTelemetryIntegrationTest.java index efb36a662937d..61fc30a9bda30 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsTelemetryIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsTelemetryIntegrationTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.Consumer; @@ -55,7 +56,6 @@ import org.apache.kafka.streams.state.KeyValueIterator; import org.apache.kafka.streams.state.KeyValueStore; import org.apache.kafka.streams.state.Stores; -import org.apache.kafka.test.TestUtils; import org.apache.kafka.tools.ClientMetricsCommand; import org.junit.jupiter.api.AfterAll; @@ -86,11 +86,11 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Stream; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.common.utils.Utils.mkEntry; import static org.apache.kafka.common.utils.Utils.mkMap; import static org.apache.kafka.common.utils.Utils.mkObjectProperties; import static org.apache.kafka.streams.utils.TestUtils.safeUniqueTestName; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/LagFetchIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/LagFetchIntegrationTest.java index db2a809c718cb..a08fe5a62ecc9 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/LagFetchIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/LagFetchIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.serialization.LongDeserializer; @@ -36,7 +37,6 @@ import org.apache.kafka.streams.processor.StateRestoreListener; import org.apache.kafka.streams.processor.internals.StreamThread; import org.apache.kafka.streams.processor.internals.assignment.FallbackPriorTaskAssignor; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/MetricsIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/MetricsIntegrationTest.java index 020f6a2c315ee..1526cdabe0c63 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/MetricsIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/MetricsIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.Metric; import org.apache.kafka.common.metrics.Sensor; import org.apache.kafka.common.serialization.IntegerSerializer; @@ -43,7 +44,6 @@ import org.apache.kafka.streams.state.Stores; import org.apache.kafka.streams.state.WindowStore; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/NamedTopologyIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/NamedTopologyIntegrationTest.java index 8186a5b304969..badfeba10ec20 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/NamedTopologyIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/NamedTopologyIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.serialization.LongDeserializer; @@ -53,7 +54,6 @@ import org.apache.kafka.streams.state.Stores; import org.apache.kafka.streams.state.internals.StreamsMetadataImpl; import org.apache.kafka.streams.utils.UniqueTopicSerdeScope; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/OptimizedKTableIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/OptimizedKTableIntegrationTest.java index 7d076b7487f14..24b5124d21e3d 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/OptimizedKTableIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/OptimizedKTableIntegrationTest.java @@ -16,6 +16,8 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.NoRetryException; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.IntegerSerializer; @@ -35,8 +37,6 @@ 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.test.NoRetryException; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/OuterJoinListValueStoreRestorationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/OuterJoinListValueStoreRestorationTest.java index bdf824290bf32..04c628d4735c5 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/OuterJoinListValueStoreRestorationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/OuterJoinListValueStoreRestorationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.Serdes; @@ -30,7 +31,6 @@ import org.apache.kafka.streams.kstream.JoinWindows; import org.apache.kafka.streams.kstream.KStream; import org.apache.kafka.streams.kstream.StreamJoined; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PauseResumeIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PauseResumeIntegrationTest.java index e0f080f885581..e8181ba3de93a 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PauseResumeIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PauseResumeIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.LongDeserializer; import org.apache.kafka.common.serialization.LongSerializer; @@ -35,7 +36,6 @@ import org.apache.kafka.streams.processor.internals.namedtopology.NamedTopologyBuilder; import org.apache.kafka.streams.state.KeyValueStore; import org.apache.kafka.streams.state.Stores; -import org.apache.kafka.test.TestUtils; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.AfterAll; @@ -55,6 +55,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.singletonList; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.streams.KeyValue.pair; import static org.apache.kafka.streams.integration.utils.IntegrationTestUtils.cleanStateBeforeTest; import static org.apache.kafka.streams.integration.utils.IntegrationTestUtils.getTopicSize; @@ -62,7 +63,6 @@ import static org.apache.kafka.streams.integration.utils.IntegrationTestUtils.waitUntilStreamsHasPolled; import static org.apache.kafka.streams.utils.TestUtils.safeUniqueTestName; import static org.apache.kafka.streams.utils.TestUtils.waitForApplicationState; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PositionRestartIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PositionRestartIntegrationTest.java index 5217f133d2044..0632897a8af03 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PositionRestartIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PositionRestartIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.Producer; @@ -61,7 +62,6 @@ import org.apache.kafka.streams.state.ValueAndTimestamp; import org.apache.kafka.streams.state.WindowBytesStoreSupplier; import org.apache.kafka.streams.state.WindowStore; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PurgeRepartitionTopicIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PurgeRepartitionTopicIntegrationTest.java index 67203b8926642..c063803132d9e 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PurgeRepartitionTopicIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PurgeRepartitionTopicIntegrationTest.java @@ -16,6 +16,8 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestCondition; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.Config; import org.apache.kafka.clients.admin.LogDirDescription; @@ -36,8 +38,6 @@ import org.apache.kafka.streams.integration.utils.EmbeddedKafkaCluster; import org.apache.kafka.streams.integration.utils.IntegrationTestUtils; import org.apache.kafka.test.MockMapper; -import org.apache.kafka.test.TestCondition; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/QueryableStateIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/QueryableStateIntegrationTest.java index ae0e6226ba299..3dc93ed1eb364 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/QueryableStateIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/QueryableStateIntegrationTest.java @@ -16,6 +16,8 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.NoRetryException; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerConfig; @@ -57,8 +59,6 @@ import org.apache.kafka.streams.state.ReadOnlyWindowStore; import org.apache.kafka.streams.state.WindowStoreIterator; import org.apache.kafka.test.MockMapper; -import org.apache.kafka.test.NoRetryException; -import org.apache.kafka.test.TestUtils; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterAll; @@ -99,6 +99,7 @@ import static java.time.Duration.ofMillis; import static java.time.Duration.ofSeconds; import static java.time.Instant.ofEpochMilli; +import static org.apache.kafka.base.test.TestUtils.retryOnExceptionWithTimeout; import static org.apache.kafka.common.utils.Utils.mkEntry; import static org.apache.kafka.common.utils.Utils.mkMap; import static org.apache.kafka.common.utils.Utils.mkProperties; @@ -110,7 +111,6 @@ import static org.apache.kafka.streams.state.QueryableStoreTypes.sessionStore; import static org.apache.kafka.streams.utils.TestUtils.safeUniqueTestName; import static org.apache.kafka.streams.utils.TestUtils.waitForApplicationState; -import static org.apache.kafka.test.TestUtils.retryOnExceptionWithTimeout; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.core.IsEqual.equalTo; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RangeQueryIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RangeQueryIntegrationTest.java index 5f45f3d7212e5..bf31faa8e30e6 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RangeQueryIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RangeQueryIntegrationTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; @@ -35,7 +36,6 @@ import org.apache.kafka.streams.state.QueryableStoreTypes; import org.apache.kafka.streams.state.ReadOnlyKeyValueStore; import org.apache.kafka.streams.state.Stores; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceIntegrationTest.java index a1a24be0aabd9..ae47f8b6c7f2a 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.LongDeserializer; @@ -33,7 +34,6 @@ import org.apache.kafka.streams.processor.api.ProcessorContext; import org.apache.kafka.streams.processor.api.Record; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceProtocolMigrationIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceProtocolMigrationIntegrationTest.java index be7cdf109d57d..6e24115834da0 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceProtocolMigrationIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceProtocolMigrationIntegrationTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -35,7 +36,6 @@ import org.apache.kafka.streams.kstream.Consumed; import org.apache.kafka.streams.kstream.KStream; import org.apache.kafka.streams.kstream.Produced; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceTaskClosureIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceTaskClosureIntegrationTest.java index 7be2a1bd36eaa..7b078b0c3c777 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceTaskClosureIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceTaskClosureIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.Serdes; @@ -39,7 +40,6 @@ import org.apache.kafka.streams.state.internals.CachedStateStore; import org.apache.kafka.streams.state.internals.RocksDBStore; import org.apache.kafka.test.MockApiProcessorSupplier; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RegexSourceIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RegexSourceIntegrationTest.java index 880818703ba8b..170eca0b3e156 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RegexSourceIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RegexSourceIntegrationTest.java @@ -16,6 +16,8 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestCondition; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRebalanceListener; @@ -44,8 +46,6 @@ import org.apache.kafka.test.MockApiProcessorSupplier; import org.apache.kafka.test.MockKeyValueStoreBuilder; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestCondition; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/ResetPartitionTimeIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/ResetPartitionTimeIntegrationTest.java index 83a38ea982e68..655c4759403a0 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/ResetPartitionTimeIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/ResetPartitionTimeIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.producer.ProducerConfig; @@ -33,7 +34,6 @@ import org.apache.kafka.streams.integration.utils.IntegrationTestUtils; import org.apache.kafka.streams.kstream.Consumed; import org.apache.kafka.streams.processor.TimestampExtractor; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RestoreIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RestoreIntegrationTest.java index 01caca6467641..5c308895b206b 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RestoreIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RestoreIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.ListOffsetsResult; @@ -65,7 +66,6 @@ import org.apache.kafka.streams.state.internals.KeyValueStoreBuilder; import org.apache.kafka.streams.state.internals.OffsetCheckpoint; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.AfterAll; @@ -100,6 +100,7 @@ import java.util.stream.IntStream; import static java.util.Arrays.asList; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.common.utils.Utils.mkEntry; import static org.apache.kafka.common.utils.Utils.mkMap; import static org.apache.kafka.common.utils.Utils.mkObjectProperties; @@ -110,7 +111,6 @@ import static org.apache.kafka.streams.integration.utils.IntegrationTestUtils.waitForCompletion; import static org.apache.kafka.streams.integration.utils.IntegrationTestUtils.waitForStandbyCompletion; import static org.apache.kafka.streams.utils.TestUtils.safeUniqueTestName; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.greaterThanOrEqualTo; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RocksDBMetricsIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RocksDBMetricsIntegrationTest.java index c9fabbdc05367..8c98e92812c06 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RocksDBMetricsIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RocksDBMetricsIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.Metric; import org.apache.kafka.common.metrics.Sensor; import org.apache.kafka.common.serialization.IntegerSerializer; @@ -37,7 +38,6 @@ import org.apache.kafka.streams.state.Stores; import org.apache.kafka.streams.state.WindowStore; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfJoinUpgradeIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfJoinUpgradeIntegrationTest.java index 6f6e65bf344be..cc6609542731d 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfJoinUpgradeIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfJoinUpgradeIntegrationTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringDeserializer; @@ -35,7 +36,6 @@ import org.apache.kafka.streams.kstream.TimeWindowedDeserializer; import org.apache.kafka.streams.kstream.ValueJoiner; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfManagedOffsetLifecycleIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfManagedOffsetLifecycleIntegrationTest.java index d6a55bdb7cef4..66aedfb3172ad 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfManagedOffsetLifecycleIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfManagedOffsetLifecycleIntegrationTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.TopicPartition; @@ -40,7 +41,6 @@ import org.apache.kafka.streams.state.QueryableStoreTypes; import org.apache.kafka.streams.state.ReadOnlyKeyValueStore; import org.apache.kafka.streams.state.internals.RocksDBStoreTestingUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfManagedOffsetRecoveryIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfManagedOffsetRecoveryIntegrationTest.java index a9ac4b4059b3f..ea1363d0eb65c 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfManagedOffsetRecoveryIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfManagedOffsetRecoveryIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.TopicPartition; @@ -35,7 +36,6 @@ import org.apache.kafka.streams.kstream.Materialized; import org.apache.kafka.streams.kstream.Produced; import org.apache.kafka.streams.state.internals.RocksDBStoreTestingUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SessionsStoreWithHeadersTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SessionsStoreWithHeadersTest.java index bf18dce66e585..0132f0177cc57 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SessionsStoreWithHeadersTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SessionsStoreWithHeadersTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; @@ -41,7 +42,6 @@ import org.apache.kafka.streams.state.SessionStore; import org.apache.kafka.streams.state.SessionStoreWithHeaders; import org.apache.kafka.streams.state.Stores; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SlidingWindowedKStreamIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SlidingWindowedKStreamIntegrationTest.java index 562a80d0f3747..6e07e2c3af742 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SlidingWindowedKStreamIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SlidingWindowedKStreamIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Serde; @@ -45,7 +46,6 @@ import org.apache.kafka.test.MockAggregator; import org.apache.kafka.test.MockInitializer; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskCreationIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskCreationIntegrationTest.java index fe0e6adaff339..804586cb2afb3 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskCreationIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskCreationIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.streams.GroupProtocol; import org.apache.kafka.streams.KafkaStreams; @@ -33,7 +34,6 @@ import org.apache.kafka.streams.state.StoreBuilder; import org.apache.kafka.streams.state.Stores; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSIntegrationTest.java index 722d3ab234d0f..e915b197e3cc1 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.serialization.IntegerDeserializer; @@ -39,7 +40,6 @@ import org.apache.kafka.streams.state.QueryableStoreTypes; import org.apache.kafka.streams.state.Stores; import org.apache.kafka.streams.state.internals.OffsetCheckpoint; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; @@ -60,9 +60,9 @@ import java.util.concurrent.atomic.AtomicBoolean; import static java.util.Arrays.asList; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.streams.integration.utils.IntegrationTestUtils.startApplicationAndWaitUntilRunning; import static org.apache.kafka.streams.utils.TestUtils.safeUniqueTestName; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertTrue; /** diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSMultiRebalanceIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSMultiRebalanceIntegrationTest.java index 1f8c9ba8e4236..019e42a2fb97c 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSMultiRebalanceIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSMultiRebalanceIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.producer.ProducerConfig; @@ -36,7 +37,6 @@ import org.apache.kafka.streams.state.KeyValueStore; import org.apache.kafka.streams.state.QueryableStoreTypes; import org.apache.kafka.streams.state.Stores; -import org.apache.kafka.test.TestUtils; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterAll; @@ -57,8 +57,8 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.streams.integration.utils.IntegrationTestUtils.startApplicationAndWaitUntilRunning; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StateDirectoryIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StateDirectoryIntegrationTest.java index fbed04dd8a44a..a80ebc922ae70 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StateDirectoryIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StateDirectoryIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.clients.producer.ProducerRecord; @@ -30,7 +31,6 @@ import org.apache.kafka.streams.integration.utils.IntegrationTestUtils; import org.apache.kafka.streams.kstream.Materialized; import org.apache.kafka.streams.state.KeyValueStore; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StateUpdaterFailureIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StateUpdaterFailureIntegrationTest.java index 16cb72e3a3bcf..f1a836302f81e 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StateUpdaterFailureIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StateUpdaterFailureIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.MockTime; @@ -31,7 +32,6 @@ import org.apache.kafka.streams.state.internals.AbstractStoreBuilder; import org.apache.kafka.test.MockApiProcessorSupplier; import org.apache.kafka.test.MockKeyValueStore; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StoreQueryIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StoreQueryIntegrationTest.java index 7631bbfa3bc1d..fe41de1564fd3 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StoreQueryIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StoreQueryIntegrationTest.java @@ -16,6 +16,8 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestCondition; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.IntegerSerializer; @@ -42,8 +44,6 @@ import org.apache.kafka.streams.state.QueryableStoreType; import org.apache.kafka.streams.state.ReadOnlyKeyValueStore; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestCondition; -import org.apache.kafka.test.TestUtils; import org.hamcrest.Matcher; import org.junit.jupiter.api.AfterAll; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamTableJoinTopologyOptimizationIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamTableJoinTopologyOptimizationIntegrationTest.java index deb6b12c1d426..8a7fad1fba378 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamTableJoinTopologyOptimizationIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamTableJoinTopologyOptimizationIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.TopicDescription; @@ -36,7 +37,6 @@ import org.apache.kafka.streams.kstream.KTable; import org.apache.kafka.streams.kstream.Materialized; import org.apache.kafka.streams.kstream.Named; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamsUncaughtExceptionHandlerIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamsUncaughtExceptionHandlerIntegrationTest.java index 94cde6824b39f..0eb4442fd437d 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamsUncaughtExceptionHandlerIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamsUncaughtExceptionHandlerIntegrationTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.IntegerDeserializer; import org.apache.kafka.common.serialization.IntegerSerializer; @@ -46,7 +47,6 @@ import org.apache.kafka.streams.state.Stores; import org.apache.kafka.streams.state.internals.KeyValueStoreBuilder; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.apache.logging.log4j.Level; import org.junit.jupiter.api.AfterAll; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamsUpgradeTestIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamsUpgradeTestIntegrationTest.java index 00a0ef279367e..fd40fd2653976 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamsUpgradeTestIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamsUpgradeTestIntegrationTest.java @@ -34,11 +34,11 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; +import static org.apache.kafka.base.test.TestUtils.retryOnExceptionWithTimeout; import static org.apache.kafka.common.utils.Utils.mkEntry; import static org.apache.kafka.common.utils.Utils.mkMap; import static org.apache.kafka.common.utils.Utils.mkProperties; import static org.apache.kafka.streams.processor.internals.assignment.StreamsAssignmentProtocolVersions.LATEST_SUPPORTED_VERSION; -import static org.apache.kafka.test.TestUtils.retryOnExceptionWithTimeout; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionDurabilityIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionDurabilityIntegrationTest.java index d6a1646dec9ad..511d7675f4c4f 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionDurabilityIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionDurabilityIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.Deserializer; @@ -43,7 +44,6 @@ import org.apache.kafka.streams.processor.api.Record; import org.apache.kafka.streams.state.KeyValueStore; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionIntegrationTest.java index 9b1aa9496a7a9..80ba470f5875d 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecords; @@ -43,7 +44,6 @@ import org.apache.kafka.streams.kstream.Produced; import org.apache.kafka.streams.state.KeyValueStore; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterAll; @@ -67,6 +67,7 @@ import static java.lang.Long.MAX_VALUE; import static java.time.Duration.ofMillis; import static java.util.Arrays.asList; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.common.utils.Utils.mkEntry; import static org.apache.kafka.common.utils.Utils.mkMap; import static org.apache.kafka.common.utils.Utils.mkProperties; @@ -77,7 +78,6 @@ import static org.apache.kafka.streams.kstream.Suppressed.BufferConfig.maxBytes; import static org.apache.kafka.streams.kstream.Suppressed.BufferConfig.maxRecords; import static org.apache.kafka.streams.kstream.Suppressed.untilTimeLimit; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SwallowUnknownTopicErrorIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SwallowUnknownTopicErrorIntegrationTest.java index 0535dd2465e4d..511a83d9d6b66 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SwallowUnknownTopicErrorIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SwallowUnknownTopicErrorIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; @@ -39,7 +40,6 @@ import org.apache.kafka.streams.kstream.Consumed; import org.apache.kafka.streams.kstream.KStream; import org.apache.kafka.streams.kstream.Produced; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TaskAssignorIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TaskAssignorIntegrationTest.java index f0fc5477be9e4..463f9528baa00 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TaskAssignorIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TaskAssignorIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerPartitionAssignor; import org.apache.kafka.clients.consumer.KafkaConsumer; @@ -31,7 +32,6 @@ import org.apache.kafka.streams.processor.internals.assignment.AssignorConfiguration.AssignmentListener; import org.apache.kafka.streams.processor.internals.assignment.HighAvailabilityTaskAssignor; import org.apache.kafka.streams.processor.internals.assignment.LegacyTaskAssignor; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TaskMetadataIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TaskMetadataIntegrationTest.java index a7d1a0c65b185..b37d3be38d9c2 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TaskMetadataIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TaskMetadataIntegrationTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; @@ -30,7 +31,6 @@ import org.apache.kafka.streams.kstream.KStream; import org.apache.kafka.streams.processor.api.ContextualProcessor; import org.apache.kafka.streams.processor.api.Record; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimeWindowedKStreamIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimeWindowedKStreamIntegrationTest.java index 1d7d8053d37a3..7e4a5d308ea47 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimeWindowedKStreamIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimeWindowedKStreamIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Serde; @@ -47,7 +48,6 @@ import org.apache.kafka.test.MockAggregator; import org.apache.kafka.test.MockInitializer; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedKeyValueStoreWithHeadersTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedKeyValueStoreWithHeadersTest.java index bb110d86cdd2b..3365ac98330fe 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedKeyValueStoreWithHeadersTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedKeyValueStoreWithHeadersTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; @@ -40,7 +41,6 @@ import org.apache.kafka.streams.state.TimestampedKeyValueStoreWithHeaders; import org.apache.kafka.streams.state.ValueAndTimestamp; import org.apache.kafka.streams.state.ValueTimestampHeaders; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedStoreUpgradeIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedStoreUpgradeIntegrationTest.java index dbeaa628d4cdd..30f5f46154ff3 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedStoreUpgradeIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedStoreUpgradeIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.Serdes; @@ -41,7 +42,6 @@ import org.apache.kafka.streams.state.TimestampedWindowStore; import org.apache.kafka.streams.state.ValueAndTimestamp; import org.apache.kafka.streams.state.WindowStore; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedWindowStoreWithHeadersTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedWindowStoreWithHeadersTest.java index 012bc773df6c5..c3ad7925f62b6 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedWindowStoreWithHeadersTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedWindowStoreWithHeadersTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; @@ -41,7 +42,6 @@ import org.apache.kafka.streams.state.ValueAndTimestamp; import org.apache.kafka.streams.state.ValueTimestampHeaders; import org.apache.kafka.streams.state.WindowStoreIterator; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/VersionedKeyValueStoreIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/VersionedKeyValueStoreIntegrationTest.java index 740b5b1af5c31..e5366a90921bc 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/VersionedKeyValueStoreIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/VersionedKeyValueStoreIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.integration; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.config.TopicConfig; @@ -54,7 +55,6 @@ import org.apache.kafka.streams.state.VersionedKeyValueStore; import org.apache.kafka.streams.state.VersionedRecord; import org.apache.kafka.streams.state.internals.VersionedKeyValueToBytesStoreAdapter; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/utils/EmbeddedKafkaCluster.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/utils/EmbeddedKafkaCluster.java index ba3451589f0a2..501261e788856 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/utils/EmbeddedKafkaCluster.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/utils/EmbeddedKafkaCluster.java @@ -16,6 +16,8 @@ */ package org.apache.kafka.streams.integration.utils; +import org.apache.kafka.base.test.TestCondition; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterConfigOp; @@ -50,8 +52,6 @@ import org.apache.kafka.server.config.ServerLogConfigs; import org.apache.kafka.server.util.MockTime; import org.apache.kafka.storage.internals.log.CleanerConfig; -import org.apache.kafka.test.TestCondition; -import org.apache.kafka.test.TestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/utils/IntegrationTestUtils.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/utils/IntegrationTestUtils.java index 832e8eb1a0691..464b92487117e 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/utils/IntegrationTestUtils.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/utils/IntegrationTestUtils.java @@ -16,6 +16,8 @@ */ package org.apache.kafka.streams.integration.utils; +import org.apache.kafka.base.test.TestCondition; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.ConsumerGroupDescription; import org.apache.kafka.clients.consumer.Consumer; @@ -55,8 +57,6 @@ import org.apache.kafka.streams.query.StateQueryRequest; import org.apache.kafka.streams.query.StateQueryResult; import org.apache.kafka.streams.state.QueryableStoreType; -import org.apache.kafka.test.TestCondition; -import org.apache.kafka.test.TestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -91,8 +91,8 @@ import java.util.stream.Collectors; import static java.util.Collections.singletonList; +import static org.apache.kafka.base.test.TestUtils.retryOnExceptionWithTimeout; import static org.apache.kafka.common.utils.Utils.sleep; -import static org.apache.kafka.test.TestUtils.retryOnExceptionWithTimeout; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.is; diff --git a/streams/integration-tests/src/test/scala/org/apache/kafka/streams/integration/WordCountTest.scala b/streams/integration-tests/src/test/scala/org/apache/kafka/streams/integration/WordCountTest.scala index 3e9813dda24d8..bb827afd63832 100644 --- a/streams/integration-tests/src/test/scala/org/apache/kafka/streams/integration/WordCountTest.scala +++ b/streams/integration-tests/src/test/scala/org/apache/kafka/streams/integration/WordCountTest.scala @@ -30,7 +30,7 @@ import org.apache.kafka.clients.consumer.ConsumerConfig import org.apache.kafka.clients.producer.ProducerConfig import org.apache.kafka.common.utils.{MockTime, Utils} import org.apache.kafka.common.serialization.{LongDeserializer, StringDeserializer, StringSerializer} -import org.apache.kafka.test.TestUtils +import org.apache.kafka.base.test.TestUtils import org.junit.jupiter.api.Tag import java.io.File diff --git a/streams/integration-tests/src/test/scala/org/apache/kafka/streams/integration/utils/StreamToTableJoinScalaIntegrationTestBase.scala b/streams/integration-tests/src/test/scala/org/apache/kafka/streams/integration/utils/StreamToTableJoinScalaIntegrationTestBase.scala index f3aec5784cd5d..f77a4256cda79 100644 --- a/streams/integration-tests/src/test/scala/org/apache/kafka/streams/integration/utils/StreamToTableJoinScalaIntegrationTestBase.scala +++ b/streams/integration-tests/src/test/scala/org/apache/kafka/streams/integration/utils/StreamToTableJoinScalaIntegrationTestBase.scala @@ -21,7 +21,7 @@ import org.apache.kafka.clients.producer.ProducerConfig import org.apache.kafka.common.serialization._ import org.apache.kafka.common.utils.{MockTime, Utils} import org.apache.kafka.streams._ -import org.apache.kafka.test.TestUtils +import org.apache.kafka.base.test.TestUtils import org.junit.jupiter.api._ import java.io.File diff --git a/streams/src/test/java/org/apache/kafka/streams/KafkaStreamsTest.java b/streams/src/test/java/org/apache/kafka/streams/KafkaStreamsTest.java index 11607240eb211..242af2d6346b2 100644 --- a/streams/src/test/java/org/apache/kafka/streams/KafkaStreamsTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/KafkaStreamsTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.ListOffsetsResult.ListOffsetsResultInfo; import org.apache.kafka.clients.admin.MockAdminClient; @@ -61,7 +62,6 @@ import org.apache.kafka.test.MockClientSupplier; import org.apache.kafka.test.MockMetricsReporter; import org.apache.kafka.test.MockProcessorSupplier; -import org.apache.kafka.test.TestUtils; import org.apache.logging.log4j.Level; import org.junit.jupiter.api.AfterEach; @@ -99,10 +99,10 @@ import java.util.concurrent.atomic.AtomicReference; import static java.util.Collections.singletonList; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.streams.state.QueryableStoreTypes.keyValueStore; import static org.apache.kafka.streams.utils.TestUtils.safeUniqueTestName; import static org.apache.kafka.streams.utils.TestUtils.waitForApplicationState; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/PrintedTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/PrintedTest.java index 566c99fea1763..3b6f755923db3 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/PrintedTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/PrintedTest.java @@ -17,12 +17,12 @@ package org.apache.kafka.streams.kstream; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.streams.errors.TopologyException; import org.apache.kafka.streams.kstream.internals.PrintedInternal; import org.apache.kafka.streams.processor.api.Processor; import org.apache.kafka.streams.processor.api.ProcessorSupplier; import org.apache.kafka.streams.processor.api.Record; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamSessionWindowAggregateProcessorTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamSessionWindowAggregateProcessorTest.java index d0a71c63280ce..09004a6b2333d 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamSessionWindowAggregateProcessorTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamSessionWindowAggregateProcessorTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.kstream.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; @@ -49,7 +50,6 @@ import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.MockRecordCollector; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.params.ParameterizedTest; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregateTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregateTest.java index eed3fd998e86b..8ecde7f13dedd 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregateTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregateTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.kstream.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringDeserializer; @@ -60,7 +61,6 @@ import org.apache.kafka.test.MockInitializer; import org.apache.kafka.test.MockInternalProcessorContext; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.hamcrest.Matcher; import org.junit.jupiter.params.ParameterizedTest; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableAggregateTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableAggregateTest.java index 653039db21ef2..4140173217b21 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableAggregateTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableAggregateTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.kstream.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeader; import org.apache.kafka.common.header.internals.RecordHeaders; @@ -50,7 +51,6 @@ import org.apache.kafka.test.MockInitializer; import org.apache.kafka.test.MockMapper; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableKTableForeignKeyJoinScenarioTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableKTableForeignKeyJoinScenarioTest.java index a2c564fc16a19..57c3438867f50 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableKTableForeignKeyJoinScenarioTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableKTableForeignKeyJoinScenarioTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.kstream.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.serialization.IntegerDeserializer; import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.Serdes; @@ -35,7 +36,6 @@ import org.apache.kafka.streams.state.KeyValueStore; import org.apache.kafka.streams.utils.UniqueTopicSerdeScope; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableTransformValuesTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableTransformValuesTest.java index 75a64d580ec8e..0a87d59ac6665 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableTransformValuesTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableTransformValuesTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.kstream.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; @@ -49,7 +50,6 @@ import org.apache.kafka.test.MockReducer; import org.apache.kafka.test.NoOpValueTransformerWithKeySupplier; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/SuppressScenarioTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/SuppressScenarioTest.java index 48363fe0a1a6c..015d3da711f19 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/SuppressScenarioTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/SuppressScenarioTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.kstream.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.LongDeserializer; import org.apache.kafka.common.serialization.Serde; @@ -47,7 +48,6 @@ import org.apache.kafka.streams.state.SessionStore; import org.apache.kafka.streams.state.WindowStore; import org.apache.kafka.streams.test.TestRecord; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/ForeignTableJoinProcessorSupplierTests.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/ForeignTableJoinProcessorSupplierTests.java index c3ba367a30519..9edb20a2f72c6 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/ForeignTableJoinProcessorSupplierTests.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/ForeignTableJoinProcessorSupplierTests.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.kstream.internals.foreignkeyjoin; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.common.serialization.Serdes; @@ -32,7 +33,6 @@ import org.apache.kafka.streams.state.ValueTimestampHeaders; import org.apache.kafka.test.MockInternalProcessorContext; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/SubscriptionReceiveProcessorSupplierTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/SubscriptionReceiveProcessorSupplierTest.java index 7a7fb74cd38ee..413af17875adf 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/SubscriptionReceiveProcessorSupplierTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/SubscriptionReceiveProcessorSupplierTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.streams.kstream.internals.foreignkeyjoin; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serde; @@ -36,7 +37,6 @@ import org.apache.kafka.streams.state.ValueTimestampHeaders; import org.apache.kafka.test.MockInternalProcessorContext; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/suppress/KTableSuppressProcessorMetricsTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/suppress/KTableSuppressProcessorMetricsTest.java index 728fdd72f8345..d0228456197b3 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/suppress/KTableSuppressProcessorMetricsTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/suppress/KTableSuppressProcessorMetricsTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.kstream.internals.suppress; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.serialization.Serdes; @@ -33,7 +34,6 @@ import org.apache.kafka.streams.state.internals.InMemoryTimeOrderedKeyValueChangeBuffer; import org.apache.kafka.test.MockInternalProcessorContext; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.hamcrest.Matcher; import org.junit.jupiter.api.Test; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdaterTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdaterTest.java index b6461669bd77b..a404284a34d39 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdaterTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdaterTest.java @@ -53,6 +53,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.common.utils.Utils.mkEntry; import static org.apache.kafka.common.utils.Utils.mkMap; import static org.apache.kafka.common.utils.Utils.mkObjectProperties; @@ -61,7 +62,6 @@ import static org.apache.kafka.test.StreamsTestUtils.TaskBuilder.statefulTask; import static org.apache.kafka.test.StreamsTestUtils.TaskBuilder.statelessTask; import static org.apache.kafka.test.StreamsTestUtils.TopologyMetadataBuilder.unnamedTopology; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.is; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImplTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImplTest.java index 419fdbf15626a..a86c7ff87ccec 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImplTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImplTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.processor.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.MockConsumer; @@ -43,7 +44,6 @@ import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.MockStateRestoreListener; import org.apache.kafka.test.NoOpReadOnlyStore; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateTaskTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateTaskTest.java index fedb0da6b2f26..60d8f3bba5ae7 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateTaskTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateTaskTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.processor.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.header.internals.RecordHeaders; @@ -38,7 +39,6 @@ import org.apache.kafka.test.MockProcessorNode; import org.apache.kafka.test.MockSourceNode; import org.apache.kafka.test.NoOpProcessorContext; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStreamThreadTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStreamThreadTest.java index 7c0216cd07f58..ebdaa6e9a6c13 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStreamThreadTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStreamThreadTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.processor.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.InvalidOffsetException; import org.apache.kafka.clients.consumer.MockConsumer; import org.apache.kafka.clients.consumer.internals.AutoOffsetResetStrategy; @@ -43,7 +44,6 @@ import org.apache.kafka.streams.state.KeyValueStore; import org.apache.kafka.streams.state.StoreBuilder; import org.apache.kafka.test.MockStateRestoreListener; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/NamedTopologyTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/NamedTopologyTest.java index 43a59b7057c48..5de9505405148 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/NamedTopologyTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/NamedTopologyTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.processor.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.errors.TopologyException; @@ -27,7 +28,6 @@ import org.apache.kafka.streams.processor.internals.namedtopology.NamedTopologyBuilder; import org.apache.kafka.streams.processor.internals.namedtopology.NamedTopologyStoreQueryParameters; import org.apache.kafka.streams.state.Stores; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorStateManagerTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorStateManagerTest.java index f2a96bffa3ed8..7a418bf9ab598 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorStateManagerTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorStateManagerTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.processor.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.utils.LogCaptureAppender; @@ -43,7 +44,6 @@ import org.apache.kafka.test.MockCachedKeyValueStore; import org.apache.kafka.test.MockKeyValueStore; import org.apache.kafka.test.MockRestoreCallback; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorTopologyTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorTopologyTest.java index e77891bb531a9..3b3aa5476aa40 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorTopologyTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorTopologyTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.processor.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.Headers; @@ -47,7 +48,6 @@ import org.apache.kafka.streams.state.Stores; import org.apache.kafka.streams.test.TestRecord; import org.apache.kafka.test.MockApiProcessorSupplier; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StandbyTaskTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StandbyTaskTest.java index 7d3f0fb573ab8..88ff231c31c96 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StandbyTaskTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StandbyTaskTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.processor.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.Node; import org.apache.kafka.common.PartitionInfo; @@ -43,7 +44,6 @@ import org.apache.kafka.test.MockKeyValueStoreBuilder; import org.apache.kafka.test.MockRestoreConsumer; import org.apache.kafka.test.MockTimestampExtractor; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateDirectoryTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateDirectoryTest.java index 6e2250ead51f1..6846b3d23620a 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateDirectoryTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateDirectoryTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.processor.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.LogContext; @@ -29,7 +30,6 @@ import org.apache.kafka.streams.processor.internals.StateDirectory.TaskDirectory; import org.apache.kafka.streams.state.internals.OffsetCheckpoint; import org.apache.kafka.test.MockKeyValueStore; -import org.apache.kafka.test.TestUtils; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateManagerUtilTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateManagerUtilTest.java index 98ec0f1a64b4a..7042e326bb3f4 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateManagerUtilTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateManagerUtilTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.processor.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.errors.LockException; @@ -24,7 +25,6 @@ import org.apache.kafka.streams.processor.TaskId; import org.apache.kafka.streams.processor.internals.Task.TaskType; import org.apache.kafka.test.MockKeyValueStore; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamTaskTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamTaskTest.java index a79d178e2a94c..e2665e6a66d66 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamTaskTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamTaskTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.processor.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.InvalidOffsetException; @@ -76,7 +77,6 @@ import org.apache.kafka.test.MockProcessorNode; import org.apache.kafka.test.MockSourceNode; import org.apache.kafka.test.MockTimestampExtractor; -import org.apache.kafka.test.TestUtils; import org.apache.logging.log4j.Level; import org.hamcrest.Matchers; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamThreadTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamThreadTest.java index 21e06b19cc129..6803f6b9a7008 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamThreadTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamThreadTest.java @@ -16,6 +16,8 @@ */ package org.apache.kafka.streams.processor.internals; +import org.apache.kafka.base.test.TestCondition; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.MockAdminClient; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerGroupMetadata; @@ -101,8 +103,6 @@ import org.apache.kafka.test.MockStateRestoreListener; import org.apache.kafka.test.MockTimestampExtractor; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestCondition; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -142,13 +142,13 @@ import static java.util.Collections.emptySet; import static java.util.Collections.singleton; import static java.util.Collections.singletonMap; +import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.apache.kafka.common.utils.Utils.mkEntry; import static org.apache.kafka.common.utils.Utils.mkMap; import static org.apache.kafka.common.utils.Utils.mkProperties; import static org.apache.kafka.streams.processor.internals.ClientUtils.adminClientId; import static org.apache.kafka.test.StreamsTestUtils.TaskBuilder.statelessTask; -import static org.apache.kafka.test.TestUtils.DEFAULT_MAX_WAIT_MS; -import static org.apache.kafka.test.TestUtils.waitForCondition; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.startsWith; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutorTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutorTest.java index d43670429b135..726f909b201e1 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutorTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutorTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.processor.internals.tasks; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.KafkaFuture; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.utils.MockTime; @@ -24,7 +25,6 @@ import org.apache.kafka.streams.processor.TaskId; import org.apache.kafka.streams.processor.internals.StreamTask; import org.apache.kafka.streams.processor.internals.TaskExecutionMetadata; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -33,7 +33,7 @@ import java.time.Duration; import java.util.Collections; -import static org.apache.kafka.test.TestUtils.waitForCondition; +import static org.apache.kafka.base.test.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/KeyValueStoreTestDriver.java b/streams/src/test/java/org/apache/kafka/streams/state/KeyValueStoreTestDriver.java index 8d2a330f7b127..eb55316495e40 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/KeyValueStoreTestDriver.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/KeyValueStoreTestDriver.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.producer.MockProducer; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; @@ -46,7 +47,6 @@ import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.MockRocksDbConfigSetter; import org.apache.kafka.test.MockTimestampExtractor; -import org.apache.kafka.test.TestUtils; import java.io.File; import java.util.Collections; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractDualSchemaRocksDBSegmentedBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractDualSchemaRocksDBSegmentedBytesStoreTest.java index 34405f2705c14..ca664a9b9b3c8 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractDualSchemaRocksDBSegmentedBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractDualSchemaRocksDBSegmentedBytesStoreTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; @@ -53,7 +54,6 @@ import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.MockRecordCollector; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractRocksDBSegmentedBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractRocksDBSegmentedBytesStoreTest.java index c4ab91aac1182..2e05f841381fd 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractRocksDBSegmentedBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractRocksDBSegmentedBytesStoreTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; @@ -52,7 +53,6 @@ import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.MockRecordCollector; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSegmentsTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSegmentsTest.java index d729d07f181d5..c6162473bfa1e 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSegmentsTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSegmentsTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.Serdes; @@ -29,7 +30,6 @@ import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.MockRecordCollector; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSessionBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSessionBytesStoreTest.java index 7c6c71af575b3..c36c6b16ad0e1 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSessionBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSessionBytesStoreTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; @@ -42,7 +43,6 @@ import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.MockRecordCollector; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractWindowBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractWindowBytesStoreTest.java index 56cf10aea7b0e..a5d2103774637 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractWindowBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractWindowBytesStoreTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; @@ -39,7 +40,6 @@ import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.MockRecordCollector; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemoryKeyValueStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemoryKeyValueStoreTest.java index 7af5b68e46216..c68c00dc71aac 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemoryKeyValueStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemoryKeyValueStoreTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serde; @@ -34,7 +35,6 @@ import org.apache.kafka.streams.state.StoreBuilder; import org.apache.kafka.streams.state.Stores; import org.apache.kafka.test.InternalMockProcessorContext; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemorySessionStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemorySessionStoreTest.java index b68374f878631..b5d256623a421 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemorySessionStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemorySessionStoreTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Deserializer; @@ -38,7 +39,6 @@ import org.apache.kafka.streams.state.KeyValueIterator; import org.apache.kafka.streams.state.SessionStore; import org.apache.kafka.test.InternalMockProcessorContext; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentSessionStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentSessionStoreTest.java index cbbd7ca383e6a..b549e57538ba5 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentSessionStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentSessionStoreTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Deserializer; @@ -38,7 +39,6 @@ import org.apache.kafka.streams.state.KeyValueIterator; import org.apache.kafka.streams.state.SessionStore; import org.apache.kafka.test.InternalMockProcessorContext; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentWindowStoreTest.java index 29435b12f20b8..7bb60ee53946d 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentWindowStoreTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; @@ -48,7 +49,6 @@ import org.apache.kafka.streams.state.WindowStore; import org.apache.kafka.streams.state.WindowStoreIterator; import org.apache.kafka.test.InternalMockProcessorContext; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStoreTest.java index 504b7b3e07c79..dd222334f5384 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStoreTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; @@ -39,7 +40,6 @@ import org.apache.kafka.streams.state.KeyValueStore; import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.MockRecordCollector; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreTest.java index 668ef7d21e6c9..4df8609207094 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Bytes; @@ -27,7 +28,6 @@ import org.apache.kafka.streams.state.ValueAndTimestamp; import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.MockRecordCollector; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreWithHeadersTest.java index a9b1bdd5ca29f..c38c1828a7d48 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreWithHeadersTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; @@ -29,7 +30,6 @@ import org.apache.kafka.streams.state.ValueTimestampHeaders; import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.MockRecordCollector; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreWithHeadersTest.java index 6ce3c1637d212..c986f753fe2ee 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreWithHeadersTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeader; import org.apache.kafka.common.header.internals.RecordHeaders; @@ -41,7 +42,6 @@ import org.apache.kafka.streams.state.WindowStoreIterator; import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.MockRecordCollector; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingVersionedKeyValueBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingVersionedKeyValueBytesStoreTest.java index 23550bf6acb24..3579b425b5501 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingVersionedKeyValueBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingVersionedKeyValueBytesStoreTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.Serializer; @@ -28,7 +29,6 @@ import org.apache.kafka.streams.state.VersionedBytesStore; import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.MockRecordCollector; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryWindowStoreTest.java index b9461f75d054f..f0c36cfe8f819 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryWindowStoreTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.common.serialization.Serdes; @@ -40,7 +41,6 @@ import org.apache.kafka.streams.state.WindowStoreIterator; import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/KeyValueSegmentTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/KeyValueSegmentTest.java index fa0757ac62f6d..08bc95f81c193 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/KeyValueSegmentTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/KeyValueSegmentTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.processor.TaskId; import org.apache.kafka.streams.processor.internals.metrics.StreamsMetricsImpl; import org.apache.kafka.streams.query.Position; import org.apache.kafka.streams.state.internals.metrics.RocksDBMetricsRecorder; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/LegacyCheckpointingStateStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/LegacyCheckpointingStateStoreTest.java index 16bc126de10a5..d20acd16f6373 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/LegacyCheckpointingStateStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/LegacyCheckpointingStateStoreTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.MockTime; @@ -28,7 +29,6 @@ import org.apache.kafka.streams.processor.TaskId; import org.apache.kafka.streams.processor.internals.StateDirectory; import org.apache.kafka.test.MockKeyValueStore; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ListValueStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ListValueStoreTest.java index 81d89791facc8..08890b7076a6b 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ListValueStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ListValueStoreTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.common.serialization.Serdes; @@ -29,7 +30,6 @@ import org.apache.kafka.streams.state.Stores; import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.MockRecordCollector; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.params.ParameterizedTest; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/LogicalKeyValueSegmentTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/LogicalKeyValueSegmentTest.java index bc1a49dd44fb1..8f6baac818dc4 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/LogicalKeyValueSegmentTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/LogicalKeyValueSegmentTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.Serializer; @@ -30,7 +31,6 @@ import org.apache.kafka.streams.state.internals.metrics.RocksDBMetricsRecorder; import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStoreTest.java index a50d833edffed..a4134b845fa6a 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStoreTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.Headers; @@ -48,7 +49,6 @@ import org.apache.kafka.test.KeyValueIteratorStub; import org.apache.kafka.test.MockRecordCollector; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredSessionStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredSessionStoreTest.java index 21ae08edd8985..cb3eceb6313e0 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredSessionStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredSessionStoreTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.Headers; @@ -50,7 +51,6 @@ import org.apache.kafka.test.KeyValueIteratorStub; import org.apache.kafka.test.MockRecordCollector; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreTest.java index af2b8583dd4da..8372e16678046 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.MetricConfig; import org.apache.kafka.common.metrics.Metrics; @@ -38,7 +39,6 @@ import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.MockRecordCollector; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreWithHeadersTest.java index 726054e787f9d..6d50b5584d209 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreWithHeadersTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.MetricConfig; import org.apache.kafka.common.metrics.Metrics; @@ -45,7 +46,6 @@ import org.apache.kafka.test.KeyValueIteratorStub; import org.apache.kafka.test.MockRecordCollector; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredWindowStoreTest.java index 35685a9627670..d311195270fac 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredWindowStoreTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.Headers; @@ -45,7 +46,6 @@ import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.MockRecordCollector; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/OffsetCheckpointTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/OffsetCheckpointTest.java index 903050c568b15..b4fcb54b73381 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/OffsetCheckpointTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/OffsetCheckpointTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/PlainToHeadersWindowStoreAdapterTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/PlainToHeadersWindowStoreAdapterTest.java index 6c3400c344e3b..2099e856233df 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/PlainToHeadersWindowStoreAdapterTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/PlainToHeadersWindowStoreAdapterTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serdes; @@ -36,7 +37,6 @@ import org.apache.kafka.streams.state.WindowStoreIterator; import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBSessionStoreWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBSessionStoreWithHeadersTest.java index 9acbdfef326ac..49fdfa53df4a1 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBSessionStoreWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBSessionStoreWithHeadersTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.StreamsConfig; @@ -28,7 +29,6 @@ import org.apache.kafka.streams.state.KeyValueIterator; import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBStoreTest.java index 7734646a5c29e..2c8390c6287c8 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBStoreTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; @@ -61,7 +62,6 @@ import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.MockRocksDbConfigSetter; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBufferTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBufferTest.java index e288c04517e27..8b64a675223fb 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBufferTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBufferTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.metrics.Sensor; @@ -30,7 +31,6 @@ import org.apache.kafka.streams.processor.internals.metrics.StreamsMetricsImpl; import org.apache.kafka.test.MockInternalProcessorContext; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBytesStoreTest.java index 1b465da5111e1..a0206d1b92ecf 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBytesStoreTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; @@ -27,7 +28,6 @@ import org.apache.kafka.streams.processor.internals.ProcessorRecordContext; import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.MockRecordCollector; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedSessionStoreWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedSessionStoreWithHeadersTest.java index d9647494a66d1..d81a2acd49783 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedSessionStoreWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedSessionStoreWithHeadersTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.StreamsConfig; @@ -28,7 +29,6 @@ import org.apache.kafka.streams.state.KeyValueIterator; import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedWindowStoreWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedWindowStoreWithHeadersTest.java index 13994dd36af45..b3083f448f231 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedWindowStoreWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedWindowStoreWithHeadersTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.StreamsConfig; @@ -29,7 +30,6 @@ import org.apache.kafka.streams.state.WindowStoreIterator; import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimestampedWindowStoreWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimestampedWindowStoreWithHeadersTest.java index 554f5559865a2..ff65c15eed35c 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimestampedWindowStoreWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimestampedWindowStoreWithHeadersTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.StreamsConfig; @@ -29,7 +30,6 @@ import org.apache.kafka.streams.state.WindowStoreIterator; import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBVersionedStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBVersionedStoreTest.java index 340ca7eb21642..c0e78d4d593f4 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBVersionedStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBVersionedStoreTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; @@ -34,7 +35,6 @@ import org.apache.kafka.streams.state.VersionedRecordIterator; import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/SegmentIteratorTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/SegmentIteratorTest.java index 99cd84a228480..a2fd3065521e9 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/SegmentIteratorTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/SegmentIteratorTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Bytes; @@ -26,7 +27,6 @@ import org.apache.kafka.streams.state.internals.metrics.RocksDBMetricsRecorder; import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.MockRecordCollector; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionSegmentWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionSegmentWithHeadersTest.java index 1aeba768601cc..3a415d2fc82b4 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionSegmentWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionSegmentWithHeadersTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.processor.TaskId; import org.apache.kafka.streams.processor.internals.metrics.StreamsMetricsImpl; import org.apache.kafka.streams.query.Position; import org.apache.kafka.streams.state.internals.metrics.RocksDBMetricsRecorder; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionStoreFetchTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionStoreFetchTest.java index 87770940cf82b..4cae9214f4641 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionStoreFetchTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionStoreFetchTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.common.utils.Bytes; @@ -38,7 +39,6 @@ import org.apache.kafka.streams.state.SessionBytesStoreSupplier; import org.apache.kafka.streams.state.SessionStore; import org.apache.kafka.streams.state.Stores; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/StreamThreadStateStoreProviderTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/StreamThreadStateStoreProviderTest.java index 59cd8ff8ef1c7..86a106fc99c46 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/StreamThreadStateStoreProviderTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/StreamThreadStateStoreProviderTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.MockAdminClient; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -66,7 +67,6 @@ import org.apache.kafka.streams.state.ValueAndTimestamp; import org.apache.kafka.streams.state.ValueTimestampHeaders; import org.apache.kafka.test.MockApiProcessorSupplier; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedCachingPersistentWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedCachingPersistentWindowStoreTest.java index 8a0c95279b5ee..0f89ede9af9d0 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedCachingPersistentWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedCachingPersistentWindowStoreTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; @@ -52,7 +53,6 @@ import org.apache.kafka.streams.state.internals.PrefixedWindowKeySchemas.KeyFirstWindowKeySchema; import org.apache.kafka.streams.state.internals.PrefixedWindowKeySchemas.TimeFirstWindowKeySchema; import org.apache.kafka.test.InternalMockProcessorContext; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.params.ParameterizedTest; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedKeyValueBufferTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedKeyValueBufferTest.java index 3efbfdf5b5360..54b7f743f4131 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedKeyValueBufferTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedKeyValueBufferTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.header.Header; @@ -37,7 +38,6 @@ import org.apache.kafka.streams.state.internals.TimeOrderedKeyValueBuffer.Eviction; import org.apache.kafka.test.MockInternalProcessorContext; import org.apache.kafka.test.MockRecordCollector; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedSessionStoreUpgradeTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedSessionStoreUpgradeTest.java index 9c3ef69d7f8bc..fa3dc62b6707f 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedSessionStoreUpgradeTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedSessionStoreUpgradeTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serdes; @@ -42,7 +43,6 @@ import org.apache.kafka.streams.state.SessionStore; import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreTest.java index 472e55105cfea..ed8615a1ea276 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; @@ -51,7 +52,6 @@ import org.apache.kafka.streams.state.internals.PrefixedWindowKeySchemas.KeyFirstWindowKeySchema; import org.apache.kafka.streams.state.internals.PrefixedWindowKeySchemas.TimeFirstWindowKeySchema; import org.apache.kafka.test.InternalMockProcessorContext; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.params.ParameterizedTest; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreUpgradeTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreUpgradeTest.java index 12829a3b99535..192c309ce22a3 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreUpgradeTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreUpgradeTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serdes; @@ -25,7 +26,6 @@ import org.apache.kafka.streams.state.WindowStore; import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedKeyValueStoreBuilderWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedKeyValueStoreBuilderWithHeadersTest.java index 3c150da4f3d36..cbc87773dd61a 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedKeyValueStoreBuilderWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedKeyValueStoreBuilderWithHeadersTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serdes; @@ -40,7 +41,6 @@ import org.apache.kafka.streams.state.ValueTimestampHeaders; import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentTest.java index 11f7e6c13cb41..5160ea00f0769 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.processor.TaskId; import org.apache.kafka.streams.processor.internals.metrics.StreamsMetricsImpl; import org.apache.kafka.streams.query.Position; import org.apache.kafka.streams.state.internals.metrics.RocksDBMetricsRecorder; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentWithHeadersTest.java index 007288409cfab..12a8c5fd750ba 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentWithHeadersTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.processor.TaskId; import org.apache.kafka.streams.processor.internals.metrics.StreamsMetricsImpl; import org.apache.kafka.streams.query.Position; import org.apache.kafka.streams.state.internals.metrics.RocksDBMetricsRecorder; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedToHeadersWindowStoreAdapterTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedToHeadersWindowStoreAdapterTest.java index cf1649b144c90..84a243e660b56 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedToHeadersWindowStoreAdapterTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedToHeadersWindowStoreAdapterTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serdes; @@ -37,7 +38,6 @@ import org.apache.kafka.streams.state.WindowStoreIterator; import org.apache.kafka.test.InternalMockProcessorContext; import org.apache.kafka.test.StreamsTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedWindowStoreWithHeadersSerializerSideEffectTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedWindowStoreWithHeadersSerializerSideEffectTest.java index d3b661df17ee1..f5538b56a8ede 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedWindowStoreWithHeadersSerializerSideEffectTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedWindowStoreWithHeadersSerializerSideEffectTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.serialization.Deserializer; @@ -33,7 +34,6 @@ import org.apache.kafka.streams.state.Stores; import org.apache.kafka.streams.state.TimestampedWindowStoreWithHeaders; import org.apache.kafka.streams.state.ValueTimestampHeaders; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/WindowStoreFetchTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/WindowStoreFetchTest.java index 08391465a5f0c..0a0f6ab87588b 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/WindowStoreFetchTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/WindowStoreFetchTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.streams.state.internals; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.common.utils.Bytes; @@ -38,7 +39,6 @@ import org.apache.kafka.streams.state.Stores; import org.apache.kafka.streams.state.WindowBytesStoreSupplier; import org.apache.kafka.streams.state.WindowStore; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBBlockCacheMetricsTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBBlockCacheMetricsTest.java index 819aaa200ead8..100a25b1a1a6b 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBBlockCacheMetricsTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBBlockCacheMetricsTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.state.internals.metrics; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.metrics.KafkaMetric; import org.apache.kafka.common.utils.Utils; @@ -27,7 +28,6 @@ import org.apache.kafka.streams.state.internals.RocksDBStore; import org.apache.kafka.streams.state.internals.RocksDBTimestampedStore; import org.apache.kafka.test.MockInternalProcessorContext; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/streams/src/test/java/org/apache/kafka/streams/tests/RelationalSmokeTestTest.java b/streams/src/test/java/org/apache/kafka/streams/tests/RelationalSmokeTestTest.java index bbe7d2dad0fdf..6bc53427d85bd 100644 --- a/streams/src/test/java/org/apache/kafka/streams/tests/RelationalSmokeTestTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/tests/RelationalSmokeTestTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.streams.tests; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.serialization.IntegerDeserializer; import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.TestInputTopic; import org.apache.kafka.streams.TestOutputTopic; import org.apache.kafka.streams.TopologyTestDriver; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/streams/src/test/java/org/apache/kafka/streams/tests/SmokeTestClient.java b/streams/src/test/java/org/apache/kafka/streams/tests/SmokeTestClient.java index 13b740ced0c8d..3887b3316d4b0 100644 --- a/streams/src/test/java/org/apache/kafka/streams/tests/SmokeTestClient.java +++ b/streams/src/test/java/org/apache/kafka/streams/tests/SmokeTestClient.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.tests; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.internals.KafkaThread; @@ -37,7 +38,6 @@ import org.apache.kafka.streams.kstream.Windowed; import org.apache.kafka.streams.state.Stores; import org.apache.kafka.streams.state.WindowStore; -import org.apache.kafka.test.TestUtils; import java.time.Duration; import java.time.Instant; diff --git a/streams/src/test/java/org/apache/kafka/streams/utils/TestUtils.java b/streams/src/test/java/org/apache/kafka/streams/utils/TestUtils.java index 2e13e3e6d9b62..f471ed160ca00 100644 --- a/streams/src/test/java/org/apache/kafka/streams/utils/TestUtils.java +++ b/streams/src/test/java/org/apache/kafka/streams/utils/TestUtils.java @@ -42,9 +42,9 @@ import java.util.Set; import java.util.stream.Collectors; +import static org.apache.kafka.base.test.TestUtils.retryOnExceptionWithTimeout; import static org.apache.kafka.streams.StreamsConfig.APPLICATION_ID_CONFIG; import static org.apache.kafka.streams.StreamsConfig.BOOTSTRAP_SERVERS_CONFIG; -import static org.apache.kafka.test.TestUtils.retryOnExceptionWithTimeout; import static org.hamcrest.MatcherAssert.assertThat; public class TestUtils { diff --git a/streams/src/test/java/org/apache/kafka/test/StreamsTestUtils.java b/streams/src/test/java/org/apache/kafka/test/StreamsTestUtils.java index 35b9f5aa3f639..a72312d44d140 100644 --- a/streams/src/test/java/org/apache/kafka/test/StreamsTestUtils.java +++ b/streams/src/test/java/org/apache/kafka/test/StreamsTestUtils.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.test; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.TopicPartition; diff --git a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/utils/TestDriver.scala b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/utils/TestDriver.scala index 23a24178fb941..8ec942e9c9aeb 100644 --- a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/utils/TestDriver.scala +++ b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/utils/TestDriver.scala @@ -22,7 +22,7 @@ import java.util.Properties import org.apache.kafka.common.serialization.Serde import org.apache.kafka.streams.scala.StreamsBuilder import org.apache.kafka.streams.{StreamsConfig, TestInputTopic, TestOutputTopic, TopologyTestDriver} -import org.apache.kafka.test.TestUtils +import org.apache.kafka.base.test.TestUtils trait TestDriver { def createTestDriver(builder: StreamsBuilder, initialWallClockTime: Instant = Instant.now()): TopologyTestDriver = { diff --git a/streams/test-utils/src/test/java/org/apache/kafka/streams/TopologyTestDriverTest.java b/streams/test-utils/src/test/java/org/apache/kafka/streams/TopologyTestDriverTest.java index c8651c50ec6cb..b15f19ca75c49 100644 --- a/streams/test-utils/src/test/java/org/apache/kafka/streams/TopologyTestDriverTest.java +++ b/streams/test-utils/src/test/java/org/apache/kafka/streams/TopologyTestDriverTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.Headers; @@ -55,7 +56,6 @@ import org.apache.kafka.streams.state.Stores; import org.apache.kafka.streams.state.internals.KeyValueStoreBuilder; import org.apache.kafka.streams.test.TestRecord; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/streams/test-utils/src/test/java/org/apache/kafka/streams/test/MockProcessorContextStateStoreTest.java b/streams/test-utils/src/test/java/org/apache/kafka/streams/test/MockProcessorContextStateStoreTest.java index 4ff9ffe563b28..31197d434700c 100644 --- a/streams/test-utils/src/test/java/org/apache/kafka/streams/test/MockProcessorContextStateStoreTest.java +++ b/streams/test-utils/src/test/java/org/apache/kafka/streams/test/MockProcessorContextStateStoreTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.test; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.StreamsConfig; @@ -30,7 +31,6 @@ import org.apache.kafka.streams.state.Stores; import org.apache.kafka.streams.state.WindowBytesStoreSupplier; import org.apache.kafka.streams.state.WindowStore; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/streams/test-utils/src/test/java/org/apache/kafka/streams/test/wordcount/WindowedWordCountProcessorTest.java b/streams/test-utils/src/test/java/org/apache/kafka/streams/test/wordcount/WindowedWordCountProcessorTest.java index ddd120adb5def..49dfb53f4faa2 100644 --- a/streams/test-utils/src/test/java/org/apache/kafka/streams/test/wordcount/WindowedWordCountProcessorTest.java +++ b/streams/test-utils/src/test/java/org/apache/kafka/streams/test/wordcount/WindowedWordCountProcessorTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.streams.test.wordcount; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.processor.StateStore; @@ -28,7 +29,6 @@ import org.apache.kafka.streams.processor.internals.metrics.StreamsMetricsImpl; import org.apache.kafka.streams.state.Stores; import org.apache.kafka.streams.state.WindowStore; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; diff --git a/tools/src/test/java/org/apache/kafka/tools/AbstractResetIntegrationTest.java b/tools/src/test/java/org/apache/kafka/tools/AbstractResetIntegrationTest.java index 8c7d0c55105b2..391442a53edac 100644 --- a/tools/src/test/java/org/apache/kafka/tools/AbstractResetIntegrationTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/AbstractResetIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.tools; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -41,7 +42,6 @@ import org.apache.kafka.streams.kstream.KStream; import org.apache.kafka.streams.kstream.Produced; import org.apache.kafka.streams.kstream.TimeWindows; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/tools/src/test/java/org/apache/kafka/tools/AclCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/AclCommandTest.java index bd69835dbc074..d4e3a4ff4583b 100644 --- a/tools/src/test/java/org/apache/kafka/tools/AclCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/AclCommandTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.tools; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.acl.AccessControlEntry; import org.apache.kafka.common.acl.AclBinding; import org.apache.kafka.common.acl.AclBindingFilter; @@ -36,7 +37,6 @@ import org.apache.kafka.common.utils.SecurityUtils; import org.apache.kafka.common.utils.internals.Exit; import org.apache.kafka.metadata.authorizer.StandardAuthorizer; -import org.apache.kafka.test.TestUtils; import org.apache.logging.log4j.Level; import org.junit.jupiter.api.Test; diff --git a/tools/src/test/java/org/apache/kafka/tools/ClusterToolTest.java b/tools/src/test/java/org/apache/kafka/tools/ClusterToolTest.java index 6207cc740fd0f..3bbb80bafb140 100644 --- a/tools/src/test/java/org/apache/kafka/tools/ClusterToolTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/ClusterToolTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.tools; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.MockAdminClient; import org.apache.kafka.common.test.ClusterInstance; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.Type; -import org.apache.kafka.test.TestUtils; import net.sourceforge.argparse4j.inf.ArgumentParserException; diff --git a/tools/src/test/java/org/apache/kafka/tools/ConfigCommandIntegrationTest.java b/tools/src/test/java/org/apache/kafka/tools/ConfigCommandIntegrationTest.java index 3ff74fc3d2e4a..761a319161e5a 100644 --- a/tools/src/test/java/org/apache/kafka/tools/ConfigCommandIntegrationTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/ConfigCommandIntegrationTest.java @@ -18,6 +18,7 @@ import kafka.server.KafkaBroker; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientTestUtils; import org.apache.kafka.clients.admin.AlterConfigsOptions; @@ -34,7 +35,6 @@ import org.apache.kafka.common.test.api.Type; import org.apache.kafka.common.utils.internals.Exit; import org.apache.kafka.server.common.MetadataVersion; -import org.apache.kafka.test.TestUtils; import org.mockito.Mockito; @@ -746,7 +746,7 @@ public void testUpdateBrokerConfigNotAffectedByInvalidConfig() throws Exception .map(KafkaBroker::config) .allMatch(config -> config.getInt("log.cleaner.threads") == 2), () -> "Timeout waiting for topic config propagating to broker", - org.apache.kafka.test.TestUtils.DEFAULT_MAX_WAIT_MS, + org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS, 100L); } } diff --git a/tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java index e815514aac363..0c2e5d2ea0525 100644 --- a/tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.tools; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterClientQuotasOptions; import org.apache.kafka.clients.admin.AlterClientQuotasResult; @@ -46,7 +47,6 @@ import org.apache.kafka.common.quota.ClientQuotaFilterComponent; import org.apache.kafka.common.utils.internals.Exit; import org.apache.kafka.server.config.ConfigType; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/tools/src/test/java/org/apache/kafka/tools/GetOffsetShellTest.java b/tools/src/test/java/org/apache/kafka/tools/GetOffsetShellTest.java index cf59419a10ae3..208cf48404503 100644 --- a/tools/src/test/java/org/apache/kafka/tools/GetOffsetShellTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/GetOffsetShellTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.tools; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewTopic; @@ -41,7 +42,6 @@ import org.apache.kafka.server.log.remote.storage.LocalTieredStorage; import org.apache.kafka.server.log.remote.storage.RemoteLogManagerConfig; import org.apache.kafka.storage.internals.log.LogConfig; -import org.apache.kafka.test.TestUtils; import java.time.Duration; import java.util.ArrayList; diff --git a/tools/src/test/java/org/apache/kafka/tools/GroupsCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/GroupsCommandTest.java index 36f289804bbd1..21d8d64857095 100644 --- a/tools/src/test/java/org/apache/kafka/tools/GroupsCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/GroupsCommandTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.tools; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.AdminClientTestUtils; @@ -45,7 +46,6 @@ import org.apache.kafka.streams.Topology; import org.apache.kafka.streams.kstream.KStream; import org.apache.kafka.streams.kstream.Produced; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java index 621943f695ab9..331a598605e4a 100644 --- a/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.tools; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.common.test.ClusterInstance; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTests; import org.apache.kafka.common.test.api.Type; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; diff --git a/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandUnitTest.java b/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandUnitTest.java index b3131ec3b5959..e0ae07034c6d1 100644 --- a/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandUnitTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandUnitTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.tools; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.RaftVoterEndpoint; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.metadata.properties.MetaProperties; import org.apache.kafka.metadata.properties.MetaPropertiesEnsemble; import org.apache.kafka.metadata.properties.PropertiesUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; diff --git a/tools/src/test/java/org/apache/kafka/tools/ResetIntegrationTest.java b/tools/src/test/java/org/apache/kafka/tools/ResetIntegrationTest.java index 236b942b35235..632dcb611c33e 100644 --- a/tools/src/test/java/org/apache/kafka/tools/ResetIntegrationTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/ResetIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.tools; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -27,7 +28,6 @@ import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.integration.utils.EmbeddedKafkaCluster; import org.apache.kafka.streams.integration.utils.IntegrationTestUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/tools/src/test/java/org/apache/kafka/tools/ResetIntegrationWithSslTest.java b/tools/src/test/java/org/apache/kafka/tools/ResetIntegrationWithSslTest.java index 20b65f818bf3c..eed8237549f4a 100644 --- a/tools/src/test/java/org/apache/kafka/tools/ResetIntegrationWithSslTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/ResetIntegrationWithSslTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.tools; +import org.apache.kafka.base.test.TestSslUtils; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.network.ConnectionMode; import org.apache.kafka.network.SocketServerConfigs; import org.apache.kafka.streams.integration.utils.EmbeddedKafkaCluster; -import org.apache.kafka.test.TestSslUtils; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/tools/src/test/java/org/apache/kafka/tools/ToolsTestUtils.java b/tools/src/test/java/org/apache/kafka/tools/ToolsTestUtils.java index 1321549a46076..5bd502587eeb8 100644 --- a/tools/src/test/java/org/apache/kafka/tools/ToolsTestUtils.java +++ b/tools/src/test/java/org/apache/kafka/tools/ToolsTestUtils.java @@ -166,7 +166,7 @@ public static File tempPropertiesFile(Map properties) throws IOE for (Entry entry : properties.entrySet()) { sb.append(entry.getKey() + "=" + entry.getValue() + System.lineSeparator()); } - return org.apache.kafka.test.TestUtils.tempFile(sb.toString()); + return org.apache.kafka.base.test.TestUtils.tempFile(sb.toString()); } /** diff --git a/tools/src/test/java/org/apache/kafka/tools/TopicCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/TopicCommandTest.java index 06efc3c918611..bdbfa017cd36f 100644 --- a/tools/src/test/java/org/apache/kafka/tools/TopicCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/TopicCommandTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.tools; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientTestUtils; import org.apache.kafka.clients.admin.Config; @@ -58,7 +59,6 @@ import org.apache.kafka.common.utils.internals.Exit; import org.apache.kafka.metadata.LeaderAndIsr; import org.apache.kafka.storage.internals.log.LogConfig; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/tools/src/test/java/org/apache/kafka/tools/UserScramCredentialsCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/UserScramCredentialsCommandTest.java index a5e7cfec859c9..73b218c69ad14 100644 --- a/tools/src/test/java/org/apache/kafka/tools/UserScramCredentialsCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/UserScramCredentialsCommandTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.tools; +import org.apache.kafka.base.test.NoRetryException; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.test.ClusterInstance; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.utils.internals.Exit; -import org.apache.kafka.test.NoRetryException; -import org.apache.kafka.test.TestUtils; import java.util.ArrayList; import java.util.List; diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/DeleteConsumerGroupsTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/DeleteConsumerGroupsTest.java index 2866027e2327d..9648d5960e192 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/DeleteConsumerGroupsTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/DeleteConsumerGroupsTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.tools.consumer.group; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.GroupProtocol; import org.apache.kafka.clients.consumer.KafkaConsumer; @@ -30,7 +31,6 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; -import org.apache.kafka.test.TestUtils; import org.apache.kafka.tools.ToolsTestUtils; import org.junit.jupiter.api.Test; diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/DeleteOffsetsConsumerGroupCommandIntegrationTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/DeleteOffsetsConsumerGroupCommandIntegrationTest.java index 265b880e4ea3c..1bfeb66c73eee 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/DeleteOffsetsConsumerGroupCommandIntegrationTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/DeleteOffsetsConsumerGroupCommandIntegrationTest.java @@ -46,12 +46,12 @@ import java.util.Map; import java.util.Map.Entry; +import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.CONSUMER_GROUP_HEARTBEAT_INTERVAL_MS_CONFIG; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.CONSUMER_GROUP_MIN_HEARTBEAT_INTERVAL_MS_CONFIG; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.GROUP_INITIAL_REBALANCE_DELAY_MS_CONFIG; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.OFFSETS_TOPIC_PARTITIONS_CONFIG; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.OFFSETS_TOPIC_REPLICATION_FACTOR_CONFIG; -import static org.apache.kafka.test.TestUtils.DEFAULT_MAX_WAIT_MS; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/DescribeConsumerGroupTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/DescribeConsumerGroupTest.java index 44f538044801f..35686d4e83d6f 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/DescribeConsumerGroupTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/DescribeConsumerGroupTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.tools.consumer.group; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; @@ -42,7 +43,6 @@ import org.apache.kafka.common.test.api.Type; import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.common.utils.internals.Exit; -import org.apache.kafka.test.TestUtils; import org.apache.kafka.tools.ToolsTestUtils; import org.junit.jupiter.api.Assertions; @@ -67,12 +67,12 @@ import java.util.stream.IntStream; import java.util.stream.Stream; +import static org.apache.kafka.base.test.TestUtils.RANDOM; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.CONSUMER_GROUP_HEARTBEAT_INTERVAL_MS_CONFIG; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.CONSUMER_GROUP_MIN_HEARTBEAT_INTERVAL_MS_CONFIG; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.GROUP_INITIAL_REBALANCE_DELAY_MS_CONFIG; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.OFFSETS_TOPIC_PARTITIONS_CONFIG; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.OFFSETS_TOPIC_REPLICATION_FACTOR_CONFIG; -import static org.apache.kafka.test.TestUtils.RANDOM; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ListConsumerGroupTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ListConsumerGroupTest.java index 896ed06706225..fc283f7b2b898 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ListConsumerGroupTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ListConsumerGroupTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.tools.consumer.group; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; @@ -34,7 +35,6 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; -import org.apache.kafka.test.TestUtils; import org.apache.kafka.tools.ToolsTestUtils; import org.junit.jupiter.api.Assertions; diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ResetConsumerGroupOffsetTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ResetConsumerGroupOffsetTest.java index 503a5bea217e9..b912c48826ffa 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ResetConsumerGroupOffsetTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ResetConsumerGroupOffsetTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.tools.consumer.group; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.consumer.GroupProtocol; @@ -36,7 +37,6 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; -import org.apache.kafka.test.TestUtils; import java.io.BufferedWriter; import java.io.File; @@ -62,6 +62,7 @@ import static java.time.LocalDateTime.now; import static java.util.stream.Collectors.toMap; +import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; import static org.apache.kafka.clients.CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG; import static org.apache.kafka.clients.admin.AdminClientConfig.RETRIES_CONFIG; import static org.apache.kafka.clients.consumer.ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG; @@ -78,7 +79,6 @@ import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.GROUP_INITIAL_REBALANCE_DELAY_MS_CONFIG; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.OFFSETS_TOPIC_PARTITIONS_CONFIG; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.OFFSETS_TOPIC_REPLICATION_FACTOR_CONFIG; -import static org.apache.kafka.test.TestUtils.DEFAULT_MAX_WAIT_MS; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/SaslClientsWithInvalidCredentialsTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/SaslClientsWithInvalidCredentialsTest.java index 3676cf4d48215..08580c2295e5d 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/SaslClientsWithInvalidCredentialsTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/SaslClientsWithInvalidCredentialsTest.java @@ -19,6 +19,7 @@ import kafka.api.AbstractSaslTest; import kafka.security.JaasTestUtils; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.consumer.Consumer; @@ -27,7 +28,6 @@ import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.common.serialization.ByteArrayDeserializer; import org.apache.kafka.metadata.storage.Formatter; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandTest.java index 8a078715fe161..cb7a002af633c 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.tools.consumer.group; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientTestUtils; import org.apache.kafka.clients.admin.AlterShareGroupOffsetsOptions; @@ -53,7 +54,6 @@ import org.apache.kafka.common.internals.KafkaFutureImpl; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.utils.internals.Exit; -import org.apache.kafka.test.TestUtils; import org.apache.kafka.tools.ToolsTestUtils; import org.apache.kafka.tools.consumer.group.ShareGroupCommand.ShareGroupService; diff --git a/tools/src/test/java/org/apache/kafka/tools/other/ReplicationQuotasTestRig.java b/tools/src/test/java/org/apache/kafka/tools/other/ReplicationQuotasTestRig.java index 8e646534263a7..2e2dfd17ebd8b 100644 --- a/tools/src/test/java/org/apache/kafka/tools/other/ReplicationQuotasTestRig.java +++ b/tools/src/test/java/org/apache/kafka/tools/other/ReplicationQuotasTestRig.java @@ -77,7 +77,7 @@ import static java.nio.file.StandardOpenOption.APPEND; import static java.nio.file.StandardOpenOption.CREATE; -import static org.apache.kafka.test.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; /** * Test rig for measuring throttling performance. Configure the parameters for a set of experiments, then execute them diff --git a/tools/src/test/java/org/apache/kafka/tools/reassign/ReassignPartitionsCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/reassign/ReassignPartitionsCommandTest.java index a71e4779a3e4e..b51e97c36d110 100644 --- a/tools/src/test/java/org/apache/kafka/tools/reassign/ReassignPartitionsCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/reassign/ReassignPartitionsCommandTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.tools.reassign; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; @@ -47,7 +48,6 @@ import org.apache.kafka.common.test.api.Type; import org.apache.kafka.common.utils.Time; import org.apache.kafka.server.config.QuotaConfig; -import org.apache.kafka.test.TestUtils; import org.apache.kafka.tools.TerseException; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/tools/src/test/java/org/apache/kafka/tools/streams/DeleteStreamsGroupOffsetTest.java b/tools/src/test/java/org/apache/kafka/tools/streams/DeleteStreamsGroupOffsetTest.java index 8b4591b99036a..76a646eda8da2 100644 --- a/tools/src/test/java/org/apache/kafka/tools/streams/DeleteStreamsGroupOffsetTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/streams/DeleteStreamsGroupOffsetTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.tools.streams; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.GroupListing; import org.apache.kafka.clients.admin.ListGroupsOptions; @@ -40,7 +41,6 @@ import org.apache.kafka.streams.kstream.KTable; import org.apache.kafka.streams.kstream.Materialized; import org.apache.kafka.streams.kstream.Produced; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/tools/src/test/java/org/apache/kafka/tools/streams/DeleteStreamsGroupTest.java b/tools/src/test/java/org/apache/kafka/tools/streams/DeleteStreamsGroupTest.java index 998b97f9582ad..3e612b298621e 100644 --- a/tools/src/test/java/org/apache/kafka/tools/streams/DeleteStreamsGroupTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/streams/DeleteStreamsGroupTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.tools.streams; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.FeatureUpdate; @@ -43,7 +44,6 @@ import org.apache.kafka.streams.kstream.KTable; import org.apache.kafka.streams.kstream.Materialized; import org.apache.kafka.streams.kstream.Produced; -import org.apache.kafka.test.TestUtils; import org.apache.kafka.tools.ToolsTestUtils; import org.junit.jupiter.api.AfterAll; diff --git a/tools/src/test/java/org/apache/kafka/tools/streams/DescribeStreamsGroupTest.java b/tools/src/test/java/org/apache/kafka/tools/streams/DescribeStreamsGroupTest.java index f03805c37d29f..5036d097d8935 100644 --- a/tools/src/test/java/org/apache/kafka/tools/streams/DescribeStreamsGroupTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/streams/DescribeStreamsGroupTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.tools.streams; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.errors.TimeoutException; @@ -29,7 +30,6 @@ import org.apache.kafka.streams.integration.utils.EmbeddedKafkaCluster; import org.apache.kafka.streams.kstream.Consumed; import org.apache.kafka.streams.kstream.Produced; -import org.apache.kafka.test.TestUtils; import org.apache.kafka.tools.ToolsTestUtils; import org.junit.jupiter.api.AfterAll; diff --git a/tools/src/test/java/org/apache/kafka/tools/streams/ListStreamsGroupTest.java b/tools/src/test/java/org/apache/kafka/tools/streams/ListStreamsGroupTest.java index 151cb5706940e..2a4b4482f27ac 100644 --- a/tools/src/test/java/org/apache/kafka/tools/streams/ListStreamsGroupTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/streams/ListStreamsGroupTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.tools.streams; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.GroupListing; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -30,7 +31,6 @@ import org.apache.kafka.streams.integration.utils.EmbeddedKafkaCluster; import org.apache.kafka.streams.kstream.Consumed; import org.apache.kafka.streams.kstream.Produced; -import org.apache.kafka.test.TestUtils; import org.apache.kafka.tools.ToolsTestUtils; import org.junit.jupiter.api.AfterAll; diff --git a/tools/src/test/java/org/apache/kafka/tools/streams/ResetStreamsGroupOffsetTest.java b/tools/src/test/java/org/apache/kafka/tools/streams/ResetStreamsGroupOffsetTest.java index fcbba67e52d11..4371a22050664 100644 --- a/tools/src/test/java/org/apache/kafka/tools/streams/ResetStreamsGroupOffsetTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/streams/ResetStreamsGroupOffsetTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.tools.streams; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.GroupListing; @@ -38,7 +39,6 @@ import org.apache.kafka.streams.kstream.KStream; import org.apache.kafka.streams.kstream.KTable; import org.apache.kafka.streams.kstream.Materialized; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/tools/src/test/java/org/apache/kafka/tools/streams/StreamsGroupCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/streams/StreamsGroupCommandTest.java index 20f6ed26e6078..461ae602ba25b 100644 --- a/tools/src/test/java/org/apache/kafka/tools/streams/StreamsGroupCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/streams/StreamsGroupCommandTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.tools.streams; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.DeleteStreamsGroupsOptions; import org.apache.kafka.clients.admin.DeleteStreamsGroupsResult; @@ -47,7 +48,6 @@ import org.apache.kafka.common.TopicPartitionInfo; import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; import org.apache.kafka.common.internals.KafkaFutureImpl; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.mockito.MockedStatic; diff --git a/transaction-coordinator/src/test/java/org/apache/kafka/coordinator/transaction/ProducerIdManagerTest.java b/transaction-coordinator/src/test/java/org/apache/kafka/coordinator/transaction/ProducerIdManagerTest.java index bd2623898f885..d7558e73001ca 100644 --- a/transaction-coordinator/src/test/java/org/apache/kafka/coordinator/transaction/ProducerIdManagerTest.java +++ b/transaction-coordinator/src/test/java/org/apache/kafka/coordinator/transaction/ProducerIdManagerTest.java @@ -16,6 +16,7 @@ */ package org.apache.kafka.coordinator.transaction; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.ClientResponse; import org.apache.kafka.common.errors.AuthenticationException; import org.apache.kafka.common.errors.CoordinatorLoadInProgressException; @@ -27,7 +28,6 @@ import org.apache.kafka.common.utils.Time; import org.apache.kafka.server.common.NodeToControllerChannelManager; import org.apache.kafka.server.common.ProducerIdsBlock; -import org.apache.kafka.test.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/agent/AgentTest.java b/trogdor/src/test/java/org/apache/kafka/trogdor/agent/AgentTest.java index 3780a8fd36d46..0eda89f973fd3 100644 --- a/trogdor/src/test/java/org/apache/kafka/trogdor/agent/AgentTest.java +++ b/trogdor/src/test/java/org/apache/kafka/trogdor/agent/AgentTest.java @@ -17,9 +17,9 @@ package org.apache.kafka.trogdor.agent; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Utils; -import org.apache.kafka.test.TestUtils; import org.apache.kafka.trogdor.basic.BasicNode; import org.apache.kafka.trogdor.basic.BasicPlatform; import org.apache.kafka.trogdor.basic.BasicTopology; diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/basic/BasicPlatformTest.java b/trogdor/src/test/java/org/apache/kafka/trogdor/basic/BasicPlatformTest.java index eaba1124fd60f..e34f743d91e2f 100644 --- a/trogdor/src/test/java/org/apache/kafka/trogdor/basic/BasicPlatformTest.java +++ b/trogdor/src/test/java/org/apache/kafka/trogdor/basic/BasicPlatformTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.trogdor.basic; -import org.apache.kafka.test.TestUtils; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.trogdor.common.Platform; import org.junit.jupiter.api.Test; diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/common/ExpectedTasks.java b/trogdor/src/test/java/org/apache/kafka/trogdor/common/ExpectedTasks.java index 87f818018c80e..d17ec4ab10adb 100644 --- a/trogdor/src/test/java/org/apache/kafka/trogdor/common/ExpectedTasks.java +++ b/trogdor/src/test/java/org/apache/kafka/trogdor/common/ExpectedTasks.java @@ -17,7 +17,7 @@ package org.apache.kafka.trogdor.common; -import org.apache.kafka.test.TestUtils; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.trogdor.agent.AgentClient; import org.apache.kafka.trogdor.coordinator.CoordinatorClient; import org.apache.kafka.trogdor.rest.AgentStatusResponse; diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/common/JsonUtilTest.java b/trogdor/src/test/java/org/apache/kafka/trogdor/common/JsonUtilTest.java index 8f42d043311c4..1b11220925ef2 100644 --- a/trogdor/src/test/java/org/apache/kafka/trogdor/common/JsonUtilTest.java +++ b/trogdor/src/test/java/org/apache/kafka/trogdor/common/JsonUtilTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.trogdor.common; -import org.apache.kafka.test.TestUtils; +import org.apache.kafka.base.test.TestUtils; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/coordinator/CoordinatorTest.java b/trogdor/src/test/java/org/apache/kafka/trogdor/coordinator/CoordinatorTest.java index 866c8cb48c0d4..e511fe7383b83 100644 --- a/trogdor/src/test/java/org/apache/kafka/trogdor/coordinator/CoordinatorTest.java +++ b/trogdor/src/test/java/org/apache/kafka/trogdor/coordinator/CoordinatorTest.java @@ -17,8 +17,8 @@ package org.apache.kafka.trogdor.coordinator; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.utils.MockTime; -import org.apache.kafka.test.TestUtils; import org.apache.kafka.trogdor.agent.AgentClient; import org.apache.kafka.trogdor.common.CapturingCommandRunner; import org.apache.kafka.trogdor.common.ExpectedTasks; diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/workload/ExternalCommandWorkerTest.java b/trogdor/src/test/java/org/apache/kafka/trogdor/workload/ExternalCommandWorkerTest.java index ec0dc7fe51907..c2ae1385f434b 100644 --- a/trogdor/src/test/java/org/apache/kafka/trogdor/workload/ExternalCommandWorkerTest.java +++ b/trogdor/src/test/java/org/apache/kafka/trogdor/workload/ExternalCommandWorkerTest.java @@ -17,9 +17,9 @@ package org.apache.kafka.trogdor.workload; +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.internals.KafkaFutureImpl; import org.apache.kafka.common.utils.internals.OperatingSystem; -import org.apache.kafka.test.TestUtils; import org.apache.kafka.trogdor.task.AgentWorkerStatusTracker; import org.apache.kafka.trogdor.task.WorkerStatusTracker; From c5a2bff16f382ffdbd62615e5d4d28784e48e6ef Mon Sep 17 00:00:00 2001 From: Igor Soarez Date: Sat, 2 May 2026 08:54:07 +0100 Subject: [PATCH 03/10] Tighten dependencies and checkstyle rules --- build.gradle | 5 ----- checkstyle/import-control-coordinator-common.xml | 1 - checkstyle/import-control-group-coordinator.xml | 1 - checkstyle/import-control-metadata.xml | 3 --- checkstyle/import-control-server-common.xml | 3 --- checkstyle/import-control-storage.xml | 5 +---- checkstyle/import-control-transaction-coordinator.xml | 1 - checkstyle/import-control.xml | 3 --- 8 files changed, 1 insertion(+), 21 deletions(-) diff --git a/build.gradle b/build.gradle index f29de414ddac0..f691217a9a56d 100644 --- a/build.gradle +++ b/build.gradle @@ -1120,7 +1120,6 @@ project(':core') { implementation libs.slf4jApi implementation libs.re2j - testImplementation project(':clients').sourceSets.test.output testImplementation project(':group-coordinator').sourceSets.test.output testImplementation project(':share-coordinator').sourceSets.test.output testImplementation project(':metadata').sourceSets.test.output @@ -2314,7 +2313,6 @@ project(':storage:storage-api') { implementation libs.slf4jApi testImplementation project(':clients') - testImplementation project(':clients').sourceSets.test.output testImplementation project(':test-common:test-common-base') testImplementation libs.junitJupiter testImplementation libs.mockitoCore @@ -2714,7 +2712,6 @@ project(':shell') { implementation libs.jacksonJakartarsJsonProvider testImplementation project(':clients') - testImplementation project(':clients').sourceSets.test.output testImplementation project(':core') testImplementation project(':server-common') testImplementation project(':server-common').sourceSets.test.output @@ -2910,7 +2907,6 @@ project(':streams:streams-scala') { api libs.scalaLibrary testImplementation project(':streams').sourceSets.test.output - testImplementation project(':clients').sourceSets.test.output testImplementation project(':streams:test-utils') testImplementation project(':test-common:test-common-base') @@ -2963,7 +2959,6 @@ project(':streams:integration-tests') { implementation libs.slf4jApi implementation libs.scalaLibrary - testImplementation project(':clients').sourceSets.test.output testImplementation project(':group-coordinator') testImplementation project(':server') testImplementation project(':server-common') diff --git a/checkstyle/import-control-coordinator-common.xml b/checkstyle/import-control-coordinator-common.xml index 4271b781b6f66..1e7d87d535694 100644 --- a/checkstyle/import-control-coordinator-common.xml +++ b/checkstyle/import-control-coordinator-common.xml @@ -66,7 +66,6 @@ - diff --git a/checkstyle/import-control-group-coordinator.xml b/checkstyle/import-control-group-coordinator.xml index ed93b0bdafe3e..8324192688960 100644 --- a/checkstyle/import-control-group-coordinator.xml +++ b/checkstyle/import-control-group-coordinator.xml @@ -73,7 +73,6 @@ - diff --git a/checkstyle/import-control-metadata.xml b/checkstyle/import-control-metadata.xml index 8b03214763f56..e50a6ce28d38e 100644 --- a/checkstyle/import-control-metadata.xml +++ b/checkstyle/import-control-metadata.xml @@ -90,7 +90,6 @@ - @@ -119,7 +118,6 @@ - @@ -165,7 +163,6 @@ - diff --git a/checkstyle/import-control-server-common.xml b/checkstyle/import-control-server-common.xml index 06bd76c268877..7497c9f9d38d8 100644 --- a/checkstyle/import-control-server-common.xml +++ b/checkstyle/import-control-server-common.xml @@ -54,7 +54,6 @@ - @@ -64,7 +63,6 @@ - @@ -113,7 +111,6 @@ - diff --git a/checkstyle/import-control-storage.xml b/checkstyle/import-control-storage.xml index 06b59c061f796..289cc11b1c05a 100644 --- a/checkstyle/import-control-storage.xml +++ b/checkstyle/import-control-storage.xml @@ -65,7 +65,6 @@ - @@ -102,7 +101,6 @@ - @@ -137,7 +135,6 @@ - @@ -146,7 +143,7 @@ - + diff --git a/checkstyle/import-control-transaction-coordinator.xml b/checkstyle/import-control-transaction-coordinator.xml index 2c5c856af17e7..d80062b1e9059 100644 --- a/checkstyle/import-control-transaction-coordinator.xml +++ b/checkstyle/import-control-transaction-coordinator.xml @@ -37,7 +37,6 @@ - diff --git a/checkstyle/import-control.xml b/checkstyle/import-control.xml index f2946bef39731..8d36d81e44feb 100644 --- a/checkstyle/import-control.xml +++ b/checkstyle/import-control.xml @@ -369,7 +369,6 @@ - @@ -477,7 +476,6 @@ - @@ -490,7 +488,6 @@ - From fe31ac20eea7afd2d1c410f3bc66293e2fcc9a98 Mon Sep 17 00:00:00 2001 From: Igor Soarez Date: Sat, 2 May 2026 10:18:39 +0100 Subject: [PATCH 04/10] Merge trunk --- build.gradle | 2 + checkstyle/import-control-jmh-benchmarks.xml | 1 + .../clients/consumer/ConsumerBounceTest.java | 2 +- .../org/apache/kafka/clients/ClientUtils.java | 2 +- .../clients/ClusterConnectionStates.java | 2 +- .../kafka/clients/FetchSessionHandler.java | 2 +- .../org/apache/kafka/clients/Metadata.java | 2 +- .../apache/kafka/clients/NetworkClient.java | 2 +- .../kafka/clients/admin/KafkaAdminClient.java | 4 +- .../internals/AbortTransactionHandler.java | 2 +- .../admin/internals/AdminApiDriver.java | 2 +- .../admin/internals/AdminMetadataManager.java | 2 +- .../admin/internals/AllBrokersStrategy.java | 2 +- .../AlterConsumerGroupOffsetsHandler.java | 2 +- .../AlterShareGroupOffsetsHandler.java | 2 +- .../admin/internals/CoordinatorStrategy.java | 2 +- .../DeleteConsumerGroupOffsetsHandler.java | 2 +- .../DeleteConsumerGroupsHandler.java | 2 +- .../admin/internals/DeleteGroupsHandler.java | 2 +- .../admin/internals/DeleteRecordsHandler.java | 2 +- .../DeleteShareGroupOffsetsHandler.java | 2 +- .../internals/DeleteShareGroupsHandler.java | 2 +- .../DescribeClassicGroupsHandler.java | 2 +- .../DescribeConsumerGroupsHandler.java | 2 +- .../internals/DescribeProducersHandler.java | 2 +- .../internals/DescribeShareGroupsHandler.java | 2 +- .../DescribeStreamsGroupsHandler.java | 2 +- .../DescribeTransactionsHandler.java | 2 +- .../internals/FenceProducersHandler.java | 2 +- .../ListConsumerGroupOffsetsHandler.java | 2 +- .../admin/internals/ListOffsetsHandler.java | 2 +- .../ListShareGroupOffsetsHandler.java | 2 +- .../internals/ListTransactionsHandler.java | 2 +- .../internals/PartitionLeaderStrategy.java | 2 +- ...RemoveMembersFromConsumerGroupHandler.java | 2 +- .../kafka/clients/consumer/KafkaConsumer.java | 2 +- .../clients/consumer/KafkaShareConsumer.java | 2 +- .../kafka/clients/consumer/MockConsumer.java | 2 +- .../clients/consumer/MockShareConsumer.java | 2 +- .../internals/AbstractCoordinator.java | 2 +- .../consumer/internals/AbstractFetch.java | 2 +- .../AbstractHeartbeatRequestManager.java | 2 +- .../consumer/internals/AsyncClient.java | 2 +- .../internals/AsyncKafkaConsumer.java | 4 +- .../internals/ClassicKafkaConsumer.java | 4 +- .../internals/CommitRequestManager.java | 2 +- .../internals/ConsumerCoordinator.java | 2 +- .../internals/ConsumerDelegateCreator.java | 2 +- .../ConsumerHeartbeatRequestManager.java | 2 +- .../internals/ConsumerMembershipManager.java | 2 +- .../consumer/internals/ConsumerMetadata.java | 2 +- .../internals/ConsumerNetworkClient.java | 2 +- .../internals/ConsumerNetworkThread.java | 2 +- .../ConsumerRebalanceListenerInvoker.java | 2 +- .../consumer/internals/ConsumerUtils.java | 2 +- .../internals/CoordinatorRequestManager.java | 2 +- .../consumer/internals/FetchBuffer.java | 2 +- .../consumer/internals/FetchCollector.java | 2 +- .../internals/FetchRequestManager.java | 2 +- .../clients/consumer/internals/Fetcher.java | 2 +- .../clients/consumer/internals/Heartbeat.java | 2 +- .../internals/HeartbeatRequestState.java | 2 +- .../internals/NetworkClientDelegate.java | 2 +- .../consumer/internals/OffsetFetcher.java | 2 +- .../internals/OffsetFetcherUtils.java | 2 +- .../OffsetsForLeaderEpochClient.java | 2 +- .../internals/OffsetsRequestManager.java | 2 +- .../internals/PositionsValidator.java | 2 +- .../consumer/internals/RequestManagers.java | 2 +- .../consumer/internals/RequestState.java | 2 +- .../internals/ShareCompletedFetch.java | 2 +- .../internals/ShareConsumeRequestManager.java | 2 +- .../ShareConsumerDelegateCreator.java | 2 +- .../consumer/internals/ShareConsumerImpl.java | 4 +- .../internals/ShareConsumerMetadata.java | 2 +- .../consumer/internals/ShareFetchBuffer.java | 2 +- .../internals/ShareFetchCollector.java | 2 +- .../ShareHeartbeatRequestManager.java | 2 +- .../internals/ShareMembershipManager.java | 2 +- .../internals/ShareSessionHandler.java | 2 +- .../StreamsGroupHeartbeatRequestManager.java | 2 +- .../internals/StreamsMembershipManager.java | 2 +- .../StreamsRebalanceListenerInvoker.java | 2 +- .../consumer/internals/SubscriptionState.java | 2 +- .../consumer/internals/TimedRequestState.java | 2 +- .../internals/TopicMetadataFetcher.java | 2 +- .../TopicMetadataRequestManager.java | 2 +- .../events/ApplicationEventHandler.java | 2 +- .../events/ApplicationEventProcessor.java | 2 +- .../events/CompletableEventReaper.java | 2 +- .../kafka/clients/producer/KafkaProducer.java | 4 +- .../internals/BuiltInPartitioner.java | 2 +- .../producer/internals/ProducerMetadata.java | 2 +- .../producer/internals/RecordAccumulator.java | 2 +- .../clients/producer/internals/Sender.java | 2 +- .../internals/TransactionManager.java | 2 +- .../producer/internals/TxnPartitionMap.java | 2 +- .../kafka/common/network/ChannelBuilders.java | 2 +- .../common/network/SaslChannelBuilder.java | 2 +- .../apache/kafka/common/network/Selector.java | 2 +- .../common/network/SslTransportLayer.java | 2 +- .../common/requests/ApiVersionsRequest.java | 2 +- .../security/authenticator/LoginManager.java | 2 +- .../SaslClientAuthenticator.java | 2 +- .../security/ssl/DefaultSslEngineFactory.java | 2 +- .../kafka/common/security/ssl/SslFactory.java | 2 +- .../utils/{ => internals}/AppInfoParser.java | 3 +- .../utils/{ => internals}/ConfigUtils.java | 2 +- .../utils/{ => internals}/LogContext.java | 2 +- .../utils/{ => internals}/SecurityUtils.java | 2 +- .../kafka/server/authorizer/Authorizer.java | 2 +- .../clients/ClusterConnectionStatesTest.java | 2 +- .../clients/FetchSessionHandlerTest.java | 8 +- .../apache/kafka/clients/MetadataTest.java | 2 +- .../kafka/clients/NetworkClientTest.java | 2 +- .../clients/admin/AdminClientUnitTestEnv.java | 2 +- .../AbortTransactionHandlerTest.java | 2 +- .../admin/internals/AdminApiDriverTest.java | 2 +- .../internals/AdminMetadataManagerTest.java | 2 +- .../AllBrokersStrategyIntegrationTest.java | 2 +- .../internals/AllBrokersStrategyTest.java | 2 +- .../AlterConsumerGroupOffsetsHandlerTest.java | 2 +- .../internals/CoordinatorStrategyTest.java | 2 +- ...DeleteConsumerGroupOffsetsHandlerTest.java | 2 +- .../DeleteConsumerGroupsHandlerTest.java | 2 +- .../internals/DeleteRecordsHandlerTest.java | 2 +- .../DeleteShareGroupsHandlerTest.java | 2 +- .../DescribeConsumerGroupsHandlerTest.java | 2 +- .../DescribeProducersHandlerTest.java | 2 +- .../DescribeTransactionsHandlerTest.java | 2 +- .../internals/FenceProducersHandlerTest.java | 2 +- .../ListConsumerGroupOffsetsHandlerTest.java | 2 +- .../internals/ListOffsetsHandlerTest.java | 2 +- .../ListTransactionsHandlerTest.java | 2 +- ...artitionLeaderStrategyIntegrationTest.java | 2 +- .../PartitionLeaderStrategyTest.java | 2 +- ...veMembersFromConsumerGroupHandlerTest.java | 2 +- .../clients/consumer/KafkaConsumerTest.java | 2 +- .../KafkaShareConsumerMetricsTest.java | 2 +- .../consumer/KafkaShareConsumerTest.java | 2 +- .../internals/AbstractCoordinatorTest.java | 2 +- .../ApplicationEventHandlerTest.java | 2 +- .../internals/AsyncKafkaConsumerTest.java | 2 +- .../internals/CommitRequestManagerTest.java | 2 +- .../internals/CompletedFetchTest.java | 8 +- .../internals/ConsumerCoordinatorTest.java | 2 +- .../ConsumerHeartbeatRequestManagerTest.java | 2 +- .../ConsumerMembershipManagerTest.java | 2 +- .../internals/ConsumerMetadataTest.java | 2 +- .../internals/ConsumerNetworkClientTest.java | 2 +- .../internals/ConsumerNetworkThreadTest.java | 2 +- .../CoordinatorRequestManagerTest.java | 2 +- .../consumer/internals/FetchBufferTest.java | 2 +- .../internals/FetchCollectorTest.java | 2 +- .../internals/FetchMetricsManagerTest.java | 2 +- .../internals/FetchRequestManagerTest.java | 2 +- .../consumer/internals/FetcherTest.java | 2 +- .../internals/HeartbeatRequestStateTest.java | 2 +- .../internals/NetworkClientDelegateTest.java | 2 +- .../consumer/internals/OffsetFetcherTest.java | 2 +- .../OffsetForLeaderEpochClientTest.java | 2 +- .../internals/OffsetsRequestManagerTest.java | 2 +- .../internals/RequestManagersTest.java | 2 +- .../consumer/internals/RequestStateTest.java | 2 +- .../internals/ShareCompletedFetchTest.java | 2 +- .../ShareConsumeRequestManagerTest.java | 2 +- .../internals/ShareConsumerImplTest.java | 2 +- .../internals/ShareFetchBufferTest.java | 2 +- .../internals/ShareFetchCollectorTest.java | 2 +- .../ShareHeartbeatRequestManagerTest.java | 2 +- .../internals/ShareMembershipManagerTest.java | 2 +- .../internals/ShareSessionHandlerTest.java | 2 +- ...reamsGroupHeartbeatRequestManagerTest.java | 2 +- .../StreamsMembershipManagerTest.java | 2 +- .../StreamsRebalanceListenerInvokerTest.java | 2 +- .../internals/SubscriptionStateTest.java | 2 +- .../internals/TimedRequestStateTest.java | 2 +- .../internals/TopicMetadataFetcherTest.java | 2 +- .../TopicMetadataRequestManagerTest.java | 2 +- .../events/ApplicationEventProcessorTest.java | 2 +- .../events/CompletableEventReaperTest.java | 2 +- .../ConsumerRebalanceMetricsManagerTest.java | 2 +- .../clients/producer/KafkaProducerTest.java | 2 +- .../internals/BuiltInPartitionerTest.java | 2 +- .../internals/ProducerMetadataTest.java | 2 +- .../internals/RecordAccumulatorTest.java | 2 +- .../producer/internals/SenderTest.java | 2 +- .../internals/TransactionManagerTest.java | 2 +- .../common/network/NetworkTestUtils.java | 2 +- .../kafka/common/network/NioEchoServer.java | 2 +- .../network/SaslChannelBuilderTest.java | 2 +- .../kafka/common/network/SelectorTest.java | 2 +- .../kafka/common/network/SslSelectorTest.java | 2 +- .../common/network/SslTransportLayerTest.java | 2 +- .../network/SslTransportTls12Tls13Test.java | 2 +- .../SslVersionsTransportLayerTest.java | 2 +- .../common/requests/RequestResponseTest.java | 2 +- .../SaslAuthenticatorFailureDelayTest.java | 2 +- .../authenticator/SaslAuthenticatorTest.java | 4 +- .../SaslServerAuthenticatorTest.java | 2 +- .../{ => internals}/AppInfoParserTest.java | 3 +- .../{ => internals}/ConfigUtilsTest.java | 2 +- .../{ => internals}/SecurityUtilsTest.java | 2 +- .../storage/SimpleHeaderConverter.java | 2 +- .../connect/storage/StringConverter.java | 2 +- .../storage/SimpleHeaderConverterTest.java | 2 +- .../connect/storage/StringConverterTest.java | 2 +- .../BasicAuthSecurityRestExtension.java | 2 +- .../connect/file/FileStreamSinkConnector.java | 2 +- .../file/FileStreamSourceConnector.java | 2 +- .../kafka/connect/json/JsonConverter.java | 2 +- .../kafka/connect/json/JsonConverterTest.java | 2 +- .../mirror/MirrorCheckpointConnector.java | 2 +- .../mirror/MirrorHeartbeatConnector.java | 2 +- .../connect/mirror/MirrorSourceConnector.java | 2 +- ...ctConnectorClientConfigOverridePolicy.java | 2 +- .../connect/converters/BooleanConverter.java | 2 +- .../converters/ByteArrayConverter.java | 2 +- .../connect/converters/NumberConverter.java | 2 +- .../kafka/connect/runtime/ConnectMetrics.java | 2 +- .../distributed/DistributedHerder.java | 2 +- .../runtime/distributed/EagerAssignor.java | 2 +- .../IncrementalCooperativeAssignor.java | 2 +- .../distributed/WorkerCoordinator.java | 2 +- .../distributed/WorkerGroupMember.java | 4 +- .../runtime/rest/entities/ServerInfo.java | 2 +- .../kafka/connect/util/LoggingContext.java | 2 +- .../converters/BooleanConverterTest.java | 2 +- .../converters/ByteArrayConverterTest.java | 2 +- .../converters/NumberConverterTest.java | 2 +- .../runtime/SampleConverterWithHeaders.java | 2 +- .../runtime/SampleHeaderConverter.java | 2 +- .../connect/runtime/SamplePredicate.java | 2 +- .../connect/runtime/SampleTransformation.java | 2 +- .../IncrementalCooperativeAssignorTest.java | 2 +- .../WorkerCoordinatorIncrementalTest.java | 2 +- .../distributed/WorkerCoordinatorTest.java | 2 +- .../distributed/WorkerGroupMemberTest.java | 2 +- .../ConnectorPluginsResourceTest.java | 2 +- .../rest/resources/RootResourceTest.java | 2 +- .../DefaultConstructorThrowsConverter.java | 2 +- .../NoDefaultConstructorConverter.java | 2 +- .../converters/ByteArrayConverter.java | 2 +- .../test/plugins/VersionedPredicate.java | 2 +- .../test/plugins/VersionedTransformation.java | 2 +- .../kafka/connect/tools/MockConnector.java | 2 +- .../kafka/connect/tools/MockSinkTask.java | 2 +- .../kafka/connect/tools/MockSourceTask.java | 2 +- .../connect/tools/SchemaSourceConnector.java | 2 +- .../tools/VerifiableSinkConnector.java | 2 +- .../tools/VerifiableSourceConnector.java | 2 +- .../apache/kafka/connect/transforms/Cast.java | 2 +- .../kafka/connect/transforms/DropHeaders.java | 2 +- .../connect/transforms/ExtractField.java | 2 +- .../kafka/connect/transforms/Filter.java | 2 +- .../kafka/connect/transforms/Flatten.java | 2 +- .../kafka/connect/transforms/HeaderFrom.java | 2 +- .../kafka/connect/transforms/HoistField.java | 2 +- .../kafka/connect/transforms/InsertField.java | 2 +- .../connect/transforms/InsertHeader.java | 2 +- .../kafka/connect/transforms/MaskField.java | 2 +- .../kafka/connect/transforms/RegexRouter.java | 2 +- .../connect/transforms/ReplaceField.java | 2 +- .../connect/transforms/SetSchemaMetadata.java | 2 +- .../transforms/TimestampConverter.java | 2 +- .../connect/transforms/TimestampRouter.java | 2 +- .../kafka/connect/transforms/ValueToKey.java | 2 +- .../transforms/predicates/HasHeaderKey.java | 2 +- .../predicates/RecordIsTombstone.java | 2 +- .../predicates/TopicNameMatches.java | 2 +- .../kafka/connect/transforms/CastTest.java | 2 +- .../connect/transforms/DropHeadersTest.java | 2 +- .../connect/transforms/ExtractFieldTest.java | 2 +- .../kafka/connect/transforms/FlattenTest.java | 2 +- .../connect/transforms/HoistFieldTest.java | 2 +- .../connect/transforms/InsertFieldTest.java | 2 +- .../connect/transforms/InsertHeaderTest.java | 2 +- .../connect/transforms/MaskFieldTest.java | 2 +- .../connect/transforms/RegexRouterTest.java | 2 +- .../connect/transforms/ReplaceFieldTest.java | 2 +- .../transforms/SetSchemaMetadataTest.java | 2 +- .../transforms/TimestampConverterTest.java | 2 +- .../transforms/TimestampRouterTest.java | 2 +- .../connect/transforms/ValueToKeyTest.java | 2 +- .../runtime/CoordinatorExecutorImpl.java | 2 +- .../common/runtime/CoordinatorRuntime.java | 2 +- .../runtime/CoordinatorShardBuilder.java | 2 +- .../common/runtime/CoordinatorTimerImpl.java | 2 +- .../runtime/MultiThreadedEventProcessor.java | 2 +- .../runtime/SnapshottableCoordinator.java | 2 +- .../runtime/CoordinatorExecutorImplTest.java | 2 +- .../runtime/CoordinatorRuntimeTest.java | 2 +- .../runtime/CoordinatorTimerImplTest.java | 2 +- .../runtime/DeferredEventCollectionTest.java | 2 +- .../runtime/MockCoordinatorShardBuilder.java | 2 +- .../MultiThreadedEventProcessorTest.java | 2 +- .../runtime/SnapshottableCoordinatorTest.java | 2 +- .../main/java/kafka/server/NetworkUtils.java | 2 +- .../transaction/TransactionCoordinator.scala | 3 +- .../TransactionMarkerChannelManager.scala | 3 +- .../scala/kafka/network/SocketServer.scala | 3 +- .../scala/kafka/raft/KafkaRaftManager.scala | 3 +- .../kafka/server/BrokerBlockingSender.scala | 3 +- .../scala/kafka/server/BrokerServer.scala | 3 +- .../scala/kafka/server/ControllerServer.scala | 3 +- .../kafka/server/DynamicBrokerConfig.scala | 5 +- .../scala/kafka/server/KafkaRaftServer.scala | 3 +- .../kafka/server/ReplicaFetcherManager.scala | 3 +- .../scala/kafka/server/SharedServer.scala | 4 +- ...ribeTopicPartitionsRequestHandlerTest.java | 2 +- .../server/share/SharePartitionTest.java | 6 +- .../kafka/api/AuthorizerIntegrationTest.scala | 4 +- .../kafka/api/BaseAdminIntegrationTest.scala | 5 +- .../api/PlaintextAdminIntegrationTest.scala | 192 +++++++---- .../api/SaslSslAdminIntegrationTest.scala | 2 +- .../server/GssapiAuthenticationTest.scala | 3 +- .../server/RaftClusterSnapshotTest.scala | 2 +- .../server/RemoteLeaderEndPointTest.scala | 2 +- ...ransactionCoordinatorConcurrencyTest.scala | 3 +- .../TransactionCoordinatorTest.scala | 3 +- .../TransactionMarkerChannelManagerTest.scala | 3 +- .../integration/KafkaServerTestHarness.scala | 31 +- .../scala/unit/kafka/log/LogCleanerTest.scala | 6 +- .../scala/unit/kafka/log/LogTestUtils.scala | 6 +- .../unit/kafka/metrics/MetricsTest.scala | 44 ++- .../kafka/network/RequestChannelTest.scala | 49 ++- .../unit/kafka/network/SocketServerTest.scala | 1 + .../security/authorizer/AuthorizerTest.scala | 2 +- .../server/AutoTopicCreationManagerTest.scala | 3 +- .../server/DelegationTokenRequestsTest.scala | 2 +- .../GroupCoordinatorBaseRequestTest.scala | 9 +- .../unit/kafka/server/KafkaApisTest.scala | 18 +- .../kafka/server/ProduceRequestTest.scala | 301 ---------------- .../server/RegistrationTestContext.scala | 2 +- .../server/ReplicaFetcherThreadTest.scala | 3 +- .../kafka/server/ReplicaManagerTest.scala | 3 +- .../unit/kafka/server/RequestQuotaTest.scala | 2 +- .../epoch/LeaderEpochIntegrationTest.scala | 3 +- .../scala/unit/kafka/utils/TestUtils.scala | 300 +--------------- .../native-image-configs/reflect-config.json | 4 +- docs/streams/upgrade-guide.md | 4 + .../group/GroupCoordinatorService.java | 2 +- .../group/GroupCoordinatorShard.java | 2 +- .../group/GroupMetadataManager.java | 2 +- .../group/OffsetMetadataManager.java | 2 +- .../group/classic/ClassicGroup.java | 2 +- .../group/modern/consumer/ConsumerGroup.java | 2 +- .../group/streams/StreamsGroup.java | 2 +- .../GroupCoordinatorRecordHelpersTest.java | 2 +- .../group/GroupCoordinatorServiceTest.java | 2 +- .../group/GroupCoordinatorShardTest.java | 2 +- .../group/GroupMetadataManagerTest.java | 4 +- .../GroupMetadataManagerTestContext.java | 2 +- .../group/OffsetMetadataManagerTest.java | 2 +- .../group/classic/ClassicGroupTest.java | 2 +- .../GroupCoordinatorMetricsShardTest.java | 2 +- .../metrics/GroupCoordinatorMetricsTest.java | 2 +- .../modern/TargetAssignmentBuilderTest.java | 8 +- .../modern/consumer/ConsumerGroupTest.java | 2 +- .../group/modern/share/ShareGroupTest.java | 2 +- .../group/streams/StreamsGroupTest.java | 2 +- .../consumer/SubscriptionStateBenchmark.java | 2 +- ...GroupCoordinatorShardLoadingBenchmark.java | 2 +- .../coordinator/RegexResolutionBenchmark.java | 2 +- .../TransactionalOffsetFetchBenchmark.java | 2 +- .../ReplicaFetcherThreadBenchmark.java | 2 +- .../fetchsession/FetchSessionBenchmark.java | 2 +- .../ClientQuotasImageDescribeBenchmark.java | 100 ++++++ .../RecordAccumulatorFlushBenchmark.java | 2 +- .../timeline/TimelineHashMapBenchmark.java | 2 +- .../kafka/controller/AclControlManager.java | 2 +- .../controller/BrokerHeartbeatManager.java | 2 +- .../controller/ClientQuotaControlManager.java | 2 +- .../controller/ClusterControlManager.java | 2 +- .../ConfigurationControlManager.java | 2 +- .../DelegationTokenControlManager.java | 2 +- .../controller/EventPerformanceMonitor.java | 2 +- .../controller/FeatureControlManager.java | 2 +- .../controller/OffsetControlManager.java | 2 +- .../PeriodicTaskControlManager.java | 2 +- .../controller/ProducerIdControlManager.java | 2 +- .../kafka/controller/QuorumController.java | 2 +- .../controller/ReplicationControlManager.java | 2 +- .../kafka/controller/ScramControlManager.java | 2 +- .../apache/kafka/image/ClientQuotasImage.java | 127 +++++-- .../image/loader/MetadataBatchLoader.java | 2 +- .../kafka/image/loader/MetadataLoader.java | 2 +- .../publisher/BrokerRegistrationTracker.java | 2 +- .../image/publisher/SnapshotEmitter.java | 2 +- .../image/publisher/SnapshotGenerator.java | 2 +- .../kafka/metadata/DelegationTokenData.java | 2 +- .../kafka/metadata/KRaftMetadataCache.java | 2 +- .../authorizer/StandardAuthorizer.java | 2 +- .../authorizer/StandardAuthorizerData.java | 4 +- .../metadata/publisher/AclPublisher.java | 2 +- .../metadata/publisher/FeaturesPublisher.java | 2 +- .../metadata/util/SnapshotFileReader.java | 2 +- .../controller/AclControlManagerTest.java | 2 +- .../BrokerHeartbeatManagerTest.java | 2 +- .../kafka/controller/BrokerToElrsTest.java | 2 +- .../kafka/controller/BrokersToIsrsTest.java | 2 +- .../controller/ClusterControlManagerTest.java | 2 +- .../controller/FeatureControlManagerTest.java | 2 +- .../kafka/controller/MockRaftClient.java | 2 +- .../controller/MockRaftClientTestEnv.java | 2 +- .../controller/OffsetControlManagerTest.java | 2 +- .../ProducerIdControlManagerTest.java | 2 +- .../controller/QuorumControllerTest.java | 2 +- .../ReplicationControlManagerTest.java | 2 +- .../kafka/image/ClientQuotasImageTest.java | 306 +++++++++++++++++ .../kafka/image/DelegationTokenImageTest.java | 2 +- .../image/loader/MetadataBatchLoaderTest.java | 2 +- .../org/apache/kafka/raft/CandidateState.java | 2 +- .../org/apache/kafka/raft/FollowerState.java | 2 +- .../apache/kafka/raft/KafkaRaftClient.java | 2 +- .../kafka/raft/KafkaRaftClientDriver.java | 2 +- .../org/apache/kafka/raft/LeaderState.java | 2 +- .../apache/kafka/raft/ProspectiveState.java | 2 +- .../org/apache/kafka/raft/QuorumState.java | 2 +- .../org/apache/kafka/raft/ResignedState.java | 2 +- .../apache/kafka/raft/UnattachedState.java | 2 +- .../kafka/raft/internals/AddVoterHandler.java | 2 +- .../raft/internals/DefaultRequestSender.java | 2 +- .../KRaftControlRecordStateMachine.java | 2 +- .../kafka/raft/internals/KafkaRaftLog.java | 10 +- .../raft/internals/RecordsBatchReader.java | 2 +- .../kafka/raft/internals/RecordsIterator.java | 2 +- .../raft/internals/RemoveVoterHandler.java | 2 +- .../raft/internals/UpdateVoterHandler.java | 2 +- .../kafka/raft/internals/VoterSetHistory.java | 2 +- .../kafka/snapshot/RecordsSnapshotReader.java | 2 +- .../org/apache/kafka/snapshot/Snapshots.java | 2 +- .../apache/kafka/raft/CandidateStateTest.java | 2 +- .../apache/kafka/raft/FollowerStateTest.java | 2 +- .../kafka/raft/KafkaRaftClientDriverTest.java | 2 +- .../raft/KafkaRaftClientReconfigTest.java | 2 +- .../apache/kafka/raft/LeaderStateTest.java | 2 +- .../java/org/apache/kafka/raft/MockLog.java | 2 +- .../org/apache/kafka/raft/MockLogTest.java | 2 +- .../kafka/raft/ProspectiveStateTest.java | 2 +- .../apache/kafka/raft/QuorumStateTest.java | 2 +- .../kafka/raft/RaftClientTestContext.java | 2 +- .../kafka/raft/RaftEventSimulationTest.java | 2 +- .../apache/kafka/raft/ReplicatedCounter.java | 2 +- .../apache/kafka/raft/ResignedStateTest.java | 2 +- .../kafka/raft/UnattachedStateTest.java | 2 +- .../KRaftControlRecordStateMachineTest.java | 2 +- .../raft/internals/KafkaRaftMetricsTest.java | 2 +- .../internals/RecordsBatchReaderTest.java | 2 +- .../raft/internals/RecordsIteratorTest.java | 2 +- .../raft/internals/VoterSetHistoryTest.java | 2 +- .../snapshot/RecordsSnapshotWriterTest.java | 2 +- .../snapshot/SnapshotWriterReaderTest.java | 2 +- .../kafka/deferred/DeferredEventQueue.java | 2 +- .../apache/kafka/queue/KafkaEventQueue.java | 2 +- .../server/network/EndpointReadyFutures.java | 2 +- .../kafka/server/util/CommandLineUtils.java | 2 +- .../kafka/server/util/ShutdownableThread.java | 2 +- .../kafka/timeline/SnapshotRegistry.java | 2 +- .../deferred/DeferredEventQueueTest.java | 2 +- .../kafka/queue/KafkaEventQueueTest.java | 2 +- .../kafka/timeline/SnapshotRegistryTest.java | 2 +- .../timeline/SnapshottableHashTableTest.java | 2 +- .../kafka/timeline/TimelineHashMapTest.java | 2 +- .../kafka/timeline/TimelineHashSetTest.java | 2 +- .../kafka/timeline/TimelineIntegerTest.java | 2 +- .../kafka/timeline/TimelineLongTest.java | 2 +- .../kafka/timeline/TimelineObjectTest.java | 2 +- .../timeline/TrackingSnapshotRegistry.java | 2 +- .../kafka/server/AssignmentsManager.java | 2 +- .../kafka/server/BrokerLifecycleManager.java | 2 +- .../kafka/server/FetchSessionCacheShard.java | 2 +- .../NodeToControllerChannelManagerImpl.java | 2 +- .../ControllerRegistrationManager.java | 2 +- .../kafka/server/purgatory/DelayedFuture.java | 2 +- .../kafka/server/KRaftTopicCreatorTest.java | 2 +- .../server/requests/ProduceRequestTest.java | 322 ++++++++++++++++++ .../share/ShareCoordinatorService.java | 2 +- .../share/ShareCoordinatorShard.java | 2 +- .../ShareCoordinatorOffsetsManagerTest.java | 2 +- .../share/ShareCoordinatorServiceTest.java | 2 +- .../share/ShareCoordinatorShardTest.java | 2 +- .../metrics/ShareCoordinatorMetricsTest.java | 2 +- .../kafka/shell/node/LocalShellNode.java | 2 +- ...icBasedRemoteLogMetadataManagerConfig.java | 2 +- .../log/remote/storage/RemoteLogManager.java | 2 +- .../checkpoint/CleanShutdownFileHandler.java | 2 +- .../internals/epoch/LeaderEpochFileCache.java | 2 +- .../kafka/storage/internals/log/Cleaner.java | 2 +- .../kafka/storage/internals/log/LocalLog.java | 2 +- .../storage/internals/log/LogCleaner.java | 2 +- .../storage/internals/log/LogConfig.java | 2 +- .../storage/internals/log/LogLoader.java | 2 +- .../internals/log/ProducerStateManager.java | 2 +- .../storage/internals/log/UnifiedLog.java | 2 +- .../remote/storage/LocalTieredStorage.java | 2 +- .../integration/IQv2StoreIntegrationTest.java | 10 +- ...fkaStreamsCloseOptionsIntegrationTest.java | 2 +- .../SuppressionDurabilityIntegrationTest.java | 4 +- .../streams/integration/WordCountTest.scala | 3 +- ...mToTableJoinScalaIntegrationTestBase.scala | 3 +- .../apache/kafka/streams/KafkaStreams.java | 2 +- .../apache/kafka/streams/kstream/KStream.java | 4 +- .../processor/internals/AbstractTask.java | 2 +- .../internals/ActiveTaskCreator.java | 2 +- .../processor/internals/ChangelogTopics.java | 2 +- .../internals/DefaultStateUpdater.java | 2 +- .../internals/GlobalStateManagerImpl.java | 2 +- .../internals/GlobalStateUpdateTask.java | 2 +- .../internals/GlobalStreamThread.java | 2 +- .../internals/InternalTopicManager.java | 2 +- .../processor/internals/PartitionGroup.java | 2 +- .../internals/ProcessorStateManager.java | 2 +- .../internals/RecordCollectorImpl.java | 2 +- .../internals/RecordDeserializer.java | 2 +- .../processor/internals/RecordQueue.java | 2 +- .../internals/RepartitionTopics.java | 2 +- .../internals/StandbyTaskCreator.java | 2 +- .../processor/internals/StateDirectory.java | 2 +- .../internals/StoreChangelogReader.java | 2 +- .../processor/internals/StreamTask.java | 2 +- .../processor/internals/StreamThread.java | 4 +- .../internals/StreamsMetadataState.java | 2 +- .../internals/StreamsPartitionAssignor.java | 8 +- .../processor/internals/StreamsProducer.java | 2 +- .../internals/TaskExecutionMetadata.java | 2 +- .../processor/internals/TaskExecutor.java | 2 +- .../processor/internals/TaskManager.java | 2 +- .../streams/processor/internals/Tasks.java | 2 +- .../processor/internals/TopologyMetadata.java | 2 +- .../assignment/AssignorConfiguration.java | 2 +- .../CopartitionedTopicsEnforcer.java | 2 +- .../processor/internals/assignment/Graph.java | 2 +- .../KafkaStreamsNamedTopologyWrapper.java | 2 +- .../RemoveNamedTopologyResult.java | 2 +- .../internals/tasks/DefaultTaskExecutor.java | 2 +- .../internals/tasks/DefaultTaskManager.java | 2 +- .../RocksDBTimeOrderedKeyValueBuffer.java | 12 +- .../RocksDBTimeOrderedSessionStore.java | 4 +- .../streams/state/internals/ThreadCache.java | 2 +- .../metrics/RocksDBMetricsRecorder.java | 2 +- .../kstream/internals/KStreamImplTest.java | 4 +- ...amSessionWindowAggregateProcessorTest.java | 2 +- .../AbstractProcessorContextTest.java | 2 +- .../internals/ActiveTaskCreatorTest.java | 2 +- .../internals/GlobalStateManagerImplTest.java | 2 +- .../internals/GlobalStateTaskTest.java | 2 +- .../internals/PartitionGroupTest.java | 2 +- .../internals/ProcessorStateManagerTest.java | 4 +- .../internals/RecordCollectorTest.java | 2 +- .../internals/RecordDeserializerTest.java | 2 +- .../processor/internals/RecordQueueTest.java | 2 +- .../processor/internals/StandbyTaskTest.java | 2 +- .../internals/StateConsumerTest.java | 2 +- .../internals/StateDirectoryTest.java | 2 +- .../internals/StateManagerUtilTest.java | 2 +- .../internals/StoreChangelogReaderTest.java | 2 +- .../processor/internals/StreamTaskTest.java | 2 +- .../processor/internals/StreamThreadTest.java | 8 +- .../internals/StreamsMetadataStateTest.java | 2 +- .../internals/StreamsProducerTest.java | 2 +- .../processor/internals/TaskExecutorTest.java | 2 +- .../processor/internals/TaskManagerTest.java | 4 +- .../processor/internals/TasksTest.java | 2 +- .../state/KeyValueStoreTestDriver.java | 2 +- ...lSchemaRocksDBSegmentedBytesStoreTest.java | 2 +- ...bstractRocksDBSegmentedBytesStoreTest.java | 2 +- .../state/internals/AbstractSegmentsTest.java | 2 +- .../AbstractSessionBytesStoreTest.java | 2 +- .../AbstractWindowBytesStoreTest.java | 2 +- .../CachingInMemoryKeyValueStoreTest.java | 2 +- .../CachingInMemorySessionStoreTest.java | 2 +- .../CachingPersistentSessionStoreTest.java | 2 +- .../CachingPersistentWindowStoreTest.java | 2 +- .../ChangeLoggingKeyValueBytesStoreTest.java | 2 +- ...gingTimestampedKeyValueBytesStoreTest.java | 2 +- ...mpedKeyValueBytesStoreWithHeadersTest.java | 2 +- ...tampedWindowBytesStoreWithHeadersTest.java | 2 +- ...oggingVersionedKeyValueBytesStoreTest.java | 2 +- .../state/internals/ListValueStoreTest.java | 2 +- ...edCacheKeyValueBytesStoreIteratorTest.java | 2 +- ...edCacheWrappedWindowStoreIteratorTest.java | 2 +- .../internals/MeteredKeyValueStoreTest.java | 2 +- .../internals/MeteredSessionStoreTest.java | 2 +- .../MeteredTimestampedWindowStoreTest.java | 2 +- ...TimestampedWindowStoreWithHeadersTest.java | 2 +- .../internals/MeteredWindowStoreTest.java | 2 +- ...ksDBTimeOrderedKeyValueBytesStoreTest.java | 2 +- .../state/internals/SegmentIteratorTest.java | 2 +- .../StreamThreadStateStoreProviderTest.java | 2 +- .../state/internals/ThreadCacheTest.java | 2 +- ...deredCachingPersistentWindowStoreTest.java | 2 +- .../internals/TimeOrderedWindowStoreTest.java | 2 +- .../kafka/streams/TopologyTestDriver.java | 2 +- .../processor/api/MockProcessorContext.java | 2 +- .../org/apache/kafka/base/test/TestUtils.java | 1 - .../org/apache/kafka/tools/AclCommand.java | 2 +- .../kafka/tools/BrokerApiVersionsCommand.java | 2 +- .../kafka/tools/DelegationTokenCommand.java | 2 +- .../apache/kafka/tools/ManifestWorkspace.java | 2 +- .../tools/PrintVersionAndExitAction.java | 2 +- .../kafka/tools/ReplicaVerificationTool.java | 2 +- .../apache/kafka/tools/AclCommandTest.java | 4 +- .../apache/kafka/tools/ConfigCommandTest.java | 5 +- .../kafka/tools/GetOffsetShellTest.java | 2 +- .../org/apache/kafka/tools/JmxToolTest.java | 2 +- .../tools/LeaderElectionCommandTest.java | 154 ++++++--- .../apache/kafka/tools/TopicCommandTest.java | 2 +- .../group/DescribeConsumerGroupTest.java | 2 +- .../streams/DescribeStreamsGroupTest.java | 72 ++-- .../kafka/trogdor/common/StringExpander.java | 2 +- .../trogdor/coordinator/NodeManager.java | 2 +- .../kafka/trogdor/rest/JsonRestServer.java | 2 +- .../kafka/trogdor/task/TaskController.java | 2 +- .../workload/ConnectionStressWorker.java | 2 +- 615 files changed, 1940 insertions(+), 1424 deletions(-) rename clients/src/main/java/org/apache/kafka/common/utils/{ => internals}/AppInfoParser.java (98%) rename clients/src/main/java/org/apache/kafka/common/utils/{ => internals}/ConfigUtils.java (98%) rename clients/src/main/java/org/apache/kafka/common/utils/{ => internals}/LogContext.java (99%) rename clients/src/main/java/org/apache/kafka/common/utils/{ => internals}/SecurityUtils.java (99%) rename clients/src/test/java/org/apache/kafka/common/utils/{ => internals}/AppInfoParserTest.java (98%) rename clients/src/test/java/org/apache/kafka/common/utils/{ => internals}/ConfigUtilsTest.java (98%) rename clients/src/test/java/org/apache/kafka/common/utils/{ => internals}/SecurityUtilsTest.java (98%) delete mode 100644 core/src/test/scala/unit/kafka/server/ProduceRequestTest.scala create mode 100644 jmh-benchmarks/src/main/java/org/apache/kafka/jmh/metadata/ClientQuotasImageDescribeBenchmark.java create mode 100644 server/src/test/java/org/apache/kafka/server/requests/ProduceRequestTest.java diff --git a/build.gradle b/build.gradle index f691217a9a56d..2d01926fc1124 100644 --- a/build.gradle +++ b/build.gradle @@ -1120,6 +1120,7 @@ project(':core') { implementation libs.slf4jApi implementation libs.re2j + testImplementation project(':clients').sourceSets.test.output testImplementation project(':group-coordinator').sourceSets.test.output testImplementation project(':share-coordinator').sourceSets.test.output testImplementation project(':metadata').sourceSets.test.output @@ -2965,6 +2966,7 @@ project(':streams:integration-tests') { testImplementation project(':server-common').sourceSets.test.output testImplementation project(':storage') testImplementation project(':streams').sourceSets.test.output + testImplementation project(':clients').sourceSets.test.output testImplementation project(':streams:streams-scala') testImplementation project(':test-common:test-common-runtime') testImplementation project(':test-common:test-common-base') diff --git a/checkstyle/import-control-jmh-benchmarks.xml b/checkstyle/import-control-jmh-benchmarks.xml index bed5f64ce96d5..df968c425038f 100644 --- a/checkstyle/import-control-jmh-benchmarks.xml +++ b/checkstyle/import-control-jmh-benchmarks.xml @@ -54,6 +54,7 @@ + diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerBounceTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerBounceTest.java index cca1babea04c7..8076c5310d21d 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerBounceTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerBounceTest.java @@ -34,7 +34,7 @@ import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.ClusterTests; import org.apache.kafka.common.test.api.Type; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; import org.apache.kafka.raft.KRaftConfigs; import org.apache.kafka.server.IntegrationTestUtils; diff --git a/clients/src/main/java/org/apache/kafka/clients/ClientUtils.java b/clients/src/main/java/org/apache/kafka/clients/ClientUtils.java index 3965701667179..c27c79be61a47 100644 --- a/clients/src/main/java/org/apache/kafka/clients/ClientUtils.java +++ b/clients/src/main/java/org/apache/kafka/clients/ClientUtils.java @@ -29,8 +29,8 @@ import org.apache.kafka.common.security.JaasContext; import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.common.telemetry.internals.ClientTelemetrySender; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java b/clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java index dbab689b09f7e..0f888bd3136ed 100644 --- a/clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java +++ b/clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java @@ -17,8 +17,8 @@ package org.apache.kafka.clients; import org.apache.kafka.common.errors.AuthenticationException; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.internals.ExponentialBackoff; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/FetchSessionHandler.java b/clients/src/main/java/org/apache/kafka/clients/FetchSessionHandler.java index 101dce5ab06fb..b5150b2d7f17e 100644 --- a/clients/src/main/java/org/apache/kafka/clients/FetchSessionHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/FetchSessionHandler.java @@ -24,7 +24,7 @@ import org.apache.kafka.common.requests.FetchMetadata; import org.apache.kafka.common.requests.FetchRequest.PartitionData; import org.apache.kafka.common.requests.FetchResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/Metadata.java b/clients/src/main/java/org/apache/kafka/clients/Metadata.java index 93bc8f8bc8382..b6244c19dc6a7 100644 --- a/clients/src/main/java/org/apache/kafka/clients/Metadata.java +++ b/clients/src/main/java/org/apache/kafka/clients/Metadata.java @@ -30,8 +30,8 @@ import org.apache.kafka.common.requests.MetadataRequest; import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.requests.MetadataResponse.PartitionMetadata; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.internals.ExponentialBackoff; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/NetworkClient.java b/clients/src/main/java/org/apache/kafka/clients/NetworkClient.java index 2194f22d63c3d..27d0655ae004e 100644 --- a/clients/src/main/java/org/apache/kafka/clients/NetworkClient.java +++ b/clients/src/main/java/org/apache/kafka/clients/NetworkClient.java @@ -45,9 +45,9 @@ import org.apache.kafka.common.requests.RequestHeader; import org.apache.kafka.common.security.authenticator.SaslClientAuthenticator; import org.apache.kafka.common.telemetry.internals.ClientTelemetrySender; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java b/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java index a221d9e52a6c6..0f59264b7eaba 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java @@ -257,13 +257,13 @@ import org.apache.kafka.common.security.token.delegation.TokenInformation; import org.apache.kafka.common.telemetry.internals.ClientTelemetryReporter; import org.apache.kafka.common.telemetry.internals.ClientTelemetryUtils; -import org.apache.kafka.common.utils.AppInfoParser; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.ProducerIdAndEpoch; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.common.utils.internals.ExponentialBackoff; import org.apache.kafka.common.utils.internals.KafkaThread; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandler.java index 80ad8da3e3e5f..88a3f086ceb24 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandler.java @@ -29,7 +29,7 @@ import org.apache.kafka.common.requests.AbstractResponse; import org.apache.kafka.common.requests.WriteTxnMarkersRequest; import org.apache.kafka.common.requests.WriteTxnMarkersResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiDriver.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiDriver.java index 0acfd289d8caf..e2d025dfaba84 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiDriver.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiDriver.java @@ -24,8 +24,8 @@ import org.apache.kafka.common.requests.AbstractResponse; import org.apache.kafka.common.requests.FindCoordinatorRequest.NoBatchedFindCoordinatorsException; import org.apache.kafka.common.requests.OffsetFetchRequest.NoBatchedOffsetFetchRequestException; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.internals.ExponentialBackoff; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminMetadataManager.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminMetadataManager.java index 0ac5419991e1b..3e92c60248e36 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminMetadataManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminMetadataManager.java @@ -27,7 +27,7 @@ import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.requests.RequestHeader; import org.apache.kafka.common.requests.RequestUtils; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategy.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategy.java index ed5f513e020c0..e2f0b36f69d79 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategy.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategy.java @@ -22,7 +22,7 @@ import org.apache.kafka.common.requests.AbstractResponse; import org.apache.kafka.common.requests.MetadataRequest; import org.apache.kafka.common.requests.MetadataResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AlterConsumerGroupOffsetsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AlterConsumerGroupOffsetsHandler.java index 99111a70d4bae..279a7999c681a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AlterConsumerGroupOffsetsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AlterConsumerGroupOffsetsHandler.java @@ -29,7 +29,7 @@ import org.apache.kafka.common.requests.FindCoordinatorRequest.CoordinatorType; import org.apache.kafka.common.requests.OffsetCommitRequest; import org.apache.kafka.common.requests.OffsetCommitResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AlterShareGroupOffsetsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AlterShareGroupOffsetsHandler.java index 9a8149d479180..3a2aecca41576 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AlterShareGroupOffsetsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AlterShareGroupOffsetsHandler.java @@ -28,7 +28,7 @@ import org.apache.kafka.common.requests.AlterShareGroupOffsetsRequest; import org.apache.kafka.common.requests.AlterShareGroupOffsetsResponse; import org.apache.kafka.common.requests.FindCoordinatorRequest; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategy.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategy.java index 46cba73e75a18..9671595748575 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategy.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategy.java @@ -26,7 +26,7 @@ import org.apache.kafka.common.requests.FindCoordinatorRequest; import org.apache.kafka.common.requests.FindCoordinatorRequest.CoordinatorType; import org.apache.kafka.common.requests.FindCoordinatorResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandler.java index ebafe634db627..d2f5611ddaaf1 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandler.java @@ -27,7 +27,7 @@ import org.apache.kafka.common.requests.FindCoordinatorRequest.CoordinatorType; import org.apache.kafka.common.requests.OffsetDeleteRequest; import org.apache.kafka.common.requests.OffsetDeleteResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandler.java index c3b248838f3d8..ab0ad7cf04c84 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandler.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.admin.internals; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; public class DeleteConsumerGroupsHandler extends DeleteGroupsHandler { diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteGroupsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteGroupsHandler.java index bf8b7a2210b54..6854737fb5491 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteGroupsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteGroupsHandler.java @@ -25,7 +25,7 @@ import org.apache.kafka.common.requests.DeleteGroupsRequest; import org.apache.kafka.common.requests.DeleteGroupsResponse; import org.apache.kafka.common.requests.FindCoordinatorRequest; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandler.java index 7a8aca79b39e3..4bfff87372228 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandler.java @@ -31,7 +31,7 @@ import org.apache.kafka.common.requests.AbstractResponse; import org.apache.kafka.common.requests.DeleteRecordsRequest; import org.apache.kafka.common.requests.DeleteRecordsResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteShareGroupOffsetsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteShareGroupOffsetsHandler.java index 9f0ab59e32cb6..04c11fdd8fd85 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteShareGroupOffsetsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteShareGroupOffsetsHandler.java @@ -26,7 +26,7 @@ import org.apache.kafka.common.requests.DeleteShareGroupOffsetsRequest; import org.apache.kafka.common.requests.DeleteShareGroupOffsetsResponse; import org.apache.kafka.common.requests.FindCoordinatorRequest; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteShareGroupsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteShareGroupsHandler.java index 9b43509d415e3..685a0df15abf7 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteShareGroupsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteShareGroupsHandler.java @@ -17,7 +17,7 @@ package org.apache.kafka.clients.admin.internals; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; public class DeleteShareGroupsHandler extends DeleteGroupsHandler { public DeleteShareGroupsHandler( diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeClassicGroupsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeClassicGroupsHandler.java index 3ff4726661be2..360bc7ff416fd 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeClassicGroupsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeClassicGroupsHandler.java @@ -33,7 +33,7 @@ import org.apache.kafka.common.requests.DescribeGroupsResponse; import org.apache.kafka.common.requests.FindCoordinatorRequest; import org.apache.kafka.common.requests.FindCoordinatorRequest.CoordinatorType; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandler.java index 9cb7f9deace15..6d1df3cdd9a6f 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandler.java @@ -40,7 +40,7 @@ import org.apache.kafka.common.requests.DescribeGroupsResponse; import org.apache.kafka.common.requests.FindCoordinatorRequest; import org.apache.kafka.common.requests.FindCoordinatorRequest.CoordinatorType; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandler.java index 526d0d227e2ca..480ef9361d416 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandler.java @@ -30,7 +30,7 @@ import org.apache.kafka.common.requests.ApiError; import org.apache.kafka.common.requests.DescribeProducersRequest; import org.apache.kafka.common.requests.DescribeProducersResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeShareGroupsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeShareGroupsHandler.java index 5ce8af38baad7..9210b672360ba 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeShareGroupsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeShareGroupsHandler.java @@ -31,7 +31,7 @@ import org.apache.kafka.common.requests.FindCoordinatorRequest.CoordinatorType; import org.apache.kafka.common.requests.ShareGroupDescribeRequest; import org.apache.kafka.common.requests.ShareGroupDescribeResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeStreamsGroupsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeStreamsGroupsHandler.java index 490ef89d4e2ad..69314e6c30fe9 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeStreamsGroupsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeStreamsGroupsHandler.java @@ -30,7 +30,7 @@ import org.apache.kafka.common.requests.FindCoordinatorRequest.CoordinatorType; import org.apache.kafka.common.requests.StreamsGroupDescribeRequest; import org.apache.kafka.common.requests.StreamsGroupDescribeResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandler.java index b68521bd0005a..7d5422e2cff0c 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandler.java @@ -30,7 +30,7 @@ import org.apache.kafka.common.requests.DescribeTransactionsResponse; import org.apache.kafka.common.requests.FindCoordinatorRequest; import org.apache.kafka.common.requests.FindCoordinatorRequest.CoordinatorType; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/FenceProducersHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/FenceProducersHandler.java index f2dea06c7b3af..abdabf7d9669b 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/FenceProducersHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/FenceProducersHandler.java @@ -26,8 +26,8 @@ import org.apache.kafka.common.requests.FindCoordinatorRequest; import org.apache.kafka.common.requests.InitProducerIdRequest; import org.apache.kafka.common.requests.InitProducerIdResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.ProducerIdAndEpoch; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandler.java index febc4033223b5..70cd181b1b2cc 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandler.java @@ -27,7 +27,7 @@ import org.apache.kafka.common.requests.OffsetFetchRequest; import org.apache.kafka.common.requests.OffsetFetchResponse; import org.apache.kafka.common.requests.RequestUtils; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandler.java index 742c8a276f03d..399cdd0c9b1f5 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandler.java @@ -32,7 +32,7 @@ import org.apache.kafka.common.requests.AbstractResponse; import org.apache.kafka.common.requests.ListOffsetsRequest; import org.apache.kafka.common.requests.ListOffsetsResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListShareGroupOffsetsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListShareGroupOffsetsHandler.java index 2d033510d7f5a..1766b6ea3ec5e 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListShareGroupOffsetsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListShareGroupOffsetsHandler.java @@ -31,7 +31,7 @@ import org.apache.kafka.common.requests.DescribeShareGroupOffsetsRequest; import org.apache.kafka.common.requests.DescribeShareGroupOffsetsResponse; import org.apache.kafka.common.requests.FindCoordinatorRequest.CoordinatorType; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandler.java index f47d9f90189a5..b4cb7182533a0 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandler.java @@ -26,7 +26,7 @@ import org.apache.kafka.common.requests.AbstractResponse; import org.apache.kafka.common.requests.ListTransactionsRequest; import org.apache.kafka.common.requests.ListTransactionsResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategy.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategy.java index e43e7914a7f53..1e913252d2562 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategy.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategy.java @@ -27,7 +27,7 @@ import org.apache.kafka.common.requests.AbstractResponse; import org.apache.kafka.common.requests.MetadataRequest; import org.apache.kafka.common.requests.MetadataResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/RemoveMembersFromConsumerGroupHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/RemoveMembersFromConsumerGroupHandler.java index 21f1543d6553c..2e51b4e816645 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/RemoveMembersFromConsumerGroupHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/RemoveMembersFromConsumerGroupHandler.java @@ -24,7 +24,7 @@ import org.apache.kafka.common.requests.FindCoordinatorRequest.CoordinatorType; import org.apache.kafka.common.requests.LeaveGroupRequest; import org.apache.kafka.common.requests.LeaveGroupResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java index 5e2f47b5b2cf0..6a939d4d95ea6 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java @@ -34,9 +34,9 @@ import org.apache.kafka.common.metrics.KafkaMetric; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Deserializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; import java.time.Duration; import java.util.Collection; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaShareConsumer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaShareConsumer.java index c26a9e97f1681..ad716ec3bd492 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaShareConsumer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaShareConsumer.java @@ -35,8 +35,8 @@ import org.apache.kafka.common.metrics.KafkaMetric; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Deserializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import java.time.Duration; import java.util.Collection; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/MockConsumer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/MockConsumer.java index 92a3435800b11..9702cd242202c 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/MockConsumer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/MockConsumer.java @@ -28,7 +28,7 @@ import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.errors.WakeupException; import org.apache.kafka.common.metrics.KafkaMetric; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import java.time.Duration; import java.util.ArrayList; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/MockShareConsumer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/MockShareConsumer.java index 3167113caaee2..83a9761098e2a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/MockShareConsumer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/MockShareConsumer.java @@ -25,7 +25,7 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.metrics.KafkaMetric; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import java.time.Duration; import java.util.ArrayList; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinator.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinator.java index 8acf9f27eb6e9..bfe848b4b5644 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinator.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinator.java @@ -69,11 +69,11 @@ import org.apache.kafka.common.requests.SyncGroupResponse; import org.apache.kafka.common.telemetry.internals.ClientTelemetryProvider; import org.apache.kafka.common.telemetry.internals.ClientTelemetryReporter; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.ExponentialBackoff; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractFetch.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractFetch.java index 9b3e0a70ab5db..e4b7ff767f711 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractFetch.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractFetch.java @@ -34,11 +34,11 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.FetchRequest; import org.apache.kafka.common.requests.FetchResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; import org.slf4j.helpers.MessageFormatter; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractHeartbeatRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractHeartbeatRequestManager.java index 8392e5032f664..8381dc8556704 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractHeartbeatRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractHeartbeatRequestManager.java @@ -28,9 +28,9 @@ import org.apache.kafka.common.errors.RetriableException; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.AbstractResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncClient.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncClient.java index 05f04cd66592f..794be65632e68 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncClient.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncClient.java @@ -20,7 +20,7 @@ import org.apache.kafka.common.Node; import org.apache.kafka.common.requests.AbstractRequest; import org.apache.kafka.common.requests.AbstractResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumer.java index 1022bf6aab3b5..08e5ce30ed601 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumer.java @@ -106,10 +106,10 @@ import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.telemetry.internals.ClientTelemetryReporter; import org.apache.kafka.common.telemetry.internals.ClientTelemetryUtils; -import org.apache.kafka.common.utils.AppInfoParser; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.AppInfoParser; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; import org.slf4j.event.Level; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ClassicKafkaConsumer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ClassicKafkaConsumer.java index 4851e54d8ac5f..2a21671f22e20 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ClassicKafkaConsumer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ClassicKafkaConsumer.java @@ -55,10 +55,10 @@ import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.telemetry.internals.ClientTelemetryReporter; import org.apache.kafka.common.telemetry.internals.ClientTelemetryUtils; -import org.apache.kafka.common.utils.AppInfoParser; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.AppInfoParser; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; import org.slf4j.event.Level; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CommitRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CommitRequestManager.java index 00c5812a5facb..7912c0c413553 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CommitRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CommitRequestManager.java @@ -46,9 +46,9 @@ import org.apache.kafka.common.requests.OffsetFetchRequest; import org.apache.kafka.common.requests.OffsetFetchResponse; import org.apache.kafka.common.requests.RequestUtils; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java index 9e999c72a65a1..1c9c231e361b8 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java @@ -66,10 +66,10 @@ import org.apache.kafka.common.requests.OffsetFetchResponse; import org.apache.kafka.common.requests.RequestUtils; import org.apache.kafka.common.telemetry.internals.ClientTelemetryReporter; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerDelegateCreator.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerDelegateCreator.java index d4ded4377b290..13a7e722b842f 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerDelegateCreator.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerDelegateCreator.java @@ -24,8 +24,8 @@ import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.serialization.Deserializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import java.util.List; import java.util.Locale; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerHeartbeatRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerHeartbeatRequestManager.java index 1f916f8b9cb49..e73523254a131 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerHeartbeatRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerHeartbeatRequestManager.java @@ -27,9 +27,9 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.ConsumerGroupHeartbeatRequest; import org.apache.kafka.common.requests.ConsumerGroupHeartbeatResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; import java.util.ArrayList; import java.util.List; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerMembershipManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerMembershipManager.java index 3266920aea55c..5084d8c73b130 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerMembershipManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerMembershipManager.java @@ -36,8 +36,8 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.ConsumerGroupHeartbeatRequest; import org.apache.kafka.common.requests.ConsumerGroupHeartbeatResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import java.util.HashMap; import java.util.Map; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerMetadata.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerMetadata.java index 677beaa5fa1c8..d2f7719dd1991 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerMetadata.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerMetadata.java @@ -21,7 +21,7 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.internals.ClusterResourceListeners; import org.apache.kafka.common.requests.MetadataRequest; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import java.util.ArrayList; import java.util.HashSet; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClient.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClient.java index 1f07bbcaa2f9a..0ef184db0c7ac 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClient.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClient.java @@ -29,9 +29,9 @@ import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.errors.WakeupException; import org.apache.kafka.common.requests.AbstractRequest; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThread.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThread.java index 02f57c4b51a60..b66857f22018a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThread.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThread.java @@ -31,10 +31,10 @@ import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.internals.IdempotentCloser; import org.apache.kafka.common.requests.AbstractRequest; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.internals.KafkaThread; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerRebalanceListenerInvoker.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerRebalanceListenerInvoker.java index 3f66b6ce3c383..8cb8bdcdd5091 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerRebalanceListenerInvoker.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerRebalanceListenerInvoker.java @@ -22,8 +22,8 @@ import org.apache.kafka.common.errors.InterruptException; import org.apache.kafka.common.errors.WakeupException; import org.apache.kafka.common.metrics.Sensor; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerUtils.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerUtils.java index 2f715e206cc07..8c22b42bb03db 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerUtils.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerUtils.java @@ -37,9 +37,9 @@ import org.apache.kafka.common.metrics.MetricsReporter; import org.apache.kafka.common.metrics.Sensor; import org.apache.kafka.common.telemetry.internals.ClientTelemetrySender; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManager.java index 2c9c72e052040..872b213ad6a54 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManager.java @@ -26,7 +26,7 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.FindCoordinatorRequest; import org.apache.kafka.common.requests.FindCoordinatorResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchBuffer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchBuffer.java index 6cf5bc301b370..8f5184f8356d9 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchBuffer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchBuffer.java @@ -19,8 +19,8 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.InterruptException; import org.apache.kafka.common.internals.IdempotentCloser; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchCollector.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchCollector.java index 9765d1a0387c3..17a02d4cfe936 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchCollector.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchCollector.java @@ -26,8 +26,8 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.record.internal.RecordBatch; import org.apache.kafka.common.requests.FetchResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchRequestManager.java index e7139657d5abf..5b90fa2b48a8d 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchRequestManager.java @@ -25,8 +25,8 @@ import org.apache.kafka.clients.consumer.internals.events.CreateFetchRequestsEvent; import org.apache.kafka.common.Node; import org.apache.kafka.common.requests.FetchRequest; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import java.util.List; import java.util.Map; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java index f23c81383b559..eaa9a4628bc2e 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java @@ -25,9 +25,9 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.internals.IdempotentCloser; import org.apache.kafka.common.requests.FetchRequest; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Heartbeat.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Heartbeat.java index 0700a531ce0a3..aa7a6b89acf3d 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Heartbeat.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Heartbeat.java @@ -18,10 +18,10 @@ import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.GroupRebalanceConfig; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.internals.ExponentialBackoff; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestState.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestState.java index 14b3650a5d1bc..bdb66c4a10d4b 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestState.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestState.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; /** * Represents the state of a heartbeat request, including logic for timing, retries, and exponential backoff. diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegate.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegate.java index 42c1c73acb565..aaaca46fda619 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegate.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegate.java @@ -37,9 +37,9 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.AbstractRequest; import org.apache.kafka.common.telemetry.internals.ClientTelemetrySender; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcher.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcher.java index b97a4a3cde785..9bef1d61cd882 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcher.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcher.java @@ -34,9 +34,9 @@ import org.apache.kafka.common.message.ListOffsetsRequestData.ListOffsetsPartition; import org.apache.kafka.common.requests.ListOffsetsRequest; import org.apache.kafka.common.requests.ListOffsetsResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherUtils.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherUtils.java index 7a3d535782f08..ab6a32450286a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherUtils.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherUtils.java @@ -34,8 +34,8 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.ListOffsetsResponse; import org.apache.kafka.common.requests.OffsetsForLeaderEpochRequest; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsForLeaderEpochClient.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsForLeaderEpochClient.java index 6bfdce392dacf..81f45439d3f1b 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsForLeaderEpochClient.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsForLeaderEpochClient.java @@ -21,7 +21,7 @@ import org.apache.kafka.common.requests.AbstractRequest; import org.apache.kafka.common.requests.OffsetsForLeaderEpochRequest; import org.apache.kafka.common.requests.OffsetsForLeaderEpochResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import java.util.Map; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManager.java index 23d95811555f9..83c53ffb9ff1f 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManager.java @@ -38,8 +38,8 @@ import org.apache.kafka.common.requests.ListOffsetsResponse; import org.apache.kafka.common.requests.OffsetsForLeaderEpochRequest; import org.apache.kafka.common.requests.OffsetsForLeaderEpochResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/PositionsValidator.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/PositionsValidator.java index a714157400d77..924a36796edd6 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/PositionsValidator.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/PositionsValidator.java @@ -21,8 +21,8 @@ import org.apache.kafka.clients.consumer.internals.events.AsyncPollEvent; import org.apache.kafka.clients.consumer.internals.events.CheckAndUpdatePositionsEvent; import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestManagers.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestManagers.java index fe61d5c53bacf..dca5067bf4f45 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestManagers.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestManagers.java @@ -25,8 +25,8 @@ import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.telemetry.internals.ClientTelemetryProvider; import org.apache.kafka.common.telemetry.internals.ClientTelemetryReporter; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestState.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestState.java index 8b1f8f79109f9..441b8596422a9 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestState.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestState.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.internals.ExponentialBackoff; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetch.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetch.java index 57a2738e88bac..f172949ec3ab3 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetch.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetch.java @@ -33,9 +33,9 @@ import org.apache.kafka.common.requests.ShareFetchRequest; import org.apache.kafka.common.requests.ShareFetchResponse; import org.apache.kafka.common.serialization.Deserializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.internals.BufferSupplier; import org.apache.kafka.common.utils.internals.CloseableIterator; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManager.java index 49f83fbef9830..4ff391ecfc1d6 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManager.java @@ -40,10 +40,10 @@ import org.apache.kafka.common.requests.ShareAcknowledgeResponse; import org.apache.kafka.common.requests.ShareFetchRequest; import org.apache.kafka.common.requests.ShareFetchResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumerDelegateCreator.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumerDelegateCreator.java index e213196c03846..e88390db41d3d 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumerDelegateCreator.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumerDelegateCreator.java @@ -22,8 +22,8 @@ import org.apache.kafka.clients.consumer.ShareConsumer; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.serialization.Deserializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; /** * {@code ShareConsumerDelegateCreator} implements a quasi-factory pattern to allow the caller to remain unaware of the diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumerImpl.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumerImpl.java index 7504eecf5bd45..04d3955ec02b9 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumerImpl.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumerImpl.java @@ -68,11 +68,11 @@ import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.telemetry.internals.ClientTelemetryReporter; import org.apache.kafka.common.telemetry.internals.ClientTelemetryUtils; -import org.apache.kafka.common.utils.AppInfoParser; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.AppInfoParser; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; import org.slf4j.event.Level; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumerMetadata.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumerMetadata.java index 20b99540e1958..13cc757bf6629 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumerMetadata.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumerMetadata.java @@ -20,7 +20,7 @@ import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.internals.ClusterResourceListeners; import org.apache.kafka.common.requests.MetadataRequest; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import java.util.ArrayList; import java.util.List; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchBuffer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchBuffer.java index 7735c80451364..a7fbaddd7813e 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchBuffer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchBuffer.java @@ -19,8 +19,8 @@ import org.apache.kafka.common.TopicIdPartition; import org.apache.kafka.common.errors.InterruptException; import org.apache.kafka.common.internals.IdempotentCloser; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchCollector.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchCollector.java index 109fe3da48cc9..4b22b07ab3c87 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchCollector.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchCollector.java @@ -23,7 +23,7 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.record.internal.RecordBatch; import org.apache.kafka.common.requests.ShareFetchResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareHeartbeatRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareHeartbeatRequestManager.java index f46b6f72c87e1..87d154f8b8b9a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareHeartbeatRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareHeartbeatRequestManager.java @@ -25,9 +25,9 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.ShareGroupHeartbeatRequest; import org.apache.kafka.common.requests.ShareGroupHeartbeatResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; import java.util.ArrayList; import java.util.TreeSet; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareMembershipManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareMembershipManager.java index e37c30f293438..fb1bf0fb89009 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareMembershipManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareMembershipManager.java @@ -27,8 +27,8 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.ShareGroupHeartbeatRequest; import org.apache.kafka.common.requests.ShareGroupHeartbeatResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import java.util.HashMap; import java.util.Map; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareSessionHandler.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareSessionHandler.java index e4e16d1506fe4..b73500e2dd40f 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareSessionHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareSessionHandler.java @@ -29,7 +29,7 @@ import org.apache.kafka.common.requests.ShareFetchRequest; import org.apache.kafka.common.requests.ShareFetchResponse; import org.apache.kafka.common.requests.ShareRequestMetadata; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/StreamsGroupHeartbeatRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/StreamsGroupHeartbeatRequestManager.java index d4f1b3dace86a..f7b551e812dad 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/StreamsGroupHeartbeatRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/StreamsGroupHeartbeatRequestManager.java @@ -32,9 +32,9 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.StreamsGroupHeartbeatRequest; import org.apache.kafka.common.requests.StreamsGroupHeartbeatResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/StreamsMembershipManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/StreamsMembershipManager.java index 8222908f8f38f..a378cb0570b75 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/StreamsMembershipManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/StreamsMembershipManager.java @@ -33,8 +33,8 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.StreamsGroupHeartbeatRequest; import org.apache.kafka.common.requests.StreamsGroupHeartbeatResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/StreamsRebalanceListenerInvoker.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/StreamsRebalanceListenerInvoker.java index fc8c78c13dce6..0c9b278bbdba5 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/StreamsRebalanceListenerInvoker.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/StreamsRebalanceListenerInvoker.java @@ -18,7 +18,7 @@ import org.apache.kafka.common.errors.InterruptException; import org.apache.kafka.common.errors.WakeupException; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java index 820b99235e8a2..04135ca536f51 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java @@ -28,7 +28,7 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.internals.PartitionStates; import org.apache.kafka.common.message.OffsetForLeaderEpochResponseData.EpochEndOffset; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TimedRequestState.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TimedRequestState.java index 8aaf482f9accf..c0f589e0d0680 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TimedRequestState.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TimedRequestState.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; /** * {@code TimedRequestState} adds to a {@link RequestState} a {@link Timer} with which to keep track diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcher.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcher.java index aea2cb27c5f0e..ec4d476b29ccb 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcher.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcher.java @@ -29,9 +29,9 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.MetadataRequest; import org.apache.kafka.common.requests.MetadataResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.internals.ExponentialBackoff; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManager.java index fcef3ce2647af..59a06fa79fbf2 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManager.java @@ -28,8 +28,8 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.MetadataRequest; import org.apache.kafka.common.requests.MetadataResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventHandler.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventHandler.java index 5e6a25ed31a24..7b6a7de773ba8 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventHandler.java @@ -23,9 +23,9 @@ import org.apache.kafka.clients.consumer.internals.metrics.AsyncConsumerMetrics; import org.apache.kafka.common.errors.InterruptException; import org.apache.kafka.common.internals.IdempotentCloser; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessor.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessor.java index d024d3736a4ca..76636c58d76e5 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessor.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessor.java @@ -38,7 +38,7 @@ import org.apache.kafka.common.TopicIdPartition; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.requests.ListOffsetsRequest; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaper.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaper.java index b4440de06264b..14e4814cc4ba2 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaper.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaper.java @@ -18,7 +18,7 @@ import org.apache.kafka.clients.consumer.internals.AsyncKafkaConsumer; import org.apache.kafka.common.errors.TimeoutException; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/KafkaProducer.java b/clients/src/main/java/org/apache/kafka/clients/producer/KafkaProducer.java index dd4ac00660d15..63303f8e08911 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/KafkaProducer.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/KafkaProducer.java @@ -76,12 +76,12 @@ import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.telemetry.internals.ClientTelemetryReporter; import org.apache.kafka.common.telemetry.internals.ClientTelemetryUtils; -import org.apache.kafka.common.utils.AppInfoParser; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.ProducerIdAndEpoch; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.AppInfoParser; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/BuiltInPartitioner.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/BuiltInPartitioner.java index d5f0afd4fa1ee..ba58840a9c638 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/BuiltInPartitioner.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/BuiltInPartitioner.java @@ -18,8 +18,8 @@ import org.apache.kafka.common.Cluster; import org.apache.kafka.common.PartitionInfo; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerMetadata.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerMetadata.java index 0c77ef5fc4c69..910eff70d01f8 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerMetadata.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerMetadata.java @@ -22,8 +22,8 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.MetadataRequest; import org.apache.kafka.common.requests.MetadataResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java index 5bf497a413fe4..b1eced17e4f25 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java @@ -35,12 +35,12 @@ import org.apache.kafka.common.record.internal.MemoryRecordsBuilder; import org.apache.kafka.common.record.internal.Record; import org.apache.kafka.common.record.internal.RecordBatch; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.ProducerIdAndEpoch; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.CopyOnWriteMap; import org.apache.kafka.common.utils.internals.ExponentialBackoff; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/Sender.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/Sender.java index a880110ab5283..ba67f0d892cb9 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/Sender.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/Sender.java @@ -53,9 +53,9 @@ 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.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.internals.KafkaThread; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/TransactionManager.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/TransactionManager.java index 6bfba3979d223..be4b1f8dfbc64 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/TransactionManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/TransactionManager.java @@ -70,8 +70,8 @@ import org.apache.kafka.common.requests.TxnOffsetCommitRequest; import org.apache.kafka.common.requests.TxnOffsetCommitRequest.CommittedOffset; import org.apache.kafka.common.requests.TxnOffsetCommitResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.ProducerIdAndEpoch; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionMap.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionMap.java index 5d2be89a9dd5a..e236dff6f084d 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionMap.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionMap.java @@ -19,8 +19,8 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.requests.ProduceResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.ProducerIdAndEpoch; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/common/network/ChannelBuilders.java b/clients/src/main/java/org/apache/kafka/common/network/ChannelBuilders.java index 847f887a324fb..dd557a1b25cc7 100644 --- a/clients/src/main/java/org/apache/kafka/common/network/ChannelBuilders.java +++ b/clients/src/main/java/org/apache/kafka/common/network/ChannelBuilders.java @@ -30,9 +30,9 @@ import org.apache.kafka.common.security.kerberos.KerberosShortNamer; import org.apache.kafka.common.security.ssl.SslPrincipalMapper; import org.apache.kafka.common.security.token.delegation.internals.DelegationTokenCache; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/common/network/SaslChannelBuilder.java b/clients/src/main/java/org/apache/kafka/common/network/SaslChannelBuilder.java index 9b3bff9b9faf2..3401f593e9115 100644 --- a/clients/src/main/java/org/apache/kafka/common/network/SaslChannelBuilder.java +++ b/clients/src/main/java/org/apache/kafka/common/network/SaslChannelBuilder.java @@ -49,9 +49,9 @@ import org.apache.kafka.common.security.scram.internals.ScramServerCallbackHandler; import org.apache.kafka.common.security.ssl.SslFactory; import org.apache.kafka.common.security.token.delegation.internals.DelegationTokenCache; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.ietf.jgss.GSSContext; import org.ietf.jgss.GSSCredential; diff --git a/clients/src/main/java/org/apache/kafka/common/network/Selector.java b/clients/src/main/java/org/apache/kafka/common/network/Selector.java index 7acf88269ee14..a88a7c1196e06 100644 --- a/clients/src/main/java/org/apache/kafka/common/network/Selector.java +++ b/clients/src/main/java/org/apache/kafka/common/network/Selector.java @@ -29,9 +29,9 @@ import org.apache.kafka.common.metrics.stats.Meter; import org.apache.kafka.common.metrics.stats.SampledStat; import org.apache.kafka.common.metrics.stats.WindowedCount; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/common/network/SslTransportLayer.java b/clients/src/main/java/org/apache/kafka/common/network/SslTransportLayer.java index cc1c8bd807454..db908d17f58fb 100644 --- a/clients/src/main/java/org/apache/kafka/common/network/SslTransportLayer.java +++ b/clients/src/main/java/org/apache/kafka/common/network/SslTransportLayer.java @@ -18,10 +18,10 @@ import org.apache.kafka.common.errors.SslAuthenticationException; import org.apache.kafka.common.security.auth.KafkaPrincipal; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.ByteBufferUnmapper; import org.apache.kafka.common.utils.internals.ByteUtils; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/ApiVersionsRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/ApiVersionsRequest.java index 1bdb0903c7d7d..b99a7d310e6a3 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/ApiVersionsRequest.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/ApiVersionsRequest.java @@ -22,7 +22,7 @@ import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.protocol.Readable; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import java.util.regex.Pattern; diff --git a/clients/src/main/java/org/apache/kafka/common/security/authenticator/LoginManager.java b/clients/src/main/java/org/apache/kafka/common/security/authenticator/LoginManager.java index 636ee939e6db7..7db661d63e64c 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/authenticator/LoginManager.java +++ b/clients/src/main/java/org/apache/kafka/common/security/authenticator/LoginManager.java @@ -25,8 +25,8 @@ import org.apache.kafka.common.security.auth.Login; import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; import org.apache.kafka.common.security.oauthbearer.internals.unsecured.OAuthBearerUnsecuredLoginCallbackHandler; -import org.apache.kafka.common.utils.SecurityUtils; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.SecurityUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientAuthenticator.java b/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientAuthenticator.java index 25653636b403d..1b400db407131 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientAuthenticator.java +++ b/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientAuthenticator.java @@ -49,9 +49,9 @@ import org.apache.kafka.common.security.auth.KafkaPrincipal; import org.apache.kafka.common.security.auth.KafkaPrincipalSerde; import org.apache.kafka.common.security.kerberos.KerberosError; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/clients/src/main/java/org/apache/kafka/common/security/ssl/DefaultSslEngineFactory.java b/clients/src/main/java/org/apache/kafka/common/security/ssl/DefaultSslEngineFactory.java index a5068dc83abce..38bbe170e8b8f 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/ssl/DefaultSslEngineFactory.java +++ b/clients/src/main/java/org/apache/kafka/common/security/ssl/DefaultSslEngineFactory.java @@ -24,8 +24,8 @@ import org.apache.kafka.common.errors.InvalidConfigurationException; import org.apache.kafka.common.network.ConnectionMode; import org.apache.kafka.common.security.auth.SslEngineFactory; -import org.apache.kafka.common.utils.SecurityUtils; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.SecurityUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/common/security/ssl/SslFactory.java b/clients/src/main/java/org/apache/kafka/common/security/ssl/SslFactory.java index 9f9d23686d4b7..ced699640fd4e 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/ssl/SslFactory.java +++ b/clients/src/main/java/org/apache/kafka/common/security/ssl/SslFactory.java @@ -23,8 +23,8 @@ import org.apache.kafka.common.config.internals.BrokerSecurityConfigs; import org.apache.kafka.common.network.ConnectionMode; import org.apache.kafka.common.security.auth.SslEngineFactory; -import org.apache.kafka.common.utils.ConfigUtils; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.ConfigUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/common/utils/AppInfoParser.java b/clients/src/main/java/org/apache/kafka/common/utils/internals/AppInfoParser.java similarity index 98% rename from clients/src/main/java/org/apache/kafka/common/utils/AppInfoParser.java rename to clients/src/main/java/org/apache/kafka/common/utils/internals/AppInfoParser.java index 9148e82418ca9..4b3f640736383 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/AppInfoParser.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/internals/AppInfoParser.java @@ -14,12 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.common.utils; +package org.apache.kafka.common.utils.internals; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.metrics.Gauge; import org.apache.kafka.common.metrics.Metrics; -import org.apache.kafka.common.utils.internals.Sanitizer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/common/utils/ConfigUtils.java b/clients/src/main/java/org/apache/kafka/common/utils/internals/ConfigUtils.java similarity index 98% rename from clients/src/main/java/org/apache/kafka/common/utils/ConfigUtils.java rename to clients/src/main/java/org/apache/kafka/common/utils/internals/ConfigUtils.java index 2c3702af13167..0421cfa126bd4 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/ConfigUtils.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/internals/ConfigUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.kafka.common.utils; +package org.apache.kafka.common.utils.internals; import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.ConfigDef.ConfigKey; diff --git a/clients/src/main/java/org/apache/kafka/common/utils/LogContext.java b/clients/src/main/java/org/apache/kafka/common/utils/internals/LogContext.java similarity index 99% rename from clients/src/main/java/org/apache/kafka/common/utils/LogContext.java rename to clients/src/main/java/org/apache/kafka/common/utils/internals/LogContext.java index 0992cd2dfdc3b..ca30f7c293826 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/LogContext.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/internals/LogContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.common.utils; +package org.apache.kafka.common.utils.internals; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/common/utils/SecurityUtils.java b/clients/src/main/java/org/apache/kafka/common/utils/internals/SecurityUtils.java similarity index 99% rename from clients/src/main/java/org/apache/kafka/common/utils/SecurityUtils.java rename to clients/src/main/java/org/apache/kafka/common/utils/internals/SecurityUtils.java index 0c8876ebd6a6a..777c4adf4f880 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/SecurityUtils.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/internals/SecurityUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.common.utils; +package org.apache.kafka.common.utils.internals; import org.apache.kafka.common.acl.AclOperation; import org.apache.kafka.common.acl.AclPermissionType; diff --git a/clients/src/main/java/org/apache/kafka/server/authorizer/Authorizer.java b/clients/src/main/java/org/apache/kafka/server/authorizer/Authorizer.java index 68f1aaf678d1d..c938dd7c44950 100644 --- a/clients/src/main/java/org/apache/kafka/server/authorizer/Authorizer.java +++ b/clients/src/main/java/org/apache/kafka/server/authorizer/Authorizer.java @@ -29,7 +29,7 @@ import org.apache.kafka.common.resource.ResourcePatternFilter; import org.apache.kafka.common.resource.ResourceType; import org.apache.kafka.common.security.auth.KafkaPrincipal; -import org.apache.kafka.common.utils.SecurityUtils; +import org.apache.kafka.common.utils.internals.SecurityUtils; import java.io.Closeable; import java.util.Collections; diff --git a/clients/src/test/java/org/apache/kafka/clients/ClusterConnectionStatesTest.java b/clients/src/test/java/org/apache/kafka/clients/ClusterConnectionStatesTest.java index 9812f490ddd7f..f794bd2c0a124 100644 --- a/clients/src/test/java/org/apache/kafka/clients/ClusterConnectionStatesTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/ClusterConnectionStatesTest.java @@ -18,8 +18,8 @@ package org.apache.kafka.clients; import org.apache.kafka.common.errors.AuthenticationException; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/FetchSessionHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/FetchSessionHandlerTest.java index 1c50666c6afd0..85a076d18970e 100644 --- a/clients/src/test/java/org/apache/kafka/clients/FetchSessionHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/FetchSessionHandlerTest.java @@ -25,7 +25,7 @@ import org.apache.kafka.common.requests.FetchMetadata; import org.apache.kafka.common.requests.FetchRequest; import org.apache.kafka.common.requests.FetchResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; @@ -124,10 +124,10 @@ private static void assertMapEquals(Map actuaLEntry = actualIter.next(); - assertEquals(expectedEntry.getKey(), actuaLEntry.getKey(), "Element " + i + + Map.Entry actualEntry = actualIter.next(); + assertEquals(expectedEntry.getKey(), actualEntry.getKey(), "Element " + i + " had a different TopicPartition than expected."); - assertEquals(expectedEntry.getValue(), actuaLEntry.getValue(), "Element " + i + + assertEquals(expectedEntry.getValue(), actualEntry.getValue(), "Element " + i + " had different PartitionData than expected."); i++; } diff --git a/clients/src/test/java/org/apache/kafka/clients/MetadataTest.java b/clients/src/test/java/org/apache/kafka/clients/MetadataTest.java index 35c9b6a3068d8..abbb04a1838eb 100644 --- a/clients/src/test/java/org/apache/kafka/clients/MetadataTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/MetadataTest.java @@ -36,9 +36,9 @@ import org.apache.kafka.common.requests.MetadataRequest; import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.requests.RequestTestUtils; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.test.MockClusterResourceListener; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java b/clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java index 93e3b9e8c057e..aef858384de9c 100644 --- a/clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java @@ -52,8 +52,8 @@ import org.apache.kafka.common.requests.RequestTestUtils; import org.apache.kafka.common.security.authenticator.SaslClientAuthenticator; import org.apache.kafka.common.telemetry.internals.ClientTelemetrySender; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.test.DelayedReceive; import org.apache.kafka.test.MockSelector; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/AdminClientUnitTestEnv.java b/clients/src/test/java/org/apache/kafka/clients/admin/AdminClientUnitTestEnv.java index add2256b2b3cb..c9ec39d4d7d3c 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/AdminClientUnitTestEnv.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/AdminClientUnitTestEnv.java @@ -20,8 +20,8 @@ import org.apache.kafka.clients.admin.internals.AdminMetadataManager; import org.apache.kafka.common.Cluster; import org.apache.kafka.common.Node; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import java.time.Duration; import java.util.Collections; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandlerTest.java index 86f2c9dfd2228..68e3f6167fa3f 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandlerTest.java @@ -29,7 +29,7 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.WriteTxnMarkersRequest; import org.apache.kafka.common.requests.WriteTxnMarkersResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AdminApiDriverTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AdminApiDriverTest.java index c4ffc657914cd..4ec9c87970f99 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AdminApiDriverTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AdminApiDriverTest.java @@ -32,8 +32,8 @@ import org.apache.kafka.common.requests.FindCoordinatorRequest.NoBatchedFindCoordinatorsException; import org.apache.kafka.common.requests.MetadataRequest; import org.apache.kafka.common.requests.MetadataResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AdminMetadataManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AdminMetadataManagerTest.java index 1e6823ea8ee64..d9898c76b812b 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AdminMetadataManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AdminMetadataManagerTest.java @@ -21,8 +21,8 @@ import org.apache.kafka.common.Node; import org.apache.kafka.common.errors.AuthenticationException; import org.apache.kafka.common.errors.AuthorizationException; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyIntegrationTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyIntegrationTest.java index 6a47e4cb9ca5f..f494f4b71b71d 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyIntegrationTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyIntegrationTest.java @@ -28,8 +28,8 @@ import org.apache.kafka.common.requests.AbstractResponse; import org.apache.kafka.common.requests.MetadataRequest; import org.apache.kafka.common.requests.MetadataResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyTest.java index 696a1151f0064..7c7a2c98984f3 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyTest.java @@ -20,7 +20,7 @@ import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.requests.MetadataRequest; import org.apache.kafka.common.requests.MetadataResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AlterConsumerGroupOffsetsHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AlterConsumerGroupOffsetsHandlerTest.java index 3fa80e584a2a8..185790f377949 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AlterConsumerGroupOffsetsHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AlterConsumerGroupOffsetsHandlerTest.java @@ -23,7 +23,7 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.OffsetCommitRequest; import org.apache.kafka.common.requests.OffsetCommitResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategyTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategyTest.java index cbbbe93e2d4c4..9e6422db1945c 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategyTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategyTest.java @@ -22,7 +22,7 @@ import org.apache.kafka.common.requests.FindCoordinatorRequest; import org.apache.kafka.common.requests.FindCoordinatorRequest.CoordinatorType; import org.apache.kafka.common.requests.FindCoordinatorResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandlerTest.java index 72330084fd691..08c51c346cf15 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandlerTest.java @@ -30,7 +30,7 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.OffsetDeleteRequest; import org.apache.kafka.common.requests.OffsetDeleteResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandlerTest.java index 773708aa2f63f..c3b3a34850b20 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandlerTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.clients.admin.internals; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; public class DeleteConsumerGroupsHandlerTest extends DeleteGroupsHandlerTest { protected DeleteGroupsHandler handler() { diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandlerTest.java index 4cd9d613095c8..10109aea52b8d 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandlerTest.java @@ -32,7 +32,7 @@ import org.apache.kafka.common.requests.DeleteRecordsResponse; import org.apache.kafka.common.requests.MetadataRequest; import org.apache.kafka.common.requests.MetadataResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteShareGroupsHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteShareGroupsHandlerTest.java index 26f9d97f77e1c..3031eec769a77 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteShareGroupsHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteShareGroupsHandlerTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.clients.admin.internals; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; public class DeleteShareGroupsHandlerTest extends DeleteGroupsHandlerTest { protected DeleteGroupsHandler handler() { diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandlerTest.java index 8b92b429ac4b1..e72d4127d0a9c 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandlerTest.java @@ -42,8 +42,8 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.ConsumerGroupDescribeResponse; import org.apache.kafka.common.requests.DescribeGroupsResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandlerTest.java index 3a2ab50624918..92e6737082fe0 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandlerTest.java @@ -33,7 +33,7 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.DescribeProducersRequest; import org.apache.kafka.common.requests.DescribeProducersResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandlerTest.java index be60e89eb65cd..90cf3c6d800d7 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandlerTest.java @@ -24,7 +24,7 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.DescribeTransactionsRequest; import org.apache.kafka.common.requests.DescribeTransactionsResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/FenceProducersHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/FenceProducersHandlerTest.java index 7e97c68d6ac5f..a748a950b2a94 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/FenceProducersHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/FenceProducersHandlerTest.java @@ -23,8 +23,8 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.InitProducerIdRequest; import org.apache.kafka.common.requests.InitProducerIdResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.ProducerIdAndEpoch; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandlerTest.java index c53785c585dd7..be561b9c8fe4a 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandlerTest.java @@ -32,7 +32,7 @@ import org.apache.kafka.common.record.internal.RecordBatch; import org.apache.kafka.common.requests.OffsetFetchRequest; import org.apache.kafka.common.requests.OffsetFetchResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandlerTest.java index a7156554001aa..9d461faa37dda 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandlerTest.java @@ -32,7 +32,7 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.ListOffsetsRequest; import org.apache.kafka.common.requests.ListOffsetsResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandlerTest.java index 2c2529a0664c1..7a1d6cf1a931c 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandlerTest.java @@ -27,7 +27,7 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.ListTransactionsRequest; import org.apache.kafka.common.requests.ListTransactionsResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategyIntegrationTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategyIntegrationTest.java index 3d024a76a62ff..acb282e1843d4 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategyIntegrationTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategyIntegrationTest.java @@ -34,8 +34,8 @@ 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.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategyTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategyTest.java index 8a47b8bc3fcc5..389bf7a1698fa 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategyTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategyTest.java @@ -28,7 +28,7 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.MetadataRequest; import org.apache.kafka.common.requests.MetadataResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/RemoveMembersFromConsumerGroupHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/RemoveMembersFromConsumerGroupHandlerTest.java index eb84e4780bfd8..cfdfabe7f1ec8 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/RemoveMembersFromConsumerGroupHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/RemoveMembersFromConsumerGroupHandlerTest.java @@ -25,7 +25,7 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.LeaveGroupRequest; import org.apache.kafka.common.requests.LeaveGroupResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java index 742f06c886d49..86787295b68d3 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java @@ -103,10 +103,10 @@ import org.apache.kafka.common.telemetry.internals.ClientTelemetryReporter; import org.apache.kafka.common.telemetry.internals.ClientTelemetrySender; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.test.MockConsumerInterceptor; import org.apache.kafka.test.MockDeserializer; import org.apache.kafka.test.MockMetricsReporter; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaShareConsumerMetricsTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaShareConsumerMetricsTest.java index 502cee9ae624e..a9dc21d3d185a 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaShareConsumerMetricsTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaShareConsumerMetricsTest.java @@ -37,9 +37,9 @@ import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.telemetry.internals.ClientTelemetryReporter; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.logging.log4j.Level; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaShareConsumerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaShareConsumerTest.java index 90d0a87d39f31..7741a8b58fde5 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaShareConsumerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaShareConsumerTest.java @@ -45,9 +45,9 @@ import org.apache.kafka.common.requests.ShareGroupHeartbeatResponse; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.StringDeserializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinatorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinatorTest.java index 26121536df4ca..50d6426043871 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinatorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinatorTest.java @@ -53,11 +53,11 @@ import org.apache.kafka.common.requests.RequestTestUtils; import org.apache.kafka.common.requests.SyncGroupRequest; import org.apache.kafka.common.requests.SyncGroupResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ApplicationEventHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ApplicationEventHandlerTest.java index 54d056b3b15c2..8ff686cf588b9 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ApplicationEventHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ApplicationEventHandlerTest.java @@ -26,9 +26,9 @@ import org.apache.kafka.common.errors.InterruptException; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.metrics.Metrics; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumerTest.java index c1783ceb86b62..1fe17c0c41294 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumerTest.java @@ -88,10 +88,10 @@ import org.apache.kafka.common.requests.RequestTestUtils; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.test.MockConsumerInterceptor; import org.junit.jupiter.api.AfterEach; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java index ae9b34e1360aa..c4aedae73496c 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java @@ -49,8 +49,8 @@ import org.apache.kafka.common.requests.OffsetFetchResponse; import org.apache.kafka.common.requests.RequestHeader; import org.apache.kafka.common.serialization.StringDeserializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CompletedFetchTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CompletedFetchTest.java index 6795bc30185d0..452d86974676c 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CompletedFetchTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CompletedFetchTest.java @@ -37,11 +37,11 @@ import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.UUIDDeserializer; import org.apache.kafka.common.serialization.UUIDSerializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; @@ -92,7 +92,7 @@ record = records.get(0); @Test public void testAbortedTransactionRecordsRemoved() { int numRecords = 10; - Records rawRecords = newTranscactionalRecords(ControlRecordType.ABORT, numRecords); + Records rawRecords = newTransactionalRecords(ControlRecordType.ABORT, numRecords); FetchResponseData.PartitionData partitionData = new FetchResponseData.PartitionData() .setRecords(rawRecords) @@ -114,7 +114,7 @@ public void testAbortedTransactionRecordsRemoved() { @Test public void testCommittedTransactionRecordsIncluded() { int numRecords = 10; - Records rawRecords = newTranscactionalRecords(ControlRecordType.COMMIT, numRecords); + Records rawRecords = newTransactionalRecords(ControlRecordType.COMMIT, numRecords); FetchResponseData.PartitionData partitionData = new FetchResponseData.PartitionData() .setRecords(rawRecords); CompletedFetch completedFetch = newCompletedFetch(0, partitionData); @@ -258,7 +258,7 @@ private Records newRecords(long baseOffset, int count, long firstMessageId) { } } - private Records newTranscactionalRecords(ControlRecordType controlRecordType, int numRecords) { + private Records newTransactionalRecords(ControlRecordType controlRecordType, int numRecords) { Time time = new MockTime(); ByteBuffer buffer = ByteBuffer.allocate(1024); diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinatorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinatorTest.java index 345c7e70e83d5..6fa93b5eabc90 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinatorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinatorTest.java @@ -78,11 +78,11 @@ import org.apache.kafka.common.requests.RequestTestUtils; import org.apache.kafka.common.requests.SyncGroupRequest; import org.apache.kafka.common.requests.SyncGroupResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerHeartbeatRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerHeartbeatRequestManagerTest.java index 906ae79518f43..62f819dc6005b 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerHeartbeatRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerHeartbeatRequestManagerTest.java @@ -42,11 +42,11 @@ import org.apache.kafka.common.requests.ConsumerGroupHeartbeatResponse; import org.apache.kafka.common.requests.RequestHeader; import org.apache.kafka.common.serialization.StringDeserializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.annotation.ApiKeyVersionsSource; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerMembershipManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerMembershipManagerTest.java index 914f0a26fb79e..23626919b4476 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerMembershipManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerMembershipManagerTest.java @@ -40,9 +40,9 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.ConsumerGroupHeartbeatRequest; import org.apache.kafka.common.requests.ConsumerGroupHeartbeatResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerMetadataTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerMetadataTest.java index f57e93a2a15e8..49073696d959b 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerMetadataTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerMetadataTest.java @@ -30,9 +30,9 @@ import org.apache.kafka.common.requests.MetadataRequest; import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.requests.RequestTestUtils; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClientTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClientTest.java index b2029331c5783..a04b7c22df092 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClientTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClientTest.java @@ -38,8 +38,8 @@ import org.apache.kafka.common.requests.HeartbeatResponse; import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.requests.RequestTestUtils; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThreadTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThreadTest.java index b969784c2e1cb..a5b06cc98d375 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThreadTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThreadTest.java @@ -25,9 +25,9 @@ import org.apache.kafka.clients.consumer.internals.metrics.AsyncConsumerMetrics; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.metrics.Metrics; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManagerTest.java index c22af52cf89c8..91b3a7c2c33c9 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManagerTest.java @@ -27,8 +27,8 @@ import org.apache.kafka.common.requests.FindCoordinatorResponse; import org.apache.kafka.common.requests.RequestHeader; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.logging.log4j.Level; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchBufferTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchBufferTest.java index 612e9ec29a96c..44143ee9bc701 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchBufferTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchBufferTest.java @@ -21,11 +21,11 @@ import org.apache.kafka.common.message.FetchResponseData; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.StringSerializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchCollectorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchCollectorTest.java index c609116184392..63ee7bf1deec0 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchCollectorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchCollectorTest.java @@ -37,10 +37,10 @@ import org.apache.kafka.common.record.internal.SimpleRecord; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchMetricsManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchMetricsManagerTest.java index 8dc50b1e66a39..f01d0f65046a9 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchMetricsManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchMetricsManagerTest.java @@ -24,9 +24,9 @@ import org.apache.kafka.common.metrics.Sensor; import org.apache.kafka.common.metrics.stats.Avg; import org.apache.kafka.common.metrics.stats.Max; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java index 1e473114e7556..23546d4b6270c 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java @@ -80,12 +80,12 @@ import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.utils.ByteBufferOutputStream; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.test.DelayedReceive; import org.apache.kafka.test.MockSelector; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java index c6342dd5cd724..66c317a8c8856 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java @@ -79,11 +79,11 @@ import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.utils.ByteBufferOutputStream; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.test.DelayedReceive; import org.apache.kafka.test.MockSelector; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestStateTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestStateTest.java index 025e99a9aecc1..68eaa19234f5e 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestStateTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestStateTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegateTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegateTest.java index 74cf42adee586..58203cab3595c 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegateTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegateTest.java @@ -36,8 +36,8 @@ import org.apache.kafka.common.requests.FindCoordinatorRequest; import org.apache.kafka.common.requests.FindCoordinatorResponse; import org.apache.kafka.common.serialization.StringDeserializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherTest.java index 342e2b393f1a4..b801ce8fa522f 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherTest.java @@ -56,8 +56,8 @@ import org.apache.kafka.common.requests.OffsetsForLeaderEpochResponse; import org.apache.kafka.common.requests.RequestTestUtils; import org.apache.kafka.common.serialization.ByteArrayDeserializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetForLeaderEpochClientTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetForLeaderEpochClientTest.java index 8a3617d61c752..902876eef6d17 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetForLeaderEpochClientTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetForLeaderEpochClientTest.java @@ -27,9 +27,9 @@ import org.apache.kafka.common.message.OffsetForLeaderEpochResponseData.OffsetForLeaderTopicResult; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.OffsetsForLeaderEpochResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManagerTest.java index d2ea976a9f5a0..6c5fb9d31245e 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManagerTest.java @@ -39,8 +39,8 @@ import org.apache.kafka.common.requests.OffsetsForLeaderEpochRequest; import org.apache.kafka.common.requests.OffsetsForLeaderEpochResponse; import org.apache.kafka.common.requests.RequestHeader; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/RequestManagersTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/RequestManagersTest.java index 6a426e1519f80..bcb2c5dc8e774 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/RequestManagersTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/RequestManagersTest.java @@ -21,8 +21,8 @@ import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.internals.events.BackgroundEventHandler; import org.apache.kafka.common.metrics.Metrics; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/RequestStateTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/RequestStateTest.java index ecca5e90fdd9e..5cb4507730712 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/RequestStateTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/RequestStateTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetchTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetchTest.java index f0dfc7e5b5fa9..a6bc4943821d1 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetchTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetchTest.java @@ -40,11 +40,11 @@ import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.UUIDDeserializer; import org.apache.kafka.common.serialization.UUIDSerializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManagerTest.java index 85cc39738a298..ca8d0ca08655a 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManagerTest.java @@ -71,11 +71,11 @@ import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.utils.ByteBufferOutputStream; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareConsumerImplTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareConsumerImplTest.java index aef8cf4ee5bda..e7e765e5917ef 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareConsumerImplTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareConsumerImplTest.java @@ -57,10 +57,10 @@ import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.test.MockConsumerInterceptor; import org.junit.jupiter.api.AfterEach; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareFetchBufferTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareFetchBufferTest.java index b8be2d3240c31..0e76c37e11a92 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareFetchBufferTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareFetchBufferTest.java @@ -23,11 +23,11 @@ import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.serialization.StringSerializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareFetchCollectorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareFetchCollectorTest.java index e082b48fbf25f..afcafe922f551 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareFetchCollectorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareFetchCollectorTest.java @@ -36,9 +36,9 @@ import org.apache.kafka.common.record.internal.Records; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareHeartbeatRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareHeartbeatRequestManagerTest.java index ce457a3a0285a..201aad088e7d0 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareHeartbeatRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareHeartbeatRequestManagerTest.java @@ -36,11 +36,11 @@ import org.apache.kafka.common.requests.ShareGroupHeartbeatRequest; import org.apache.kafka.common.requests.ShareGroupHeartbeatResponse; import org.apache.kafka.common.serialization.StringDeserializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.annotation.ApiKeyVersionsSource; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareMembershipManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareMembershipManagerTest.java index f65b7fc301d1f..393c3d26cefb1 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareMembershipManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareMembershipManagerTest.java @@ -27,9 +27,9 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.ShareGroupHeartbeatRequest; import org.apache.kafka.common.requests.ShareGroupHeartbeatResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareSessionHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareSessionHandlerTest.java index b508b38801035..f81a53f9204f7 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareSessionHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareSessionHandlerTest.java @@ -28,7 +28,7 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.ShareFetchRequest; import org.apache.kafka.common.requests.ShareFetchResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/StreamsGroupHeartbeatRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/StreamsGroupHeartbeatRequestManagerTest.java index 3faaf6e05e62c..6c61f13eb3d05 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/StreamsGroupHeartbeatRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/StreamsGroupHeartbeatRequestManagerTest.java @@ -36,10 +36,10 @@ import org.apache.kafka.common.requests.StreamsGroupHeartbeatResponse; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/StreamsMembershipManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/StreamsMembershipManagerTest.java index 3348a0d109f3e..ae91b7fd0f028 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/StreamsMembershipManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/StreamsMembershipManagerTest.java @@ -31,9 +31,9 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.StreamsGroupHeartbeatRequest; import org.apache.kafka.common.requests.StreamsGroupHeartbeatResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/StreamsRebalanceListenerInvokerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/StreamsRebalanceListenerInvokerTest.java index b7c7275df5851..61edf42ad4f8b 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/StreamsRebalanceListenerInvokerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/StreamsRebalanceListenerInvokerTest.java @@ -18,7 +18,7 @@ import org.apache.kafka.common.errors.InterruptException; import org.apache.kafka.common.errors.WakeupException; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/SubscriptionStateTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/SubscriptionStateTest.java index 46c2d02e637b5..4815d3cfa27d3 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/SubscriptionStateTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/SubscriptionStateTest.java @@ -30,7 +30,7 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.message.OffsetForLeaderEpochResponseData.EpochEndOffset; import org.apache.kafka.common.protocol.ApiKeys; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TimedRequestStateTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TimedRequestStateTest.java index a7ae9cf9bb4d7..6a1e64d553c28 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TimedRequestStateTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TimedRequestStateTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcherTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcherTest.java index ce2aa86e3e26e..997ea869f2179 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcherTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcherTest.java @@ -30,8 +30,8 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.requests.RequestTestUtils; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManagerTest.java index f8cc3ee0cccde..c7839880f1dff 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManagerTest.java @@ -33,8 +33,8 @@ import org.apache.kafka.common.requests.RequestHeader; import org.apache.kafka.common.requests.RequestTestUtils; import org.apache.kafka.common.serialization.StringDeserializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessorTest.java index 8933b8fcc8aca..2b94a80ad8283 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessorTest.java @@ -42,9 +42,9 @@ import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.logging.log4j.Level; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaperTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaperTest.java index 71e44631ee8c8..6b7e1855cbd04 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaperTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaperTest.java @@ -18,9 +18,9 @@ import org.apache.kafka.clients.consumer.internals.ConsumerUtils; import org.apache.kafka.common.errors.TimeoutException; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/metrics/ConsumerRebalanceMetricsManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/metrics/ConsumerRebalanceMetricsManagerTest.java index e3fea75ef8101..639ba823f3566 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/metrics/ConsumerRebalanceMetricsManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/metrics/ConsumerRebalanceMetricsManagerTest.java @@ -21,9 +21,9 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.metrics.MetricConfig; import org.apache.kafka.common.metrics.Metrics; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java index 7db1ca61149b5..f641848dc72b3 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java @@ -93,10 +93,10 @@ import org.apache.kafka.common.telemetry.internals.ClientTelemetryReporter; import org.apache.kafka.common.telemetry.internals.ClientTelemetrySender; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.ProducerIdAndEpoch; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.test.MockMetricsReporter; import org.apache.kafka.test.MockPartitioner; import org.apache.kafka.test.MockProducerInterceptor; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/BuiltInPartitionerTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/BuiltInPartitionerTest.java index e511cad61e6af..4641fab316bf6 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/BuiltInPartitionerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/BuiltInPartitionerTest.java @@ -19,7 +19,7 @@ import org.apache.kafka.common.Cluster; import org.apache.kafka.common.Node; import org.apache.kafka.common.PartitionInfo; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerMetadataTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerMetadataTest.java index bec0eb2fcff30..3353c64ff0f2f 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerMetadataTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerMetadataTest.java @@ -23,8 +23,8 @@ import org.apache.kafka.common.internals.ClusterResourceListeners; import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.requests.RequestTestUtils; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/RecordAccumulatorTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/RecordAccumulatorTest.java index 516e692d0c42b..f4339f33b254a 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/RecordAccumulatorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/RecordAccumulatorTest.java @@ -44,10 +44,10 @@ import org.apache.kafka.common.record.internal.RecordBatch; import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.requests.MetadataResponse.PartitionMetadata; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.ProducerIdAndEpoch; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java index f893efb8682e2..ecc2e755d10da 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java @@ -85,10 +85,10 @@ import org.apache.kafka.common.requests.ProduceResponse; import org.apache.kafka.common.requests.RequestTestUtils; import org.apache.kafka.common.requests.TransactionResult; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.ProducerIdAndEpoch; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.test.DelayedReceive; import org.apache.kafka.test.MockSelector; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/TransactionManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/TransactionManagerTest.java index 706163491ddfe..6f0fcbbd31512 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/TransactionManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/TransactionManagerTest.java @@ -80,9 +80,9 @@ import org.apache.kafka.common.requests.TransactionResult; import org.apache.kafka.common.requests.TxnOffsetCommitRequest; import org.apache.kafka.common.requests.TxnOffsetCommitResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.ProducerIdAndEpoch; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/network/NetworkTestUtils.java b/clients/src/test/java/org/apache/kafka/common/network/NetworkTestUtils.java index f5c1cac32ee7d..0c1b6ef303b94 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/NetworkTestUtils.java +++ b/clients/src/test/java/org/apache/kafka/common/network/NetworkTestUtils.java @@ -22,9 +22,9 @@ import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.common.security.authenticator.CredentialCache; import org.apache.kafka.common.security.token.delegation.internals.DelegationTokenCache; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java b/clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java index eefd6404794a6..747d7072ae97a 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java +++ b/clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java @@ -28,10 +28,10 @@ import org.apache.kafka.common.security.scram.ScramCredential; import org.apache.kafka.common.security.scram.internals.ScramMechanism; import org.apache.kafka.common.security.token.delegation.internals.DelegationTokenCache; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SaslChannelBuilderTest.java b/clients/src/test/java/org/apache/kafka/common/network/SaslChannelBuilderTest.java index 215c689e4ae57..92764b8ab5a52 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SaslChannelBuilderTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SaslChannelBuilderTest.java @@ -32,8 +32,8 @@ import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; import org.apache.kafka.common.security.plain.PlainLoginModule; import org.apache.kafka.common.security.scram.ScramLoginModule; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.ietf.jgss.GSSContext; import org.ietf.jgss.GSSCredential; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java b/clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java index b31c803f0c316..2bd3e61774f59 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java @@ -24,10 +24,10 @@ import org.apache.kafka.common.metrics.KafkaMetric; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.security.auth.SecurityProtocol; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SslSelectorTest.java b/clients/src/test/java/org/apache/kafka/common/network/SslSelectorTest.java index 374398bc72a9f..c476f22484022 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SslSelectorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SslSelectorTest.java @@ -27,9 +27,9 @@ import org.apache.kafka.common.security.ssl.mock.TestKeyManagerFactory; import org.apache.kafka.common.security.ssl.mock.TestProviderCreator; import org.apache.kafka.common.security.ssl.mock.TestTrustManagerFactory; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SslTransportLayerTest.java b/clients/src/test/java/org/apache/kafka/common/network/SslTransportLayerTest.java index 16a0eafc344c5..219b59ef9ddc0 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SslTransportLayerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SslTransportLayerTest.java @@ -31,9 +31,9 @@ import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.common.security.ssl.DefaultSslEngineFactory; import org.apache.kafka.common.security.ssl.SslFactory; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SslTransportTls12Tls13Test.java b/clients/src/test/java/org/apache/kafka/common/network/SslTransportTls12Tls13Test.java index 0ad81d17b5b93..b3d0243a21dfb 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SslTransportTls12Tls13Test.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SslTransportTls12Tls13Test.java @@ -20,8 +20,8 @@ import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.security.TestSecurityConfig; import org.apache.kafka.common.security.auth.SecurityProtocol; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SslVersionsTransportLayerTest.java b/clients/src/test/java/org/apache/kafka/common/network/SslVersionsTransportLayerTest.java index a34bbd049fb70..3fd6eeab3d53a 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SslVersionsTransportLayerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SslVersionsTransportLayerTest.java @@ -21,8 +21,8 @@ import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.security.TestSecurityConfig; import org.apache.kafka.common.security.auth.SecurityProtocol; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java index c6b53b5c21699..ad1f7949c9d4a 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java @@ -274,7 +274,7 @@ import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.common.security.token.delegation.DelegationToken; import org.apache.kafka.common.security.token.delegation.TokenInformation; -import org.apache.kafka.common.utils.SecurityUtils; +import org.apache.kafka.common.utils.internals.SecurityUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorFailureDelayTest.java b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorFailureDelayTest.java index 0c125559e5160..56c1c7ee2045f 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorFailureDelayTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorFailureDelayTest.java @@ -31,8 +31,8 @@ import org.apache.kafka.common.security.JaasContext; import org.apache.kafka.common.security.TestSecurityConfig; import org.apache.kafka.common.security.auth.SecurityProtocol; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java index 32ec898e06b1d..7b732b6a2c532 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java @@ -95,11 +95,11 @@ import org.apache.kafka.common.security.scram.internals.ScramMechanism; import org.apache.kafka.common.security.token.delegation.TokenInformation; import org.apache.kafka.common.security.token.delegation.internals.DelegationTokenCache; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; -import org.apache.kafka.common.utils.SecurityUtils; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; +import org.apache.kafka.common.utils.internals.SecurityUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticatorTest.java b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticatorTest.java index 9f270ceac1eb6..f89f358ff06b8 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticatorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticatorTest.java @@ -49,9 +49,9 @@ import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; import org.apache.kafka.common.security.plain.PlainLoginModule; import org.apache.kafka.common.security.ssl.SslPrincipalMapper; -import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.junit.jupiter.api.Test; import org.mockito.Answers; diff --git a/clients/src/test/java/org/apache/kafka/common/utils/AppInfoParserTest.java b/clients/src/test/java/org/apache/kafka/common/utils/internals/AppInfoParserTest.java similarity index 98% rename from clients/src/test/java/org/apache/kafka/common/utils/AppInfoParserTest.java rename to clients/src/test/java/org/apache/kafka/common/utils/internals/AppInfoParserTest.java index 7e153be5862c7..8cc5d204307d1 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/AppInfoParserTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/internals/AppInfoParserTest.java @@ -14,10 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.common.utils; +package org.apache.kafka.common.utils.internals; import org.apache.kafka.common.metrics.MetricConfig; import org.apache.kafka.common.metrics.Metrics; +import org.apache.kafka.common.utils.MockTime; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/common/utils/ConfigUtilsTest.java b/clients/src/test/java/org/apache/kafka/common/utils/internals/ConfigUtilsTest.java similarity index 98% rename from clients/src/test/java/org/apache/kafka/common/utils/ConfigUtilsTest.java rename to clients/src/test/java/org/apache/kafka/common/utils/internals/ConfigUtilsTest.java index 441b815b63842..bab37a661413f 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/ConfigUtilsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/internals/ConfigUtilsTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.kafka.common.utils; +package org.apache.kafka.common.utils.internals; import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.ConfigDef.Importance; diff --git a/clients/src/test/java/org/apache/kafka/common/utils/SecurityUtilsTest.java b/clients/src/test/java/org/apache/kafka/common/utils/internals/SecurityUtilsTest.java similarity index 98% rename from clients/src/test/java/org/apache/kafka/common/utils/SecurityUtilsTest.java rename to clients/src/test/java/org/apache/kafka/common/utils/internals/SecurityUtilsTest.java index 329b5dc8e0012..ffac9443079fb 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/SecurityUtilsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/internals/SecurityUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.common.utils; +package org.apache.kafka.common.utils.internals; import org.apache.kafka.common.config.SecurityConfig; import org.apache.kafka.common.security.auth.KafkaPrincipal; diff --git a/connect/api/src/main/java/org/apache/kafka/connect/storage/SimpleHeaderConverter.java b/connect/api/src/main/java/org/apache/kafka/connect/storage/SimpleHeaderConverter.java index 7a3b234360250..209af997fc871 100644 --- a/connect/api/src/main/java/org/apache/kafka/connect/storage/SimpleHeaderConverter.java +++ b/connect/api/src/main/java/org/apache/kafka/connect/storage/SimpleHeaderConverter.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.storage; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaAndValue; import org.apache.kafka.connect.data.Values; diff --git a/connect/api/src/main/java/org/apache/kafka/connect/storage/StringConverter.java b/connect/api/src/main/java/org/apache/kafka/connect/storage/StringConverter.java index 3c025aafd6649..d48f1aa2b25b9 100644 --- a/connect/api/src/main/java/org/apache/kafka/connect/storage/StringConverter.java +++ b/connect/api/src/main/java/org/apache/kafka/connect/storage/StringConverter.java @@ -20,8 +20,8 @@ import org.apache.kafka.common.errors.SerializationException; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; -import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaAndValue; import org.apache.kafka.connect.errors.DataException; diff --git a/connect/api/src/test/java/org/apache/kafka/connect/storage/SimpleHeaderConverterTest.java b/connect/api/src/test/java/org/apache/kafka/connect/storage/SimpleHeaderConverterTest.java index 14fd0d60c142b..924e93ff4eda5 100644 --- a/connect/api/src/test/java/org/apache/kafka/connect/storage/SimpleHeaderConverterTest.java +++ b/connect/api/src/test/java/org/apache/kafka/connect/storage/SimpleHeaderConverterTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.connect.storage; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaAndValue; import org.apache.kafka.connect.data.SchemaBuilder; diff --git a/connect/api/src/test/java/org/apache/kafka/connect/storage/StringConverterTest.java b/connect/api/src/test/java/org/apache/kafka/connect/storage/StringConverterTest.java index 119d0594a8fdc..7bddfb6d41904 100644 --- a/connect/api/src/test/java/org/apache/kafka/connect/storage/StringConverterTest.java +++ b/connect/api/src/test/java/org/apache/kafka/connect/storage/StringConverterTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.connect.storage; -import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaAndValue; diff --git a/connect/basic-auth-extension/src/main/java/org/apache/kafka/connect/rest/basic/auth/extension/BasicAuthSecurityRestExtension.java b/connect/basic-auth-extension/src/main/java/org/apache/kafka/connect/rest/basic/auth/extension/BasicAuthSecurityRestExtension.java index a72f85d068888..433c47b363378 100644 --- a/connect/basic-auth-extension/src/main/java/org/apache/kafka/connect/rest/basic/auth/extension/BasicAuthSecurityRestExtension.java +++ b/connect/basic-auth-extension/src/main/java/org/apache/kafka/connect/rest/basic/auth/extension/BasicAuthSecurityRestExtension.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.rest.basic.auth.extension; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.errors.ConnectException; import org.apache.kafka.connect.rest.ConnectRestExtension; import org.apache.kafka.connect.rest.ConnectRestExtensionContext; diff --git a/connect/file/src/main/java/org/apache/kafka/connect/file/FileStreamSinkConnector.java b/connect/file/src/main/java/org/apache/kafka/connect/file/FileStreamSinkConnector.java index a288ab18ae7e3..fa0f503eb9190 100644 --- a/connect/file/src/main/java/org/apache/kafka/connect/file/FileStreamSinkConnector.java +++ b/connect/file/src/main/java/org/apache/kafka/connect/file/FileStreamSinkConnector.java @@ -21,7 +21,7 @@ import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.ConfigDef.Importance; import org.apache.kafka.common.config.ConfigDef.Type; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.Task; import org.apache.kafka.connect.sink.SinkConnector; diff --git a/connect/file/src/main/java/org/apache/kafka/connect/file/FileStreamSourceConnector.java b/connect/file/src/main/java/org/apache/kafka/connect/file/FileStreamSourceConnector.java index f0f07a62a2f9b..68862ac2930ab 100644 --- a/connect/file/src/main/java/org/apache/kafka/connect/file/FileStreamSourceConnector.java +++ b/connect/file/src/main/java/org/apache/kafka/connect/file/FileStreamSourceConnector.java @@ -20,7 +20,7 @@ import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.ConfigDef.Importance; import org.apache.kafka.common.config.ConfigDef.Type; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.Task; import org.apache.kafka.connect.errors.ConnectException; import org.apache.kafka.connect.source.ExactlyOnceSupport; diff --git a/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverter.java b/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverter.java index 9f5b62997a236..db486b0bcba18 100644 --- a/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverter.java +++ b/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverter.java @@ -21,8 +21,8 @@ import org.apache.kafka.common.cache.SynchronizedCache; import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.errors.SerializationException; -import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.ConnectSchema; import org.apache.kafka.connect.data.Date; import org.apache.kafka.connect.data.Decimal; diff --git a/connect/json/src/test/java/org/apache/kafka/connect/json/JsonConverterTest.java b/connect/json/src/test/java/org/apache/kafka/connect/json/JsonConverterTest.java index 200b33d1774e2..3ccb3b5a175a7 100644 --- a/connect/json/src/test/java/org/apache/kafka/connect/json/JsonConverterTest.java +++ b/connect/json/src/test/java/org/apache/kafka/connect/json/JsonConverterTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.connect.json; -import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Date; import org.apache.kafka.connect.data.Decimal; import org.apache.kafka.connect.data.Schema; diff --git a/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorCheckpointConnector.java b/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorCheckpointConnector.java index 9f8472c9c35b6..264e24141a05d 100644 --- a/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorCheckpointConnector.java +++ b/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorCheckpointConnector.java @@ -25,8 +25,8 @@ import org.apache.kafka.common.config.Config; import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.ConfigValue; -import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.Task; import org.apache.kafka.connect.errors.ConnectException; import org.apache.kafka.connect.errors.RetriableException; diff --git a/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorHeartbeatConnector.java b/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorHeartbeatConnector.java index 201339229379c..82a9b22322e5a 100644 --- a/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorHeartbeatConnector.java +++ b/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorHeartbeatConnector.java @@ -18,8 +18,8 @@ import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.Task; import org.apache.kafka.connect.errors.ConnectException; import org.apache.kafka.connect.source.SourceConnector; diff --git a/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorSourceConnector.java b/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorSourceConnector.java index ecaf6bd06d134..8eb5a9294406c 100644 --- a/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorSourceConnector.java +++ b/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorSourceConnector.java @@ -43,8 +43,8 @@ import org.apache.kafka.common.resource.ResourcePattern; import org.apache.kafka.common.resource.ResourcePatternFilter; import org.apache.kafka.common.resource.ResourceType; -import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.Task; import org.apache.kafka.connect.errors.ConnectException; import org.apache.kafka.connect.source.ExactlyOnceSupport; diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/connector/policy/AbstractConnectorClientConfigOverridePolicy.java b/connect/runtime/src/main/java/org/apache/kafka/connect/connector/policy/AbstractConnectorClientConfigOverridePolicy.java index fdbaba3e840b6..7cb2bb3411f92 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/connector/policy/AbstractConnectorClientConfigOverridePolicy.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/connector/policy/AbstractConnectorClientConfigOverridePolicy.java @@ -18,7 +18,7 @@ package org.apache.kafka.connect.connector.policy; import org.apache.kafka.common.config.ConfigValue; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import java.util.ArrayList; import java.util.List; diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/converters/BooleanConverter.java b/connect/runtime/src/main/java/org/apache/kafka/connect/converters/BooleanConverter.java index 5c94256cf9132..fabe0d1b19fa0 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/converters/BooleanConverter.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/converters/BooleanConverter.java @@ -20,8 +20,8 @@ import org.apache.kafka.common.errors.SerializationException; import org.apache.kafka.common.serialization.BooleanDeserializer; import org.apache.kafka.common.serialization.BooleanSerializer; -import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.Schema.Type; import org.apache.kafka.connect.data.SchemaAndValue; diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/converters/ByteArrayConverter.java b/connect/runtime/src/main/java/org/apache/kafka/connect/converters/ByteArrayConverter.java index 83838e91a1e7d..7ca766b614d64 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/converters/ByteArrayConverter.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/converters/ByteArrayConverter.java @@ -18,7 +18,7 @@ package org.apache.kafka.connect.converters; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaAndValue; import org.apache.kafka.connect.errors.DataException; diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/converters/NumberConverter.java b/connect/runtime/src/main/java/org/apache/kafka/connect/converters/NumberConverter.java index 0deb37d14e32e..c524055166e81 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/converters/NumberConverter.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/converters/NumberConverter.java @@ -20,8 +20,8 @@ import org.apache.kafka.common.errors.SerializationException; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Serializer; -import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaAndValue; import org.apache.kafka.connect.errors.DataException; diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/ConnectMetrics.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/ConnectMetrics.java index 834086490002f..9ee008f366655 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/ConnectMetrics.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/ConnectMetrics.java @@ -29,8 +29,8 @@ import org.apache.kafka.common.metrics.Sensor; import org.apache.kafka.common.metrics.internals.MetricsUtils; import org.apache.kafka.common.metrics.internals.PluginMetricsImpl; -import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.ConnectRecord; import org.apache.kafka.connect.runtime.distributed.DistributedConfig; import org.apache.kafka.connect.storage.Converter; diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/DistributedHerder.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/DistributedHerder.java index f1fd7846f28f6..2a8dbf83d2c37 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/DistributedHerder.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/DistributedHerder.java @@ -25,11 +25,11 @@ import org.apache.kafka.common.metrics.stats.Avg; import org.apache.kafka.common.metrics.stats.CumulativeSum; import org.apache.kafka.common.metrics.stats.Max; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.Exit; import org.apache.kafka.common.utils.internals.ExponentialBackoff; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.common.utils.internals.ThreadUtils; import org.apache.kafka.connect.connector.policy.ConnectorClientConfigOverridePolicy; import org.apache.kafka.connect.errors.AlreadyExistsException; diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/EagerAssignor.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/EagerAssignor.java index 68ad83ef6b68a..6d4d82055da74 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/EagerAssignor.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/EagerAssignor.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.connect.runtime.distributed; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.internals.CircularIterator; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.connect.storage.ClusterConfigState; import org.apache.kafka.connect.util.ConnectorTaskId; diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/IncrementalCooperativeAssignor.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/IncrementalCooperativeAssignor.java index 5ef3591355317..cfc4735dc4e6b 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/IncrementalCooperativeAssignor.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/IncrementalCooperativeAssignor.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.connect.runtime.distributed; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.internals.ExponentialBackoff; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.connect.runtime.distributed.WorkerCoordinator.ConnectorsAndTasks; import org.apache.kafka.connect.runtime.distributed.WorkerCoordinator.WorkerLoad; import org.apache.kafka.connect.storage.ClusterConfigState; diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinator.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinator.java index edb174ab52bed..43ae918c29126 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinator.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinator.java @@ -23,9 +23,9 @@ import org.apache.kafka.common.metrics.Measurable; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.requests.JoinGroupRequest; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.connect.storage.ClusterConfigState; import org.apache.kafka.connect.storage.ConfigBackingStore; import org.apache.kafka.connect.util.ConnectorTaskId; diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerGroupMember.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerGroupMember.java index a283ce7cf3878..f947c9a12ec79 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerGroupMember.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerGroupMember.java @@ -34,10 +34,10 @@ import org.apache.kafka.common.metrics.MetricsReporter; import org.apache.kafka.common.network.ChannelBuilder; import org.apache.kafka.common.network.Selector; -import org.apache.kafka.common.utils.AppInfoParser; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.AppInfoParser; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.connect.runtime.WorkerConfig; import org.apache.kafka.connect.storage.ConfigBackingStore; import org.apache.kafka.connect.util.ConnectorTaskId; diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/rest/entities/ServerInfo.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/rest/entities/ServerInfo.java index c739036d1e858..6bc106303b8f3 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/rest/entities/ServerInfo.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/rest/entities/ServerInfo.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.connect.runtime.rest.entities; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/util/LoggingContext.java b/connect/runtime/src/main/java/org/apache/kafka/connect/util/LoggingContext.java index a83c515e73adf..1b82a64736057 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/util/LoggingContext.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/util/LoggingContext.java @@ -37,7 +37,7 @@ * LoggingContext was created. Use {@link #clear()} to remove all MDC parameters from the * current thread context. * - *

Compare this approach to {@link org.apache.kafka.common.utils.LogContext}, which must be + *

Compare this approach to {@link org.apache.kafka.common.utils.internals.LogContext}, which must be * used to create a new {@link org.slf4j.Logger} instance pre-configured with the desired prefix. * Currently, LogContext does not allow the prefix to be changed, and it requires that all * components use the LogContext to create their Logger instance. diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/converters/BooleanConverterTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/converters/BooleanConverterTest.java index 89456699e6933..3635479993e9c 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/converters/BooleanConverterTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/converters/BooleanConverterTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.converters; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.errors.DataException; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/converters/ByteArrayConverterTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/converters/ByteArrayConverterTest.java index 0d926e42dd6f6..3e495f40dadb8 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/converters/ByteArrayConverterTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/converters/ByteArrayConverterTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.converters; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaAndValue; import org.apache.kafka.connect.errors.DataException; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/converters/NumberConverterTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/converters/NumberConverterTest.java index 41794a6c7e924..8a7d0fceb0fab 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/converters/NumberConverterTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/converters/NumberConverterTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.converters; import org.apache.kafka.common.serialization.Serializer; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaAndValue; import org.apache.kafka.connect.errors.DataException; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/SampleConverterWithHeaders.java b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/SampleConverterWithHeaders.java index a110aabbc0c25..7fe363ace0b88 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/SampleConverterWithHeaders.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/SampleConverterWithHeaders.java @@ -18,7 +18,7 @@ import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.Headers; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaAndValue; import org.apache.kafka.connect.errors.DataException; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/SampleHeaderConverter.java b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/SampleHeaderConverter.java index 5a62a9cde551c..a7695f2d5ceaa 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/SampleHeaderConverter.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/SampleHeaderConverter.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.runtime; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaAndValue; import org.apache.kafka.connect.storage.HeaderConverter; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/SamplePredicate.java b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/SamplePredicate.java index ee8edfff95bac..89c1a53a073a4 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/SamplePredicate.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/SamplePredicate.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.runtime; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.source.SourceRecord; import org.apache.kafka.connect.transforms.predicates.Predicate; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/SampleTransformation.java b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/SampleTransformation.java index 001dc0de817b9..94cbd802ea437 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/SampleTransformation.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/SampleTransformation.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.runtime; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.ConnectRecord; import org.apache.kafka.connect.transforms.Transformation; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/IncrementalCooperativeAssignorTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/IncrementalCooperativeAssignorTest.java index 84bb8b145ad0a..585ce61faa14a 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/IncrementalCooperativeAssignorTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/IncrementalCooperativeAssignorTest.java @@ -18,9 +18,9 @@ import org.apache.kafka.clients.consumer.internals.RequestFuture; import org.apache.kafka.common.message.JoinGroupResponseData; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.connect.runtime.TargetState; import org.apache.kafka.connect.runtime.distributed.WorkerCoordinator.ConnectorsAndTasks; import org.apache.kafka.connect.storage.AppliedConnectorConfig; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinatorIncrementalTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinatorIncrementalTest.java index 047a3b5d4e94c..51d59d0eafc00 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinatorIncrementalTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinatorIncrementalTest.java @@ -24,8 +24,8 @@ import org.apache.kafka.common.internals.ClusterResourceListeners; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.requests.RequestTestUtils; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.connect.storage.ClusterConfigState; import org.apache.kafka.connect.storage.KafkaConfigBackingStore; import org.apache.kafka.connect.util.ConnectorTaskId; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinatorTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinatorTest.java index 46a5b076a3398..0867184727e06 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinatorTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinatorTest.java @@ -33,9 +33,9 @@ import org.apache.kafka.common.requests.RequestTestUtils; import org.apache.kafka.common.requests.SyncGroupRequest; import org.apache.kafka.common.requests.SyncGroupResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.connect.runtime.TargetState; import org.apache.kafka.connect.storage.AppliedConnectorConfig; import org.apache.kafka.connect.storage.ClusterConfigState; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/WorkerGroupMemberTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/WorkerGroupMemberTest.java index 4886431869c1e..627497edcd9d3 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/WorkerGroupMemberTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/WorkerGroupMemberTest.java @@ -21,8 +21,8 @@ import org.apache.kafka.common.metrics.JmxReporter; import org.apache.kafka.common.metrics.MetricsReporter; import org.apache.kafka.common.metrics.stats.Avg; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.connect.runtime.MockConnectMetrics; import org.apache.kafka.connect.runtime.WorkerConfig; import org.apache.kafka.connect.storage.ConfigBackingStore; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/resources/ConnectorPluginsResourceTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/resources/ConnectorPluginsResourceTest.java index 19c9c9e006f98..6277739a2146f 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/resources/ConnectorPluginsResourceTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/resources/ConnectorPluginsResourceTest.java @@ -23,7 +23,7 @@ import org.apache.kafka.common.config.ConfigDef.Type; import org.apache.kafka.common.config.ConfigDef.Width; import org.apache.kafka.common.config.ConfigValue; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.Connector; import org.apache.kafka.connect.connector.Task; import org.apache.kafka.connect.converters.LongConverter; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/resources/RootResourceTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/resources/RootResourceTest.java index 459bc58201392..7083b2080168a 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/resources/RootResourceTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/resources/RootResourceTest.java @@ -17,8 +17,8 @@ package org.apache.kafka.connect.runtime.rest.resources; import org.apache.kafka.clients.admin.MockAdminClient; -import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.runtime.Herder; import org.apache.kafka.connect.runtime.rest.RestRequestTimeout; import org.apache.kafka.connect.runtime.rest.entities.ServerInfo; diff --git a/connect/runtime/src/test/resources/test-plugins/bad-packaging/test/plugins/DefaultConstructorThrowsConverter.java b/connect/runtime/src/test/resources/test-plugins/bad-packaging/test/plugins/DefaultConstructorThrowsConverter.java index 24295ddf59a0f..03417e819fc65 100644 --- a/connect/runtime/src/test/resources/test-plugins/bad-packaging/test/plugins/DefaultConstructorThrowsConverter.java +++ b/connect/runtime/src/test/resources/test-plugins/bad-packaging/test/plugins/DefaultConstructorThrowsConverter.java @@ -21,7 +21,7 @@ import java.util.Map; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaAndValue; import org.apache.kafka.connect.storage.Converter; diff --git a/connect/runtime/src/test/resources/test-plugins/bad-packaging/test/plugins/NoDefaultConstructorConverter.java b/connect/runtime/src/test/resources/test-plugins/bad-packaging/test/plugins/NoDefaultConstructorConverter.java index 526487d6df85e..11ffdd2d6dd3e 100644 --- a/connect/runtime/src/test/resources/test-plugins/bad-packaging/test/plugins/NoDefaultConstructorConverter.java +++ b/connect/runtime/src/test/resources/test-plugins/bad-packaging/test/plugins/NoDefaultConstructorConverter.java @@ -21,7 +21,7 @@ import java.util.Map; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaAndValue; import org.apache.kafka.connect.storage.Converter; diff --git a/connect/runtime/src/test/resources/test-plugins/classpath-converter/org/apache/kafka/connect/converters/ByteArrayConverter.java b/connect/runtime/src/test/resources/test-plugins/classpath-converter/org/apache/kafka/connect/converters/ByteArrayConverter.java index f21d4b5e4590a..90ce4fe2df303 100644 --- a/connect/runtime/src/test/resources/test-plugins/classpath-converter/org/apache/kafka/connect/converters/ByteArrayConverter.java +++ b/connect/runtime/src/test/resources/test-plugins/classpath-converter/org/apache/kafka/connect/converters/ByteArrayConverter.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.converters; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.Task; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaAndValue; diff --git a/connect/runtime/src/test/resources/test-plugins/versioned-predicate/test/plugins/VersionedPredicate.java b/connect/runtime/src/test/resources/test-plugins/versioned-predicate/test/plugins/VersionedPredicate.java index d6bd62263bcdb..003aaf20e2aa8 100644 --- a/connect/runtime/src/test/resources/test-plugins/versioned-predicate/test/plugins/VersionedPredicate.java +++ b/connect/runtime/src/test/resources/test-plugins/versioned-predicate/test/plugins/VersionedPredicate.java @@ -18,7 +18,7 @@ package test.plugins; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.ConnectRecord; import org.apache.kafka.connect.transforms.predicates.Predicate; diff --git a/connect/runtime/src/test/resources/test-plugins/versioned-transformation/test/plugins/VersionedTransformation.java b/connect/runtime/src/test/resources/test-plugins/versioned-transformation/test/plugins/VersionedTransformation.java index ab4a0e3400022..d8beae2c0fb66 100644 --- a/connect/runtime/src/test/resources/test-plugins/versioned-transformation/test/plugins/VersionedTransformation.java +++ b/connect/runtime/src/test/resources/test-plugins/versioned-transformation/test/plugins/VersionedTransformation.java @@ -18,7 +18,7 @@ package test.plugins; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.ConnectRecord; import org.apache.kafka.connect.transforms.Transformation; diff --git a/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/MockConnector.java b/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/MockConnector.java index f598feede8c1d..f3a1b75439829 100644 --- a/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/MockConnector.java +++ b/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/MockConnector.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.tools; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.Connector; import org.apache.kafka.connect.connector.Task; diff --git a/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/MockSinkTask.java b/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/MockSinkTask.java index 1c97ced61efce..96c6beaab8a9e 100644 --- a/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/MockSinkTask.java +++ b/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/MockSinkTask.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.connect.tools; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.sink.SinkRecord; import org.apache.kafka.connect.sink.SinkTask; diff --git a/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/MockSourceTask.java b/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/MockSourceTask.java index 49dc5e8a7e694..c5b83fe4b111b 100644 --- a/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/MockSourceTask.java +++ b/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/MockSourceTask.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.connect.tools; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.source.SourceRecord; import org.apache.kafka.connect.source.SourceTask; diff --git a/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/SchemaSourceConnector.java b/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/SchemaSourceConnector.java index d6186efafdf65..0426ed26af8a9 100644 --- a/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/SchemaSourceConnector.java +++ b/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/SchemaSourceConnector.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.tools; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.Task; import org.apache.kafka.connect.source.SourceConnector; diff --git a/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/VerifiableSinkConnector.java b/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/VerifiableSinkConnector.java index b198dafc535f5..e88ab7943315f 100644 --- a/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/VerifiableSinkConnector.java +++ b/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/VerifiableSinkConnector.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.tools; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.Task; import org.apache.kafka.connect.sink.SinkConnector; diff --git a/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/VerifiableSourceConnector.java b/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/VerifiableSourceConnector.java index e23992dfe1bc6..002abb6e4a4d1 100644 --- a/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/VerifiableSourceConnector.java +++ b/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/VerifiableSourceConnector.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.tools; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.Task; import org.apache.kafka.connect.source.SourceConnector; diff --git a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/Cast.java b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/Cast.java index 02e89aa818f2c..339dc9e1ba9e2 100644 --- a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/Cast.java +++ b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/Cast.java @@ -22,8 +22,8 @@ import org.apache.kafka.common.cache.SynchronizedCache; import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.ConfigException; -import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.ConnectRecord; import org.apache.kafka.connect.data.ConnectSchema; import org.apache.kafka.connect.data.Date; diff --git a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/DropHeaders.java b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/DropHeaders.java index 13f005f9115a0..47fc3e674b785 100644 --- a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/DropHeaders.java +++ b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/DropHeaders.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.transforms; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.ConnectRecord; import org.apache.kafka.connect.header.ConnectHeaders; import org.apache.kafka.connect.header.Header; diff --git a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/ExtractField.java b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/ExtractField.java index d3287ab74993e..2d6239cba949c 100644 --- a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/ExtractField.java +++ b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/ExtractField.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.transforms; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.ConnectRecord; import org.apache.kafka.connect.data.Field; import org.apache.kafka.connect.data.Schema; diff --git a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/Filter.java b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/Filter.java index 059ca456616af..ffe7f3c8f314c 100644 --- a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/Filter.java +++ b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/Filter.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.transforms; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.ConnectRecord; import java.util.Map; diff --git a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/Flatten.java b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/Flatten.java index c0e54e44fb8f8..336199cfbbe59 100644 --- a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/Flatten.java +++ b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/Flatten.java @@ -21,7 +21,7 @@ import org.apache.kafka.common.cache.LRUCache; import org.apache.kafka.common.cache.SynchronizedCache; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.ConnectRecord; import org.apache.kafka.connect.data.ConnectSchema; import org.apache.kafka.connect.data.Field; diff --git a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/HeaderFrom.java b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/HeaderFrom.java index d2dbb17615490..2dd9e2ce59637 100644 --- a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/HeaderFrom.java +++ b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/HeaderFrom.java @@ -21,7 +21,7 @@ import org.apache.kafka.common.cache.SynchronizedCache; import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.ConfigException; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.ConnectRecord; import org.apache.kafka.connect.data.Field; import org.apache.kafka.connect.data.Schema; diff --git a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/HoistField.java b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/HoistField.java index 7b4dfc291307e..f52d5cc30b504 100644 --- a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/HoistField.java +++ b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/HoistField.java @@ -20,7 +20,7 @@ import org.apache.kafka.common.cache.LRUCache; import org.apache.kafka.common.cache.SynchronizedCache; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.ConnectRecord; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaBuilder; diff --git a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/InsertField.java b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/InsertField.java index 428fcb5d3e0cc..70948461a951c 100644 --- a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/InsertField.java +++ b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/InsertField.java @@ -21,7 +21,7 @@ import org.apache.kafka.common.cache.SynchronizedCache; import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.ConfigException; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.ConnectRecord; import org.apache.kafka.connect.data.Field; import org.apache.kafka.connect.data.Schema; diff --git a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/InsertHeader.java b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/InsertHeader.java index d22a680fcb2e0..dbfc6adbb5503 100644 --- a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/InsertHeader.java +++ b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/InsertHeader.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.transforms; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.ConnectRecord; import org.apache.kafka.connect.data.SchemaAndValue; import org.apache.kafka.connect.data.Values; diff --git a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/MaskField.java b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/MaskField.java index 99ece9be309dd..9dcc5aa743445 100644 --- a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/MaskField.java +++ b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/MaskField.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.transforms; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.ConnectRecord; import org.apache.kafka.connect.data.Field; import org.apache.kafka.connect.data.Schema; diff --git a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/RegexRouter.java b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/RegexRouter.java index d91189ce1f83a..9a167a65227e5 100644 --- a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/RegexRouter.java +++ b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/RegexRouter.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.transforms; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.ConnectRecord; import org.apache.kafka.connect.transforms.util.RegexValidator; import org.apache.kafka.connect.transforms.util.SimpleConfig; diff --git a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/ReplaceField.java b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/ReplaceField.java index ca6bbb73c5851..df1a50d26da0d 100644 --- a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/ReplaceField.java +++ b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/ReplaceField.java @@ -21,7 +21,7 @@ import org.apache.kafka.common.cache.SynchronizedCache; import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.ConfigException; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.ConnectRecord; import org.apache.kafka.connect.data.Field; import org.apache.kafka.connect.data.Schema; diff --git a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/SetSchemaMetadata.java b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/SetSchemaMetadata.java index 9d24f9a1c1309..984d6b428269d 100644 --- a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/SetSchemaMetadata.java +++ b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/SetSchemaMetadata.java @@ -18,7 +18,7 @@ import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.ConfigException; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.ConnectRecord; import org.apache.kafka.connect.data.ConnectSchema; import org.apache.kafka.connect.data.Field; diff --git a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/TimestampConverter.java b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/TimestampConverter.java index 95c97eb6bad18..5ec0db9e510be 100644 --- a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/TimestampConverter.java +++ b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/TimestampConverter.java @@ -22,8 +22,8 @@ import org.apache.kafka.common.cache.SynchronizedCache; import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.ConfigException; -import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.ConnectRecord; import org.apache.kafka.connect.data.Field; import org.apache.kafka.connect.data.Schema; diff --git a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/TimestampRouter.java b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/TimestampRouter.java index 6739a15946444..6d27ad9eb3021 100644 --- a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/TimestampRouter.java +++ b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/TimestampRouter.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.transforms; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.ConnectRecord; import org.apache.kafka.connect.errors.DataException; import org.apache.kafka.connect.transforms.util.SimpleConfig; diff --git a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/ValueToKey.java b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/ValueToKey.java index e8a57f355258d..673742a1eeab9 100644 --- a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/ValueToKey.java +++ b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/ValueToKey.java @@ -20,7 +20,7 @@ import org.apache.kafka.common.cache.LRUCache; import org.apache.kafka.common.cache.SynchronizedCache; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.ConnectRecord; import org.apache.kafka.connect.data.Field; import org.apache.kafka.connect.data.Schema; diff --git a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/predicates/HasHeaderKey.java b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/predicates/HasHeaderKey.java index c393b1308a917..436c5f1f2aeb4 100644 --- a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/predicates/HasHeaderKey.java +++ b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/predicates/HasHeaderKey.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.transforms.predicates; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.ConnectRecord; import org.apache.kafka.connect.header.Header; import org.apache.kafka.connect.transforms.util.SimpleConfig; diff --git a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/predicates/RecordIsTombstone.java b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/predicates/RecordIsTombstone.java index b709a83b0938a..7e60d7d95fe43 100644 --- a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/predicates/RecordIsTombstone.java +++ b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/predicates/RecordIsTombstone.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.transforms.predicates; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.ConnectRecord; import java.util.Map; diff --git a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/predicates/TopicNameMatches.java b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/predicates/TopicNameMatches.java index cd358b2642b6b..5e4c9f988309a 100644 --- a/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/predicates/TopicNameMatches.java +++ b/connect/transforms/src/main/java/org/apache/kafka/connect/transforms/predicates/TopicNameMatches.java @@ -18,7 +18,7 @@ import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.ConfigException; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.connector.ConnectRecord; import org.apache.kafka.connect.transforms.util.RegexValidator; import org.apache.kafka.connect.transforms.util.SimpleConfig; diff --git a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/CastTest.java b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/CastTest.java index 1a470095a417d..7d520fb26f1df 100644 --- a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/CastTest.java +++ b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/CastTest.java @@ -18,7 +18,7 @@ package org.apache.kafka.connect.transforms; import org.apache.kafka.common.config.ConfigException; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Decimal; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.Schema.Type; diff --git a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/DropHeadersTest.java b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/DropHeadersTest.java index 2def8f2e4d226..e3391532347fb 100644 --- a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/DropHeadersTest.java +++ b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/DropHeadersTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.transforms; import org.apache.kafka.common.config.ConfigException; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.header.ConnectHeaders; import org.apache.kafka.connect.source.SourceRecord; diff --git a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/ExtractFieldTest.java b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/ExtractFieldTest.java index 414dec56095d3..d39c43f962b23 100644 --- a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/ExtractFieldTest.java +++ b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/ExtractFieldTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.connect.transforms; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaBuilder; import org.apache.kafka.connect.data.Struct; diff --git a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/FlattenTest.java b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/FlattenTest.java index 8873f4c03b0b8..9e9fd302affb2 100644 --- a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/FlattenTest.java +++ b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/FlattenTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.transforms; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaBuilder; import org.apache.kafka.connect.data.Struct; diff --git a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/HoistFieldTest.java b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/HoistFieldTest.java index 93b69d5413d83..3f079c9f8387a 100644 --- a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/HoistFieldTest.java +++ b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/HoistFieldTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.connect.transforms; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.Struct; import org.apache.kafka.connect.sink.SinkRecord; diff --git a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/InsertFieldTest.java b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/InsertFieldTest.java index 705f60f5a2e5b..9a0d57059f659 100644 --- a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/InsertFieldTest.java +++ b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/InsertFieldTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.connect.transforms; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaBuilder; import org.apache.kafka.connect.data.Struct; diff --git a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/InsertHeaderTest.java b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/InsertHeaderTest.java index 190931b829bf2..29e9dddcc2816 100644 --- a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/InsertHeaderTest.java +++ b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/InsertHeaderTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.transforms; import org.apache.kafka.common.config.ConfigException; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.header.ConnectHeaders; import org.apache.kafka.connect.header.Headers; diff --git a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/MaskFieldTest.java b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/MaskFieldTest.java index 3bdc1cd3b4cfa..92f7983a1fa99 100644 --- a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/MaskFieldTest.java +++ b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/MaskFieldTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.transforms; import org.apache.kafka.common.config.ConfigException; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Decimal; import org.apache.kafka.connect.data.Field; import org.apache.kafka.connect.data.Schema; diff --git a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/RegexRouterTest.java b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/RegexRouterTest.java index 6ec7601bb625c..ff63752c5708d 100644 --- a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/RegexRouterTest.java +++ b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/RegexRouterTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.connect.transforms; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.sink.SinkRecord; import org.junit.jupiter.api.Test; diff --git a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/ReplaceFieldTest.java b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/ReplaceFieldTest.java index e0f17e065ddf2..a508dd0e8878c 100644 --- a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/ReplaceFieldTest.java +++ b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/ReplaceFieldTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.connect.transforms; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaBuilder; import org.apache.kafka.connect.data.Struct; diff --git a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/SetSchemaMetadataTest.java b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/SetSchemaMetadataTest.java index 7f47dd0f8c0f0..1ae02ef2c0d92 100644 --- a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/SetSchemaMetadataTest.java +++ b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/SetSchemaMetadataTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.connect.transforms; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Field; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaBuilder; diff --git a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/TimestampConverterTest.java b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/TimestampConverterTest.java index d67d031482dd6..1d7be287f98eb 100644 --- a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/TimestampConverterTest.java +++ b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/TimestampConverterTest.java @@ -18,7 +18,7 @@ package org.apache.kafka.connect.transforms; import org.apache.kafka.common.config.ConfigException; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Date; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaBuilder; diff --git a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/TimestampRouterTest.java b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/TimestampRouterTest.java index a98c4406ad9ed..12f46be6315ad 100644 --- a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/TimestampRouterTest.java +++ b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/TimestampRouterTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.connect.transforms; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.source.SourceRecord; import org.junit.jupiter.api.AfterEach; diff --git a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/ValueToKeyTest.java b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/ValueToKeyTest.java index 775bfbabac252..345d252e758a4 100644 --- a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/ValueToKeyTest.java +++ b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/ValueToKeyTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.connect.transforms; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaBuilder; import org.apache.kafka.connect.data.Struct; diff --git a/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/CoordinatorExecutorImpl.java b/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/CoordinatorExecutorImpl.java index 31aeebee30acf..53a2379e46fb5 100644 --- a/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/CoordinatorExecutorImpl.java +++ b/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/CoordinatorExecutorImpl.java @@ -19,7 +19,7 @@ import org.apache.kafka.common.errors.CoordinatorLoadInProgressException; import org.apache.kafka.common.errors.NotCoordinatorException; import org.apache.kafka.common.protocol.Errors; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/CoordinatorRuntime.java b/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/CoordinatorRuntime.java index eab9c5f1a6485..670458c2aa959 100644 --- a/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/CoordinatorRuntime.java +++ b/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/CoordinatorRuntime.java @@ -33,10 +33,10 @@ import org.apache.kafka.common.record.internal.RecordBatch; import org.apache.kafka.common.record.internal.SimpleRecord; import org.apache.kafka.common.requests.TransactionResult; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.deferred.DeferredEvent; import org.apache.kafka.deferred.DeferredEventQueue; import org.apache.kafka.server.common.TransactionVersion; diff --git a/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/CoordinatorShardBuilder.java b/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/CoordinatorShardBuilder.java index 83583fb302c2e..a3739cee4f3ea 100644 --- a/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/CoordinatorShardBuilder.java +++ b/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/CoordinatorShardBuilder.java @@ -17,8 +17,8 @@ package org.apache.kafka.coordinator.common.runtime; import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.timeline.SnapshotRegistry; diff --git a/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/CoordinatorTimerImpl.java b/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/CoordinatorTimerImpl.java index 6b2eaff5ff22e..9e74e9842fe2b 100644 --- a/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/CoordinatorTimerImpl.java +++ b/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/CoordinatorTimerImpl.java @@ -19,7 +19,7 @@ import org.apache.kafka.common.errors.CoordinatorLoadInProgressException; import org.apache.kafka.common.errors.NotCoordinatorException; import org.apache.kafka.common.protocol.Errors; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.server.util.timer.Timer; import org.apache.kafka.server.util.timer.TimerTask; diff --git a/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/MultiThreadedEventProcessor.java b/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/MultiThreadedEventProcessor.java index bd3d0e5d8894a..032ceb9df2243 100644 --- a/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/MultiThreadedEventProcessor.java +++ b/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/MultiThreadedEventProcessor.java @@ -17,8 +17,8 @@ package org.apache.kafka.coordinator.common.runtime; import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/SnapshottableCoordinator.java b/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/SnapshottableCoordinator.java index 0676421423fd9..6c5d65f1b33de 100644 --- a/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/SnapshottableCoordinator.java +++ b/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/SnapshottableCoordinator.java @@ -18,7 +18,7 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.requests.TransactionResult; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.timeline.SnapshotRegistry; import org.slf4j.Logger; diff --git a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorExecutorImplTest.java b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorExecutorImplTest.java index da0f4697c5189..f3d379c3e48e1 100644 --- a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorExecutorImplTest.java +++ b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorExecutorImplTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.coordinator.common.runtime; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorRuntimeTest.java b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorRuntimeTest.java index 626706afd6c93..7a5f0635e6500 100644 --- a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorRuntimeTest.java +++ b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorRuntimeTest.java @@ -30,8 +30,8 @@ import org.apache.kafka.common.record.internal.RecordBatch; import org.apache.kafka.common.record.internal.Records; import org.apache.kafka.common.requests.TransactionResult; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.image.MetadataDelta; import org.apache.kafka.image.MetadataImage; import org.apache.kafka.server.common.TransactionVersion; diff --git a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorTimerImplTest.java b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorTimerImplTest.java index 07866aa3a041d..3b86f8b1c371c 100644 --- a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorTimerImplTest.java +++ b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorTimerImplTest.java @@ -18,7 +18,7 @@ import org.apache.kafka.common.errors.CoordinatorLoadInProgressException; import org.apache.kafka.common.errors.NotCoordinatorException; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.server.util.timer.MockTimer; import org.junit.jupiter.api.Test; diff --git a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/DeferredEventCollectionTest.java b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/DeferredEventCollectionTest.java index 821f048c8b66f..8026e5063c10b 100644 --- a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/DeferredEventCollectionTest.java +++ b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/DeferredEventCollectionTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.coordinator.common.runtime; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.deferred.DeferredEvent; import org.junit.jupiter.api.Test; diff --git a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/MockCoordinatorShardBuilder.java b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/MockCoordinatorShardBuilder.java index 13b0c3b13d145..ed2130b565325 100644 --- a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/MockCoordinatorShardBuilder.java +++ b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/MockCoordinatorShardBuilder.java @@ -17,8 +17,8 @@ package org.apache.kafka.coordinator.common.runtime; import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.timeline.SnapshotRegistry; import java.util.Objects; diff --git a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/MultiThreadedEventProcessorTest.java b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/MultiThreadedEventProcessorTest.java index faff0e00eac5c..97c3038fac80c 100644 --- a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/MultiThreadedEventProcessorTest.java +++ b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/MultiThreadedEventProcessorTest.java @@ -17,9 +17,9 @@ package org.apache.kafka.coordinator.common.runtime; import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/SnapshottableCoordinatorTest.java b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/SnapshottableCoordinatorTest.java index b1436a3eff5c0..d28978c5bcbab 100644 --- a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/SnapshottableCoordinatorTest.java +++ b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/SnapshottableCoordinatorTest.java @@ -17,8 +17,8 @@ package org.apache.kafka.coordinator.common.runtime; import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.timeline.SnapshotRegistry; import org.junit.jupiter.api.Test; diff --git a/core/src/main/java/kafka/server/NetworkUtils.java b/core/src/main/java/kafka/server/NetworkUtils.java index 5f084bfd98904..c716fe98f8dec 100644 --- a/core/src/main/java/kafka/server/NetworkUtils.java +++ b/core/src/main/java/kafka/server/NetworkUtils.java @@ -28,8 +28,8 @@ import org.apache.kafka.common.network.Selectable; import org.apache.kafka.common.network.Selector; import org.apache.kafka.common.security.JaasContext; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import java.util.Map; diff --git a/core/src/main/scala/kafka/coordinator/transaction/TransactionCoordinator.scala b/core/src/main/scala/kafka/coordinator/transaction/TransactionCoordinator.scala index fab67b3fcd0c0..96dc7ad7f8d06 100644 --- a/core/src/main/scala/kafka/coordinator/transaction/TransactionCoordinator.scala +++ b/core/src/main/scala/kafka/coordinator/transaction/TransactionCoordinator.scala @@ -26,7 +26,8 @@ import org.apache.kafka.common.metrics.Metrics import org.apache.kafka.common.protocol.Errors import org.apache.kafka.common.record.internal.RecordBatch import org.apache.kafka.common.requests.{AddPartitionsToTxnResponse, TransactionResult} -import org.apache.kafka.common.utils.{LogContext, ProducerIdAndEpoch, Time} +import org.apache.kafka.common.utils.{ProducerIdAndEpoch, Time} +import org.apache.kafka.common.utils.internals.LogContext import org.apache.kafka.coordinator.transaction.{ProducerIdManager, TransactionLogConfig, TransactionMetadata, TransactionState, TransactionStateManagerConfig, TxnTransitMetadata} import org.apache.kafka.metadata.MetadataCache import org.apache.kafka.server.common.{RequestLocal, TransactionVersion} diff --git a/core/src/main/scala/kafka/coordinator/transaction/TransactionMarkerChannelManager.scala b/core/src/main/scala/kafka/coordinator/transaction/TransactionMarkerChannelManager.scala index 91daeedf81536..aeb69d1795f4e 100644 --- a/core/src/main/scala/kafka/coordinator/transaction/TransactionMarkerChannelManager.scala +++ b/core/src/main/scala/kafka/coordinator/transaction/TransactionMarkerChannelManager.scala @@ -30,7 +30,8 @@ import org.apache.kafka.common.protocol.Errors import org.apache.kafka.common.requests.WriteTxnMarkersRequest.TxnMarkerEntry import org.apache.kafka.common.requests.{TransactionResult, WriteTxnMarkersRequest} import org.apache.kafka.common.security.JaasContext -import org.apache.kafka.common.utils.{LogContext, Time} +import org.apache.kafka.common.utils.Time +import org.apache.kafka.common.utils.internals.LogContext import org.apache.kafka.common.{Node, Reconfigurable, TopicPartition} import org.apache.kafka.coordinator.transaction.{TransactionMetadata, TxnTransitMetadata} import org.apache.kafka.metadata.MetadataCache diff --git a/core/src/main/scala/kafka/network/SocketServer.scala b/core/src/main/scala/kafka/network/SocketServer.scala index 06d1c0f792f63..bc91329d4bfdf 100644 --- a/core/src/main/scala/kafka/network/SocketServer.scala +++ b/core/src/main/scala/kafka/network/SocketServer.scala @@ -40,7 +40,8 @@ import org.apache.kafka.common.network.{ChannelBuilder, ChannelBuilders, ClientI import org.apache.kafka.common.protocol.ApiKeys import org.apache.kafka.common.requests.{ApiVersionsRequest, RequestContext, RequestHeader} import org.apache.kafka.common.security.auth.SecurityProtocol -import org.apache.kafka.common.utils.{LogContext, Time, Utils} +import org.apache.kafka.common.utils.{Time, Utils} +import org.apache.kafka.common.utils.internals.LogContext import org.apache.kafka.common.{Endpoint, KafkaException, MetricName, Reconfigurable} import org.apache.kafka.network.{ConnectionQuotaEntity, ConnectionThrottledException, SocketServer => JSocketServer, SocketServerConfigs, TooManyConnectionsException} import org.apache.kafka.security.CredentialProvider diff --git a/core/src/main/scala/kafka/raft/KafkaRaftManager.scala b/core/src/main/scala/kafka/raft/KafkaRaftManager.scala index 1d1d72767dbbc..051730fba0df5 100644 --- a/core/src/main/scala/kafka/raft/KafkaRaftManager.scala +++ b/core/src/main/scala/kafka/raft/KafkaRaftManager.scala @@ -35,7 +35,8 @@ import org.apache.kafka.common.requests.RequestContext import org.apache.kafka.common.requests.RequestHeader import org.apache.kafka.common.security.JaasContext import org.apache.kafka.common.security.auth.SecurityProtocol -import org.apache.kafka.common.utils.{LogContext, Time, Utils} +import org.apache.kafka.common.utils.{Time, Utils} +import org.apache.kafka.common.utils.internals.LogContext import org.apache.kafka.raft.internals.KafkaRaftLog import org.apache.kafka.raft.{Endpoints, ExternalKRaftMetrics, FileQuorumStateStore, KafkaNetworkChannel, KafkaRaftClient, KafkaRaftClientDriver, MetadataLogConfig, QuorumConfig, RaftLog, RaftManager, TimingWheelExpirationService} import org.apache.kafka.server.ProcessRole diff --git a/core/src/main/scala/kafka/server/BrokerBlockingSender.scala b/core/src/main/scala/kafka/server/BrokerBlockingSender.scala index b4de360d532f6..8adafed4fd719 100644 --- a/core/src/main/scala/kafka/server/BrokerBlockingSender.scala +++ b/core/src/main/scala/kafka/server/BrokerBlockingSender.scala @@ -22,7 +22,8 @@ import org.apache.kafka.common.metrics.Metrics import org.apache.kafka.common.network._ import org.apache.kafka.common.requests.AbstractRequest import org.apache.kafka.common.security.JaasContext -import org.apache.kafka.common.utils.{LogContext, Time} +import org.apache.kafka.common.utils.Time +import org.apache.kafka.common.utils.internals.LogContext import org.apache.kafka.clients.{ApiVersions, ClientResponse, ManualMetadataUpdater, NetworkClient} import org.apache.kafka.common.{Node, Reconfigurable} import org.apache.kafka.common.requests.AbstractRequest.Builder diff --git a/core/src/main/scala/kafka/server/BrokerServer.scala b/core/src/main/scala/kafka/server/BrokerServer.scala index 53811dc9f21cb..8f741727735cf 100644 --- a/core/src/main/scala/kafka/server/BrokerServer.scala +++ b/core/src/main/scala/kafka/server/BrokerServer.scala @@ -31,7 +31,8 @@ import org.apache.kafka.common.metrics.Metrics import org.apache.kafka.common.network.ListenerName import org.apache.kafka.common.security.scram.internals.ScramMechanism import org.apache.kafka.common.security.token.delegation.internals.DelegationTokenCache -import org.apache.kafka.common.utils.{LogContext, Time, Utils} +import org.apache.kafka.common.utils.{Time, Utils} +import org.apache.kafka.common.utils.internals.LogContext import org.apache.kafka.common.{ClusterResource, TopicPartition, Uuid} import org.apache.kafka.coordinator.common.runtime.{CoordinatorLoaderImpl, CoordinatorRecord} import org.apache.kafka.coordinator.group.metrics.{GroupCoordinatorMetrics, GroupCoordinatorRuntimeMetrics} diff --git a/core/src/main/scala/kafka/server/ControllerServer.scala b/core/src/main/scala/kafka/server/ControllerServer.scala index 08eff37b396f7..902252233ad0f 100644 --- a/core/src/main/scala/kafka/server/ControllerServer.scala +++ b/core/src/main/scala/kafka/server/ControllerServer.scala @@ -30,7 +30,8 @@ import org.apache.kafka.common.message.ApiMessageType.ListenerType import org.apache.kafka.common.metrics.Metrics import org.apache.kafka.common.security.scram.internals.ScramMechanism import org.apache.kafka.common.security.token.delegation.internals.DelegationTokenCache -import org.apache.kafka.common.utils.{LogContext, Utils} +import org.apache.kafka.common.utils.Utils +import org.apache.kafka.common.utils.internals.LogContext import org.apache.kafka.common.{ClusterResource, Endpoint, Uuid} import org.apache.kafka.controller.metrics.{ControllerMetadataMetricsPublisher, QuorumControllerMetrics} import org.apache.kafka.controller.{Controller, QuorumController, QuorumFeatures} diff --git a/core/src/main/scala/kafka/server/DynamicBrokerConfig.scala b/core/src/main/scala/kafka/server/DynamicBrokerConfig.scala index 11c19dc871540..bc70f1955a43a 100755 --- a/core/src/main/scala/kafka/server/DynamicBrokerConfig.scala +++ b/core/src/main/scala/kafka/server/DynamicBrokerConfig.scala @@ -32,9 +32,10 @@ import org.apache.kafka.common.metadata.{ConfigRecord, MetadataRecordType} import org.apache.kafka.common.metrics.{Metrics, MetricsReporter} import org.apache.kafka.common.network.{ListenerName, ListenerReconfigurable} import org.apache.kafka.common.security.authenticator.LoginManager -import org.apache.kafka.common.utils.LogContext +import org.apache.kafka.common.utils.internals.LogContext import org.apache.kafka.common.utils.internals.BufferSupplier -import org.apache.kafka.common.utils.{ConfigUtils, Utils} +import org.apache.kafka.common.utils.Utils +import org.apache.kafka.common.utils.internals.ConfigUtils import org.apache.kafka.config import org.apache.kafka.network.SocketServer import org.apache.kafka.raft.KafkaRaftClient diff --git a/core/src/main/scala/kafka/server/KafkaRaftServer.scala b/core/src/main/scala/kafka/server/KafkaRaftServer.scala index 270b1f30a6e72..facd495713311 100644 --- a/core/src/main/scala/kafka/server/KafkaRaftServer.scala +++ b/core/src/main/scala/kafka/server/KafkaRaftServer.scala @@ -21,7 +21,8 @@ import java.util.concurrent.CompletableFuture import kafka.utils.{Logging, Mx4jLoader} import org.apache.kafka.common.config.{ConfigDef, ConfigResource} import org.apache.kafka.common.internals.Topic -import org.apache.kafka.common.utils.{AppInfoParser, Time, Utils} +import org.apache.kafka.common.utils.{Time, Utils} +import org.apache.kafka.common.utils.internals.AppInfoParser import org.apache.kafka.common.{KafkaException, Uuid} import org.apache.kafka.metadata.KafkaConfigSchema import org.apache.kafka.metadata.bootstrap.{BootstrapDirectory, BootstrapMetadata} diff --git a/core/src/main/scala/kafka/server/ReplicaFetcherManager.scala b/core/src/main/scala/kafka/server/ReplicaFetcherManager.scala index d7510fc621421..7284370bb81c8 100644 --- a/core/src/main/scala/kafka/server/ReplicaFetcherManager.scala +++ b/core/src/main/scala/kafka/server/ReplicaFetcherManager.scala @@ -19,7 +19,8 @@ package kafka.server import org.apache.kafka.clients.FetchSessionHandler import org.apache.kafka.common.metrics.Metrics -import org.apache.kafka.common.utils.{LogContext, Time} +import org.apache.kafka.common.utils.Time +import org.apache.kafka.common.utils.internals.LogContext import org.apache.kafka.server.common.MetadataVersion import org.apache.kafka.server.network.BrokerEndPoint import org.apache.kafka.server.LeaderEndPoint diff --git a/core/src/main/scala/kafka/server/SharedServer.scala b/core/src/main/scala/kafka/server/SharedServer.scala index 9e6e223101107..19f88f62bb703 100644 --- a/core/src/main/scala/kafka/server/SharedServer.scala +++ b/core/src/main/scala/kafka/server/SharedServer.scala @@ -23,7 +23,9 @@ import kafka.server.Server.MetricsPrefix import kafka.utils.{Logging, VerifiableProperties} import org.apache.kafka.common.metrics.Metrics import org.apache.kafka.common.network.ListenerName -import org.apache.kafka.common.utils.{AppInfoParser, LogContext, Time, Utils} +import org.apache.kafka.common.utils.{Time, Utils} +import org.apache.kafka.common.utils.internals.AppInfoParser +import org.apache.kafka.common.utils.internals.LogContext import org.apache.kafka.controller.metrics.ControllerMetadataMetrics import org.apache.kafka.image.MetadataProvenance import org.apache.kafka.image.loader.MetadataLoader diff --git a/core/src/test/java/kafka/server/handlers/DescribeTopicPartitionsRequestHandlerTest.java b/core/src/test/java/kafka/server/handlers/DescribeTopicPartitionsRequestHandlerTest.java index 0ad4d63202e1e..90f2c10d00b63 100644 --- a/core/src/test/java/kafka/server/handlers/DescribeTopicPartitionsRequestHandlerTest.java +++ b/core/src/test/java/kafka/server/handlers/DescribeTopicPartitionsRequestHandlerTest.java @@ -50,8 +50,8 @@ import org.apache.kafka.common.security.auth.KafkaPrincipal; import org.apache.kafka.common.security.auth.KafkaPrincipalSerde; import org.apache.kafka.common.security.auth.SecurityProtocol; -import org.apache.kafka.common.utils.SecurityUtils; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.SecurityUtils; import org.apache.kafka.image.ClusterImage; import org.apache.kafka.image.MetadataDelta; import org.apache.kafka.image.MetadataImage; diff --git a/core/src/test/java/kafka/server/share/SharePartitionTest.java b/core/src/test/java/kafka/server/share/SharePartitionTest.java index 7375f1237955b..a5244fd7ec4fc 100644 --- a/core/src/test/java/kafka/server/share/SharePartitionTest.java +++ b/core/src/test/java/kafka/server/share/SharePartitionTest.java @@ -5278,7 +5278,7 @@ public void testReleaseAcquiredRecordsWithAnotherMemberAndSubsetAcknowledged() { // Ack subset of records by "member-2". sharePartition.acknowledge("member-2", List.of(new ShareAcknowledgementBatch(5, 5, List.of(AcknowledgeType.ACCEPT.id)))); - // After the acknowledgements, the startOffset will be upadated to 6, since offset 5 is Terminal. Hence + // After the acknowledgements, the startOffset will be updated to 6, since offset 5 is Terminal. Hence // deliveryCompleteCount will remain 9. assertEquals(9, sharePartition.deliveryCompleteCount()); @@ -5465,7 +5465,7 @@ public void testMaxDeliveryCountLimitExceededForRecordsSubsetCacheCleared() { ))); // After acknowledgements, since offsets 10 -> 12 are at the start of the caches state and are in Terminal state, - // the start offset will be updated to 13. From the remaining offstes in flight, only records (17 -> 19) are in Terminal state. + // the start offset will be updated to 13. From the remaining offsets in flight, only records (17 -> 19) are in Terminal state. assertEquals(3, sharePartition.deliveryCompleteCount()); // Send next batch from offset 13, only 2 records should be acquired. @@ -9709,7 +9709,7 @@ public void testAcquisitionLockTimeoutWithConcurrentAcknowledgement() throws Int TimerTask timerTask2 = sharePartition.cachedState().get(5L).batchAcquisitionLockTimeoutTask(); // Acknowledge 1 offset in first batch as Accept to create offset tracking, accept complete - // sencond batch. And mark offset 0 as release so cached state do not move ahead. + // second batch. And mark offset 0 as release so cached state do not move ahead. sharePartition.acknowledge(MEMBER_ID, List.of( new ShareAcknowledgementBatch(0, 0, List.of(AcknowledgeType.RELEASE.id)), new ShareAcknowledgementBatch(1, 1, List.of(AcknowledgeType.ACCEPT.id)), diff --git a/core/src/test/scala/integration/kafka/api/AuthorizerIntegrationTest.scala b/core/src/test/scala/integration/kafka/api/AuthorizerIntegrationTest.scala index 9499d0fc77a12..6f6959ed78614 100644 --- a/core/src/test/scala/integration/kafka/api/AuthorizerIntegrationTest.scala +++ b/core/src/test/scala/integration/kafka/api/AuthorizerIntegrationTest.scala @@ -4189,11 +4189,11 @@ class AuthorizerIntegrationTest extends AbstractAuthorizerIntegrationTest { } def removeAllClientAcls(): Unit = { - val authorizerForWrite = TestUtils.pickAuthorizerForWrite(brokers, controllerServers) + val authorizerForWrite = pickAuthorizerForWrite(brokers, controllerServers) val aclEntryFilter = new AccessControlEntryFilter(clientPrincipalString, null, AclOperation.ANY, AclPermissionType.ANY) val aclFilter = new AclBindingFilter(ResourcePatternFilter.ANY, aclEntryFilter) - authorizerForWrite.deleteAcls(TestUtils.anonymousAuthorizableContext, java.util.List.of(aclFilter)).asScala. + authorizerForWrite.deleteAcls(anonymousAuthorizableContext, java.util.List.of(aclFilter)).asScala. map(_.toCompletableFuture.get).flatMap { deletion => deletion.aclBindingDeleteResults().asScala.map(_.aclBinding.pattern).toSet }.foreach { resource => diff --git a/core/src/test/scala/integration/kafka/api/BaseAdminIntegrationTest.scala b/core/src/test/scala/integration/kafka/api/BaseAdminIntegrationTest.scala index da042f60c9384..a9c8c803fe7ad 100644 --- a/core/src/test/scala/integration/kafka/api/BaseAdminIntegrationTest.scala +++ b/core/src/test/scala/integration/kafka/api/BaseAdminIntegrationTest.scala @@ -58,7 +58,10 @@ abstract class BaseAdminIntegrationTest extends IntegrationTestHarness with Logg override def setUp(testInfo: TestInfo): Unit = { this.testInfo = testInfo super.setUp(testInfo) - waitUntilBrokerMetadataIsPropagated(brokers) + val expectedBrokerIds = brokers.map(_.config.brokerId).toSet + waitUntilTrue(() => brokers.forall(server => + expectedBrokerIds.forall(server.dataPlaneRequestProcessor.metadataCache.hasAliveBroker(_)) + ), "Timed out waiting for broker metadata to propagate to all servers", 15000) } @AfterEach diff --git a/core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala b/core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala index 02cb5d58a5288..449d83133f0ba 100644 --- a/core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala +++ b/core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala @@ -70,7 +70,7 @@ import scala.collection.Seq import scala.concurrent.duration.Duration import scala.concurrent.{Await, Future} import scala.jdk.CollectionConverters._ -import scala.util.{Random, Using} +import scala.util.{Failure, Random, Success, Try, Using} /** * An integration test of the KafkaAdminClient. @@ -1552,7 +1552,7 @@ class PlaintextAdminIntegrationTest extends BaseAdminIntegrationTest { val result1 = client.deleteRecords(util.Map.of(topicPartition, RecordsToDelete.beforeOffset(117L))) result1.all().get() restartDeadBrokers() - TestUtils.waitForBrokersInIsr(client, topicPartition, Set(followerIndex)) + waitForBrokersInIsr(client, topicPartition, Set(followerIndex)) waitForFollowerLog(expectedStartOffset=117L, expectedEndOffset=200L) } @@ -1675,7 +1675,7 @@ class PlaintextAdminIntegrationTest extends BaseAdminIntegrationTest { // delete records in corrupt segment (the first segment) client.deleteRecords(util.Map.of(topicPartition, RecordsToDelete.beforeOffset(firstSegmentRecordsSize))).all.get // verify reassignment is finished after delete records - TestUtils.waitForBrokersInIsr(client, topicPartition, Set(partitionLeaderId, partitionFollowerId)) + waitForBrokersInIsr(client, topicPartition, Set(partitionLeaderId, partitionFollowerId)) // seek to beginning and make sure we can consume all records consumer.seekToBeginning(util.List.of(topicPartition)) assertEquals(19, TestUtils.consumeRecords(consumer, 20 - firstSegmentRecordsSize).last.offset()) @@ -3152,25 +3152,25 @@ class PlaintextAdminIntegrationTest extends BaseAdminIntegrationTest { s"Expected preferred leader to become $preferred, but is ${preferredLeader(partition1)} and ${preferredLeader(partition2)}", 10000) // Check the leader hasn't moved - TestUtils.assertLeader(client, partition1, prior1) - TestUtils.assertLeader(client, partition2, prior2) + assertLeader(client, partition1, prior1) + assertLeader(client, partition2, prior2) } // Check current leaders are 0 - TestUtils.assertLeader(client, partition1, 0) - TestUtils.assertLeader(client, partition2, 0) + assertLeader(client, partition1, 0) + assertLeader(client, partition2, 0) // Noop election var electResult = client.electLeaders(ElectionType.PREFERRED, util.Set.of(partition1)) val exception = electResult.partitions.get.get(partition1).get assertEquals(classOf[ElectionNotNeededException], exception.getClass) - TestUtils.assertLeader(client, partition1, 0) + assertLeader(client, partition1, 0) // Noop election with null partitions electResult = client.electLeaders(ElectionType.PREFERRED, null) assertTrue(electResult.partitions.get.isEmpty) - TestUtils.assertLeader(client, partition1, 0) - TestUtils.assertLeader(client, partition2, 0) + assertLeader(client, partition1, 0) + assertLeader(client, partition2, 0) // Now change the preferred leader to 1 waitForBrokerMetadataPropagation(partition1) @@ -3182,18 +3182,18 @@ class PlaintextAdminIntegrationTest extends BaseAdminIntegrationTest { assertEquals(util.Set.of(partition1), electResult.partitions.get.keySet) electResult.partitions.get.get(partition1) .ifPresent(t => fail(s"Unexpected exception during leader election: $t for partition $partition1")) - TestUtils.assertLeader(client, partition1, 1) + assertLeader(client, partition1, 1) // topic 2 unchanged assertFalse(electResult.partitions.get.containsKey(partition2)) - TestUtils.assertLeader(client, partition2, 0) + assertLeader(client, partition2, 0) // meaningful election with null partitions electResult = client.electLeaders(ElectionType.PREFERRED, null) assertEquals(Set(partition2), electResult.partitions.get.keySet.asScala) electResult.partitions.get.get(partition2) .ifPresent(t => fail(s"Unexpected exception during leader election: $t for partition $partition2")) - TestUtils.assertLeader(client, partition2, 1) + assertLeader(client, partition2, 1) def assertUnknownTopicOrPartition( topicPartition: TopicPartition, @@ -3209,8 +3209,8 @@ class PlaintextAdminIntegrationTest extends BaseAdminIntegrationTest { electResult = client.electLeaders(ElectionType.PREFERRED, util.Set.of(unknownPartition)) assertEquals(util.Set.of(unknownPartition), electResult.partitions.get.keySet) assertUnknownTopicOrPartition(unknownPartition, electResult) - TestUtils.assertLeader(client, partition1, 1) - TestUtils.assertLeader(client, partition2, 1) + assertLeader(client, partition1, 1) + assertLeader(client, partition2, 1) // Now change the preferred leader to 2 waitForBrokerMetadataPropagation(partition1) @@ -3220,15 +3220,15 @@ class PlaintextAdminIntegrationTest extends BaseAdminIntegrationTest { // mixed results electResult = client.electLeaders(ElectionType.PREFERRED, util.Set.of(unknownPartition, partition1)) assertEquals(util.Set.of(unknownPartition, partition1), electResult.partitions.get.keySet) - TestUtils.assertLeader(client, partition1, 2) - TestUtils.assertLeader(client, partition2, 1) + assertLeader(client, partition1, 2) + assertLeader(client, partition2, 1) assertUnknownTopicOrPartition(unknownPartition, electResult) // elect preferred leader for partition 2 electResult = client.electLeaders(ElectionType.PREFERRED, util.Set.of(partition2)) assertEquals(util.Set.of(partition2), electResult.partitions.get.keySet) assertFalse(electResult.partitions.get.get(partition2).isPresent) - TestUtils.assertLeader(client, partition2, 2) + assertLeader(client, partition2, 2) // Now change the preferred leader to 1 waitForBrokerMetadataPropagation(partition1) @@ -3238,7 +3238,7 @@ class PlaintextAdminIntegrationTest extends BaseAdminIntegrationTest { killBroker(1) waitForBrokerMetadataPropagation(partition1) waitForBrokerMetadataPropagation(partition2) - TestUtils.waitForBrokersOutOfIsr(client, Set(partition1, partition2), Set(1)) + waitForBrokersOutOfIsr(client, Set(partition1, partition2), Set(1)) def assertPreferredLeaderNotAvailable( topicPartition: TopicPartition, @@ -3257,17 +3257,17 @@ class PlaintextAdminIntegrationTest extends BaseAdminIntegrationTest { assertEquals(util.Set.of(partition1), electResult.partitions.get.keySet) assertPreferredLeaderNotAvailable(partition1, electResult) - TestUtils.assertLeader(client, partition1, 2) + assertLeader(client, partition1, 2) // preferred leader unavailable with null argument electResult = client.electLeaders(ElectionType.PREFERRED, null, shortTimeout) assertTrue(Set(partition1, partition2).subsetOf(electResult.partitions.get.keySet.asScala)) assertPreferredLeaderNotAvailable(partition1, electResult) - TestUtils.assertLeader(client, partition1, 2) + assertLeader(client, partition1, 2) assertPreferredLeaderNotAvailable(partition2, electResult) - TestUtils.assertLeader(client, partition2, 2) + assertLeader(client, partition2, 2) } @Test @@ -3283,19 +3283,19 @@ class PlaintextAdminIntegrationTest extends BaseAdminIntegrationTest { val partition1 = new TopicPartition("unclean-test-topic-1", 0) createTopicWithAssignment(partition1.topic, Map[Int, Seq[Int]](partition1.partition -> assignment1)) - TestUtils.assertLeader(client, partition1, broker1) + assertLeader(client, partition1, broker1) killBroker(broker2) - TestUtils.waitForBrokersOutOfIsr(client, Set(partition1), Set(broker2)) + waitForBrokersOutOfIsr(client, Set(partition1), Set(broker2)) killBroker(broker1) - TestUtils.assertNoLeader(client, partition1) + assertNoLeader(client, partition1) brokers(broker2).startup() - TestUtils.waitForOnlineBroker(client, broker2) + waitForOnlineBroker(client, broker2) val electResult = client.electLeaders(ElectionType.UNCLEAN, util.Set.of(partition1)) electResult.partitions.get.get(partition1) .ifPresent(t => fail(s"Unexpected exception during leader election: $t for partition $partition1")) - TestUtils.assertLeader(client, partition1, broker2) + assertLeader(client, partition1, broker2) } @Test @@ -3318,24 +3318,24 @@ class PlaintextAdminIntegrationTest extends BaseAdminIntegrationTest { Map(partition1.partition -> assignment1, partition2.partition -> assignment2) ) - TestUtils.assertLeader(client, partition1, broker1) - TestUtils.assertLeader(client, partition2, broker1) + assertLeader(client, partition1, broker1) + assertLeader(client, partition2, broker1) killBroker(broker2) - TestUtils.waitForBrokersOutOfIsr(client, Set(partition1, partition2), Set(broker2)) + waitForBrokersOutOfIsr(client, Set(partition1, partition2), Set(broker2)) killBroker(broker1) - TestUtils.assertNoLeader(client, partition1) - TestUtils.assertNoLeader(client, partition2) + assertNoLeader(client, partition1) + assertNoLeader(client, partition2) brokers(broker2).startup() - TestUtils.waitForOnlineBroker(client, broker2) + waitForOnlineBroker(client, broker2) val electResult = client.electLeaders(ElectionType.UNCLEAN, util.Set.of(partition1, partition2)) electResult.partitions.get.get(partition1) .ifPresent(t => fail(s"Unexpected exception during leader election: $t for partition $partition1")) electResult.partitions.get.get(partition2) .ifPresent(t => fail(s"Unexpected exception during leader election: $t for partition $partition2")) - TestUtils.assertLeader(client, partition1, broker2) - TestUtils.assertLeader(client, partition2, broker2) + assertLeader(client, partition1, broker2) + assertLeader(client, partition2, broker2) } @Test @@ -3359,23 +3359,23 @@ class PlaintextAdminIntegrationTest extends BaseAdminIntegrationTest { Map(partition1.partition -> assignment1, partition2.partition -> assignment2) ) - TestUtils.assertLeader(client, partition1, broker1) - TestUtils.assertLeader(client, partition2, broker1) + assertLeader(client, partition1, broker1) + assertLeader(client, partition2, broker1) killBroker(broker2) - TestUtils.waitForBrokersOutOfIsr(client, Set(partition1), Set(broker2)) + waitForBrokersOutOfIsr(client, Set(partition1), Set(broker2)) killBroker(broker1) - TestUtils.assertNoLeader(client, partition1) - TestUtils.assertLeader(client, partition2, broker3) + assertNoLeader(client, partition1) + assertLeader(client, partition2, broker3) brokers(broker2).startup() - TestUtils.waitForOnlineBroker(client, broker2) + waitForOnlineBroker(client, broker2) val electResult = client.electLeaders(ElectionType.UNCLEAN, null) electResult.partitions.get.get(partition1) .ifPresent(t => fail(s"Unexpected exception during leader election: $t for partition $partition1")) assertFalse(electResult.partitions.get.containsKey(partition2)) - TestUtils.assertLeader(client, partition1, broker2) - TestUtils.assertLeader(client, partition2, broker3) + assertLeader(client, partition1, broker2) + assertLeader(client, partition2, broker3) } @Test @@ -3397,7 +3397,7 @@ class PlaintextAdminIntegrationTest extends BaseAdminIntegrationTest { Map(0 -> assignment1) ) - TestUtils.assertLeader(client, new TopicPartition(topic, 0), broker1) + assertLeader(client, new TopicPartition(topic, 0), broker1) val electResult = client.electLeaders(ElectionType.UNCLEAN, util.Set.of(unknownPartition, unknownTopic)) assertTrue(electResult.partitions.get.get(unknownPartition).get.isInstanceOf[UnknownTopicOrPartitionException]) @@ -3422,12 +3422,12 @@ class PlaintextAdminIntegrationTest extends BaseAdminIntegrationTest { Map(partition1.partition -> assignment1) ) - TestUtils.assertLeader(client, partition1, broker1) + assertLeader(client, partition1, broker1) killBroker(broker2) - TestUtils.waitForBrokersOutOfIsr(client, Set(partition1), Set(broker2)) + waitForBrokersOutOfIsr(client, Set(partition1), Set(broker2)) killBroker(broker1) - TestUtils.assertNoLeader(client, partition1) + assertNoLeader(client, partition1) val electResult = client.electLeaders(ElectionType.UNCLEAN, util.Set.of(partition1)) assertTrue(electResult.partitions.get.get(partition1).get.isInstanceOf[EligibleLeadersNotAvailableException]) @@ -3451,10 +3451,10 @@ class PlaintextAdminIntegrationTest extends BaseAdminIntegrationTest { Map(partition1.partition -> assignment1) ) - TestUtils.assertLeader(client, partition1, broker1) + assertLeader(client, partition1, broker1) killBroker(broker1) - TestUtils.assertLeader(client, partition1, broker2) + assertLeader(client, partition1, broker2) brokers(broker1).startup() val electResult = client.electLeaders(ElectionType.UNCLEAN, util.Set.of(partition1)) @@ -3482,23 +3482,23 @@ class PlaintextAdminIntegrationTest extends BaseAdminIntegrationTest { Map(partition1.partition -> assignment1, partition2.partition -> assignment2) ) - TestUtils.assertLeader(client, partition1, broker1) - TestUtils.assertLeader(client, partition2, broker1) + assertLeader(client, partition1, broker1) + assertLeader(client, partition2, broker1) killBroker(broker2) - TestUtils.waitForBrokersOutOfIsr(client, Set(partition1), Set(broker2)) + waitForBrokersOutOfIsr(client, Set(partition1), Set(broker2)) killBroker(broker1) - TestUtils.assertNoLeader(client, partition1) - TestUtils.assertLeader(client, partition2, broker3) + assertNoLeader(client, partition1) + assertLeader(client, partition2, broker3) brokers(broker2).startup() - TestUtils.waitForOnlineBroker(client, broker2) + waitForOnlineBroker(client, broker2) val electResult = client.electLeaders(ElectionType.UNCLEAN, util.Set.of(partition1, partition2)) electResult.partitions.get.get(partition1) .ifPresent(t => fail(s"Unexpected exception during leader election: $t for partition $partition1")) assertTrue(electResult.partitions.get.get(partition2).get.isInstanceOf[ElectionNotNeededException]) - TestUtils.assertLeader(client, partition1, broker2) - TestUtils.assertLeader(client, partition2, broker3) + assertLeader(client, partition1, broker2) + assertLeader(client, partition2, broker3) } @Test @@ -5061,4 +5061,82 @@ object PlaintextAdminIntegrationTest { assertEquals(ServerLogConfigs.COMPRESSION_TYPE_DEFAULT, configs.get(brokerResource).get(ServerConfigs.COMPRESSION_TYPE_CONFIG).value) } + + private def waitForBrokersInIsr(client: Admin, partition: TopicPartition, brokerIds: Set[Int]): Unit = { + waitUntilTrue( + () => { + val isr = client.describeTopics(util.Set.of(partition.topic)) + .allTopicNames + .get + .get(partition.topic) + .partitions.asScala + .filter(_.partition == partition.partition) + .flatMap(_.isr.asScala) + .map(_.id) + .toSet + brokerIds.subsetOf(isr) + }, + s"Expected brokers $brokerIds to be in the ISR for $partition" + ) + } + + private def waitForBrokersOutOfIsr(client: Admin, partition: Set[TopicPartition], brokerIds: Set[Int]): Unit = { + waitUntilTrue( + () => { + val description = client.describeTopics(partition.map(_.topic).asJava).allTopicNames.get.asScala + val isr = description + .flatMap { case (topic, desc) => + desc.partitions.asScala + .filter(info => partition.contains(new TopicPartition(topic, info.partition))) + .flatMap(_.isr.asScala) + } + .map(_.id) + .toSet + + brokerIds.intersect(isr).isEmpty + }, + s"Expected brokers $brokerIds to no longer be in the ISR for $partition" + ) + } + + private def waitForOnlineBroker(client: Admin, brokerId: Int): Unit = { + waitUntilTrue(() => { + val nodes = client.describeCluster().nodes().get() + nodes.asScala.exists(_.id == brokerId) + }, s"Timed out waiting for brokerId $brokerId to come online") + } + + private def assertLeader(client: Admin, topicPartition: TopicPartition, expectedLeader: Int): Unit = { + waitForLeaderToBecome(client, topicPartition, Some(expectedLeader)) + } + + private def assertNoLeader(client: Admin, topicPartition: TopicPartition): Unit = { + waitForLeaderToBecome(client, topicPartition, None) + } + + private def waitForLeaderToBecome( + client: Admin, + topicPartition: TopicPartition, + expectedLeaderOpt: Option[Int] + ): Unit = { + val topic = topicPartition.topic + val partitionId = topicPartition.partition + + def currentLeader: Try[Option[Int]] = Try { + val topicDescription = client.describeTopics(util.List.of(topic)).allTopicNames.get.get(topic) + topicDescription.partitions.asScala + .find(_.partition == partitionId) + .flatMap(partitionState => Option(partitionState.leader)) + .map(_.id) + } + + val (lastLeaderCheck, isLeaderElected) = computeUntilTrue(currentLeader) { + case Success(leaderOpt) => leaderOpt == expectedLeaderOpt + case Failure(e: ExecutionException) if e.getCause.isInstanceOf[UnknownTopicOrPartitionException] => false + case Failure(e) => throw e + } + + assertTrue(isLeaderElected, s"Timed out waiting for leader to become $expectedLeaderOpt. " + + s"Last metadata lookup returned leader = ${lastLeaderCheck.getOrElse("unknown")}") + } } diff --git a/core/src/test/scala/integration/kafka/api/SaslSslAdminIntegrationTest.scala b/core/src/test/scala/integration/kafka/api/SaslSslAdminIntegrationTest.scala index e80aa02e7005b..4987a4c9e73f9 100644 --- a/core/src/test/scala/integration/kafka/api/SaslSslAdminIntegrationTest.scala +++ b/core/src/test/scala/integration/kafka/api/SaslSslAdminIntegrationTest.scala @@ -28,7 +28,7 @@ import org.apache.kafka.common.resource.PatternType.LITERAL import org.apache.kafka.common.resource.ResourceType.{GROUP, TOPIC} import org.apache.kafka.common.resource.{PatternType, Resource, ResourcePattern, ResourcePatternFilter, ResourceType} import org.apache.kafka.common.security.auth.{KafkaPrincipal, SecurityProtocol} -import org.apache.kafka.common.utils.SecurityUtils +import org.apache.kafka.common.utils.internals.SecurityUtils import org.apache.kafka.common.security.token.delegation.DelegationToken import org.apache.kafka.security.authorizer.AclEntry.{WILDCARD_HOST, WILDCARD_PRINCIPAL_STRING} import org.apache.kafka.server.config.{DelegationTokenManagerConfigs, ServerConfigs, ServerLogConfigs} diff --git a/core/src/test/scala/integration/kafka/server/GssapiAuthenticationTest.scala b/core/src/test/scala/integration/kafka/server/GssapiAuthenticationTest.scala index f25357ee41118..d90f2a122123c 100644 --- a/core/src/test/scala/integration/kafka/server/GssapiAuthenticationTest.scala +++ b/core/src/test/scala/integration/kafka/server/GssapiAuthenticationTest.scala @@ -34,7 +34,8 @@ import org.apache.kafka.common.network._ import org.apache.kafka.common.security.{JaasContext, TestSecurityConfig} import org.apache.kafka.common.security.auth.{Login, SecurityProtocol} import org.apache.kafka.common.security.kerberos.KerberosLogin -import org.apache.kafka.common.utils.{LogContext, MockTime} +import org.apache.kafka.common.utils.MockTime +import org.apache.kafka.common.utils.internals.LogContext import org.apache.kafka.network.SocketServerConfigs import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Test, TestInfo} diff --git a/core/src/test/scala/integration/kafka/server/RaftClusterSnapshotTest.scala b/core/src/test/scala/integration/kafka/server/RaftClusterSnapshotTest.scala index 19d49f070d686..155ecf44207d3 100644 --- a/core/src/test/scala/integration/kafka/server/RaftClusterSnapshotTest.scala +++ b/core/src/test/scala/integration/kafka/server/RaftClusterSnapshotTest.scala @@ -19,7 +19,7 @@ package kafka.server import kafka.utils.TestUtils import org.apache.kafka.common.test.{KafkaClusterTestKit, TestKitNodes} -import org.apache.kafka.common.utils.LogContext +import org.apache.kafka.common.utils.internals.LogContext import org.apache.kafka.common.utils.internals.BufferSupplier import org.apache.kafka.metadata.MetadataRecordSerde import org.apache.kafka.raft.MetadataLogConfig diff --git a/core/src/test/scala/kafka/server/RemoteLeaderEndPointTest.scala b/core/src/test/scala/kafka/server/RemoteLeaderEndPointTest.scala index 739f8968bd29f..32150d453b2b2 100644 --- a/core/src/test/scala/kafka/server/RemoteLeaderEndPointTest.scala +++ b/core/src/test/scala/kafka/server/RemoteLeaderEndPointTest.scala @@ -23,7 +23,7 @@ import org.apache.kafka.clients.FetchSessionHandler import org.apache.kafka.common.errors.{FencedLeaderEpochException, UnknownLeaderEpochException} import org.apache.kafka.common.message.OffsetForLeaderEpochResponseData.EpochEndOffset import org.apache.kafka.common.utils.annotation.ApiKeyVersionsSource -import org.apache.kafka.common.utils.LogContext +import org.apache.kafka.common.utils.internals.LogContext import org.apache.kafka.common.{TopicPartition, Uuid} import org.apache.kafka.common.message.ListOffsetsResponseData.ListOffsetsPartitionResponse import org.apache.kafka.common.message.OffsetForLeaderEpochRequestData.OffsetForLeaderPartition diff --git a/core/src/test/scala/unit/kafka/coordinator/transaction/TransactionCoordinatorConcurrencyTest.scala b/core/src/test/scala/unit/kafka/coordinator/transaction/TransactionCoordinatorConcurrencyTest.scala index f9c20a1dd6992..26317d8535d06 100644 --- a/core/src/test/scala/unit/kafka/coordinator/transaction/TransactionCoordinatorConcurrencyTest.scala +++ b/core/src/test/scala/unit/kafka/coordinator/transaction/TransactionCoordinatorConcurrencyTest.scala @@ -35,7 +35,8 @@ import org.apache.kafka.common.network.ListenerName import org.apache.kafka.common.protocol.{ApiKeys, Errors} import org.apache.kafka.common.record.internal.{FileRecords, MemoryRecords, RecordBatch, SimpleRecord} import org.apache.kafka.common.requests._ -import org.apache.kafka.common.utils.{LogContext, MockTime, ProducerIdAndEpoch} +import org.apache.kafka.common.utils.{MockTime, ProducerIdAndEpoch} +import org.apache.kafka.common.utils.internals.LogContext import org.apache.kafka.common.{Node, TopicPartition, Uuid} import org.apache.kafka.coordinator.transaction.{ProducerIdManager, TransactionLog, TransactionMetadata, TransactionState} import org.apache.kafka.metadata.MetadataCache diff --git a/core/src/test/scala/unit/kafka/coordinator/transaction/TransactionCoordinatorTest.scala b/core/src/test/scala/unit/kafka/coordinator/transaction/TransactionCoordinatorTest.scala index 3f0cd44989f48..7abfcea5592da 100644 --- a/core/src/test/scala/unit/kafka/coordinator/transaction/TransactionCoordinatorTest.scala +++ b/core/src/test/scala/unit/kafka/coordinator/transaction/TransactionCoordinatorTest.scala @@ -21,7 +21,8 @@ import org.apache.kafka.common.message.AddPartitionsToTxnResponseData.AddPartiti import org.apache.kafka.common.protocol.Errors import org.apache.kafka.common.record.internal.RecordBatch import org.apache.kafka.common.requests.{AddPartitionsToTxnResponse, TransactionResult} -import org.apache.kafka.common.utils.{LogContext, MockTime, ProducerIdAndEpoch} +import org.apache.kafka.common.utils.{MockTime, ProducerIdAndEpoch} +import org.apache.kafka.common.utils.internals.LogContext import org.apache.kafka.coordinator.transaction.{ProducerIdManager, TransactionMetadata, TransactionState, TransactionStateManagerConfig, TxnTransitMetadata} import org.apache.kafka.server.common.{RequestLocal, TransactionVersion} import org.apache.kafka.server.common.TransactionVersion.{TV_0, TV_2} diff --git a/core/src/test/scala/unit/kafka/coordinator/transaction/TransactionMarkerChannelManagerTest.scala b/core/src/test/scala/unit/kafka/coordinator/transaction/TransactionMarkerChannelManagerTest.scala index 926c5d87d5ca0..af48a4673b27b 100644 --- a/core/src/test/scala/unit/kafka/coordinator/transaction/TransactionMarkerChannelManagerTest.scala +++ b/core/src/test/scala/unit/kafka/coordinator/transaction/TransactionMarkerChannelManagerTest.scala @@ -25,7 +25,8 @@ import org.apache.kafka.clients.{ClientResponse, NetworkClient} import org.apache.kafka.common.protocol.{ApiKeys, Errors} import org.apache.kafka.common.record.internal.RecordBatch import org.apache.kafka.common.requests.{RequestHeader, TransactionResult, WriteTxnMarkersRequest, WriteTxnMarkersResponse} -import org.apache.kafka.common.utils.{LogContext, MockTime} +import org.apache.kafka.common.utils.MockTime +import org.apache.kafka.common.utils.internals.LogContext import org.apache.kafka.common.metrics.Metrics import org.apache.kafka.common.{Node, TopicPartition} import org.apache.kafka.coordinator.transaction.{TransactionMetadata, TransactionState} diff --git a/core/src/test/scala/unit/kafka/integration/KafkaServerTestHarness.scala b/core/src/test/scala/unit/kafka/integration/KafkaServerTestHarness.scala index 7f37eeb25a15d..4b6690a4fdc45 100755 --- a/core/src/test/scala/unit/kafka/integration/KafkaServerTestHarness.scala +++ b/core/src/test/scala/unit/kafka/integration/KafkaServerTestHarness.scala @@ -24,14 +24,16 @@ import org.apache.kafka.common.acl.{AccessControlEntry, AccessControlEntryFilter import org.apache.kafka.common.network.ListenerName import org.apache.kafka.common.quota.{ClientQuotaAlteration, ClientQuotaEntity} import org.apache.kafka.common.resource.ResourcePattern -import org.apache.kafka.common.security.auth.SecurityProtocol +import org.apache.kafka.common.security.auth.{KafkaPrincipal, SecurityProtocol} import org.apache.kafka.common.security.scram.ScramCredential import org.apache.kafka.common.utils.Time import org.apache.kafka.common.{KafkaException, Uuid} import org.apache.kafka.controller.ControllerRequestContextUtil.ANONYMOUS_CONTEXT +import org.apache.kafka.server.authorizer.{AuthorizableRequestContext, Authorizer => JAuthorizer} import org.junit.jupiter.api.{AfterEach, BeforeEach, TestInfo} import java.io.File +import java.net.InetAddress import java.time.Duration import java.util import java.util.Properties @@ -214,6 +216,17 @@ abstract class KafkaServerTestHarness extends QuorumTestHarness { } } + val anonymousAuthorizableContext = new AuthorizableRequestContext() { + override def listenerName(): String = "" + override def securityProtocol(): SecurityProtocol = SecurityProtocol.PLAINTEXT + override def principal(): KafkaPrincipal = KafkaPrincipal.ANONYMOUS + override def clientAddress(): InetAddress = null + override def requestType(): Int = 0 + override def requestVersion(): Int = 0 + override def clientId(): String = "" + override def correlationId(): Int = 0 + } + def addAndVerifyAcls(acls: Set[AccessControlEntry], resource: ResourcePattern): Unit = { val authorizerForWrite = pickAuthorizerForWrite(brokers, controllerServers) val aclBindings = acls.map { acl => new AclBinding(resource, acl) } @@ -371,4 +384,20 @@ abstract class KafkaServerTestHarness extends QuorumTestHarness { } } } + + /** + * Find an Authorizer that we can call createAcls or deleteAcls on. + */ + def pickAuthorizerForWrite[B <: KafkaBroker](brokers: Seq[B], controllers: Seq[ControllerServer]): JAuthorizer = { + if (controllers.isEmpty) { + brokers.head.authorizerPlugin.get.get + } else { + var result: JAuthorizer = null + TestUtils.retry(120000) { + val active = controllers.filter(_.controller.isActive).head + result = active.authorizerPlugin.get.get + } + result + } + } } diff --git a/core/src/test/scala/unit/kafka/log/LogCleanerTest.scala b/core/src/test/scala/unit/kafka/log/LogCleanerTest.scala index c51cba6a66fb4..e1aa985e01cbd 100644 --- a/core/src/test/scala/unit/kafka/log/LogCleanerTest.scala +++ b/core/src/test/scala/unit/kafka/log/LogCleanerTest.scala @@ -1229,7 +1229,7 @@ class LogCleanerTest extends Logging { // the last (active) segment has just one message - def distinctValuesBySegment = log.logSegments.asScala.map(s => s.log.records.asScala.map(record => TestUtils.readString(record.value)).toSet.size).toSeq + def distinctValuesBySegment = log.logSegments.asScala.map(s => s.log.records.asScala.map(record => Utils.utf8(record.value())).toSet.size).toSeq val distinctValuesBySegmentBeforeClean = distinctValuesBySegment assertTrue(distinctValuesBySegment.reverse.tail.forall(_ > N), @@ -1927,7 +1927,7 @@ class LogCleanerTest extends Logging { for (segment <- log.logSegments.asScala; batch <- segment.log.batches.asScala; record <- batch.asScala) { assertTrue(record.hasMagic(batch.magic)) - val value = TestUtils.readString(record.value).toLong + val value = Utils.utf8(record.value()).toLong assertEquals(record.offset, value) } } @@ -1947,7 +1947,7 @@ class LogCleanerTest extends Logging { for (logEntry <- records.records.asScala) { val offset = logEntry.offset - val value = TestUtils.readString(logEntry.value).toLong + val value = Utils.utf8(logEntry.value()).toLong assertEquals(offset, value) } } diff --git a/core/src/test/scala/unit/kafka/log/LogTestUtils.scala b/core/src/test/scala/unit/kafka/log/LogTestUtils.scala index 9875a3b2ce441..e5d34608a048a 100644 --- a/core/src/test/scala/unit/kafka/log/LogTestUtils.scala +++ b/core/src/test/scala/unit/kafka/log/LogTestUtils.scala @@ -19,7 +19,6 @@ package kafka.log import java.io.File import java.util.Properties -import kafka.utils.TestUtils import org.apache.kafka.common.Uuid import org.apache.kafka.common.compress.Compression import org.apache.kafka.common.record.internal.{ControlRecordType, EndTransactionMarker, FileRecords, MemoryRecords, RecordBatch, SimpleRecord} @@ -38,7 +37,7 @@ import org.apache.kafka.server.storage.log.FetchIsolation import org.apache.kafka.server.util.Scheduler import org.apache.kafka.storage.internals.log.LogConfig.{DEFAULT_REMOTE_LOG_COPY_DISABLE_CONFIG, DEFAULT_REMOTE_LOG_DELETE_ON_DISABLE_CONFIG} import org.apache.kafka.common.message.AbortedTxn -import org.apache.kafka.storage.internals.log.{AppendOrigin, FetchDataInfo, LazyIndex, LogAppendInfo, LogConfig, LogDirFailureChannel, LogFileUtils, LogOffsetsListener, LogSegment, ProducerStateManager, ProducerStateManagerConfig, TransactionIndex, VerificationGuard, UnifiedLog} +import org.apache.kafka.storage.internals.log.{AppendOrigin, FetchDataInfo, LazyIndex, LogAppendInfo, LogConfig, LogDirFailureChannel, LogFileUtils, LogOffsetsListener, LogSegment, ProducerStateManager, ProducerStateManagerConfig, TransactionIndex, UnifiedLog, VerificationGuard} import org.apache.kafka.storage.log.metrics.BrokerTopicStats import scala.jdk.CollectionConverters._ @@ -202,7 +201,7 @@ object LogTestUtils { for (logSegment <- log.logSegments.asScala; batch <- logSegment.log.batches.asScala if !batch.isControlBatch; record <- batch.asScala if record.hasValue && record.hasKey) - yield TestUtils.readString(record.key).toLong + yield Utils.utf8(record.key()).toLong } def recoverAndCheck(logDir: File, config: LogConfig, expectedKeys: Iterable[Long], brokerTopicStats: BrokerTopicStats, time: Time, scheduler: Scheduler): UnifiedLog = { @@ -308,4 +307,5 @@ object LogTestUtils { sequence += numRecords } } + } diff --git a/core/src/test/scala/unit/kafka/metrics/MetricsTest.scala b/core/src/test/scala/unit/kafka/metrics/MetricsTest.scala index 770ec43211855..e30531779c20e 100644 --- a/core/src/test/scala/unit/kafka/metrics/MetricsTest.scala +++ b/core/src/test/scala/unit/kafka/metrics/MetricsTest.scala @@ -36,11 +36,14 @@ import org.apache.kafka.common.metrics.JmxReporter import org.apache.kafka.common.utils.Time import org.apache.kafka.server.config.ServerLogConfigs import org.apache.kafka.server.metrics.{KafkaMetricsGroup, KafkaYammerMetrics, LinuxIoMetricsCollector} +import org.apache.kafka.storage.internals.checkpoint.OffsetCheckpointFile +import org.apache.kafka.storage.internals.log.UnifiedLog import org.apache.kafka.storage.log.metrics.BrokerTopicMetrics import org.junit.jupiter.api.{Test, Timeout} import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.MethodSource +import java.io.File import scala.jdk.OptionConverters.RichOptional @Timeout(120) @@ -64,7 +67,7 @@ class MetricsTest extends KafkaServerTestHarness with Logging { val topic = "test-topic-metric" createTopic(topic) deleteTopic(topic) - TestUtils.verifyTopicDeletion(topic, 1, brokers) + verifyTopicDeletion(topic, brokers) assertEquals(Set.empty, topicMetricGroups(topic), "Topic metrics exists after deleteTopic") } @@ -78,7 +81,7 @@ class MetricsTest extends KafkaServerTestHarness with Logging { assertTrue(topicMetricGroups(topic).nonEmpty, "Topic metrics don't exist") brokers.foreach(b => assertNotNull(b.brokerTopicStats.topicStats(topic))) deleteTopic(topic) - TestUtils.verifyTopicDeletion(topic, 1, brokers) + verifyTopicDeletion(topic, brokers) assertEquals(Set.empty, topicMetricGroups(topic), "Topic metrics exists after deleteTopic") } @@ -244,4 +247,41 @@ class MetricsTest extends KafkaServerTestHarness with Logging { val pattern = (".*BrokerTopicMetrics.*" + topic.map(t => s"($t)$$").getOrElse("")).r.pattern metrics.filter(pattern.matcher(_).matches()) } + + private def verifyTopicDeletion[B <: KafkaBroker](topic: String, brokers: Seq[B]): Unit = { + val topicPartitions = (0 until 1).map(new TopicPartition(topic, _)) + // ensure that the topic-partition has been deleted from all brokers' replica managers + TestUtils.waitUntilTrue(() => + brokers.forall(broker => topicPartitions.forall(tp => broker.replicaManager.onlinePartition(tp).isEmpty)), + "Replica manager's should have deleted all of this topic's partitions") + // ensure that logs from all replicas are deleted + TestUtils.waitUntilTrue(() => brokers.forall(broker => topicPartitions.forall(tp => broker.logManager.getLog(tp).isEmpty)), + "Replica logs not deleted after delete topic is complete") + // ensure that topic is removed from all cleaner offsets + TestUtils.waitUntilTrue(() => brokers.forall(broker => topicPartitions.forall { tp => + val checkpoints = broker.logManager.liveLogDirs.asScala.map { logDir => + new OffsetCheckpointFile(new File(logDir, "cleaner-offset-checkpoint"), null).read() + } + checkpoints.forall(checkpointsPerLogDir => !checkpointsPerLogDir.containsKey(tp)) + }), "Cleaner offset for deleted partition should have been removed") + TestUtils.waitUntilTrue(() => brokers.forall(broker => + broker.config.logDirs.stream().allMatch { logDir => + topicPartitions.forall { tp => + !new File(logDir, tp.topic + "-" + tp.partition).exists() + } + } + ), "Failed to soft-delete the data to a delete directory") + TestUtils.waitUntilTrue(() => brokers.forall(broker => + broker.config.logDirs.stream().allMatch { logDir => + topicPartitions.forall { tp => + !util.List.of(new File(logDir).list()).asScala.exists { partitionDirectoryNames => + partitionDirectoryNames.exists { directoryName => + directoryName.startsWith(tp.topic + "-" + tp.partition) && + directoryName.endsWith(UnifiedLog.DELETE_DIR_SUFFIX) + } + } + } + } + ), "Failed to hard-delete the delete directory") + } } diff --git a/core/src/test/scala/unit/kafka/network/RequestChannelTest.scala b/core/src/test/scala/unit/kafka/network/RequestChannelTest.scala index a5293e1212dbe..582215500b7f9 100644 --- a/core/src/test/scala/unit/kafka/network/RequestChannelTest.scala +++ b/core/src/test/scala/unit/kafka/network/RequestChannelTest.scala @@ -20,7 +20,6 @@ package kafka.network import com.fasterxml.jackson.databind.ObjectMapper import kafka.network import kafka.server.EnvelopeUtils -import kafka.utils.TestUtils import org.apache.kafka.clients.admin.AlterConfigOp.OpType import org.apache.kafka.common.config.types.Password import org.apache.kafka.common.config.{ConfigResource, SaslConfigs, SslConfigs, TopicConfig} @@ -29,11 +28,12 @@ import org.apache.kafka.common.message.CreateTopicsRequestData.CreatableTopic import org.apache.kafka.common.message.IncrementalAlterConfigsRequestData._ import org.apache.kafka.common.message.{CreateTopicsRequestData, CreateTopicsResponseData, IncrementalAlterConfigsRequestData} import org.apache.kafka.common.network.{ClientInformation, ListenerName} -import org.apache.kafka.common.protocol.Errors +import org.apache.kafka.common.protocol.{ApiKeys, Errors} import org.apache.kafka.common.requests.AlterConfigsRequest._ import org.apache.kafka.common.requests._ import org.apache.kafka.common.security.auth.{KafkaPrincipal, KafkaPrincipalSerde, SecurityProtocol} -import org.apache.kafka.common.utils.{SecurityUtils, Utils} +import org.apache.kafka.common.utils.Utils +import org.apache.kafka.common.utils.internals.SecurityUtils import org.apache.kafka.network.RequestConvertToJson import org.apache.kafka.network.metrics.RequestChannelMetrics import org.junit.jupiter.api.Assertions._ @@ -46,6 +46,7 @@ import java.io.IOException import java.net.InetAddress import java.nio.ByteBuffer import java.util +import java.util.Optional import java.util.concurrent.atomic.AtomicReference import scala.collection.Map import scala.jdk.CollectionConverters._ @@ -258,7 +259,7 @@ class RequestChannelTest { } private def buildUnwrappedEnvelopeRequest(request: AbstractRequest): RequestChannel.Request = { - val wrappedRequest = TestUtils.buildEnvelopeRequest( + val wrappedRequest = buildEnvelopeRequest( request, principalSerde, requestChannelMetrics, @@ -276,6 +277,46 @@ class RequestChannelTest { unwrappedRequest.get() } + def buildEnvelopeRequest( + request: AbstractRequest, + principalSerde: KafkaPrincipalSerde, + requestChannelMetrics: RequestChannelMetrics, + startTimeNanos: Long, + dequeueTimeNanos: Long = -1, + fromPrivilegedListener: Boolean = true + ): RequestChannel.Request = { + val clientId = "id" + val listenerName = ListenerName.forSecurityProtocol(SecurityProtocol.PLAINTEXT) + + val requestHeader = new RequestHeader(request.apiKey, request.version, clientId, 0) + val requestBuffer = request.serializeWithHeader(requestHeader) + + val envelopeHeader = new RequestHeader(ApiKeys.ENVELOPE, ApiKeys.ENVELOPE.latestVersion(), clientId, 0) + val envelopeBuffer = new EnvelopeRequest.Builder( + requestBuffer, + principalSerde.serialize(KafkaPrincipal.ANONYMOUS), + InetAddress.getLocalHost.getAddress + ).build().serializeWithHeader(envelopeHeader) + + RequestHeader.parse(envelopeBuffer) + + val envelopeContext = new RequestContext(envelopeHeader, "1", InetAddress.getLocalHost, Optional.empty(), + KafkaPrincipal.ANONYMOUS, listenerName, SecurityProtocol.PLAINTEXT, ClientInformation.EMPTY, + fromPrivilegedListener, Optional.of(principalSerde)) + + val envelopRequest = new RequestChannel.Request( + processor = 1, + context = envelopeContext, + startTimeNanos = startTimeNanos, + memoryPool = MemoryPool.NONE, + buffer = envelopeBuffer, + metrics = requestChannelMetrics, + envelope = None + ) + envelopRequest.requestDequeueTimeNanos = dequeueTimeNanos + envelopRequest + } + private def isValidJson(str: String): Boolean = { try { val mapper = new ObjectMapper diff --git a/core/src/test/scala/unit/kafka/network/SocketServerTest.scala b/core/src/test/scala/unit/kafka/network/SocketServerTest.scala index e773982562990..39e97eca8eb47 100644 --- a/core/src/test/scala/unit/kafka/network/SocketServerTest.scala +++ b/core/src/test/scala/unit/kafka/network/SocketServerTest.scala @@ -35,6 +35,7 @@ import org.apache.kafka.common.requests._ import org.apache.kafka.common.security.auth.{KafkaPrincipal, SecurityProtocol} import org.apache.kafka.common.security.scram.internals.ScramMechanism import org.apache.kafka.common.utils._ +import org.apache.kafka.common.utils.internals.{AppInfoParser, LogContext} import org.apache.kafka.network.RequestConvertToJson import org.apache.kafka.network.SocketServerConfigs import org.apache.kafka.security.CredentialProvider diff --git a/core/src/test/scala/unit/kafka/security/authorizer/AuthorizerTest.scala b/core/src/test/scala/unit/kafka/security/authorizer/AuthorizerTest.scala index 50b405ecd16b0..d06ad4a380068 100644 --- a/core/src/test/scala/unit/kafka/security/authorizer/AuthorizerTest.scala +++ b/core/src/test/scala/unit/kafka/security/authorizer/AuthorizerTest.scala @@ -32,7 +32,7 @@ import org.apache.kafka.common.resource.ResourcePattern.WILDCARD_RESOURCE import org.apache.kafka.common.resource.ResourceType._ import org.apache.kafka.common.resource.{PatternType, ResourcePattern, ResourcePatternFilter, ResourceType} import org.apache.kafka.common.security.auth.{KafkaPrincipal, SecurityProtocol} -import org.apache.kafka.common.utils.{SecurityUtils => JSecurityUtils} +import org.apache.kafka.common.utils.internals.{SecurityUtils => JSecurityUtils} import org.apache.kafka.controller.MockAclMutator import org.apache.kafka.metadata.authorizer.StandardAuthorizer import org.apache.kafka.metadata.authorizer.StandardAuthorizerTest.AuthorizerTestServerInfo diff --git a/core/src/test/scala/unit/kafka/server/AutoTopicCreationManagerTest.scala b/core/src/test/scala/unit/kafka/server/AutoTopicCreationManagerTest.scala index 5b436c627b1f5..c90014622f63e 100644 --- a/core/src/test/scala/unit/kafka/server/AutoTopicCreationManagerTest.scala +++ b/core/src/test/scala/unit/kafka/server/AutoTopicCreationManagerTest.scala @@ -33,7 +33,8 @@ import org.apache.kafka.common.network.{ClientInformation, ListenerName} import org.apache.kafka.common.protocol.{ApiKeys, Errors} import org.apache.kafka.common.requests._ import org.apache.kafka.common.security.auth.{KafkaPrincipal, KafkaPrincipalSerde, SecurityProtocol} -import org.apache.kafka.common.utils.{SecurityUtils, Utils} +import org.apache.kafka.common.utils.Utils +import org.apache.kafka.common.utils.internals.SecurityUtils import org.apache.kafka.server.util.MockTime import org.apache.kafka.coordinator.group.{GroupCoordinator, GroupCoordinatorConfig} import org.apache.kafka.coordinator.share.{ShareCoordinator, ShareCoordinatorConfig} diff --git a/core/src/test/scala/unit/kafka/server/DelegationTokenRequestsTest.scala b/core/src/test/scala/unit/kafka/server/DelegationTokenRequestsTest.scala index 38040d0a120a0..06e8a3049e0f4 100644 --- a/core/src/test/scala/unit/kafka/server/DelegationTokenRequestsTest.scala +++ b/core/src/test/scala/unit/kafka/server/DelegationTokenRequestsTest.scala @@ -22,7 +22,7 @@ import kafka.utils.TestUtils import org.apache.kafka.clients.admin.{Admin, AdminClientConfig, CreateDelegationTokenOptions, DescribeDelegationTokenOptions} import org.apache.kafka.common.errors.{DelegationTokenNotFoundException, InvalidPrincipalTypeException} import org.apache.kafka.common.security.auth.SecurityProtocol -import org.apache.kafka.common.utils.SecurityUtils +import org.apache.kafka.common.utils.internals.SecurityUtils import org.apache.kafka.server.config.DelegationTokenManagerConfigs import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Test, TestInfo} diff --git a/core/src/test/scala/unit/kafka/server/GroupCoordinatorBaseRequestTest.scala b/core/src/test/scala/unit/kafka/server/GroupCoordinatorBaseRequestTest.scala index 50bad2dfcd3a9..cd9afcc889b5b 100644 --- a/core/src/test/scala/unit/kafka/server/GroupCoordinatorBaseRequestTest.scala +++ b/core/src/test/scala/unit/kafka/server/GroupCoordinatorBaseRequestTest.scala @@ -33,6 +33,7 @@ import org.apache.kafka.common.serialization.StringSerializer import org.apache.kafka.common.test.ClusterInstance import org.apache.kafka.common.utils.ProducerIdAndEpoch import org.apache.kafka.controller.ControllerRequestContextUtil.ANONYMOUS_CONTEXT +import org.apache.kafka.coordinator.transaction.TransactionLogConfig import org.apache.kafka.server.IntegrationTestUtils import org.junit.jupiter.api.Assertions.{assertEquals, fail} @@ -70,10 +71,14 @@ class GroupCoordinatorBaseRequestTest(cluster: ClusterInstance) { protected def createTransactionStateTopic(): Unit = { val admin = cluster.admin() try { - TestUtils.createTransactionStateTopicWithAdmin( + TestUtils.createTopicWithAdmin( admin = admin, + topic = Topic.TRANSACTION_STATE_TOPIC_NAME, + numPartitions = brokers().head.config.getInt(TransactionLogConfig.TRANSACTIONS_TOPIC_PARTITIONS_CONFIG), + replicationFactor = brokers().head.config.getShort(TransactionLogConfig.TRANSACTIONS_TOPIC_REPLICATION_FACTOR_CONFIG).toInt, brokers = brokers(), - controllers = controllerServers() + controllers = controllerServers(), + topicConfig = new Properties() ) } finally { admin.close() diff --git a/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala b/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala index 9956bf1203d05..be14bcb331405 100644 --- a/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala +++ b/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala @@ -17,6 +17,7 @@ package kafka.server +import com.yammer.metrics.core.{Histogram, Meter} import kafka.cluster.Partition import kafka.coordinator.transaction.{InitProducerIdResult, TransactionCoordinator} import kafka.network.RequestChannel @@ -75,7 +76,8 @@ import org.apache.kafka.common.requests.{FetchMetadata => JFetchMetadata, _} import org.apache.kafka.common.resource.{PatternType, Resource, ResourcePattern, ResourceType} import org.apache.kafka.common.security.auth.{KafkaPrincipal, KafkaPrincipalSerde, SecurityProtocol} import org.apache.kafka.common.utils.annotation.ApiKeyVersionsSource -import org.apache.kafka.common.utils.{ProducerIdAndEpoch, SecurityUtils, Utils} +import org.apache.kafka.common.utils.{ProducerIdAndEpoch, Utils} +import org.apache.kafka.common.utils.internals.SecurityUtils import org.apache.kafka.common.utils.internals.ImplicitLinkedHashCollection import org.apache.kafka.coordinator.group.GroupConfig.{CONSUMER_ASSIGNMENT_INTERVAL_MS_CONFIG, CONSUMER_ASSIGNOR_OFFLOAD_ENABLE_CONFIG, CONSUMER_HEARTBEAT_INTERVAL_MS_CONFIG, CONSUMER_SESSION_TIMEOUT_MS_CONFIG, SHARE_ASSIGNMENT_INTERVAL_MS_CONFIG, SHARE_ASSIGNOR_OFFLOAD_ENABLE_CONFIG, SHARE_AUTO_OFFSET_RESET_CONFIG, SHARE_DELIVERY_COUNT_LIMIT_CONFIG, SHARE_HEARTBEAT_INTERVAL_MS_CONFIG, SHARE_ISOLATION_LEVEL_CONFIG, SHARE_PARTITION_MAX_RECORD_LOCKS_CONFIG, SHARE_RECORD_LOCK_DURATION_MS_CONFIG, SHARE_RENEW_ACKNOWLEDGE_ENABLE_CONFIG, SHARE_SESSION_TIMEOUT_MS_CONFIG, STREAMS_ASSIGNMENT_INTERVAL_MS_CONFIG, STREAMS_ASSIGNOR_OFFLOAD_ENABLE_CONFIG, STREAMS_HEARTBEAT_INTERVAL_MS_CONFIG, STREAMS_INITIAL_REBALANCE_DELAY_MS_CONFIG, STREAMS_NUM_STANDBY_REPLICAS_CONFIG, STREAMS_SESSION_TIMEOUT_MS_CONFIG, STREAMS_TASK_OFFSET_INTERVAL_MS_CONFIG, STREAMS_NUM_WARMUP_REPLICAS_CONFIG, ERRORS_DEADLETTERQUEUE_TOPIC_NAME_CONFIG, ERRORS_DEADLETTERQUEUE_COPY_RECORD_ENABLE_CONFIG} import org.apache.kafka.coordinator.group.modern.share.ShareGroupConfig @@ -95,7 +97,7 @@ import org.apache.kafka.server.authorizer.{Action, AuthorizationResult, Authoriz import org.apache.kafka.server.common.{FeatureVersion, FinalizedFeatures, GroupVersion, KRaftVersion, MetadataVersion, RequestLocal, ShareVersion, StreamsVersion, TransactionVersion} import org.apache.kafka.server.config.{ReplicationConfigs, ServerConfigs, ServerLogConfigs} import org.apache.kafka.server.logger.LoggingController -import org.apache.kafka.server.metrics.ClientMetricsTestUtils +import org.apache.kafka.server.metrics.{ClientMetricsTestUtils, KafkaYammerMetrics} import org.apache.kafka.server.share.{CachedSharePartition, ErroneousAndValidPartitionData, SharePartitionKey} import org.apache.kafka.server.quota.{ClientQuotaManager, ControllerMutationQuota, ControllerMutationQuotaManager, ReplicaQuota, ReplicationQuotaManager, ThrottleCallback} import org.apache.kafka.server.share.acknowledge.ShareAcknowledgementBatch @@ -2261,12 +2263,22 @@ class KafkaApisTest extends Logging { assertEquals(expectedError, error) val metricName = if (version < 4) ApiKeys.ADD_PARTITIONS_TO_TXN.name else RequestMetrics.VERIFY_PARTITIONS_IN_TXN_METRIC_NAME - assertEquals(8, TestUtils.metersCount(metricName)) + assertEquals(8, metersCount(metricName)) } finally { requestMetrics.close() } } + private def metersCount(metricName: String): Long = { + KafkaYammerMetrics.defaultRegistry.allMetrics.asScala + .filter { case (k, _) => k.getMBeanName.endsWith(metricName) } + .values.map { + case histogram: Histogram => histogram.count() + case meter: Meter => meter.count() + case _ => 0 + }.sum + } + @ParameterizedTest @ApiKeyVersionsSource(apiKey = ApiKeys.ADD_PARTITIONS_TO_TXN) def testAddPartitionsToTxnOperationNotAttempted(version: Short): Unit = { diff --git a/core/src/test/scala/unit/kafka/server/ProduceRequestTest.scala b/core/src/test/scala/unit/kafka/server/ProduceRequestTest.scala deleted file mode 100644 index 5354c3e1d686e..0000000000000 --- a/core/src/test/scala/unit/kafka/server/ProduceRequestTest.scala +++ /dev/null @@ -1,301 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package kafka.server - -import java.nio.ByteBuffer -import java.util.{Collections, Properties} -import kafka.utils.TestUtils -import org.apache.kafka.clients.admin.{Admin, TopicDescription} -import org.apache.kafka.common.{TopicIdPartition, TopicPartition} -import org.apache.kafka.common.compress.Compression -import org.apache.kafka.common.config.TopicConfig -import org.apache.kafka.common.message.ProduceRequestData -import org.apache.kafka.common.protocol.{ApiKeys, Errors} -import org.apache.kafka.common.record.internal._ -import org.apache.kafka.common.record.TimestampType -import org.apache.kafka.common.requests.{ProduceRequest, ProduceResponse} -import org.apache.kafka.server.metrics.KafkaYammerMetrics -import org.apache.kafka.server.record.BrokerCompressionType -import org.apache.kafka.storage.log.metrics.BrokerTopicMetrics -import org.junit.jupiter.api.Assertions._ -import org.junit.jupiter.api.Test -import org.junit.jupiter.params.ParameterizedTest -import org.junit.jupiter.params.provider.{Arguments, MethodSource} - -import java.util.concurrent.TimeUnit -import scala.jdk.CollectionConverters._ - -/** - * Subclasses of `BaseProduceSendRequestTest` exercise the producer and produce request/response. This class - * complements those classes with tests that require lower-level access to the protocol. - */ -class ProduceRequestTest extends BaseRequestTest { - - val metricsKeySet = KafkaYammerMetrics.defaultRegistry.allMetrics.keySet.asScala - - @Test - def testSimpleProduceRequest(): Unit = { - val (partition, leader) = createTopicAndFindPartitionWithLeader("topic") - - def sendAndCheck(memoryRecords: MemoryRecords, expectedOffset: Long): Unit = { - val topicId = getTopicIds().get("topic").get - val produceRequest = ProduceRequest.builder(new ProduceRequestData() - .setTopicData(new ProduceRequestData.TopicProduceDataCollection(Collections.singletonList( - new ProduceRequestData.TopicProduceData() - .setTopicId(topicId) - .setPartitionData(Collections.singletonList(new ProduceRequestData.PartitionProduceData() - .setIndex(partition) - .setRecords(memoryRecords)))).iterator)) - .setAcks((-1).toShort) - .setTimeoutMs(3000) - .setTransactionalId(null)).build() - assertEquals(ApiKeys.PRODUCE.latestVersion(), produceRequest.version()) - val produceResponse = sendProduceRequest(leader, produceRequest) - assertEquals(1, produceResponse.data.responses.size) - val topicProduceResponse = produceResponse.data.responses.asScala.head - assertEquals(1, topicProduceResponse.partitionResponses.size) - val partitionProduceResponse = topicProduceResponse.partitionResponses.asScala.head - assertEquals(topicId, topicProduceResponse.topicId()) - assertEquals(partition, partitionProduceResponse.index()) - assertEquals(Errors.NONE, Errors.forCode(partitionProduceResponse.errorCode)) - assertEquals(expectedOffset, partitionProduceResponse.baseOffset) - assertEquals(-1, partitionProduceResponse.logAppendTimeMs) - assertTrue(partitionProduceResponse.recordErrors.isEmpty) - } - - sendAndCheck(MemoryRecords.withRecords(Compression.NONE, - new SimpleRecord(System.currentTimeMillis(), "key".getBytes, "value".getBytes)), 0) - - sendAndCheck(MemoryRecords.withRecords(Compression.gzip().build(), - new SimpleRecord(System.currentTimeMillis(), "key1".getBytes, "value1".getBytes), - new SimpleRecord(System.currentTimeMillis(), "key2".getBytes, "value2".getBytes)), 1) - } - - private def getPartitionToLeader( - admin: Admin, - topic: String - ): Map[Int, Int] = { - var topicDescription: TopicDescription = null - TestUtils.waitUntilTrue(() => { - val topicMap = admin. - describeTopics(java.util.Arrays.asList(topic)). - allTopicNames().get(10, TimeUnit.MINUTES) - topicDescription = topicMap.get(topic) - topicDescription != null - }, "Timed out waiting to describe topic " + topic) - topicDescription.partitions().asScala.map(p => { - p.partition() -> p.leader().id() - }).toMap - } - - @ParameterizedTest - @MethodSource(Array("timestampConfigProvider")) - def testProduceWithInvalidTimestamp(messageTimeStampConfig: String, recordTimestamp: Long): Unit = { - val topic = "topic" - val partition = 0 - val topicConfig = new Properties - topicConfig.setProperty(messageTimeStampConfig, "1000") - val admin = createAdminClient() - TestUtils.createTopicWithAdmin( - admin = admin, - topic = topic, - brokers = brokers, - controllers = controllerServers, - numPartitions = 1, - replicationFactor = 1, - topicConfig = topicConfig - ) - val partitionToLeader = getPartitionToLeader(admin, topic) - val leader = partitionToLeader(partition) - val topicDescription = TestUtils.describeTopic(createAdminClient(), topic) - - def createRecords(magicValue: Byte, timestamp: Long, codec: Compression): MemoryRecords = { - val buf = ByteBuffer.allocate(512) - val builder = MemoryRecords.builder(buf, magicValue, codec, TimestampType.CREATE_TIME, 0L) - builder.appendWithOffset(0, timestamp, null, "hello".getBytes) - builder.appendWithOffset(1, timestamp, null, "there".getBytes) - builder.appendWithOffset(2, timestamp, null, "beautiful".getBytes) - builder.build() - } - - val records = createRecords(RecordBatch.MAGIC_VALUE_V2, recordTimestamp, Compression.gzip().build()) - val topicPartition = new TopicIdPartition(topicDescription.topicId(), partition, "topic") - val produceResponse = sendProduceRequest(leader, ProduceRequest.builder(new ProduceRequestData() - .setTopicData(new ProduceRequestData.TopicProduceDataCollection(Collections.singletonList( - new ProduceRequestData.TopicProduceData() - .setTopicId(topicPartition.topicId()) - .setPartitionData(Collections.singletonList(new ProduceRequestData.PartitionProduceData() - .setIndex(topicPartition.partition()) - .setRecords(records)))).iterator)) - .setAcks((-1).toShort) - .setTimeoutMs(3000) - .setTransactionalId(null)).build()) - - assertEquals(1, produceResponse.data.responses.size) - val topicProduceResponse = produceResponse.data.responses.asScala.head - assertEquals(1, topicProduceResponse.partitionResponses.size) - val partitionProduceResponse = topicProduceResponse.partitionResponses.asScala.head - val tp = new TopicIdPartition(topicProduceResponse.topicId(), - partitionProduceResponse.index, - getTopicNames().get(topicProduceResponse.topicId()).getOrElse("")) - assertEquals(topicPartition, tp) - assertEquals(Errors.INVALID_TIMESTAMP, Errors.forCode(partitionProduceResponse.errorCode)) - // there are 3 records with InvalidTimestampException created from inner function createRecords - assertEquals(3, partitionProduceResponse.recordErrors.size) - val recordErrors = partitionProduceResponse.recordErrors.asScala - recordErrors.indices.foreach(i => assertEquals(i, recordErrors(i).batchIndex)) - recordErrors.foreach(recordError => assertNotNull(recordError.batchIndexErrorMessage)) - assertEquals("One or more records have been rejected due to invalid timestamp", partitionProduceResponse.errorMessage) - } - - @Test - def testProduceToNonReplica(): Unit = { - val topic = "topic" - val partition = 0 - - // Create a single-partition topic and find a broker which is not the leader - val admin = createAdminClient() - TestUtils.createTopicWithAdmin( - admin = admin, - topic = topic, - brokers = brokers, - controllers = controllerServers - ) - val partitionToLeader = getPartitionToLeader(admin, topic) - val leader = partitionToLeader(partition) - val nonReplicaOpt = brokers.find(_.config.brokerId != leader) - assertTrue(nonReplicaOpt.isDefined) - val nonReplicaId = nonReplicaOpt.get.config.brokerId - - // Send the produce request to the non-replica - val records = MemoryRecords.withRecords(Compression.NONE, new SimpleRecord("key".getBytes, "value".getBytes)) - val produceRequest = ProduceRequest.builder(new ProduceRequestData() - .setTopicData(new ProduceRequestData.TopicProduceDataCollection(Collections.singletonList( - new ProduceRequestData.TopicProduceData() - .setTopicId(getTopicIds().get("topic").get) - .setPartitionData(Collections.singletonList(new ProduceRequestData.PartitionProduceData() - .setIndex(partition) - .setRecords(records)))).iterator)) - .setAcks((-1).toShort) - .setTimeoutMs(3000) - .setTransactionalId(null)).build() - - val produceResponse = sendProduceRequest(nonReplicaId, produceRequest) - assertEquals(1, produceResponse.data.responses.size) - val topicProduceResponse = produceResponse.data.responses.asScala.head - assertEquals(1, topicProduceResponse.partitionResponses.size) - val partitionProduceResponse = topicProduceResponse.partitionResponses.asScala.head - assertEquals(Errors.NOT_LEADER_OR_FOLLOWER, Errors.forCode(partitionProduceResponse.errorCode)) - } - - /* returns a pair of partition id and leader id */ - private def createTopicAndFindPartitionWithLeader(topic: String): (Int, Int) = { - val partitionToLeader = createTopic(topic, 3, 2) - partitionToLeader.collectFirst { - case (partition, leader) if leader != -1 => (partition, leader) - }.getOrElse(throw new AssertionError(s"No leader elected for topic $topic")) - } - - @Test - def testCorruptLz4ProduceRequest(): Unit = { - val (partition, leader) = createTopicAndFindPartitionWithLeader("topic") - val topicId = getTopicIds().get("topic").get - val timestamp = 1000000 - val memoryRecords = MemoryRecords.withRecords(Compression.lz4().build(), - new SimpleRecord(timestamp, "key".getBytes, "value".getBytes)) - // Change the lz4 checksum value (not the kafka record crc) so that it doesn't match the contents - val lz4ChecksumOffset = 6 - memoryRecords.buffer.array.update(DefaultRecordBatch.RECORD_BATCH_OVERHEAD + lz4ChecksumOffset, 0) - val produceResponse = sendProduceRequest(leader, ProduceRequest.builder(new ProduceRequestData() - .setTopicData(new ProduceRequestData.TopicProduceDataCollection(Collections.singletonList( - new ProduceRequestData.TopicProduceData() - .setTopicId(topicId) - .setPartitionData(Collections.singletonList(new ProduceRequestData.PartitionProduceData() - .setIndex(partition) - .setRecords(memoryRecords)))).iterator)) - .setAcks((-1).toShort) - .setTimeoutMs(3000) - .setTransactionalId(null)).build()) - - assertEquals(1, produceResponse.data.responses.size) - val topicProduceResponse = produceResponse.data.responses.asScala.head - assertEquals(1, topicProduceResponse.partitionResponses.size) - val partitionProduceResponse = topicProduceResponse.partitionResponses.asScala.head - assertEquals(topicId, topicProduceResponse.topicId()) - assertEquals(partition, partitionProduceResponse.index()) - assertEquals(Errors.CORRUPT_MESSAGE, Errors.forCode(partitionProduceResponse.errorCode)) - assertEquals(-1, partitionProduceResponse.baseOffset) - assertEquals(-1, partitionProduceResponse.logAppendTimeMs) - assertEquals(metricsKeySet.count(_.getMBeanName.endsWith(s"${BrokerTopicMetrics.INVALID_MESSAGE_CRC_RECORDS_PER_SEC}")), 1) - assertTrue(TestUtils.meterCount(s"${BrokerTopicMetrics.INVALID_MESSAGE_CRC_RECORDS_PER_SEC}") > 0) - } - - @Test - def testZSTDProduceRequest(): Unit = { - val topic = "topic" - val partition = 0 - - // Create a single-partition topic compressed with ZSTD - val topicConfig = new Properties - topicConfig.setProperty(TopicConfig.COMPRESSION_TYPE_CONFIG, BrokerCompressionType.ZSTD.name) - val partitionToLeader = createTopic(topic, topicConfig = topicConfig) - val leader = partitionToLeader(partition) - val memoryRecords = MemoryRecords.withRecords(Compression.zstd().build(), - new SimpleRecord(System.currentTimeMillis(), "key".getBytes, "value".getBytes)) - val topicPartition = new TopicPartition("topic", partition) - val partitionRecords = new ProduceRequestData() - .setTopicData(new ProduceRequestData.TopicProduceDataCollection(Collections.singletonList( - new ProduceRequestData.TopicProduceData() - .setName("topic") // This test case is testing producer v.7, no need to use topic id - .setPartitionData(Collections.singletonList( - new ProduceRequestData.PartitionProduceData() - .setIndex(partition) - .setRecords(memoryRecords)))) - .iterator)) - .setAcks((-1).toShort) - .setTimeoutMs(3000) - .setTransactionalId(null) - - // produce request with v7: works fine! - val produceResponse1 = sendProduceRequest(leader, new ProduceRequest.Builder(7, 7, partitionRecords).build()) - - val topicProduceResponse1 = produceResponse1.data.responses.asScala.head - val partitionProduceResponse1 = topicProduceResponse1.partitionResponses.asScala.head - val tp1 = new TopicPartition(topicProduceResponse1.name, partitionProduceResponse1.index) - assertEquals(topicPartition, tp1) - assertEquals(Errors.NONE, Errors.forCode(partitionProduceResponse1.errorCode)) - assertEquals(0, partitionProduceResponse1.baseOffset) - assertEquals(-1, partitionProduceResponse1.logAppendTimeMs) - } - - private def sendProduceRequest(leaderId: Int, request: ProduceRequest): ProduceResponse = { - connectAndReceive[ProduceResponse](request, destination = brokerSocketServer(leaderId)) - } - -} - -object ProduceRequestTest { - - def timestampConfigProvider: java.util.stream.Stream[Arguments] = { - val fiveMinutesInMs: Long = 5 * 60 * 60 * 1000L - java.util.stream.Stream.of[Arguments]( - Arguments.of(TopicConfig.MESSAGE_TIMESTAMP_BEFORE_MAX_MS_CONFIG, Long.box(System.currentTimeMillis() - fiveMinutesInMs)), - Arguments.of(TopicConfig.MESSAGE_TIMESTAMP_AFTER_MAX_MS_CONFIG, Long.box(System.currentTimeMillis() + fiveMinutesInMs)) - ) - } -} diff --git a/core/src/test/scala/unit/kafka/server/RegistrationTestContext.scala b/core/src/test/scala/unit/kafka/server/RegistrationTestContext.scala index b29498b92b4b3..85547abcf3dce 100644 --- a/core/src/test/scala/unit/kafka/server/RegistrationTestContext.scala +++ b/core/src/test/scala/unit/kafka/server/RegistrationTestContext.scala @@ -26,7 +26,7 @@ import org.apache.kafka.common.message.BrokerRegistrationRequestData.{Listener, import org.apache.kafka.common.network.ListenerName import org.apache.kafka.common.protocol.ApiKeys.{BROKER_HEARTBEAT, BROKER_REGISTRATION, CONTROLLER_REGISTRATION} import org.apache.kafka.common.security.auth.SecurityProtocol -import org.apache.kafka.common.utils.LogContext +import org.apache.kafka.common.utils.internals.LogContext import org.apache.kafka.server.util.MockTime import org.apache.kafka.server.ControllerInformation diff --git a/core/src/test/scala/unit/kafka/server/ReplicaFetcherThreadTest.scala b/core/src/test/scala/unit/kafka/server/ReplicaFetcherThreadTest.scala index c23d8ec8f07ef..736d71f631ab8 100644 --- a/core/src/test/scala/unit/kafka/server/ReplicaFetcherThreadTest.scala +++ b/core/src/test/scala/unit/kafka/server/ReplicaFetcherThreadTest.scala @@ -31,7 +31,8 @@ import org.apache.kafka.common.protocol.{ApiKeys, Errors} import org.apache.kafka.common.record.internal.{CompressionType, MemoryRecords, RecordBatch, SimpleRecord} import org.apache.kafka.common.requests.OffsetsForLeaderEpochResponse.{UNDEFINED_EPOCH, UNDEFINED_EPOCH_OFFSET} import org.apache.kafka.common.requests.{FetchRequest, FetchResponse} -import org.apache.kafka.common.utils.{LogContext, Time} +import org.apache.kafka.common.utils.Time +import org.apache.kafka.common.utils.internals.LogContext import org.apache.kafka.metadata.KRaftMetadataCache import org.apache.kafka.server.common.{KRaftVersion, MetadataVersion, OffsetAndEpoch} import org.apache.kafka.server.network.BrokerEndPoint diff --git a/core/src/test/scala/unit/kafka/server/ReplicaManagerTest.scala b/core/src/test/scala/unit/kafka/server/ReplicaManagerTest.scala index 9639d1e46aa40..3c0ee3db9029c 100644 --- a/core/src/test/scala/unit/kafka/server/ReplicaManagerTest.scala +++ b/core/src/test/scala/unit/kafka/server/ReplicaManagerTest.scala @@ -50,7 +50,8 @@ import org.apache.kafka.common.requests.FetchRequest.PartitionData import org.apache.kafka.common.requests.ProduceResponse.PartitionResponse import org.apache.kafka.common.requests._ import org.apache.kafka.common.security.auth.KafkaPrincipal -import org.apache.kafka.common.utils.{LogContext, Time, Utils} +import org.apache.kafka.common.utils.{Time, Utils} +import org.apache.kafka.common.utils.internals.LogContext import org.apache.kafka.coordinator.transaction.{AddPartitionsToTxnConfig, TransactionLogConfig} import org.apache.kafka.image._ import org.apache.kafka.metadata.KRaftMetadataCache diff --git a/core/src/test/scala/unit/kafka/server/RequestQuotaTest.scala b/core/src/test/scala/unit/kafka/server/RequestQuotaTest.scala index d0bd0c9808f52..639328798a0e5 100644 --- a/core/src/test/scala/unit/kafka/server/RequestQuotaTest.scala +++ b/core/src/test/scala/unit/kafka/server/RequestQuotaTest.scala @@ -35,7 +35,7 @@ import org.apache.kafka.common.record.internal._ import org.apache.kafka.common.requests._ import org.apache.kafka.common.resource.{PatternType, ResourceType => AdminResourceType} import org.apache.kafka.common.security.auth._ -import org.apache.kafka.common.utils.SecurityUtils +import org.apache.kafka.common.utils.internals.SecurityUtils import org.apache.kafka.common.utils.internals.Sanitizer import org.apache.kafka.coordinator.group.GroupCoordinatorConfig import org.apache.kafka.metadata.authorizer.StandardAuthorizer diff --git a/core/src/test/scala/unit/kafka/server/epoch/LeaderEpochIntegrationTest.scala b/core/src/test/scala/unit/kafka/server/epoch/LeaderEpochIntegrationTest.scala index 560c8988348c0..cb6c3431e4f86 100644 --- a/core/src/test/scala/unit/kafka/server/epoch/LeaderEpochIntegrationTest.scala +++ b/core/src/test/scala/unit/kafka/server/epoch/LeaderEpochIntegrationTest.scala @@ -31,7 +31,8 @@ import org.apache.kafka.common.requests.OffsetsForLeaderEpochResponse.UNDEFINED_ import org.apache.kafka.common.requests.{OffsetsForLeaderEpochRequest, OffsetsForLeaderEpochResponse} import org.apache.kafka.common.security.auth.SecurityProtocol import org.apache.kafka.common.serialization.StringSerializer -import org.apache.kafka.common.utils.{LogContext, Time} +import org.apache.kafka.common.utils.Time +import org.apache.kafka.common.utils.internals.LogContext import org.apache.kafka.server.network.BrokerEndPoint import org.apache.kafka.base.test.{TestUtils => JTestUtils} import org.junit.jupiter.api.{AfterEach, Test} diff --git a/core/src/test/scala/unit/kafka/utils/TestUtils.scala b/core/src/test/scala/unit/kafka/utils/TestUtils.scala index a1dbb9ec3d472..784b5a74d1224 100755 --- a/core/src/test/scala/unit/kafka/utils/TestUtils.scala +++ b/core/src/test/scala/unit/kafka/utils/TestUtils.scala @@ -16,8 +16,7 @@ */ package kafka.utils -import com.yammer.metrics.core.{Histogram, Meter} -import kafka.network.RequestChannel +import com.yammer.metrics.core.Meter import kafka.security.JaasTestUtils import kafka.server._ import kafka.utils.Implicits._ @@ -32,15 +31,12 @@ import org.apache.kafka.common.config.{ConfigException, ConfigResource} import org.apache.kafka.common.errors.{TopicExistsException, UnknownTopicOrPartitionException} import org.apache.kafka.common.header.Header import org.apache.kafka.common.internals.{Plugin, Topic} -import org.apache.kafka.common.memory.MemoryPool -import org.apache.kafka.common.metrics.Metrics -import org.apache.kafka.common.network.{ClientInformation, ConnectionMode, ListenerName} -import org.apache.kafka.common.protocol.ApiKeys -import org.apache.kafka.common.record.internal._ +import org.apache.kafka.common.network.{ConnectionMode, ListenerName} import org.apache.kafka.common.record.TimestampType +import org.apache.kafka.common.record.internal._ import org.apache.kafka.common.requests._ import org.apache.kafka.common.resource.ResourcePattern -import org.apache.kafka.common.security.auth.{KafkaPrincipal, KafkaPrincipalSerde, SecurityProtocol} +import org.apache.kafka.common.security.auth.SecurityProtocol import org.apache.kafka.common.serialization._ import org.apache.kafka.common.utils.Utils import org.apache.kafka.common.utils.Utils.formatAddress @@ -48,14 +44,12 @@ import org.apache.kafka.coordinator.group.GroupCoordinatorConfig import org.apache.kafka.coordinator.transaction.TransactionLogConfig import org.apache.kafka.metadata.{ConfigRepository, LeaderAndIsr, MockConfigRepository} import org.apache.kafka.network.SocketServerConfigs -import org.apache.kafka.network.metrics.RequestChannelMetrics import org.apache.kafka.raft.{KRaftConfigs, QuorumConfig} -import org.apache.kafka.server.authorizer.{AuthorizableRequestContext, Authorizer => JAuthorizer} +import org.apache.kafka.server.authorizer.{Authorizer => JAuthorizer} import org.apache.kafka.server.config.{DelegationTokenManagerConfigs, ReplicationConfigs, ServerConfigs, ServerLogConfigs} import org.apache.kafka.server.metrics.KafkaYammerMetrics import org.apache.kafka.server.util.MockTime -import org.apache.kafka.storage.internals.checkpoint.OffsetCheckpointFile -import org.apache.kafka.storage.internals.log.{CleanerConfig, LogCleaner, LogConfig, LogDirFailureChannel, LogManager, ProducerStateManagerConfig, UnifiedLog} +import org.apache.kafka.storage.internals.log._ import org.apache.kafka.storage.log.metrics.BrokerTopicStats import org.apache.kafka.base.test.{TestUtils => JTestUtils} import org.junit.jupiter.api.Assertions._ @@ -63,9 +57,8 @@ import org.mockito.ArgumentMatchers.{any, anyBoolean} import org.mockito.Mockito import java.io._ -import java.net.InetAddress import java.nio._ -import java.nio.charset.{Charset, StandardCharsets} +import java.nio.charset.StandardCharsets import java.nio.file.{Files, StandardOpenOption} import java.time.Duration import java.util @@ -78,7 +71,6 @@ import scala.concurrent.{Await, ExecutionContext, Future} import scala.jdk.CollectionConverters._ import scala.jdk.OptionConverters.RichOption import scala.jdk.javaapi.OptionConverters -import scala.util.{Failure, Success, Try} /** * Utility functions to help with testing @@ -99,7 +91,6 @@ object TestUtils extends Logging { private val transactionStatusKey = "transactionStatus" private val committedValue : Array[Byte] = "committed".getBytes(StandardCharsets.UTF_8) - private val abortedValue : Array[Byte] = "aborted".getBytes(StandardCharsets.UTF_8) sealed trait LogDirFailureType case object Roll extends LogDirFailureType @@ -131,11 +122,6 @@ object TestUtils extends Logging { */ def tempFile(prefix: String, suffix: String): File = JTestUtils.tempFile(prefix, suffix) - def tempPropertiesFile(properties: Map[String, String]): File = { - val content = properties.map{case (k, v) => k + "=" + v}.mkString(System.lineSeparator()) - JTestUtils.tempFile(content) - } - /** * Create a test config for the provided parameters. * @@ -440,23 +426,6 @@ object TestUtils extends Logging { ) } - def createTransactionStateTopicWithAdmin[B <: KafkaBroker]( - admin: Admin, - brokers: Seq[B], - controllers: Seq[ControllerServer] - ): Map[Int, Int] = { - val broker = brokers.head - createTopicWithAdmin( - admin = admin, - topic = Topic.TRANSACTION_STATE_TOPIC_NAME, - numPartitions = broker.config.getInt(TransactionLogConfig.TRANSACTIONS_TOPIC_PARTITIONS_CONFIG), - replicationFactor = broker.config.getShort(TransactionLogConfig.TRANSACTIONS_TOPIC_REPLICATION_FACTOR_CONFIG).toInt, - brokers = brokers, - controllers = controllers, - topicConfig = new Properties(), - ) - } - def deleteTopicWithAdmin[B <: KafkaBroker]( admin: Admin, topic: String, @@ -576,7 +545,7 @@ object TestUtils extends Logging { * * @return The new leader (note that negative values are used to indicate conditions like NoLeader and * LeaderDuringDelete). - * @throws AssertionError if the expected condition is not true within the timeout. + * @throws java.lang.AssertionError if the expected condition is not true within the timeout. */ def waitUntilLeaderIsElectedOrChangedWithAdmin( admin: Admin, @@ -597,17 +566,6 @@ object TestUtils extends Logging { } } } - doWaitUntilLeaderIsElectedOrChanged(getPartitionLeader, topic, partition, timeoutMs, oldLeaderOpt, newLeaderOpt) - } - - private def doWaitUntilLeaderIsElectedOrChanged( - getPartitionLeader: (String, Int) => Option[Int], - topic: String, - partition: Int, - timeoutMs: Long, - oldLeaderOpt: Option[Int], - newLeaderOpt: Option[Int] - ): Int = { require(!(oldLeaderOpt.isDefined && newLeaderOpt.isDefined), "Can't define both the old and the new leader") val startTime = System.currentTimeMillis() val topicPartition = new TopicPartition(topic, partition) @@ -804,21 +762,6 @@ object TestUtils extends Logging { .getOrElse(throw new AssertionError(s"Unable to locate follower for $topicPartition")) } - /** - * Wait until all brokers know about each other. - * - * @param brokers The Kafka brokers. - * @param timeout The amount of time waiting on this condition before assert to fail - */ - def waitUntilBrokerMetadataIsPropagated[B <: KafkaBroker]( - brokers: Seq[B], - timeout: Long = JTestUtils.DEFAULT_MAX_WAIT_MS): Unit = { - val expectedBrokerIds = brokers.map(_.config.brokerId).toSet - waitUntilTrue(() => brokers.forall(server => - expectedBrokerIds.forall(server.dataPlaneRequestProcessor.metadataCache.hasAliveBroker(_)) - ), "Timed out waiting for broker metadata to propagate to all servers", timeout) - } - /** * Wait until the expected number of partitions is in the metadata cache in each broker. * @@ -1041,58 +984,6 @@ object TestUtils extends Logging { } } - def verifyTopicDeletion[B <: KafkaBroker]( - topic: String, - numPartitions: Int, - brokers: Seq[B]): Unit = { - val topicPartitions = (0 until numPartitions).map(new TopicPartition(topic, _)) - // ensure that the topic-partition has been deleted from all brokers' replica managers - waitUntilTrue(() => - brokers.forall(broker => topicPartitions.forall(tp => broker.replicaManager.onlinePartition(tp).isEmpty)), - "Replica manager's should have deleted all of this topic's partitions") - // ensure that logs from all replicas are deleted - waitUntilTrue(() => brokers.forall(broker => topicPartitions.forall(tp => broker.logManager.getLog(tp).isEmpty)), - "Replica logs not deleted after delete topic is complete") - // ensure that topic is removed from all cleaner offsets - waitUntilTrue(() => brokers.forall(broker => topicPartitions.forall { tp => - val checkpoints = broker.logManager.liveLogDirs.asScala.map { logDir => - new OffsetCheckpointFile(new File(logDir, "cleaner-offset-checkpoint"), null).read() - } - checkpoints.forall(checkpointsPerLogDir => !checkpointsPerLogDir.containsKey(tp)) - }), "Cleaner offset for deleted partition should have been removed") - waitUntilTrue(() => brokers.forall(broker => - broker.config.logDirs.stream().allMatch { logDir => - topicPartitions.forall { tp => - !new File(logDir, tp.topic + "-" + tp.partition).exists() - } - } - ), "Failed to soft-delete the data to a delete directory") - waitUntilTrue(() => brokers.forall(broker => - broker.config.logDirs.stream().allMatch { logDir => - topicPartitions.forall { tp => - !util.List.of(new File(logDir).list()).asScala.exists { partitionDirectoryNames => - partitionDirectoryNames.exists { directoryName => - directoryName.startsWith(tp.topic + "-" + tp.partition) && - directoryName.endsWith(UnifiedLog.DELETE_DIR_SUFFIX) - } - } - } - } - ), "Failed to hard-delete the delete directory") - } - - /** - * Translate the given buffer into a string - * - * @param buffer The buffer to translate - * @param encoding The encoding to use in translating bytes to characters - */ - def readString(buffer: ByteBuffer, encoding: String = Charset.defaultCharset.toString): String = { - val bytes = new Array[Byte](buffer.remaining) - buffer.get(bytes) - new String(bytes, encoding) - } - def waitAndVerifyAcls(expected: Set[AccessControlEntry], authorizerPlugin: Plugin[JAuthorizer], resource: ResourcePattern, @@ -1112,7 +1003,7 @@ object TestUtils extends Logging { 45000) } - def consumeTopicRecords[K, V, B <: KafkaBroker]( + def consumeTopicRecords[B <: KafkaBroker]( brokers: Seq[B], topic: String, numMessages: Int, @@ -1223,7 +1114,7 @@ object TestUtils extends Logging { override def value() = if (willBeCommitted) committedValue else - abortedValue + "aborted".getBytes(StandardCharsets.UTF_8) } new ProducerRecord[Array[Byte], Array[Byte]](topic, partition, key, value, util.Set.of(header)) } @@ -1270,86 +1161,6 @@ object TestUtils extends Logging { adminClient.incrementalAlterConfigs(configs) } - def assertLeader(client: Admin, topicPartition: TopicPartition, expectedLeader: Int): Unit = { - waitForLeaderToBecome(client, topicPartition, Some(expectedLeader)) - } - - def assertNoLeader(client: Admin, topicPartition: TopicPartition): Unit = { - waitForLeaderToBecome(client, topicPartition, None) - } - - def waitForOnlineBroker(client: Admin, brokerId: Int): Unit = { - waitUntilTrue(() => { - val nodes = client.describeCluster().nodes().get() - nodes.asScala.exists(_.id == brokerId) - }, s"Timed out waiting for brokerId $brokerId to come online") - } - - def waitForLeaderToBecome( - client: Admin, - topicPartition: TopicPartition, - expectedLeaderOpt: Option[Int] - ): Unit = { - val topic = topicPartition.topic - val partitionId = topicPartition.partition - - def currentLeader: Try[Option[Int]] = Try { - val topicDescription = client.describeTopics(util.List.of(topic)).allTopicNames.get.get(topic) - topicDescription.partitions.asScala - .find(_.partition == partitionId) - .flatMap(partitionState => Option(partitionState.leader)) - .map(_.id) - } - - val (lastLeaderCheck, isLeaderElected) = computeUntilTrue(currentLeader) { - case Success(leaderOpt) => leaderOpt == expectedLeaderOpt - case Failure(e: ExecutionException) if e.getCause.isInstanceOf[UnknownTopicOrPartitionException] => false - case Failure(e) => throw e - } - - assertTrue(isLeaderElected, s"Timed out waiting for leader to become $expectedLeaderOpt. " + - s"Last metadata lookup returned leader = ${lastLeaderCheck.getOrElse("unknown")}") - } - - def waitForBrokersOutOfIsr(client: Admin, partition: Set[TopicPartition], brokerIds: Set[Int]): Unit = { - waitUntilTrue( - () => { - val description = client.describeTopics(partition.map(_.topic).asJava).allTopicNames.get.asScala - val isr = description - .values - .flatMap(_.partitions.asScala.flatMap(_.isr.asScala)) - .map(_.id) - .toSet - - brokerIds.intersect(isr).isEmpty - }, - s"Expected brokers $brokerIds to no longer be in the ISR for $partition" - ) - } - - def currentIsr(admin: Admin, partition: TopicPartition): Set[Int] = { - val description = admin.describeTopics(util.Set.of(partition.topic)) - .allTopicNames - .get - .asScala - - description - .values - .flatMap(_.partitions.asScala.flatMap(_.isr.asScala)) - .map(_.id) - .toSet - } - - def waitForBrokersInIsr(client: Admin, partition: TopicPartition, brokerIds: Set[Int]): Unit = { - waitUntilTrue( - () => { - val isr = currentIsr(client, partition) - brokerIds.subsetOf(isr) - }, - s"Expected brokers $brokerIds to be in the ISR for $partition" - ) - } - def assertBadConfigContainingMessage(props: Properties, expectedExceptionContainsText: String): Unit = { try { KafkaConfig.fromProps(props) @@ -1364,105 +1175,18 @@ object TestUtils extends Logging { } def totalMetricValue(broker: KafkaBroker, metricName: String): Long = { - totalMetricValue(broker.metrics, metricName) - } - - def totalMetricValue(metrics: Metrics, metricName: String): Long = { - val allMetrics = metrics.metrics + val allMetrics = broker.metrics.metrics val total = allMetrics.values().asScala.filter(_.metricName().name() == metricName) .foldLeft(0.0)((total, metric) => total + metric.metricValue.asInstanceOf[Double]) total.toLong } def meterCount(metricName: String): Long = { - meterCountOpt(metricName).getOrElse(fail(s"Unable to find metric $metricName")) - } - - def meterCountOpt(metricName: String): Option[Long] = { KafkaYammerMetrics.defaultRegistry.allMetrics.asScala .filter { case (k, _) => k.getMBeanName.endsWith(metricName) } .values .headOption .map(_.asInstanceOf[Meter].count) - } - - def metersCount(metricName: String): Long = { - KafkaYammerMetrics.defaultRegistry.allMetrics.asScala - .filter { case (k, _) => k.getMBeanName.endsWith(metricName) } - .values.map { - case histogram: Histogram => histogram.count() - case meter: Meter => meter.count() - case _ => 0 - }.sum - } - - /** - * Find an Authorizer that we can call createAcls or deleteAcls on. - */ - def pickAuthorizerForWrite[B <: KafkaBroker]( - brokers: Seq[B], - controllers: Seq[ControllerServer], - ): JAuthorizer = { - if (controllers.isEmpty) { - brokers.head.authorizerPlugin.get.get - } else { - var result: JAuthorizer = null - TestUtils.retry(120000) { - val active = controllers.filter(_.controller.isActive).head - result = active.authorizerPlugin.get.get - } - result - } - } - - val anonymousAuthorizableContext = new AuthorizableRequestContext() { - override def listenerName(): String = "" - override def securityProtocol(): SecurityProtocol = SecurityProtocol.PLAINTEXT - override def principal(): KafkaPrincipal = KafkaPrincipal.ANONYMOUS - override def clientAddress(): InetAddress = null - override def requestType(): Int = 0 - override def requestVersion(): Int = 0 - override def clientId(): String = "" - override def correlationId(): Int = 0 - } - - def buildEnvelopeRequest( - request: AbstractRequest, - principalSerde: KafkaPrincipalSerde, - requestChannelMetrics: RequestChannelMetrics, - startTimeNanos: Long, - dequeueTimeNanos: Long = -1, - fromPrivilegedListener: Boolean = true - ): RequestChannel.Request = { - val clientId = "id" - val listenerName = ListenerName.forSecurityProtocol(SecurityProtocol.PLAINTEXT) - - val requestHeader = new RequestHeader(request.apiKey, request.version, clientId, 0) - val requestBuffer = request.serializeWithHeader(requestHeader) - - val envelopeHeader = new RequestHeader(ApiKeys.ENVELOPE, ApiKeys.ENVELOPE.latestVersion(), clientId, 0) - val envelopeBuffer = new EnvelopeRequest.Builder( - requestBuffer, - principalSerde.serialize(KafkaPrincipal.ANONYMOUS), - InetAddress.getLocalHost.getAddress - ).build().serializeWithHeader(envelopeHeader) - - RequestHeader.parse(envelopeBuffer) - - val envelopeContext = new RequestContext(envelopeHeader, "1", InetAddress.getLocalHost, Optional.empty(), - KafkaPrincipal.ANONYMOUS, listenerName, SecurityProtocol.PLAINTEXT, ClientInformation.EMPTY, - fromPrivilegedListener, Optional.of(principalSerde)) - - val envelopRequest = new RequestChannel.Request( - processor = 1, - context = envelopeContext, - startTimeNanos = startTimeNanos, - memoryPool = MemoryPool.NONE, - buffer = envelopeBuffer, - metrics = requestChannelMetrics, - envelope = None - ) - envelopRequest.requestDequeueTimeNanos = dequeueTimeNanos - envelopRequest + .getOrElse(fail(s"Unable to find metric $metricName")) } } diff --git a/docker/native/native-image-configs/reflect-config.json b/docker/native/native-image-configs/reflect-config.json index c953ea9fe1d8e..53a5f4a95798c 100644 --- a/docker/native/native-image-configs/reflect-config.json +++ b/docker/native/native-image-configs/reflect-config.json @@ -1054,11 +1054,11 @@ "methods":[{"name":"","parameterTypes":[] }] }, { - "name":"org.apache.kafka.common.utils.AppInfoParser$AppInfo", + "name":"org.apache.kafka.common.utils.internals.AppInfoParser$AppInfo", "queryAllPublicConstructors":true }, { - "name":"org.apache.kafka.common.utils.AppInfoParser$AppInfoMBean", + "name":"org.apache.kafka.common.utils.internals.AppInfoParser$AppInfoMBean", "queryAllPublicMethods":true }, { diff --git a/docs/streams/upgrade-guide.md b/docs/streams/upgrade-guide.md index 6e7213bfeafe6..da69b5c8af84b 100644 --- a/docs/streams/upgrade-guide.md +++ b/docs/streams/upgrade-guide.md @@ -57,6 +57,8 @@ Downgrading from 3.0.x or newer version to 2.8.x or older version needs special Downgrading from 4.0.x or newer version to older than 4.0.0 needs special attention: Since 4.0.0 release, Kafka Streams upgraded RocksDB from version 7.9.2 to 9.7.3. This upgrade introduces a RocksDB file format version change from version 5 to version 6 (introduced in RocksDB 8.6). While the newer RocksDB version (9.7.3) can read state stores written in the old format (version 5), the older RocksDB versions cannot read state stores written in the new format (version 6). This means that downgrading from Kafka Streams 4.0.x or newer to versions older than 4.0.0 in-flight is not possible out-of-the-box. Users must first delete the local RocksDB state stores written by Kafka Streams 4.0.x or newer before downgrading to versions older than 4.0.0, which will then restore the state stores from the changelogs using the old file format. +Downgrading from 4.3.x or newer version to 4.2.x or older version needs special attention: Since 4.3.0 release, Kafka Streams persists state store changelog offsets inside each state store rather than in a per-task `.checkpoint` file (see [KIP-1035](https://cwiki.apache.org/confluence/display/KAFKA/KIP-1035%3A+StateStore+managed+changelog+offsets)). For built-in RocksDB stores, offsets are written into a dedicated `offsets` column family inside each RocksDB instance. Older Kafka Streams versions do not declare this column family when opening RocksDB, so they will fail to open the store and the application will crash on startup. In-flight downgrade is therefore not supported. To downgrade to 4.2.x or older, stop each application instance, delete the local state directory (`state.dir`), then start the older version — Kafka Streams will restore all state stores from their changelog topics using the older on-disk format. + Kafka Streams does not support running multiple instances of the same application as different processes on the same physical state directory. Starting in 2.8.0 (as well as 2.7.1 and 2.6.2), this restriction will be enforced. If you wish to run more than one instance of Kafka Streams, you must configure them with different values for `state.dir`. Starting in Kafka Streams 2.6.x, a new processing mode is available, named EOS version 2. This can be configured by setting `"processing.guarantee"` to `"exactly_once_v2"` for application versions 3.0+, or setting it to `"exactly_once_beta"` for versions between 2.6 and 2.8. To use this new feature, your brokers must be on version 2.5.x or newer. If you want to upgrade your EOS application from an older version and enable this feature in version 3.0+, you first need to upgrade your application to version 3.0.x, staying on `"exactly_once"`, and then do second round of rolling bounces to switch to `"exactly_once_v2"`. If you are upgrading an EOS application from an older (pre-2.6) version to a version between 2.6 and 2.8, follow these same steps but with the config `"exactly_once_beta"` instead. No special steps are required to upgrade an application using `"exactly_once_beta"` from version 2.6+ to 3.0 or higher: you can just change the config from `"exactly_once_beta"` to `"exactly_once_v2"` during the rolling upgrade. For a downgrade, do the reverse: first switch the config from `"exactly_once_v2"` to `"exactly_once"` to disable the feature in your 2.6.x application. Afterward, you can downgrade your application to a pre-2.6.x version. @@ -71,6 +73,8 @@ The streams thread metrics `commit-ratio`, `process-ratio`, `punctuate-ratio`, a Kafka Streams now allows to purge local state directories and checkpoint files during application startup if they have not been modified for a certain period of time. This can be configured via the new `state.cleanup.dir.max.age.ms` config. More details can be found in [KIP-1259](https://cwiki.apache.org/confluence/display/KAFKA/KIP-1259%3A+Add+configuration+to+wipe+Kafka+Streams+local+state+on+startup) +Kafka Streams now persists state store changelog offsets inside each state store rather than in a single per-task `.checkpoint` file ([KIP-1035](https://cwiki.apache.org/confluence/display/KAFKA/KIP-1035%3A+StateStore+managed+changelog+offsets)). This is an internal infrastructure change and is transparent to most users — existing per-task `.checkpoint` files are migrated automatically on first startup, and no application or operator action is required. EOS crash behavior is unchanged in 4.3: state stores are still wiped and fully restored from the changelog. KIP-1035 is a prerequisite for [KIP-892: Transactional Semantics for StateStores](https://cwiki.apache.org/confluence/display/KAFKA/KIP-892%3A+Transactional+Semantics+for+StateStores), which will use these per-store offsets to make EOS state writes transactional and skip the full restore. Authors of custom `StateStore` implementations may opt-in to managing their own offsets via `managesOffsets()`, `commit(Map)`, and `committedOffset(TopicPartition)`; see KIP-1035 for the API. For downgrade implications, see [Notable compatibility changes in past releases](#notable-compatibility-changes-in-past-releases). + ### Deprecation of streams-scala module (KIP-1244) The `kafka-streams-scala` module (`org.apache.kafka.streams.scala` package) is deprecated in 4.3.0 and will be removed in 5.0. diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java index 7bcff80722ccd..15e33ce3d27a3 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java @@ -79,10 +79,10 @@ import org.apache.kafka.common.requests.StreamsGroupDescribeRequest; import org.apache.kafka.common.requests.TransactionResult; import org.apache.kafka.common.requests.TxnOffsetCommitRequest; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.common.runtime.CoordinatorBackgroundThreadPoolExecutor; import org.apache.kafka.coordinator.common.runtime.CoordinatorEventProcessor; import org.apache.kafka.coordinator.common.runtime.CoordinatorLoader; diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorShard.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorShard.java index 9fc202ebae7fa..cb1966db57856 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorShard.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorShard.java @@ -59,8 +59,8 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.OffsetFetchRequest; import org.apache.kafka.common.requests.TransactionResult; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.common.runtime.CoordinatorExecutor; import org.apache.kafka.coordinator.common.runtime.CoordinatorMetadataDelta; import org.apache.kafka.coordinator.common.runtime.CoordinatorMetadataImage; diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java index 21fab03083f42..a67ca07883a56 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java @@ -77,8 +77,8 @@ import org.apache.kafka.common.requests.ShareGroupHeartbeatRequest; import org.apache.kafka.common.requests.ShareGroupHeartbeatResponse; import org.apache.kafka.common.requests.StreamsGroupHeartbeatResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.common.runtime.CoordinatorExecutor; import org.apache.kafka.coordinator.common.runtime.CoordinatorMetadataDelta; import org.apache.kafka.coordinator.common.runtime.CoordinatorMetadataImage; diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java index 9ed21e4798e6e..1aeedd4c94f91 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java @@ -36,8 +36,8 @@ import org.apache.kafka.common.record.internal.RecordBatch; import org.apache.kafka.common.requests.OffsetCommitRequest; import org.apache.kafka.common.requests.TransactionResult; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.common.runtime.CoordinatorMetadataDelta; import org.apache.kafka.coordinator.common.runtime.CoordinatorMetadataImage; import org.apache.kafka.coordinator.common.runtime.CoordinatorRecord; diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/classic/ClassicGroup.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/classic/ClassicGroup.java index 0b04dcbf512e2..f6be6b9674cbb 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/classic/ClassicGroup.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/classic/ClassicGroup.java @@ -30,9 +30,9 @@ import org.apache.kafka.common.message.SyncGroupResponseData; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.protocol.types.SchemaException; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.common.runtime.CoordinatorMetadataImage; import org.apache.kafka.coordinator.common.runtime.CoordinatorRecord; import org.apache.kafka.coordinator.group.CommitPartitionValidator; diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/modern/consumer/ConsumerGroup.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/modern/consumer/ConsumerGroup.java index 3cdc85b62c8df..523f8e1873bd4 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/modern/consumer/ConsumerGroup.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/modern/consumer/ConsumerGroup.java @@ -29,7 +29,7 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.protocol.types.SchemaException; import org.apache.kafka.common.requests.JoinGroupRequest; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.common.runtime.CoordinatorMetadataImage; import org.apache.kafka.coordinator.common.runtime.CoordinatorRecord; import org.apache.kafka.coordinator.group.CommitPartitionValidator; diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/streams/StreamsGroup.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/streams/StreamsGroup.java index a74871871a6ef..9a5dab2bc00db 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/streams/StreamsGroup.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/streams/StreamsGroup.java @@ -25,7 +25,7 @@ import org.apache.kafka.common.message.StreamsGroupHeartbeatResponseData; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.JoinGroupRequest; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.common.runtime.CoordinatorMetadataImage; import org.apache.kafka.coordinator.common.runtime.CoordinatorRecord; import org.apache.kafka.coordinator.common.runtime.CoordinatorTimer; diff --git a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorRecordHelpersTest.java b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorRecordHelpersTest.java index dc8f643fed36b..0f941fa139135 100644 --- a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorRecordHelpersTest.java +++ b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorRecordHelpersTest.java @@ -19,9 +19,9 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.message.JoinGroupRequestData.JoinGroupRequestProtocol; import org.apache.kafka.common.message.JoinGroupRequestData.JoinGroupRequestProtocolCollection; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.common.runtime.CoordinatorRecord; import org.apache.kafka.coordinator.group.classic.ClassicGroup; import org.apache.kafka.coordinator.group.classic.ClassicGroupMember; diff --git a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorServiceTest.java b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorServiceTest.java index a7bb185ae4a46..5945cf811d1bf 100644 --- a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorServiceTest.java +++ b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorServiceTest.java @@ -86,9 +86,9 @@ import org.apache.kafka.common.requests.TransactionResult; import org.apache.kafka.common.security.auth.KafkaPrincipal; import org.apache.kafka.common.security.auth.SecurityProtocol; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.common.runtime.CoordinatorRecord; import org.apache.kafka.coordinator.common.runtime.CoordinatorRuntime; import org.apache.kafka.coordinator.common.runtime.MetadataImageBuilder; diff --git a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorShardTest.java b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorShardTest.java index 3a31f403873d8..8747c33bc4eb2 100644 --- a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorShardTest.java +++ b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorShardTest.java @@ -40,9 +40,9 @@ import org.apache.kafka.common.record.internal.RecordBatch; import org.apache.kafka.common.requests.RequestContext; import org.apache.kafka.common.requests.TransactionResult; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.common.runtime.CoordinatorMetadataDelta; import org.apache.kafka.coordinator.common.runtime.CoordinatorMetadataImage; import org.apache.kafka.coordinator.common.runtime.CoordinatorMetrics; diff --git a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java index 954b379283075..a9a3913352133 100644 --- a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java +++ b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java @@ -77,9 +77,9 @@ import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.StreamsGroupHeartbeatResponse.Status; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.common.runtime.CoordinatorMetadataDelta; import org.apache.kafka.coordinator.common.runtime.CoordinatorMetadataImage; import org.apache.kafka.coordinator.common.runtime.CoordinatorRecord; @@ -5805,7 +5805,7 @@ public void testStaticMembersJoinGroupWithMaxSize() { assertEquals(groupMaxSize, group.numAwaitingJoinResponse()); assertTrue(group.isInState(PREPARING_REBALANCE)); - // Advance clock by group initial rebalance delay to complete first inital delayed join. + // Advance clock by group initial rebalance delay to complete first initial delayed join. // This will extend the initial rebalance as new members have joined. GroupMetadataManagerTestContext.assertNoOrEmptyResult(context.sleep(50)); // Advance clock by group initial rebalance delay to complete second inital delayed join. diff --git a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTestContext.java b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTestContext.java index 3edeb452d0545..37bc781697b84 100644 --- a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTestContext.java +++ b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTestContext.java @@ -51,8 +51,8 @@ import org.apache.kafka.common.requests.RequestHeader; import org.apache.kafka.common.security.auth.KafkaPrincipal; import org.apache.kafka.common.security.auth.SecurityProtocol; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.common.runtime.CoordinatorMetadataImage; import org.apache.kafka.coordinator.common.runtime.CoordinatorRecord; import org.apache.kafka.coordinator.common.runtime.CoordinatorResult; diff --git a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/OffsetMetadataManagerTest.java b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/OffsetMetadataManagerTest.java index 570c1094728d7..69e0617350d88 100644 --- a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/OffsetMetadataManagerTest.java +++ b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/OffsetMetadataManagerTest.java @@ -43,9 +43,9 @@ import org.apache.kafka.common.requests.TransactionResult; import org.apache.kafka.common.security.auth.KafkaPrincipal; import org.apache.kafka.common.security.auth.SecurityProtocol; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.annotation.ApiKeyVersionsSource; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.common.runtime.CoordinatorMetadataImage; import org.apache.kafka.coordinator.common.runtime.CoordinatorRecord; import org.apache.kafka.coordinator.common.runtime.CoordinatorResult; diff --git a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/classic/ClassicGroupTest.java b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/classic/ClassicGroupTest.java index 13b5ca773e40d..2fad4d9b3a9f5 100644 --- a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/classic/ClassicGroupTest.java +++ b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/classic/ClassicGroupTest.java @@ -34,11 +34,11 @@ import org.apache.kafka.common.message.SyncGroupResponseData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.annotation.ApiKeyVersionsSource; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.common.runtime.KRaftCoordinatorMetadataImage; import org.apache.kafka.coordinator.common.runtime.MetadataImageBuilder; import org.apache.kafka.coordinator.group.OffsetAndMetadata; diff --git a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/metrics/GroupCoordinatorMetricsShardTest.java b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/metrics/GroupCoordinatorMetricsShardTest.java index 7dc3a4d17f637..b433df86060f1 100644 --- a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/metrics/GroupCoordinatorMetricsShardTest.java +++ b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/metrics/GroupCoordinatorMetricsShardTest.java @@ -19,7 +19,7 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.internals.Topic; import org.apache.kafka.common.metrics.Metrics; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.timeline.SnapshotRegistry; import com.yammer.metrics.core.MetricsRegistry; diff --git a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/metrics/GroupCoordinatorMetricsTest.java b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/metrics/GroupCoordinatorMetricsTest.java index f4d2ad325b1d9..92cc003744e90 100644 --- a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/metrics/GroupCoordinatorMetricsTest.java +++ b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/metrics/GroupCoordinatorMetricsTest.java @@ -21,10 +21,10 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.internals.Topic; import org.apache.kafka.common.metrics.Metrics; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.group.Group; import org.apache.kafka.coordinator.group.classic.ClassicGroupState; import org.apache.kafka.coordinator.group.modern.consumer.ConsumerGroup.ConsumerGroupState; diff --git a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/modern/TargetAssignmentBuilderTest.java b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/modern/TargetAssignmentBuilderTest.java index 902864652dc5d..c575b621e4db1 100644 --- a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/modern/TargetAssignmentBuilderTest.java +++ b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/modern/TargetAssignmentBuilderTest.java @@ -217,8 +217,8 @@ private MemberSubscriptionAndAssignmentImpl newMemberSubscriptionAndAssignment( } public TargetAssignmentBuilder.TargetAssignmentResult build() { - CoordinatorMetadataImage cooridnatorMetadataImage = new KRaftCoordinatorMetadataImage(metadataImageBuilder.build()); - TopicIds.TopicResolver topicResolver = new TopicIds.CachedTopicResolver(cooridnatorMetadataImage); + CoordinatorMetadataImage coordinatorMetadataImage = new KRaftCoordinatorMetadataImage(metadataImageBuilder.build()); + TopicIds.TopicResolver topicResolver = new TopicIds.CachedTopicResolver(coordinatorMetadataImage); // Prepare expected member specs. Map memberSubscriptions = new HashMap<>(); @@ -256,7 +256,7 @@ public TargetAssignmentBuilder.TargetAssignmentResult build() { }); // Prepare the expected subscription topic metadata. - SubscribedTopicDescriberImpl subscribedTopicMetadata = new SubscribedTopicDescriberImpl(cooridnatorMetadataImage); + SubscribedTopicDescriberImpl subscribedTopicMetadata = new SubscribedTopicDescriberImpl(coordinatorMetadataImage); SubscriptionType subscriptionType = HOMOGENEOUS; // Prepare the member assignments per topic partition. @@ -284,7 +284,7 @@ public TargetAssignmentBuilder.TargetAssignmentResult build() { .withSubscriptionType(subscriptionType) .withTargetAssignment(targetAssignment) .withInvertedTargetAssignment(invertedTargetAssignment) - .withMetadataImage(cooridnatorMetadataImage) + .withMetadataImage(coordinatorMetadataImage) .withResolvedRegularExpressions(resolvedRegularExpressions); // Add the updated members or delete the deleted members. diff --git a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/modern/consumer/ConsumerGroupTest.java b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/modern/consumer/ConsumerGroupTest.java index 73bf9655a76ce..4aa5bd4f2342b 100644 --- a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/modern/consumer/ConsumerGroupTest.java +++ b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/modern/consumer/ConsumerGroupTest.java @@ -28,10 +28,10 @@ import org.apache.kafka.common.message.ConsumerGroupDescribeResponseData; import org.apache.kafka.common.message.JoinGroupRequestData; import org.apache.kafka.common.protocol.ApiKeys; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.annotation.ApiKeyVersionsSource; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.common.runtime.CoordinatorMetadataImage; import org.apache.kafka.coordinator.common.runtime.CoordinatorRecord; import org.apache.kafka.coordinator.common.runtime.KRaftCoordinatorMetadataImage; diff --git a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/modern/share/ShareGroupTest.java b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/modern/share/ShareGroupTest.java index 1d3505cf1d399..f03c24e0f53e1 100644 --- a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/modern/share/ShareGroupTest.java +++ b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/modern/share/ShareGroupTest.java @@ -22,9 +22,9 @@ import org.apache.kafka.common.errors.UnknownMemberIdException; import org.apache.kafka.common.message.ShareGroupDescribeResponseData; import org.apache.kafka.common.protocol.ApiKeys; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.annotation.ApiKeyVersionsSource; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.common.runtime.KRaftCoordinatorMetadataImage; import org.apache.kafka.coordinator.common.runtime.MetadataImageBuilder; import org.apache.kafka.coordinator.group.Group; diff --git a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/streams/StreamsGroupTest.java b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/streams/StreamsGroupTest.java index c5fc85ea7d3bf..8597703b04d9d 100644 --- a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/streams/StreamsGroupTest.java +++ b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/streams/StreamsGroupTest.java @@ -26,9 +26,9 @@ import org.apache.kafka.common.message.StreamsGroupHeartbeatResponseData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.ApiMessage; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.annotation.ApiKeyVersionsSource; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.common.runtime.CoordinatorRecord; import org.apache.kafka.coordinator.common.runtime.CoordinatorTimer; import org.apache.kafka.coordinator.common.runtime.KRaftCoordinatorMetadataImage; diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/consumer/SubscriptionStateBenchmark.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/consumer/SubscriptionStateBenchmark.java index dc67a662b7ec7..84b7bcf0d06a8 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/consumer/SubscriptionStateBenchmark.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/consumer/SubscriptionStateBenchmark.java @@ -22,7 +22,7 @@ import org.apache.kafka.clients.consumer.internals.SubscriptionState; import org.apache.kafka.common.Node; import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/coordinator/GroupCoordinatorShardLoadingBenchmark.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/coordinator/GroupCoordinatorShardLoadingBenchmark.java index 31798621f95b6..164dead5c5b8d 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/coordinator/GroupCoordinatorShardLoadingBenchmark.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/coordinator/GroupCoordinatorShardLoadingBenchmark.java @@ -25,8 +25,8 @@ import org.apache.kafka.common.record.internal.EndTransactionMarker; import org.apache.kafka.common.record.internal.MemoryRecords; import org.apache.kafka.common.record.internal.SimpleRecord; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.common.runtime.CoordinatorLoader; import org.apache.kafka.coordinator.common.runtime.CoordinatorLoaderImpl; import org.apache.kafka.coordinator.common.runtime.CoordinatorRecord; diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/coordinator/RegexResolutionBenchmark.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/coordinator/RegexResolutionBenchmark.java index 516424fa656bc..ec09a9879e0fd 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/coordinator/RegexResolutionBenchmark.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/coordinator/RegexResolutionBenchmark.java @@ -18,8 +18,8 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.metadata.TopicRecord; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.common.runtime.KRaftCoordinatorMetadataImage; import org.apache.kafka.coordinator.group.modern.consumer.TopicRegexResolver; import org.apache.kafka.image.MetadataDelta; diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/coordinator/TransactionalOffsetFetchBenchmark.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/coordinator/TransactionalOffsetFetchBenchmark.java index a7137b492764e..d83bef108204d 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/coordinator/TransactionalOffsetFetchBenchmark.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/coordinator/TransactionalOffsetFetchBenchmark.java @@ -19,8 +19,8 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.message.OffsetFetchRequestData; import org.apache.kafka.common.metadata.TopicRecord; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.common.runtime.KRaftCoordinatorMetadataImage; import org.apache.kafka.coordinator.group.Group; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/fetcher/ReplicaFetcherThreadBenchmark.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/fetcher/ReplicaFetcherThreadBenchmark.java index 28f3577f4a5b0..a2e55b905b8c3 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/fetcher/ReplicaFetcherThreadBenchmark.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/fetcher/ReplicaFetcherThreadBenchmark.java @@ -45,9 +45,9 @@ import org.apache.kafka.common.record.internal.RecordsSend; import org.apache.kafka.common.requests.FetchRequest; import org.apache.kafka.common.requests.FetchResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.jmh.util.BenchmarkConfigUtils; import org.apache.kafka.metadata.KRaftMetadataCache; import org.apache.kafka.metadata.LeaderRecoveryState; diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/fetchsession/FetchSessionBenchmark.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/fetchsession/FetchSessionBenchmark.java index 38da51f699c9b..1ba4aa91f77d7 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/fetchsession/FetchSessionBenchmark.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/fetchsession/FetchSessionBenchmark.java @@ -26,7 +26,7 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.FetchRequest; import org.apache.kafka.common.requests.FetchResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/metadata/ClientQuotasImageDescribeBenchmark.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/metadata/ClientQuotasImageDescribeBenchmark.java new file mode 100644 index 0000000000000..4424522e30def --- /dev/null +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/metadata/ClientQuotasImageDescribeBenchmark.java @@ -0,0 +1,100 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.kafka.jmh.metadata; + +import org.apache.kafka.common.message.DescribeClientQuotasRequestData; +import org.apache.kafka.common.message.DescribeClientQuotasResponseData; +import org.apache.kafka.common.quota.ClientQuotaEntity; +import org.apache.kafka.common.requests.DescribeClientQuotasRequest; +import org.apache.kafka.image.ClientQuotaImage; +import org.apache.kafka.image.ClientQuotasImage; +import org.apache.kafka.server.config.QuotaConfig; + +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Warmup; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; + +@State(Scope.Benchmark) +@Fork(value = 1) +@Warmup(iterations = 5) +@Measurement(iterations = 15) +@BenchmarkMode(Mode.AverageTime) +@OutputTimeUnit(TimeUnit.NANOSECONDS) +public class ClientQuotasImageDescribeBenchmark { + + @Param({"10", "100", "1000"}) + private int eachEntityCount; + + private ClientQuotasImage clientQuotasImage; + + @Setup(Level.Trial) + public void setup() { + clientQuotasImage = createClientQuotasImage(eachEntityCount); + } + + static ClientQuotasImage createClientQuotasImage(int eachEntityCount) { + Map entities = new HashMap<>(); + ClientQuotaImage defaultImage = new ClientQuotaImage(Map.of(QuotaConfig.REQUEST_PERCENTAGE_OVERRIDE_CONFIG, 1.0)); + for (int i = 0; i < eachEntityCount; i++) { + entities.put(new ClientQuotaEntity(Map.of(ClientQuotaEntity.USER, "user-" + i)), defaultImage); + entities.put(new ClientQuotaEntity(Map.of(ClientQuotaEntity.CLIENT_ID, "client-id-" + i)), defaultImage); + entities.put(new ClientQuotaEntity(Map.of(ClientQuotaEntity.IP, "ip-" + i)), defaultImage); + } + return new ClientQuotasImage(entities); + } + + @Benchmark + public DescribeClientQuotasResponseData describeSpecified() { + return clientQuotasImage.describe(new DescribeClientQuotasRequestData() + .setComponents(List.of(new DescribeClientQuotasRequestData.ComponentData() + .setEntityType(ClientQuotaEntity.USER) + .setMatchType(DescribeClientQuotasRequest.MATCH_TYPE_SPECIFIED) + .setMatch(null)))); + } + + @Benchmark + public DescribeClientQuotasResponseData describeDefault() { + return clientQuotasImage.describe(new DescribeClientQuotasRequestData() + .setComponents(List.of(new DescribeClientQuotasRequestData.ComponentData() + .setEntityType(ClientQuotaEntity.USER) + .setMatchType(DescribeClientQuotasRequest.MATCH_TYPE_DEFAULT) + .setMatch(null)))); + } + + @Benchmark + public DescribeClientQuotasResponseData describeExact() { + return clientQuotasImage.describe(new DescribeClientQuotasRequestData() + .setComponents(List.of(new DescribeClientQuotasRequestData.ComponentData() + .setEntityType(ClientQuotaEntity.USER) + .setMatchType(DescribeClientQuotasRequest.MATCH_TYPE_EXACT) + .setMatch("user-0")))); + } +} diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/producer/RecordAccumulatorFlushBenchmark.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/producer/RecordAccumulatorFlushBenchmark.java index 0b47bc36f53d8..796df2e9b3d5a 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/producer/RecordAccumulatorFlushBenchmark.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/producer/RecordAccumulatorFlushBenchmark.java @@ -30,9 +30,9 @@ import org.apache.kafka.common.record.internal.DefaultRecordBatch; import org.apache.kafka.common.record.internal.Record; import org.apache.kafka.common.requests.MetadataResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/timeline/TimelineHashMapBenchmark.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/timeline/TimelineHashMapBenchmark.java index cc9ae039592bb..901e1e200be4d 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/timeline/TimelineHashMapBenchmark.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/timeline/TimelineHashMapBenchmark.java @@ -17,7 +17,7 @@ package org.apache.kafka.jmh.timeline; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.timeline.SnapshotRegistry; import org.apache.kafka.timeline.TimelineHashMap; diff --git a/metadata/src/main/java/org/apache/kafka/controller/AclControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/AclControlManager.java index 1a500e1a77e64..c3ce52870db78 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/AclControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/AclControlManager.java @@ -26,7 +26,7 @@ import org.apache.kafka.common.metadata.AccessControlEntryRecord; import org.apache.kafka.common.metadata.RemoveAccessControlEntryRecord; import org.apache.kafka.common.requests.ApiError; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.metadata.authorizer.StandardAcl; import org.apache.kafka.metadata.authorizer.StandardAclWithId; import org.apache.kafka.server.authorizer.AclCreateResult; diff --git a/metadata/src/main/java/org/apache/kafka/controller/BrokerHeartbeatManager.java b/metadata/src/main/java/org/apache/kafka/controller/BrokerHeartbeatManager.java index 58cc5f6552834..48ca047508440 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/BrokerHeartbeatManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/BrokerHeartbeatManager.java @@ -18,8 +18,8 @@ package org.apache.kafka.controller; import org.apache.kafka.common.message.BrokerHeartbeatRequestData; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.metadata.placement.UsableBroker; import org.slf4j.Logger; diff --git a/metadata/src/main/java/org/apache/kafka/controller/ClientQuotaControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ClientQuotaControlManager.java index ca6ec89733076..92480727aaa47 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ClientQuotaControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ClientQuotaControlManager.java @@ -25,7 +25,7 @@ import org.apache.kafka.common.quota.ClientQuotaAlteration; import org.apache.kafka.common.quota.ClientQuotaEntity; import org.apache.kafka.common.requests.ApiError; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.server.config.QuotaConfig; import org.apache.kafka.server.mutable.BoundedList; diff --git a/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java index 4fc14209e3444..0d6da833a7a6d 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java @@ -36,8 +36,8 @@ import org.apache.kafka.common.metadata.UnfenceBrokerRecord; import org.apache.kafka.common.metadata.UnregisterBrokerRecord; import org.apache.kafka.common.protocol.ApiMessage; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.controller.metrics.QuorumControllerMetrics; import org.apache.kafka.metadata.BrokerRegistration; import org.apache.kafka.metadata.BrokerRegistrationFencingChange; diff --git a/metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java index 013a04c3bac18..705321a235c2d 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java @@ -29,7 +29,7 @@ import org.apache.kafka.common.metadata.ConfigRecord; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.ApiError; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.metadata.KafkaConfigSchema; import org.apache.kafka.metadata.SupportedConfigChecker; import org.apache.kafka.server.common.ApiMessageAndVersion; diff --git a/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java index 4f9436637f072..a2fd71c539cdc 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java @@ -31,8 +31,8 @@ import org.apache.kafka.common.security.auth.KafkaPrincipal; import org.apache.kafka.common.security.token.delegation.TokenInformation; import org.apache.kafka.common.security.token.delegation.internals.DelegationTokenCache; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.metadata.DelegationTokenData; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.server.common.MetadataVersion; diff --git a/metadata/src/main/java/org/apache/kafka/controller/EventPerformanceMonitor.java b/metadata/src/main/java/org/apache/kafka/controller/EventPerformanceMonitor.java index 55ff819ff7b85..a54261d8a5934 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/EventPerformanceMonitor.java +++ b/metadata/src/main/java/org/apache/kafka/controller/EventPerformanceMonitor.java @@ -17,7 +17,7 @@ package org.apache.kafka.controller; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/metadata/src/main/java/org/apache/kafka/controller/FeatureControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/FeatureControlManager.java index a6b1538d2b0b9..01188bdd6d7d4 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/FeatureControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/FeatureControlManager.java @@ -23,7 +23,7 @@ import org.apache.kafka.common.metadata.NoOpRecord; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.ApiError; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.metadata.FinalizedControllerFeatures; import org.apache.kafka.metadata.VersionRange; import org.apache.kafka.server.common.ApiMessageAndVersion; diff --git a/metadata/src/main/java/org/apache/kafka/controller/OffsetControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/OffsetControlManager.java index d7d7d3c97bb3b..7d0d7e731dd74 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/OffsetControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/OffsetControlManager.java @@ -20,8 +20,8 @@ import org.apache.kafka.common.metadata.AbortTransactionRecord; import org.apache.kafka.common.metadata.BeginTransactionRecord; import org.apache.kafka.common.metadata.EndTransactionRecord; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.controller.metrics.QuorumControllerMetrics; import org.apache.kafka.raft.Batch; import org.apache.kafka.server.common.ApiMessageAndVersion; diff --git a/metadata/src/main/java/org/apache/kafka/controller/PeriodicTaskControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/PeriodicTaskControlManager.java index 8085776152174..87ac825ca72ba 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/PeriodicTaskControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/PeriodicTaskControlManager.java @@ -17,8 +17,8 @@ package org.apache.kafka.controller; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.controller.errors.PeriodicControlTaskException; import org.slf4j.Logger; diff --git a/metadata/src/main/java/org/apache/kafka/controller/ProducerIdControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ProducerIdControlManager.java index a0d56b90f7ba2..0acb4a6cb1c19 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ProducerIdControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ProducerIdControlManager.java @@ -19,7 +19,7 @@ import org.apache.kafka.common.errors.UnknownServerException; import org.apache.kafka.common.metadata.ProducerIdsRecord; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.server.common.ProducerIdsBlock; import org.apache.kafka.timeline.SnapshotRegistry; diff --git a/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java b/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java index 0f827d8551d4f..1000c04623f60 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java +++ b/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java @@ -88,9 +88,9 @@ import org.apache.kafka.common.quota.ClientQuotaEntity; import org.apache.kafka.common.requests.ApiError; import org.apache.kafka.common.security.token.delegation.internals.DelegationTokenCache; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.controller.errors.ControllerExceptions; import org.apache.kafka.controller.errors.EventHandlerExceptionInfo; import org.apache.kafka.controller.metrics.QuorumControllerMetrics; diff --git a/metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java index 198e8b2f4ed29..1a5bc40ed43fa 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java @@ -78,7 +78,7 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.AlterPartitionRequest; import org.apache.kafka.common.requests.ApiError; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.image.writer.ImageWriterOptions; import org.apache.kafka.metadata.BrokerHeartbeatReply; import org.apache.kafka.metadata.BrokerRegistration; diff --git a/metadata/src/main/java/org/apache/kafka/controller/ScramControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ScramControlManager.java index f593e2e0e4b2c..cffbed0ebcdcd 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ScramControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ScramControlManager.java @@ -27,7 +27,7 @@ import org.apache.kafka.common.metadata.UserScramCredentialRecord; import org.apache.kafka.common.requests.ApiError; import org.apache.kafka.common.security.scram.internals.ScramFormatter; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.server.common.MetadataVersion; import org.apache.kafka.timeline.SnapshotRegistry; diff --git a/metadata/src/main/java/org/apache/kafka/image/ClientQuotasImage.java b/metadata/src/main/java/org/apache/kafka/image/ClientQuotasImage.java index e5dfb0433d039..7d853980fcbf7 100644 --- a/metadata/src/main/java/org/apache/kafka/image/ClientQuotasImage.java +++ b/metadata/src/main/java/org/apache/kafka/image/ClientQuotasImage.java @@ -48,11 +48,50 @@ *

* This class is thread-safe. */ -public record ClientQuotasImage(Map entities) { +public final class ClientQuotasImage { public static final ClientQuotasImage EMPTY = new ClientQuotasImage(Map.of()); + private final Map entities; + + // Map from entity type to entity name to set of entries. The entity type could be "user", "client-id", and "ip". + // { + // "user": { "user1": {entity1: image1}, "user2": {entity2: image2} }, + // "client-id": { "client-id1": {entity3: image3}, "client-id2": {entity4: image4} }, + // "ip": { "ip1": {entity5: image5}, "ip2": {entity6: image6} } + // } + private final Map>> entitiesByTypeAndName; + + // Map from entity type to set of entries. The entity type could be "user", "client-id", and "ip". + // { + // "user": { entity1: image1, entity2: image2 }, + // "client-id": { entity3: image3, entity4: image4 }, + // "ip": { entity5: image5, entity6: image6 } + // } + private final Map> entitiesByType; + public ClientQuotasImage(Map entities) { this.entities = Collections.unmodifiableMap(entities); + var entitiesByTypeAndName = new HashMap>>(); + var entitiesByType = new HashMap>(); + for (var entry : entities.entrySet()) { + ClientQuotaEntity entity = entry.getKey(); + for (var entityEntry : entity.entries().entrySet()) { + entitiesByTypeAndName + .computeIfAbsent(entityEntry.getKey(), k -> new HashMap<>()) + .computeIfAbsent(entityEntry.getValue(), k -> new HashMap<>()) + .put(entity, entry.getValue()); + + entitiesByType + .computeIfAbsent(entityEntry.getKey(), k -> new HashMap<>()) + .put(entity, entry.getValue()); + } + } + this.entitiesByTypeAndName = Collections.unmodifiableMap(entitiesByTypeAndName); + this.entitiesByType = Collections.unmodifiableMap(entitiesByType); + } + + public Map entities() { + return entities; } public boolean isEmpty() { @@ -68,7 +107,6 @@ public void write(ImageWriter writer) { } public DescribeClientQuotasResponseData describe(DescribeClientQuotasRequestData request) { - DescribeClientQuotasResponseData response = new DescribeClientQuotasResponseData(); Map exactMatch = new HashMap<>(); Set typeMatch = new HashSet<>(); for (DescribeClientQuotasRequestData.ComponentData component : request.components()) { @@ -118,40 +156,61 @@ public DescribeClientQuotasResponseData describe(DescribeClientQuotasRequestData "user or clientId filter component."); } } - // TODO: this is O(N). We should add indexing here to speed it up. See KAFKA-13022. - for (Entry entry : entities.entrySet()) { - ClientQuotaEntity entity = entry.getKey(); - ClientQuotaImage quotaImage = entry.getValue(); - if (matches(entity, exactMatch, typeMatch, request.strict())) { - response.entries().add(toDescribeEntry(entity, quotaImage)); - } - } - return response; + + return matches(exactMatch, typeMatch, request.strict()); } - private static boolean matches(ClientQuotaEntity entity, - Map exactMatch, - Set typeMatch, - boolean strict) { - if (strict) { - if (entity.entries().size() != exactMatch.size() + typeMatch.size()) { - return false; + private DescribeClientQuotasResponseData matches( + Map exactMatch, + Set typeMatch, + boolean strict + ) { + DescribeClientQuotasResponseData response = new DescribeClientQuotasResponseData(); + Map candidates = null; + // Case 1: exact match exists. Filter candidates based on exact match first and then type match + if (!exactMatch.isEmpty()) { + for (Entry exactMatchEntry : exactMatch.entrySet()) { + String entityType = exactMatchEntry.getKey(); + String entityName = exactMatchEntry.getValue(); + var nameMap = entitiesByTypeAndName.get(entityType); + var matches = Map.of(); + if (nameMap != null) matches = nameMap.getOrDefault(entityName, Map.of()); + if (candidates == null) { + candidates = new HashMap<>(matches); + } else { + candidates.keySet().retainAll(matches.keySet()); + } } - } - for (Entry entry : exactMatch.entrySet()) { - if (!entity.entries().containsKey(entry.getKey())) { - return false; + + for (String type : typeMatch) { + candidates.keySet().retainAll(entitiesByType.getOrDefault(type, Map.of()).keySet()); + } + } else if (!typeMatch.isEmpty()) { + // Case 2: no exact match, only type match exists + for (String type : typeMatch) { + Map matches = entitiesByType.getOrDefault(type, Map.of()); + if (candidates == null) { + candidates = new HashMap<>(matches); + } else { + candidates.keySet().retainAll(matches.keySet()); + } } - if (!Objects.equals(entity.entries().get(entry.getKey()), entry.getValue())) { - return false; + } else if (!strict) { + // Case 3: no exact match, no type match, no strict, return all entries + for (Entry entry : entities.entrySet()) { + response.entries().add(toDescribeEntry(entry.getKey(), entry.getValue())); } + return response; } - for (String type : typeMatch) { - if (!entity.entries().containsKey(type)) { - return false; + + if (candidates != null) { + for (Entry entry : candidates.entrySet()) { + if (!strict || entry.getKey().entries().size() == exactMatch.size() + typeMatch.size()) { + response.entries().add(toDescribeEntry(entry.getKey(), entry.getValue())); + } } } - return true; + return response; } private static EntryData toDescribeEntry(ClientQuotaEntity entity, @@ -166,6 +225,18 @@ private static EntryData toDescribeEntry(ClientQuotaEntity entity, return data; } + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof ClientQuotasImage other)) return false; + return entities.equals(other.entities); + } + + @Override + public int hashCode() { + return Objects.hash(entities); + } + @Override public String toString() { return new ClientQuotasImageNode(this).stringify(); diff --git a/metadata/src/main/java/org/apache/kafka/image/loader/MetadataBatchLoader.java b/metadata/src/main/java/org/apache/kafka/image/loader/MetadataBatchLoader.java index 0f0cc84ff5746..6268bac71d28a 100644 --- a/metadata/src/main/java/org/apache/kafka/image/loader/MetadataBatchLoader.java +++ b/metadata/src/main/java/org/apache/kafka/image/loader/MetadataBatchLoader.java @@ -18,8 +18,8 @@ package org.apache.kafka.image.loader; import org.apache.kafka.common.metadata.MetadataRecordType; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.image.MetadataDelta; import org.apache.kafka.image.MetadataImage; import org.apache.kafka.image.MetadataProvenance; diff --git a/metadata/src/main/java/org/apache/kafka/image/loader/MetadataLoader.java b/metadata/src/main/java/org/apache/kafka/image/loader/MetadataLoader.java index bfd42e2bdc756..977dacd1dc971 100644 --- a/metadata/src/main/java/org/apache/kafka/image/loader/MetadataLoader.java +++ b/metadata/src/main/java/org/apache/kafka/image/loader/MetadataLoader.java @@ -19,8 +19,8 @@ import org.apache.kafka.common.message.KRaftVersionRecord; import org.apache.kafka.common.record.internal.ControlRecordType; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.image.MetadataDelta; import org.apache.kafka.image.MetadataImage; import org.apache.kafka.image.MetadataProvenance; diff --git a/metadata/src/main/java/org/apache/kafka/image/publisher/BrokerRegistrationTracker.java b/metadata/src/main/java/org/apache/kafka/image/publisher/BrokerRegistrationTracker.java index 3028b8b31085d..eb8455865b2b1 100644 --- a/metadata/src/main/java/org/apache/kafka/image/publisher/BrokerRegistrationTracker.java +++ b/metadata/src/main/java/org/apache/kafka/image/publisher/BrokerRegistrationTracker.java @@ -17,7 +17,7 @@ package org.apache.kafka.image.publisher; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.image.MetadataDelta; import org.apache.kafka.image.MetadataImage; import org.apache.kafka.image.loader.LoaderManifest; diff --git a/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotEmitter.java b/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotEmitter.java index cb025823bf4a4..92c0d315f6509 100644 --- a/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotEmitter.java +++ b/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotEmitter.java @@ -17,9 +17,9 @@ package org.apache.kafka.image.publisher; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.image.MetadataImage; import org.apache.kafka.image.MetadataProvenance; import org.apache.kafka.image.publisher.metrics.SnapshotEmitterMetrics; diff --git a/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotGenerator.java b/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotGenerator.java index a8483f8f8b319..9560e8d869328 100644 --- a/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotGenerator.java +++ b/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotGenerator.java @@ -17,8 +17,8 @@ package org.apache.kafka.image.publisher; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.image.MetadataDelta; import org.apache.kafka.image.MetadataImage; import org.apache.kafka.image.loader.LoaderManifest; diff --git a/metadata/src/main/java/org/apache/kafka/metadata/DelegationTokenData.java b/metadata/src/main/java/org/apache/kafka/metadata/DelegationTokenData.java index 9ed69f01081f8..458705159a5ad 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/DelegationTokenData.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/DelegationTokenData.java @@ -20,7 +20,7 @@ import org.apache.kafka.common.metadata.DelegationTokenRecord; import org.apache.kafka.common.security.auth.KafkaPrincipal; import org.apache.kafka.common.security.token.delegation.TokenInformation; -import org.apache.kafka.common.utils.SecurityUtils; +import org.apache.kafka.common.utils.internals.SecurityUtils; import java.util.ArrayList; import java.util.List; diff --git a/metadata/src/main/java/org/apache/kafka/metadata/KRaftMetadataCache.java b/metadata/src/main/java/org/apache/kafka/metadata/KRaftMetadataCache.java index b0ebd80eda9d3..283c062a9ff49 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/KRaftMetadataCache.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/KRaftMetadataCache.java @@ -35,7 +35,7 @@ import org.apache.kafka.common.network.ListenerName; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.MetadataResponse; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.image.MetadataImage; import org.apache.kafka.image.TopicImage; import org.apache.kafka.server.common.FinalizedFeatures; diff --git a/metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAuthorizer.java b/metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAuthorizer.java index 5a0749648f9a9..40f83e21fbb63 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAuthorizer.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAuthorizer.java @@ -29,7 +29,7 @@ import org.apache.kafka.common.metrics.Sensor; import org.apache.kafka.common.metrics.stats.Rate; import org.apache.kafka.common.metrics.stats.WindowedCount; -import org.apache.kafka.common.utils.SecurityUtils; +import org.apache.kafka.common.utils.internals.SecurityUtils; import org.apache.kafka.server.authorizer.Action; import org.apache.kafka.server.authorizer.AuthorizableRequestContext; import org.apache.kafka.server.authorizer.AuthorizationResult; diff --git a/metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAuthorizerData.java b/metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAuthorizerData.java index 54bb6ea478487..e10b73277c140 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAuthorizerData.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAuthorizerData.java @@ -27,8 +27,8 @@ import org.apache.kafka.common.resource.PatternType; import org.apache.kafka.common.resource.ResourcePattern; import org.apache.kafka.common.security.auth.KafkaPrincipal; -import org.apache.kafka.common.utils.LogContext; -import org.apache.kafka.common.utils.SecurityUtils; +import org.apache.kafka.common.utils.internals.LogContext; +import org.apache.kafka.common.utils.internals.SecurityUtils; import org.apache.kafka.server.authorizer.Action; import org.apache.kafka.server.authorizer.AuthorizableRequestContext; import org.apache.kafka.server.authorizer.AuthorizationResult; diff --git a/metadata/src/main/java/org/apache/kafka/metadata/publisher/AclPublisher.java b/metadata/src/main/java/org/apache/kafka/metadata/publisher/AclPublisher.java index f02cdf40fd609..fb485fedf9635 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/publisher/AclPublisher.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/publisher/AclPublisher.java @@ -17,7 +17,7 @@ package org.apache.kafka.metadata.publisher; import org.apache.kafka.common.internals.Plugin; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.image.MetadataDelta; import org.apache.kafka.image.MetadataImage; import org.apache.kafka.image.loader.LoaderManifest; diff --git a/metadata/src/main/java/org/apache/kafka/metadata/publisher/FeaturesPublisher.java b/metadata/src/main/java/org/apache/kafka/metadata/publisher/FeaturesPublisher.java index 9ccddbe810966..678a855ceaaa9 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/publisher/FeaturesPublisher.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/publisher/FeaturesPublisher.java @@ -17,7 +17,7 @@ package org.apache.kafka.metadata.publisher; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.image.MetadataDelta; import org.apache.kafka.image.MetadataImage; import org.apache.kafka.image.loader.LoaderManifest; diff --git a/metadata/src/main/java/org/apache/kafka/metadata/util/SnapshotFileReader.java b/metadata/src/main/java/org/apache/kafka/metadata/util/SnapshotFileReader.java index 4996f79071ee7..fc5a47b1ea5bf 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/util/SnapshotFileReader.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/util/SnapshotFileReader.java @@ -23,8 +23,8 @@ import org.apache.kafka.common.record.internal.FileLogInputStream.FileChannelRecordBatch; import org.apache.kafka.common.record.internal.FileRecords; import org.apache.kafka.common.record.internal.Record; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.metadata.MetadataRecordSerde; import org.apache.kafka.queue.EventQueue; import org.apache.kafka.queue.KafkaEventQueue; diff --git a/metadata/src/test/java/org/apache/kafka/controller/AclControlManagerTest.java b/metadata/src/test/java/org/apache/kafka/controller/AclControlManagerTest.java index a443cfa0fe2ec..73d910dfa445b 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/AclControlManagerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/AclControlManagerTest.java @@ -34,7 +34,7 @@ import org.apache.kafka.common.resource.ResourcePatternFilter; import org.apache.kafka.common.resource.ResourceType; import org.apache.kafka.common.test.api.Flaky; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.metadata.RecordTestUtils; import org.apache.kafka.metadata.authorizer.AclMutator; import org.apache.kafka.metadata.authorizer.ClusterMetadataAuthorizer; diff --git a/metadata/src/test/java/org/apache/kafka/controller/BrokerHeartbeatManagerTest.java b/metadata/src/test/java/org/apache/kafka/controller/BrokerHeartbeatManagerTest.java index 3dfeb0ef9403a..fe6e39600d9b7 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/BrokerHeartbeatManagerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/BrokerHeartbeatManagerTest.java @@ -18,8 +18,8 @@ package org.apache.kafka.controller; import org.apache.kafka.common.message.BrokerHeartbeatRequestData; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.controller.BrokerHeartbeatManager.BrokerHeartbeatState; import org.apache.kafka.controller.BrokerHeartbeatManager.UsableBrokerIterator; import org.apache.kafka.metadata.placement.UsableBroker; diff --git a/metadata/src/test/java/org/apache/kafka/controller/BrokerToElrsTest.java b/metadata/src/test/java/org/apache/kafka/controller/BrokerToElrsTest.java index 187b34446fa2e..d489221016764 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/BrokerToElrsTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/BrokerToElrsTest.java @@ -18,7 +18,7 @@ package org.apache.kafka.controller; import org.apache.kafka.common.Uuid; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.server.common.TopicIdPartition; import org.apache.kafka.timeline.SnapshotRegistry; diff --git a/metadata/src/test/java/org/apache/kafka/controller/BrokersToIsrsTest.java b/metadata/src/test/java/org/apache/kafka/controller/BrokersToIsrsTest.java index 886a20050ae47..8ff7eaeb86684 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/BrokersToIsrsTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/BrokersToIsrsTest.java @@ -18,7 +18,7 @@ package org.apache.kafka.controller; import org.apache.kafka.common.Uuid; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.controller.BrokersToIsrs.PartitionsOnReplicaIterator; import org.apache.kafka.server.common.TopicIdPartition; import org.apache.kafka.timeline.SnapshotRegistry; diff --git a/metadata/src/test/java/org/apache/kafka/controller/ClusterControlManagerTest.java b/metadata/src/test/java/org/apache/kafka/controller/ClusterControlManagerTest.java index 2c7660570d9b8..2eb882fdd679f 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/ClusterControlManagerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/ClusterControlManagerTest.java @@ -36,8 +36,8 @@ import org.apache.kafka.common.metadata.UnfenceBrokerRecord; import org.apache.kafka.common.metadata.UnregisterBrokerRecord; import org.apache.kafka.common.security.auth.SecurityProtocol; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.image.writer.ImageWriterOptions; import org.apache.kafka.metadata.BrokerRegistration; import org.apache.kafka.metadata.BrokerRegistrationFencingChange; diff --git a/metadata/src/test/java/org/apache/kafka/controller/FeatureControlManagerTest.java b/metadata/src/test/java/org/apache/kafka/controller/FeatureControlManagerTest.java index ace704b5bef92..941578cedcc2a 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/FeatureControlManagerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/FeatureControlManagerTest.java @@ -21,7 +21,7 @@ import org.apache.kafka.common.metadata.FeatureLevelRecord; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.ApiError; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.metadata.FinalizedControllerFeatures; import org.apache.kafka.metadata.RecordTestUtils; import org.apache.kafka.metadata.VersionRange; diff --git a/metadata/src/test/java/org/apache/kafka/controller/MockRaftClient.java b/metadata/src/test/java/org/apache/kafka/controller/MockRaftClient.java index 3606fdbd153ed..f84dea081a665 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/MockRaftClient.java +++ b/metadata/src/test/java/org/apache/kafka/controller/MockRaftClient.java @@ -20,10 +20,10 @@ import org.apache.kafka.common.Node; import org.apache.kafka.common.network.ListenerName; import org.apache.kafka.common.protocol.ObjectSerializationCache; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.metadata.MetadataRecordSerde; import org.apache.kafka.queue.EventQueue; import org.apache.kafka.queue.KafkaEventQueue; diff --git a/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTestEnv.java b/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTestEnv.java index e92814dd734f7..7fd425ecdd9c9 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTestEnv.java +++ b/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTestEnv.java @@ -19,8 +19,8 @@ import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.Uuid; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.controller.MockRaftClient.LeaderChangeBatch; import org.apache.kafka.controller.MockRaftClient.LocalRecordBatch; import org.apache.kafka.controller.MockRaftClient.SharedLogData; diff --git a/metadata/src/test/java/org/apache/kafka/controller/OffsetControlManagerTest.java b/metadata/src/test/java/org/apache/kafka/controller/OffsetControlManagerTest.java index aebdbca1730e1..dc15d3a80d680 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/OffsetControlManagerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/OffsetControlManagerTest.java @@ -21,7 +21,7 @@ import org.apache.kafka.common.metadata.BeginTransactionRecord; import org.apache.kafka.common.metadata.EndTransactionRecord; import org.apache.kafka.common.metadata.NoOpRecord; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.Batch; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.server.common.OffsetAndEpoch; diff --git a/metadata/src/test/java/org/apache/kafka/controller/ProducerIdControlManagerTest.java b/metadata/src/test/java/org/apache/kafka/controller/ProducerIdControlManagerTest.java index 2fd589cdeedd6..5f524e5e3fb99 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/ProducerIdControlManagerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/ProducerIdControlManagerTest.java @@ -22,8 +22,8 @@ import org.apache.kafka.common.metadata.ProducerIdsRecord; import org.apache.kafka.common.metadata.RegisterBrokerRecord; import org.apache.kafka.common.security.auth.SecurityProtocol; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.server.common.ProducerIdsBlock; import org.apache.kafka.timeline.SnapshotRegistry; diff --git a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java index af2b577bc619c..e7fb0d9b60adf 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java @@ -68,9 +68,9 @@ import org.apache.kafka.common.security.auth.KafkaPrincipal; import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.common.test.api.Flaky; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.controller.QuorumController.ConfigResourceExistenceChecker; import org.apache.kafka.image.AclsDelta; import org.apache.kafka.image.AclsImage; diff --git a/metadata/src/test/java/org/apache/kafka/controller/ReplicationControlManagerTest.java b/metadata/src/test/java/org/apache/kafka/controller/ReplicationControlManagerTest.java index 23366ac378bc3..19e4545cf061d 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/ReplicationControlManagerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/ReplicationControlManagerTest.java @@ -77,10 +77,10 @@ import org.apache.kafka.common.requests.AlterPartitionRequest; import org.apache.kafka.common.requests.ApiError; import org.apache.kafka.common.security.auth.SecurityProtocol; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.annotation.ApiKeyVersionsSource; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.controller.BrokerHeartbeatManager.BrokerHeartbeatState; import org.apache.kafka.controller.ReplicationControlManager.KRaftClusterDescriber; import org.apache.kafka.metadata.AssignmentsHelper; diff --git a/metadata/src/test/java/org/apache/kafka/image/ClientQuotasImageTest.java b/metadata/src/test/java/org/apache/kafka/image/ClientQuotasImageTest.java index 46f8e908fe238..eb93fd29cb675 100644 --- a/metadata/src/test/java/org/apache/kafka/image/ClientQuotasImageTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/ClientQuotasImageTest.java @@ -17,6 +17,9 @@ package org.apache.kafka.image; +import org.apache.kafka.common.errors.InvalidRequestException; +import org.apache.kafka.common.message.DescribeClientQuotasRequestData; +import org.apache.kafka.common.message.DescribeClientQuotasResponseData; import org.apache.kafka.common.metadata.ClientQuotaRecord; import org.apache.kafka.common.metadata.ClientQuotaRecord.EntityData; import org.apache.kafka.common.quota.ClientQuotaEntity; @@ -27,6 +30,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; import java.util.ArrayList; import java.util.HashMap; @@ -35,7 +40,14 @@ import java.util.Optional; import static org.apache.kafka.common.metadata.MetadataRecordType.CLIENT_QUOTA_RECORD; +import static org.apache.kafka.common.requests.DescribeClientQuotasRequest.MATCH_TYPE_DEFAULT; +import static org.apache.kafka.common.requests.DescribeClientQuotasRequest.MATCH_TYPE_EXACT; +import static org.apache.kafka.common.requests.DescribeClientQuotasRequest.MATCH_TYPE_SPECIFIED; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; @Timeout(value = 40) @@ -116,6 +128,300 @@ public void testImage2RoundTrip() { testToImage(IMAGE2); } + @ParameterizedTest(name = "{0}") + @ValueSource(strings = {ClientQuotaEntity.USER, ClientQuotaEntity.CLIENT_ID, ClientQuotaEntity.IP}) + public void testDescribeWithNonStrictExactMatch(String entityType) { + Map entities = Map.of( + new ClientQuotaEntity(Map.of(ClientQuotaEntity.USER, "foo", ClientQuotaEntity.CLIENT_ID, "baz")), new ClientQuotaImage(Map.of(QuotaConfig.PRODUCER_BYTE_RATE_OVERRIDE_CONFIG, 100.0)), + new ClientQuotaEntity(Map.of(ClientQuotaEntity.USER, "bar", ClientQuotaEntity.CLIENT_ID, "baz")), new ClientQuotaImage(Map.of(QuotaConfig.PRODUCER_BYTE_RATE_OVERRIDE_CONFIG, 200.0)), + new ClientQuotaEntity(Map.of(ClientQuotaEntity.CLIENT_ID, "foo", ClientQuotaEntity.USER, "baz")), new ClientQuotaImage(Map.of(QuotaConfig.CONSUMER_BYTE_RATE_OVERRIDE_CONFIG, 100.0)), + new ClientQuotaEntity(Map.of(ClientQuotaEntity.CLIENT_ID, "bar", ClientQuotaEntity.USER, "baz")), new ClientQuotaImage(Map.of(QuotaConfig.CONSUMER_BYTE_RATE_OVERRIDE_CONFIG, 200.0)), + new ClientQuotaEntity(Map.of(ClientQuotaEntity.IP, "foo", ClientQuotaEntity.USER, "baz")), new ClientQuotaImage(Map.of(QuotaConfig.REQUEST_PERCENTAGE_OVERRIDE_CONFIG, 10.0)), + new ClientQuotaEntity(Map.of(ClientQuotaEntity.IP, "bar", ClientQuotaEntity.USER, "baz")), new ClientQuotaImage(Map.of(QuotaConfig.REQUEST_PERCENTAGE_OVERRIDE_CONFIG, 20.0)) + ); + ClientQuotasImage image = new ClientQuotasImage(entities); + + DescribeClientQuotasRequestData request = new DescribeClientQuotasRequestData() + .setComponents(List.of( + new DescribeClientQuotasRequestData.ComponentData() + .setEntityType(entityType) + .setMatchType(MATCH_TYPE_EXACT) + .setMatch("foo"))); + + DescribeClientQuotasResponseData response = image.describe(request); + assertEquals(1, response.entries().size()); + Optional entity = response.entries().get(0).entity().stream() + .filter(e -> e.entityType().equals(entityType)) + .findFirst(); + assertTrue(entity.isPresent()); + assertEquals("foo", entity.get().entityName()); + + request = new DescribeClientQuotasRequestData() + .setComponents(List.of( + new DescribeClientQuotasRequestData.ComponentData() + .setEntityType(entityType) + .setMatchType(MATCH_TYPE_EXACT) + .setMatch("nonexistent"))); + response = image.describe(request); + assertEquals(0, response.entries().size()); + } + + @Test + public void testDescribeWithStrictMode() { + Map entities = Map.of( + new ClientQuotaEntity(Map.of(ClientQuotaEntity.USER, "foo", ClientQuotaEntity.CLIENT_ID, "id1")), new ClientQuotaImage(Map.of(QuotaConfig.PRODUCER_BYTE_RATE_OVERRIDE_CONFIG, 100.0)), + new ClientQuotaEntity(Map.of(ClientQuotaEntity.USER, "foo", ClientQuotaEntity.CLIENT_ID, "id1", ClientQuotaEntity.IP, "ip")), new ClientQuotaImage(Map.of(QuotaConfig.PRODUCER_BYTE_RATE_OVERRIDE_CONFIG, 200.0)), + new ClientQuotaEntity(Map.of(ClientQuotaEntity.USER, "bar", ClientQuotaEntity.CLIENT_ID, "id2")), new ClientQuotaImage(Map.of(QuotaConfig.PRODUCER_BYTE_RATE_OVERRIDE_CONFIG, 300.0)) + ); + ClientQuotasImage image = new ClientQuotasImage(entities); + + // 1. All exact match + DescribeClientQuotasRequestData allExactMatchRequest = new DescribeClientQuotasRequestData() + .setStrict(true) + .setComponents(List.of( + new DescribeClientQuotasRequestData.ComponentData() + .setEntityType(ClientQuotaEntity.USER) + .setMatchType(MATCH_TYPE_EXACT) + .setMatch("foo"), + new DescribeClientQuotasRequestData.ComponentData() + .setEntityType(ClientQuotaEntity.CLIENT_ID) + .setMatchType(MATCH_TYPE_EXACT) + .setMatch("id1") + )); + DescribeClientQuotasResponseData allExactMatchResponse = image.describe(allExactMatchRequest); + assertEquals(1, allExactMatchResponse.entries().size()); + List allExactMatchEntities = allExactMatchResponse.entries().get(0).entity(); + assertTrue(allExactMatchEntities.contains(new DescribeClientQuotasResponseData.EntityData() + .setEntityType(ClientQuotaEntity.CLIENT_ID) + .setEntityName("id1"))); + assertTrue(allExactMatchEntities.contains(new DescribeClientQuotasResponseData.EntityData() + .setEntityType(ClientQuotaEntity.USER) + .setEntityName("foo"))); + + // 2. All match type specified + DescribeClientQuotasRequestData allTypeMatchRequest = new DescribeClientQuotasRequestData() + .setStrict(true) + .setComponents(List.of( + new DescribeClientQuotasRequestData.ComponentData() + .setEntityType(ClientQuotaEntity.USER) + .setMatchType(MATCH_TYPE_SPECIFIED) + .setMatch(null), + new DescribeClientQuotasRequestData.ComponentData() + .setEntityType(ClientQuotaEntity.CLIENT_ID) + .setMatchType(MATCH_TYPE_SPECIFIED) + .setMatch(null) + )); + DescribeClientQuotasResponseData allTypeMatchResponse = image.describe(allTypeMatchRequest); + assertEquals(2, allTypeMatchResponse.entries().size()); + for (DescribeClientQuotasResponseData.EntryData entry : allTypeMatchResponse.entries()) { + for (DescribeClientQuotasResponseData.EntityData entity : entry.entity()) { + assertNotEquals(ClientQuotaEntity.IP, entity.entityType()); + } + } + + // 3. Mixed exact and match type specified + DescribeClientQuotasRequestData exactAndMatchTypeRequest = new DescribeClientQuotasRequestData() + .setStrict(true) + .setComponents(List.of( + new DescribeClientQuotasRequestData.ComponentData() + .setEntityType(ClientQuotaEntity.USER) + .setMatchType(MATCH_TYPE_EXACT) + .setMatch("foo"), + new DescribeClientQuotasRequestData.ComponentData() + .setEntityType(ClientQuotaEntity.CLIENT_ID) + .setMatchType(MATCH_TYPE_SPECIFIED) + .setMatch(null) + )); + DescribeClientQuotasResponseData exactAndMatchTypeResponse = image.describe(exactAndMatchTypeRequest); + assertEquals(1, exactAndMatchTypeResponse.entries().size()); + List exactAndMatchEntities = allExactMatchResponse.entries().get(0).entity(); + assertTrue(exactAndMatchEntities.contains(new DescribeClientQuotasResponseData.EntityData() + .setEntityType(ClientQuotaEntity.CLIENT_ID) + .setEntityName("id1"))); + assertTrue(exactAndMatchEntities.contains(new DescribeClientQuotasResponseData.EntityData() + .setEntityType(ClientQuotaEntity.USER) + .setEntityName("foo"))); + } + + @Test + public void testDescribeWithNonStrictTypeMatch() { + Map entities = Map.of( + new ClientQuotaEntity(Map.of(ClientQuotaEntity.USER, "foo", ClientQuotaEntity.CLIENT_ID, "id")), new ClientQuotaImage(Map.of(QuotaConfig.PRODUCER_BYTE_RATE_OVERRIDE_CONFIG, 100.0)), + new ClientQuotaEntity(Map.of(ClientQuotaEntity.USER, "bar", ClientQuotaEntity.IP, "ip")), new ClientQuotaImage(Map.of(QuotaConfig.PRODUCER_BYTE_RATE_OVERRIDE_CONFIG, 200.0)), + new ClientQuotaEntity(Map.of(ClientQuotaEntity.IP, "ip", ClientQuotaEntity.CLIENT_ID, "id")), new ClientQuotaImage(Map.of(QuotaConfig.PRODUCER_BYTE_RATE_OVERRIDE_CONFIG, 200.0)) + ); + ClientQuotasImage image = new ClientQuotasImage(entities); + DescribeClientQuotasRequestData request = new DescribeClientQuotasRequestData() + .setComponents(List.of( + new DescribeClientQuotasRequestData.ComponentData() + .setEntityType(ClientQuotaEntity.USER) + .setMatchType(MATCH_TYPE_SPECIFIED) + .setMatch(null) + )); + + DescribeClientQuotasResponseData response = image.describe(request); + assertEquals(2, response.entries().size()); + for (DescribeClientQuotasResponseData.EntryData entry : response.entries()) { + assertTrue(entry.entity().stream().anyMatch(e -> e.entityType().equals(ClientQuotaEntity.USER))); + } + } + + @ParameterizedTest(name = "{0}") + @ValueSource(strings = {ClientQuotaEntity.USER, ClientQuotaEntity.CLIENT_ID, ClientQuotaEntity.IP}) + public void testDescribeWithNonStrictDefaultMatch(String entityType) { + Map defaultEntity = new HashMap<>(); + defaultEntity.put(entityType, null); + Map entities = Map.of( + new ClientQuotaEntity(defaultEntity), new ClientQuotaImage(Map.of(QuotaConfig.PRODUCER_BYTE_RATE_OVERRIDE_CONFIG, 100.0)), + new ClientQuotaEntity(Map.of(entityType, "foo")), new ClientQuotaImage(Map.of(QuotaConfig.PRODUCER_BYTE_RATE_OVERRIDE_CONFIG, 200.0)) + ); + ClientQuotasImage image = new ClientQuotasImage(entities); + + DescribeClientQuotasRequestData request = new DescribeClientQuotasRequestData() + .setComponents(List.of( + new DescribeClientQuotasRequestData.ComponentData() + .setEntityType(entityType) + .setMatchType(MATCH_TYPE_DEFAULT) + .setMatch(null) + )); + + DescribeClientQuotasResponseData response = image.describe(request); + assertEquals(1, response.entries().size()); + assertEquals(entityType, response.entries().get(0).entity().get(0).entityType()); + assertNull(response.entries().get(0).entity().get(0).entityName()); + } + + @ParameterizedTest(name = "{0}") + @ValueSource(strings = {ClientQuotaEntity.USER, ClientQuotaEntity.CLIENT_ID, ClientQuotaEntity.IP}) + public void testDescribeDefaultMatchWithNoData(String entityType) { + ClientQuotasImage image = new ClientQuotasImage(Map.of()); + + DescribeClientQuotasRequestData request = new DescribeClientQuotasRequestData() + .setComponents(List.of( + new DescribeClientQuotasRequestData.ComponentData() + .setEntityType(entityType) + .setMatchType(MATCH_TYPE_DEFAULT) + .setMatch(null) + )); + + DescribeClientQuotasResponseData response = image.describe(request); + assertEquals(0, response.entries().size()); + } + + @Test + public void testDescribeNonStrictEmptyRequest() { + Map entities = Map.of( + new ClientQuotaEntity(Map.of(ClientQuotaEntity.USER, "foo")), new ClientQuotaImage(Map.of(QuotaConfig.PRODUCER_BYTE_RATE_OVERRIDE_CONFIG, 100.0)), + new ClientQuotaEntity(Map.of(ClientQuotaEntity.CLIENT_ID, "bar")), new ClientQuotaImage(Map.of(QuotaConfig.PRODUCER_BYTE_RATE_OVERRIDE_CONFIG, 200.0)), + new ClientQuotaEntity(Map.of(ClientQuotaEntity.IP, "baz")), new ClientQuotaImage(Map.of(QuotaConfig.PRODUCER_BYTE_RATE_OVERRIDE_CONFIG, 300.0)) + ); + ClientQuotasImage image = new ClientQuotasImage(entities); + DescribeClientQuotasRequestData request = new DescribeClientQuotasRequestData() + .setStrict(false) + .setComponents(List.of()); + + DescribeClientQuotasResponseData response = image.describe(request); + assertEquals(3, response.entries().size()); + } + + @Test + public void testDescribeWithEmptyEntityType() { + DescribeClientQuotasRequestData request = new DescribeClientQuotasRequestData() + .setComponents(List.of( + new DescribeClientQuotasRequestData.ComponentData() + .setEntityType("") + .setMatchType(MATCH_TYPE_EXACT) + .setMatch("foo"))); + + InvalidRequestException exception = assertThrows(InvalidRequestException.class, () -> IMAGE1.describe(request)); + assertEquals("Invalid empty entity type.", exception.getMessage()); + } + + @Test + public void testDescribeWithDuplicateEntityType() { + DescribeClientQuotasRequestData request = new DescribeClientQuotasRequestData() + .setComponents(List.of( + new DescribeClientQuotasRequestData.ComponentData() + .setEntityType(ClientQuotaEntity.USER) + .setMatchType(MATCH_TYPE_EXACT) + .setMatch("foo"), + new DescribeClientQuotasRequestData.ComponentData() + .setEntityType(ClientQuotaEntity.USER) + .setMatchType(MATCH_TYPE_SPECIFIED))); + + InvalidRequestException exception = assertThrows(InvalidRequestException.class, () -> IMAGE1.describe(request)); + assertEquals("Entity type user cannot appear more than once in the filter.", exception.getMessage()); + } + + @Test + public void testDescribeWithExactMatchNullMatch() { + DescribeClientQuotasRequestData request = new DescribeClientQuotasRequestData() + .setComponents(List.of( + new DescribeClientQuotasRequestData.ComponentData() + .setEntityType(ClientQuotaEntity.USER) + .setMatchType(MATCH_TYPE_EXACT) + .setMatch(null))); + + InvalidRequestException exception = assertThrows(InvalidRequestException.class, () -> IMAGE1.describe(request)); + assertEquals("Request specified MATCH_TYPE_EXACT, but set match string to null.", exception.getMessage()); + } + + @Test + public void testDescribeWithDefaultMatchNonNullMatch() { + DescribeClientQuotasRequestData request = new DescribeClientQuotasRequestData() + .setComponents(List.of( + new DescribeClientQuotasRequestData.ComponentData() + .setEntityType(ClientQuotaEntity.USER) + .setMatchType(MATCH_TYPE_DEFAULT) + .setMatch("foo"))); + + InvalidRequestException exception = assertThrows(InvalidRequestException.class, () -> IMAGE1.describe(request)); + assertEquals("Request specified MATCH_TYPE_DEFAULT, but also specified a match string.", exception.getMessage()); + } + + @Test + public void testDescribeWithSpecifiedMatchNonNullMatch() { + DescribeClientQuotasRequestData request = new DescribeClientQuotasRequestData() + .setComponents(List.of( + new DescribeClientQuotasRequestData.ComponentData() + .setEntityType(ClientQuotaEntity.USER) + .setMatchType(MATCH_TYPE_SPECIFIED) + .setMatch("foo"))); + + InvalidRequestException exception = assertThrows(InvalidRequestException.class, () -> IMAGE1.describe(request)); + assertEquals("Request specified MATCH_TYPE_SPECIFIED, but also specified a match string.", exception.getMessage()); + } + + @Test + public void testDescribeWithUnknownMatchType() { + DescribeClientQuotasRequestData request = new DescribeClientQuotasRequestData() + .setComponents(List.of( + new DescribeClientQuotasRequestData.ComponentData() + .setEntityType(ClientQuotaEntity.USER) + .setMatchType((byte) 99))); + + InvalidRequestException exception = assertThrows(InvalidRequestException.class, () -> IMAGE1.describe(request)); + assertEquals("Unknown match type 99", exception.getMessage()); + } + + @ParameterizedTest(name = "{0}") + @ValueSource(strings = {ClientQuotaEntity.USER, ClientQuotaEntity.CLIENT_ID}) + public void testDescribeWithIpAndOtherTypeCombination(String entityType) { + DescribeClientQuotasRequestData request = new DescribeClientQuotasRequestData() + .setComponents(List.of( + new DescribeClientQuotasRequestData.ComponentData() + .setEntityType(ClientQuotaEntity.IP) + .setMatchType(MATCH_TYPE_EXACT) + .setMatch("127.0.0.1"), + new DescribeClientQuotasRequestData.ComponentData() + .setEntityType(entityType) + .setMatchType(MATCH_TYPE_EXACT) + .setMatch("foo"))); + + InvalidRequestException exception = assertThrows(InvalidRequestException.class, () -> IMAGE1.describe(request)); + assertTrue(exception.getMessage().contains("IP filter component should not be used with user or clientId filter component")); + } + private static void testToImage(ClientQuotasImage image) { testToImage(image, Optional.empty()); } diff --git a/metadata/src/test/java/org/apache/kafka/image/DelegationTokenImageTest.java b/metadata/src/test/java/org/apache/kafka/image/DelegationTokenImageTest.java index d3aec2de47285..9a4f33a12892f 100644 --- a/metadata/src/test/java/org/apache/kafka/image/DelegationTokenImageTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/DelegationTokenImageTest.java @@ -21,7 +21,7 @@ import org.apache.kafka.common.metadata.RemoveDelegationTokenRecord; import org.apache.kafka.common.security.auth.KafkaPrincipal; import org.apache.kafka.common.security.token.delegation.TokenInformation; -import org.apache.kafka.common.utils.SecurityUtils; +import org.apache.kafka.common.utils.internals.SecurityUtils; import org.apache.kafka.image.writer.ImageWriterOptions; import org.apache.kafka.image.writer.RecordListWriter; import org.apache.kafka.metadata.DelegationTokenData; diff --git a/metadata/src/test/java/org/apache/kafka/image/loader/MetadataBatchLoaderTest.java b/metadata/src/test/java/org/apache/kafka/image/loader/MetadataBatchLoaderTest.java index ebe4365b27fd5..64177c451461d 100644 --- a/metadata/src/test/java/org/apache/kafka/image/loader/MetadataBatchLoaderTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/loader/MetadataBatchLoaderTest.java @@ -26,8 +26,8 @@ import org.apache.kafka.common.metadata.NoOpRecord; import org.apache.kafka.common.metadata.PartitionRecord; import org.apache.kafka.common.metadata.TopicRecord; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.image.MetadataDelta; import org.apache.kafka.image.MetadataImage; import org.apache.kafka.metadata.SupportedConfigChecker; diff --git a/raft/src/main/java/org/apache/kafka/raft/CandidateState.java b/raft/src/main/java/org/apache/kafka/raft/CandidateState.java index d96d08cdf8e32..5efd311f0af2e 100644 --- a/raft/src/main/java/org/apache/kafka/raft/CandidateState.java +++ b/raft/src/main/java/org/apache/kafka/raft/CandidateState.java @@ -17,9 +17,9 @@ package org.apache.kafka.raft; import org.apache.kafka.common.Uuid; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.internals.EpochElection; import org.slf4j.Logger; diff --git a/raft/src/main/java/org/apache/kafka/raft/FollowerState.java b/raft/src/main/java/org/apache/kafka/raft/FollowerState.java index 2564a683ed92e..ff3ee229596e4 100644 --- a/raft/src/main/java/org/apache/kafka/raft/FollowerState.java +++ b/raft/src/main/java/org/apache/kafka/raft/FollowerState.java @@ -18,9 +18,9 @@ import org.apache.kafka.common.Node; import org.apache.kafka.common.network.ListenerName; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.snapshot.RawSnapshotWriter; import org.slf4j.Logger; diff --git a/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java b/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java index a3f929629b7ed..e7d3ab89fc590 100644 --- a/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java +++ b/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java @@ -63,10 +63,10 @@ import org.apache.kafka.common.requests.FetchResponse; import org.apache.kafka.common.requests.FetchSnapshotRequest; import org.apache.kafka.common.requests.FetchSnapshotResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.errors.NotLeaderException; import org.apache.kafka.raft.internals.AddVoterHandler; import org.apache.kafka.raft.internals.BatchAccumulator; diff --git a/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClientDriver.java b/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClientDriver.java index 2af7d7d207f87..2f9552f7b61c8 100644 --- a/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClientDriver.java +++ b/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClientDriver.java @@ -19,7 +19,7 @@ import org.apache.kafka.common.protocol.ApiMessage; import org.apache.kafka.common.requests.RequestContext; import org.apache.kafka.common.requests.RequestHeader; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.server.fault.FaultHandler; import org.apache.kafka.server.util.ShutdownableThread; diff --git a/raft/src/main/java/org/apache/kafka/raft/LeaderState.java b/raft/src/main/java/org/apache/kafka/raft/LeaderState.java index d6d3d5a61809e..e05007e6986c2 100644 --- a/raft/src/main/java/org/apache/kafka/raft/LeaderState.java +++ b/raft/src/main/java/org/apache/kafka/raft/LeaderState.java @@ -26,9 +26,9 @@ import org.apache.kafka.common.record.internal.ControlRecordUtils; import org.apache.kafka.common.record.internal.MemoryRecordsBuilder; import org.apache.kafka.common.record.internal.RecordBatch; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.errors.NotLeaderException; import org.apache.kafka.raft.internals.AddVoterHandlerState; import org.apache.kafka.raft.internals.BatchAccumulator; diff --git a/raft/src/main/java/org/apache/kafka/raft/ProspectiveState.java b/raft/src/main/java/org/apache/kafka/raft/ProspectiveState.java index 911dcfef44ed3..5c8069bb8c1c4 100644 --- a/raft/src/main/java/org/apache/kafka/raft/ProspectiveState.java +++ b/raft/src/main/java/org/apache/kafka/raft/ProspectiveState.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.raft; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.internals.EpochElection; import org.slf4j.Logger; diff --git a/raft/src/main/java/org/apache/kafka/raft/QuorumState.java b/raft/src/main/java/org/apache/kafka/raft/QuorumState.java index 4ae24c84eaf99..7703a69d4d40b 100644 --- a/raft/src/main/java/org/apache/kafka/raft/QuorumState.java +++ b/raft/src/main/java/org/apache/kafka/raft/QuorumState.java @@ -18,8 +18,8 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.feature.SupportedVersionRange; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.internals.BatchAccumulator; import org.apache.kafka.raft.internals.KRaftControlRecordStateMachine; import org.apache.kafka.raft.internals.KafkaRaftMetrics; diff --git a/raft/src/main/java/org/apache/kafka/raft/ResignedState.java b/raft/src/main/java/org/apache/kafka/raft/ResignedState.java index 3a9e1dd21e8d1..65d16c1f72bd9 100644 --- a/raft/src/main/java/org/apache/kafka/raft/ResignedState.java +++ b/raft/src/main/java/org/apache/kafka/raft/ResignedState.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.raft; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/raft/src/main/java/org/apache/kafka/raft/UnattachedState.java b/raft/src/main/java/org/apache/kafka/raft/UnattachedState.java index 6b7e4b700f241..4d211c402d352 100644 --- a/raft/src/main/java/org/apache/kafka/raft/UnattachedState.java +++ b/raft/src/main/java/org/apache/kafka/raft/UnattachedState.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.raft; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/raft/src/main/java/org/apache/kafka/raft/internals/AddVoterHandler.java b/raft/src/main/java/org/apache/kafka/raft/internals/AddVoterHandler.java index 3e72b3a3cc486..7a286c537b06a 100644 --- a/raft/src/main/java/org/apache/kafka/raft/internals/AddVoterHandler.java +++ b/raft/src/main/java/org/apache/kafka/raft/internals/AddVoterHandler.java @@ -23,8 +23,8 @@ import org.apache.kafka.common.message.ApiVersionsResponseData; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.ApiVersionsRequest; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.Endpoints; import org.apache.kafka.raft.LeaderState; import org.apache.kafka.raft.LogOffsetMetadata; diff --git a/raft/src/main/java/org/apache/kafka/raft/internals/DefaultRequestSender.java b/raft/src/main/java/org/apache/kafka/raft/internals/DefaultRequestSender.java index 0cee3c255d1b0..7da5ee6ffcecb 100644 --- a/raft/src/main/java/org/apache/kafka/raft/internals/DefaultRequestSender.java +++ b/raft/src/main/java/org/apache/kafka/raft/internals/DefaultRequestSender.java @@ -21,7 +21,7 @@ import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.ApiMessage; import org.apache.kafka.common.protocol.Errors; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.NetworkChannel; import org.apache.kafka.raft.RaftMessageQueue; import org.apache.kafka.raft.RaftRequest; diff --git a/raft/src/main/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachine.java b/raft/src/main/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachine.java index b97230867d712..94bd8f526961c 100644 --- a/raft/src/main/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachine.java +++ b/raft/src/main/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachine.java @@ -18,8 +18,8 @@ import org.apache.kafka.common.message.KRaftVersionRecord; import org.apache.kafka.common.message.VotersRecord; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.Batch; import org.apache.kafka.raft.ControlRecord; import org.apache.kafka.raft.ExternalKRaftMetrics; diff --git a/raft/src/main/java/org/apache/kafka/raft/internals/KafkaRaftLog.java b/raft/src/main/java/org/apache/kafka/raft/internals/KafkaRaftLog.java index 95bc12b964395..4334d0a6d82ae 100644 --- a/raft/src/main/java/org/apache/kafka/raft/internals/KafkaRaftLog.java +++ b/raft/src/main/java/org/apache/kafka/raft/internals/KafkaRaftLog.java @@ -24,9 +24,9 @@ import org.apache.kafka.common.errors.InvalidConfigurationException; import org.apache.kafka.common.record.internal.MemoryRecords; import org.apache.kafka.common.record.internal.Records; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.Isolation; import org.apache.kafka.raft.LogAppendInfo; import org.apache.kafka.raft.LogFetchInfo; @@ -563,10 +563,10 @@ private boolean cleanSnapshots(Function epoches = new ArrayList<>(snapshots.keySet()); - for (int i = 0; i < epoches.size() - 1; i++) { - OffsetAndEpoch epoch = epoches.get(i); - OffsetAndEpoch nextEpoch = epoches.get(i + 1); + List epochs = new ArrayList<>(snapshots.keySet()); + for (int i = 0; i < epochs.size() - 1; i++) { + OffsetAndEpoch epoch = epochs.get(i); + OffsetAndEpoch nextEpoch = epochs.get(i + 1); Optional reason = predicate.apply(epoch); if (reason.isPresent()) { boolean deleted = deleteBeforeSnapshot(nextEpoch, reason.get()); diff --git a/raft/src/main/java/org/apache/kafka/raft/internals/RecordsBatchReader.java b/raft/src/main/java/org/apache/kafka/raft/internals/RecordsBatchReader.java index 48db8f9aeea01..29d42cdb29837 100644 --- a/raft/src/main/java/org/apache/kafka/raft/internals/RecordsBatchReader.java +++ b/raft/src/main/java/org/apache/kafka/raft/internals/RecordsBatchReader.java @@ -17,8 +17,8 @@ package org.apache.kafka.raft.internals; import org.apache.kafka.common.record.internal.Records; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.Batch; import org.apache.kafka.raft.BatchReader; import org.apache.kafka.server.common.serialization.RecordSerde; diff --git a/raft/src/main/java/org/apache/kafka/raft/internals/RecordsIterator.java b/raft/src/main/java/org/apache/kafka/raft/internals/RecordsIterator.java index 9ab9997143872..f0c17b267c620 100644 --- a/raft/src/main/java/org/apache/kafka/raft/internals/RecordsIterator.java +++ b/raft/src/main/java/org/apache/kafka/raft/internals/RecordsIterator.java @@ -22,10 +22,10 @@ import org.apache.kafka.common.record.internal.MemoryRecords; import org.apache.kafka.common.record.internal.MutableRecordBatch; import org.apache.kafka.common.record.internal.Records; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.BufferSupplier; import org.apache.kafka.common.utils.internals.ByteUtils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.Batch; import org.apache.kafka.raft.ControlRecord; import org.apache.kafka.server.common.serialization.RecordSerde; diff --git a/raft/src/main/java/org/apache/kafka/raft/internals/RemoveVoterHandler.java b/raft/src/main/java/org/apache/kafka/raft/internals/RemoveVoterHandler.java index 7f231b1681c88..5fcec31a48d09 100644 --- a/raft/src/main/java/org/apache/kafka/raft/internals/RemoveVoterHandler.java +++ b/raft/src/main/java/org/apache/kafka/raft/internals/RemoveVoterHandler.java @@ -19,8 +19,8 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.message.RemoveRaftVoterResponseData; import org.apache.kafka.common.protocol.Errors; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.LeaderState; import org.apache.kafka.raft.LogOffsetMetadata; import org.apache.kafka.raft.RaftUtil; diff --git a/raft/src/main/java/org/apache/kafka/raft/internals/UpdateVoterHandler.java b/raft/src/main/java/org/apache/kafka/raft/internals/UpdateVoterHandler.java index 6f98ff80f6917..6766ef0e6c75b 100644 --- a/raft/src/main/java/org/apache/kafka/raft/internals/UpdateVoterHandler.java +++ b/raft/src/main/java/org/apache/kafka/raft/internals/UpdateVoterHandler.java @@ -21,7 +21,7 @@ import org.apache.kafka.common.message.UpdateRaftVoterResponseData; import org.apache.kafka.common.network.ListenerName; import org.apache.kafka.common.protocol.Errors; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.Endpoints; import org.apache.kafka.raft.LeaderAndEpoch; import org.apache.kafka.raft.LeaderState; diff --git a/raft/src/main/java/org/apache/kafka/raft/internals/VoterSetHistory.java b/raft/src/main/java/org/apache/kafka/raft/internals/VoterSetHistory.java index 93a7e3d4db218..1a8619d9a931c 100644 --- a/raft/src/main/java/org/apache/kafka/raft/internals/VoterSetHistory.java +++ b/raft/src/main/java/org/apache/kafka/raft/internals/VoterSetHistory.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.raft.internals; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.VoterSet; import org.slf4j.Logger; diff --git a/raft/src/main/java/org/apache/kafka/snapshot/RecordsSnapshotReader.java b/raft/src/main/java/org/apache/kafka/snapshot/RecordsSnapshotReader.java index c08df4e5dcb63..9bff4a1c8fcdb 100644 --- a/raft/src/main/java/org/apache/kafka/snapshot/RecordsSnapshotReader.java +++ b/raft/src/main/java/org/apache/kafka/snapshot/RecordsSnapshotReader.java @@ -19,8 +19,8 @@ import org.apache.kafka.common.message.SnapshotHeaderRecord; import org.apache.kafka.common.record.internal.ControlRecordType; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.Batch; import org.apache.kafka.raft.internals.RecordsIterator; import org.apache.kafka.server.common.OffsetAndEpoch; diff --git a/raft/src/main/java/org/apache/kafka/snapshot/Snapshots.java b/raft/src/main/java/org/apache/kafka/snapshot/Snapshots.java index 113aecc9519e9..65002862e4677 100644 --- a/raft/src/main/java/org/apache/kafka/snapshot/Snapshots.java +++ b/raft/src/main/java/org/apache/kafka/snapshot/Snapshots.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.snapshot; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.KafkaRaftClient; import org.apache.kafka.raft.internals.IdentitySerde; import org.apache.kafka.server.common.OffsetAndEpoch; diff --git a/raft/src/test/java/org/apache/kafka/raft/CandidateStateTest.java b/raft/src/test/java/org/apache/kafka/raft/CandidateStateTest.java index 1b3226064e56d..d949e7e237138 100644 --- a/raft/src/test/java/org/apache/kafka/raft/CandidateStateTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/CandidateStateTest.java @@ -17,8 +17,8 @@ package org.apache.kafka.raft; import org.apache.kafka.common.Uuid; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/raft/src/test/java/org/apache/kafka/raft/FollowerStateTest.java b/raft/src/test/java/org/apache/kafka/raft/FollowerStateTest.java index 3f6fb61894c35..f69a3f799ac47 100644 --- a/raft/src/test/java/org/apache/kafka/raft/FollowerStateTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/FollowerStateTest.java @@ -18,8 +18,8 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.network.ListenerName; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientDriverTest.java b/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientDriverTest.java index 77ca890b8fbab..4375715bc9830 100644 --- a/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientDriverTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientDriverTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.raft; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.server.fault.MockFaultHandler; import org.junit.jupiter.api.Test; diff --git a/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientReconfigTest.java b/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientReconfigTest.java index 9d00d7fe9f1c1..ba2016cae5bb0 100644 --- a/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientReconfigTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientReconfigTest.java @@ -40,8 +40,8 @@ import org.apache.kafka.common.record.internal.Record; import org.apache.kafka.common.record.internal.RecordBatch; import org.apache.kafka.common.record.internal.Records; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.server.common.Feature; import org.apache.kafka.server.common.KRaftVersion; import org.apache.kafka.snapshot.RecordsSnapshotReader; diff --git a/raft/src/test/java/org/apache/kafka/raft/LeaderStateTest.java b/raft/src/test/java/org/apache/kafka/raft/LeaderStateTest.java index 5b4ed99fa97d8..1ed1dd972d1e2 100644 --- a/raft/src/test/java/org/apache/kafka/raft/LeaderStateTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/LeaderStateTest.java @@ -19,8 +19,8 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.errors.InvalidUpdateVersionException; import org.apache.kafka.common.metrics.Metrics; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.errors.NotLeaderException; import org.apache.kafka.raft.internals.BatchAccumulator; import org.apache.kafka.raft.internals.KRaftVersionUpgrade; diff --git a/raft/src/test/java/org/apache/kafka/raft/MockLog.java b/raft/src/test/java/org/apache/kafka/raft/MockLog.java index abadb1c8a30d4..53d9380860e90 100644 --- a/raft/src/test/java/org/apache/kafka/raft/MockLog.java +++ b/raft/src/test/java/org/apache/kafka/raft/MockLog.java @@ -28,8 +28,8 @@ import org.apache.kafka.common.record.internal.RecordBatch; import org.apache.kafka.common.record.internal.Records; import org.apache.kafka.common.record.internal.SimpleRecord; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.server.common.OffsetAndEpoch; import org.apache.kafka.snapshot.MockRawSnapshotReader; import org.apache.kafka.snapshot.MockRawSnapshotWriter; diff --git a/raft/src/test/java/org/apache/kafka/raft/MockLogTest.java b/raft/src/test/java/org/apache/kafka/raft/MockLogTest.java index c3d6ff29186d2..a004e3a09aff8 100644 --- a/raft/src/test/java/org/apache/kafka/raft/MockLogTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/MockLogTest.java @@ -30,8 +30,8 @@ import org.apache.kafka.common.record.internal.RecordBatch; import org.apache.kafka.common.record.internal.Records; import org.apache.kafka.common.record.internal.SimpleRecord; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.server.common.OffsetAndEpoch; import org.apache.kafka.snapshot.RawSnapshotReader; import org.apache.kafka.snapshot.RawSnapshotWriter; diff --git a/raft/src/test/java/org/apache/kafka/raft/ProspectiveStateTest.java b/raft/src/test/java/org/apache/kafka/raft/ProspectiveStateTest.java index 2f995cf8f535b..ce89f0a4f5c08 100644 --- a/raft/src/test/java/org/apache/kafka/raft/ProspectiveStateTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/ProspectiveStateTest.java @@ -18,8 +18,8 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.network.ListenerName; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/raft/src/test/java/org/apache/kafka/raft/QuorumStateTest.java b/raft/src/test/java/org/apache/kafka/raft/QuorumStateTest.java index 76d942d2bd98b..6c3418d64e8aa 100644 --- a/raft/src/test/java/org/apache/kafka/raft/QuorumStateTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/QuorumStateTest.java @@ -19,8 +19,8 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.network.ListenerName; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.internals.BatchAccumulator; import org.apache.kafka.raft.internals.KRaftControlRecordStateMachine; import org.apache.kafka.raft.internals.KafkaRaftMetrics; diff --git a/raft/src/test/java/org/apache/kafka/raft/RaftClientTestContext.java b/raft/src/test/java/org/apache/kafka/raft/RaftClientTestContext.java index 854824aba12dc..bbab73071671c 100644 --- a/raft/src/test/java/org/apache/kafka/raft/RaftClientTestContext.java +++ b/raft/src/test/java/org/apache/kafka/raft/RaftClientTestContext.java @@ -62,9 +62,9 @@ import org.apache.kafka.common.record.internal.Records; import org.apache.kafka.common.requests.DescribeQuorumResponse; import org.apache.kafka.common.requests.FetchSnapshotResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.internals.BatchBuilder; import org.apache.kafka.raft.internals.StringSerde; import org.apache.kafka.server.common.Feature; diff --git a/raft/src/test/java/org/apache/kafka/raft/RaftEventSimulationTest.java b/raft/src/test/java/org/apache/kafka/raft/RaftEventSimulationTest.java index 8f1cabcf1b59c..44a98bc54611f 100644 --- a/raft/src/test/java/org/apache/kafka/raft/RaftEventSimulationTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/RaftEventSimulationTest.java @@ -28,10 +28,10 @@ import org.apache.kafka.common.protocol.Readable; import org.apache.kafka.common.protocol.Writable; import org.apache.kafka.common.protocol.types.Type; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.MockLog.LogBatch; import org.apache.kafka.raft.MockLog.LogEntry; import org.apache.kafka.raft.internals.BatchMemoryPool; diff --git a/raft/src/test/java/org/apache/kafka/raft/ReplicatedCounter.java b/raft/src/test/java/org/apache/kafka/raft/ReplicatedCounter.java index bcc29eb189f46..96ecd7a401c09 100644 --- a/raft/src/test/java/org/apache/kafka/raft/ReplicatedCounter.java +++ b/raft/src/test/java/org/apache/kafka/raft/ReplicatedCounter.java @@ -17,7 +17,7 @@ package org.apache.kafka.raft; import org.apache.kafka.common.KafkaException; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.errors.NotLeaderException; import org.apache.kafka.server.common.OffsetAndEpoch; import org.apache.kafka.snapshot.SnapshotReader; diff --git a/raft/src/test/java/org/apache/kafka/raft/ResignedStateTest.java b/raft/src/test/java/org/apache/kafka/raft/ResignedStateTest.java index c86cd40762750..0564e35582e35 100644 --- a/raft/src/test/java/org/apache/kafka/raft/ResignedStateTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/ResignedStateTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.raft; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/raft/src/test/java/org/apache/kafka/raft/UnattachedStateTest.java b/raft/src/test/java/org/apache/kafka/raft/UnattachedStateTest.java index 5e9c68d2d053c..7ce5868873e38 100644 --- a/raft/src/test/java/org/apache/kafka/raft/UnattachedStateTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/UnattachedStateTest.java @@ -17,8 +17,8 @@ package org.apache.kafka.raft; import org.apache.kafka.common.Uuid; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/raft/src/test/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachineTest.java b/raft/src/test/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachineTest.java index ed99e893922ec..84ca54f206a32 100644 --- a/raft/src/test/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachineTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachineTest.java @@ -22,8 +22,8 @@ import org.apache.kafka.common.metrics.KafkaMetric; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.record.internal.MemoryRecords; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.ExternalKRaftMetrics; import org.apache.kafka.raft.MockLog; import org.apache.kafka.raft.VoterSet; diff --git a/raft/src/test/java/org/apache/kafka/raft/internals/KafkaRaftMetricsTest.java b/raft/src/test/java/org/apache/kafka/raft/internals/KafkaRaftMetricsTest.java index 42d19290657e9..620e08a04e036 100644 --- a/raft/src/test/java/org/apache/kafka/raft/internals/KafkaRaftMetricsTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/internals/KafkaRaftMetricsTest.java @@ -19,9 +19,9 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.metrics.KafkaMetric; import org.apache.kafka.common.metrics.Metrics; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.LogOffsetMetadata; import org.apache.kafka.raft.MockQuorumStateStore; import org.apache.kafka.raft.QuorumState; diff --git a/raft/src/test/java/org/apache/kafka/raft/internals/RecordsBatchReaderTest.java b/raft/src/test/java/org/apache/kafka/raft/internals/RecordsBatchReaderTest.java index 6040f9098c393..83265573581eb 100644 --- a/raft/src/test/java/org/apache/kafka/raft/internals/RecordsBatchReaderTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/internals/RecordsBatchReaderTest.java @@ -22,8 +22,8 @@ import org.apache.kafka.common.record.internal.FileRecords; import org.apache.kafka.common.record.internal.MemoryRecords; import org.apache.kafka.common.record.internal.Records; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.BatchReader; import org.apache.kafka.raft.ControlRecord; import org.apache.kafka.raft.internals.RecordsIteratorTest.TestBatch; diff --git a/raft/src/test/java/org/apache/kafka/raft/internals/RecordsIteratorTest.java b/raft/src/test/java/org/apache/kafka/raft/internals/RecordsIteratorTest.java index e8c31a10fd354..4d05391125b9e 100644 --- a/raft/src/test/java/org/apache/kafka/raft/internals/RecordsIteratorTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/internals/RecordsIteratorTest.java @@ -37,9 +37,9 @@ import org.apache.kafka.common.record.internal.MemoryRecordsBuilder; import org.apache.kafka.common.record.internal.RecordBatch; import org.apache.kafka.common.record.internal.Records; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.Batch; import org.apache.kafka.raft.ControlRecord; import org.apache.kafka.raft.VoterSet; diff --git a/raft/src/test/java/org/apache/kafka/raft/internals/VoterSetHistoryTest.java b/raft/src/test/java/org/apache/kafka/raft/internals/VoterSetHistoryTest.java index 302a1da52126d..d4a0693999a1d 100644 --- a/raft/src/test/java/org/apache/kafka/raft/internals/VoterSetHistoryTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/internals/VoterSetHistoryTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.raft.internals; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.VoterSet; import org.apache.kafka.raft.VoterSetTest; diff --git a/raft/src/test/java/org/apache/kafka/snapshot/RecordsSnapshotWriterTest.java b/raft/src/test/java/org/apache/kafka/snapshot/RecordsSnapshotWriterTest.java index 030b40b4153d7..eb23728fcabfd 100644 --- a/raft/src/test/java/org/apache/kafka/snapshot/RecordsSnapshotWriterTest.java +++ b/raft/src/test/java/org/apache/kafka/snapshot/RecordsSnapshotWriterTest.java @@ -21,9 +21,9 @@ import org.apache.kafka.common.message.SnapshotFooterRecord; import org.apache.kafka.common.message.SnapshotHeaderRecord; import org.apache.kafka.common.record.internal.ControlRecordType; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.internals.BufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.Batch; import org.apache.kafka.raft.VoterSet; import org.apache.kafka.raft.VoterSetTest; diff --git a/raft/src/test/java/org/apache/kafka/snapshot/SnapshotWriterReaderTest.java b/raft/src/test/java/org/apache/kafka/snapshot/SnapshotWriterReaderTest.java index b635d95b5750b..c57af8084bf5a 100644 --- a/raft/src/test/java/org/apache/kafka/snapshot/SnapshotWriterReaderTest.java +++ b/raft/src/test/java/org/apache/kafka/snapshot/SnapshotWriterReaderTest.java @@ -21,9 +21,9 @@ import org.apache.kafka.common.record.internal.ControlRecordUtils; import org.apache.kafka.common.record.internal.Record; import org.apache.kafka.common.record.internal.RecordBatch; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.internals.BufferSupplier; import org.apache.kafka.common.utils.internals.BufferSupplier.GrowableBufferSupplier; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.Batch; import org.apache.kafka.raft.ControlRecord; import org.apache.kafka.raft.RaftClientTestContext; diff --git a/server-common/src/main/java/org/apache/kafka/deferred/DeferredEventQueue.java b/server-common/src/main/java/org/apache/kafka/deferred/DeferredEventQueue.java index 5f3d27c74b577..570eec37c1bc9 100644 --- a/server-common/src/main/java/org/apache/kafka/deferred/DeferredEventQueue.java +++ b/server-common/src/main/java/org/apache/kafka/deferred/DeferredEventQueue.java @@ -17,7 +17,7 @@ package org.apache.kafka.deferred; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/server-common/src/main/java/org/apache/kafka/queue/KafkaEventQueue.java b/server-common/src/main/java/org/apache/kafka/queue/KafkaEventQueue.java index 5c5ec4b15f7f3..0a39cc51c5336 100644 --- a/server-common/src/main/java/org/apache/kafka/queue/KafkaEventQueue.java +++ b/server-common/src/main/java/org/apache/kafka/queue/KafkaEventQueue.java @@ -18,9 +18,9 @@ package org.apache.kafka.queue; import org.apache.kafka.common.errors.TimeoutException; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.internals.KafkaThread; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/server-common/src/main/java/org/apache/kafka/server/network/EndpointReadyFutures.java b/server-common/src/main/java/org/apache/kafka/server/network/EndpointReadyFutures.java index b02352cca04c7..9df391d7479e4 100644 --- a/server-common/src/main/java/org/apache/kafka/server/network/EndpointReadyFutures.java +++ b/server-common/src/main/java/org/apache/kafka/server/network/EndpointReadyFutures.java @@ -19,7 +19,7 @@ import org.apache.kafka.common.Endpoint; import org.apache.kafka.common.internals.Plugin; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.server.authorizer.Authorizer; import org.apache.kafka.server.authorizer.AuthorizerServerInfo; diff --git a/server-common/src/main/java/org/apache/kafka/server/util/CommandLineUtils.java b/server-common/src/main/java/org/apache/kafka/server/util/CommandLineUtils.java index b90e53fb6f583..7e231989d63ed 100644 --- a/server-common/src/main/java/org/apache/kafka/server/util/CommandLineUtils.java +++ b/server-common/src/main/java/org/apache/kafka/server/util/CommandLineUtils.java @@ -18,7 +18,7 @@ import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.AdminClientConfig; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.common.utils.internals.Exit; import java.io.IOException; diff --git a/server-common/src/main/java/org/apache/kafka/server/util/ShutdownableThread.java b/server-common/src/main/java/org/apache/kafka/server/util/ShutdownableThread.java index 547a352dfb507..b02d405d02173 100644 --- a/server-common/src/main/java/org/apache/kafka/server/util/ShutdownableThread.java +++ b/server-common/src/main/java/org/apache/kafka/server/util/ShutdownableThread.java @@ -18,8 +18,8 @@ package org.apache.kafka.server.util; import org.apache.kafka.common.internals.FatalExitError; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.internals.Exit; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/server-common/src/main/java/org/apache/kafka/timeline/SnapshotRegistry.java b/server-common/src/main/java/org/apache/kafka/timeline/SnapshotRegistry.java index b600b122f9b43..348dcd34a53fc 100644 --- a/server-common/src/main/java/org/apache/kafka/timeline/SnapshotRegistry.java +++ b/server-common/src/main/java/org/apache/kafka/timeline/SnapshotRegistry.java @@ -17,7 +17,7 @@ package org.apache.kafka.timeline; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/server-common/src/test/java/org/apache/kafka/deferred/DeferredEventQueueTest.java b/server-common/src/test/java/org/apache/kafka/deferred/DeferredEventQueueTest.java index 39680b22cae9e..f4fa9a682e8ba 100644 --- a/server-common/src/test/java/org/apache/kafka/deferred/DeferredEventQueueTest.java +++ b/server-common/src/test/java/org/apache/kafka/deferred/DeferredEventQueueTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.deferred; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/server-common/src/test/java/org/apache/kafka/queue/KafkaEventQueueTest.java b/server-common/src/test/java/org/apache/kafka/queue/KafkaEventQueueTest.java index fe02984db7a0e..c74747491796e 100644 --- a/server-common/src/test/java/org/apache/kafka/queue/KafkaEventQueueTest.java +++ b/server-common/src/test/java/org/apache/kafka/queue/KafkaEventQueueTest.java @@ -19,9 +19,9 @@ import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.errors.TimeoutException; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; diff --git a/server-common/src/test/java/org/apache/kafka/timeline/SnapshotRegistryTest.java b/server-common/src/test/java/org/apache/kafka/timeline/SnapshotRegistryTest.java index 3813511139a9d..5b5e7162e3786 100644 --- a/server-common/src/test/java/org/apache/kafka/timeline/SnapshotRegistryTest.java +++ b/server-common/src/test/java/org/apache/kafka/timeline/SnapshotRegistryTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.timeline; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/server-common/src/test/java/org/apache/kafka/timeline/SnapshottableHashTableTest.java b/server-common/src/test/java/org/apache/kafka/timeline/SnapshottableHashTableTest.java index 85e77c9d6906f..87aa71ad37d53 100644 --- a/server-common/src/test/java/org/apache/kafka/timeline/SnapshottableHashTableTest.java +++ b/server-common/src/test/java/org/apache/kafka/timeline/SnapshottableHashTableTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.timeline; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/server-common/src/test/java/org/apache/kafka/timeline/TimelineHashMapTest.java b/server-common/src/test/java/org/apache/kafka/timeline/TimelineHashMapTest.java index 77b4007e8d170..ec3e497b323c0 100644 --- a/server-common/src/test/java/org/apache/kafka/timeline/TimelineHashMapTest.java +++ b/server-common/src/test/java/org/apache/kafka/timeline/TimelineHashMapTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.timeline; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/server-common/src/test/java/org/apache/kafka/timeline/TimelineHashSetTest.java b/server-common/src/test/java/org/apache/kafka/timeline/TimelineHashSetTest.java index 45a19e97074d1..24a6cf08a39fc 100644 --- a/server-common/src/test/java/org/apache/kafka/timeline/TimelineHashSetTest.java +++ b/server-common/src/test/java/org/apache/kafka/timeline/TimelineHashSetTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.timeline; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/server-common/src/test/java/org/apache/kafka/timeline/TimelineIntegerTest.java b/server-common/src/test/java/org/apache/kafka/timeline/TimelineIntegerTest.java index 1fbae1f6873af..fac017c3e46ca 100644 --- a/server-common/src/test/java/org/apache/kafka/timeline/TimelineIntegerTest.java +++ b/server-common/src/test/java/org/apache/kafka/timeline/TimelineIntegerTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.timeline; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/server-common/src/test/java/org/apache/kafka/timeline/TimelineLongTest.java b/server-common/src/test/java/org/apache/kafka/timeline/TimelineLongTest.java index ed0a802cdd217..df14a013713c4 100644 --- a/server-common/src/test/java/org/apache/kafka/timeline/TimelineLongTest.java +++ b/server-common/src/test/java/org/apache/kafka/timeline/TimelineLongTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.timeline; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/server-common/src/test/java/org/apache/kafka/timeline/TimelineObjectTest.java b/server-common/src/test/java/org/apache/kafka/timeline/TimelineObjectTest.java index cef72942c8a09..001d867a6a877 100644 --- a/server-common/src/test/java/org/apache/kafka/timeline/TimelineObjectTest.java +++ b/server-common/src/test/java/org/apache/kafka/timeline/TimelineObjectTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.timeline; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/server-common/src/test/java/org/apache/kafka/timeline/TrackingSnapshotRegistry.java b/server-common/src/test/java/org/apache/kafka/timeline/TrackingSnapshotRegistry.java index 182051a3e88ca..5cf538167659f 100644 --- a/server-common/src/test/java/org/apache/kafka/timeline/TrackingSnapshotRegistry.java +++ b/server-common/src/test/java/org/apache/kafka/timeline/TrackingSnapshotRegistry.java @@ -17,7 +17,7 @@ package org.apache.kafka.timeline; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import java.util.ArrayList; import java.util.List; diff --git a/server/src/main/java/org/apache/kafka/server/AssignmentsManager.java b/server/src/main/java/org/apache/kafka/server/AssignmentsManager.java index b768463e7666a..0b4f000a4aef3 100644 --- a/server/src/main/java/org/apache/kafka/server/AssignmentsManager.java +++ b/server/src/main/java/org/apache/kafka/server/AssignmentsManager.java @@ -27,9 +27,9 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.AssignReplicasToDirsRequest; import org.apache.kafka.common.requests.AssignReplicasToDirsResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.internals.ExponentialBackoff; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.image.MetadataImage; import org.apache.kafka.image.TopicImage; import org.apache.kafka.queue.EventQueue; diff --git a/server/src/main/java/org/apache/kafka/server/BrokerLifecycleManager.java b/server/src/main/java/org/apache/kafka/server/BrokerLifecycleManager.java index f1a88a8fb9aed..98e182cfb5c40 100644 --- a/server/src/main/java/org/apache/kafka/server/BrokerLifecycleManager.java +++ b/server/src/main/java/org/apache/kafka/server/BrokerLifecycleManager.java @@ -27,8 +27,8 @@ import org.apache.kafka.common.requests.BrokerHeartbeatResponse; import org.apache.kafka.common.requests.BrokerRegistrationRequest; import org.apache.kafka.common.requests.BrokerRegistrationResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.metadata.BrokerState; import org.apache.kafka.metadata.VersionRange; import org.apache.kafka.queue.EventQueue; diff --git a/server/src/main/java/org/apache/kafka/server/FetchSessionCacheShard.java b/server/src/main/java/org/apache/kafka/server/FetchSessionCacheShard.java index a77148956be77..1543ab2be71c0 100644 --- a/server/src/main/java/org/apache/kafka/server/FetchSessionCacheShard.java +++ b/server/src/main/java/org/apache/kafka/server/FetchSessionCacheShard.java @@ -17,8 +17,8 @@ package org.apache.kafka.server; import org.apache.kafka.common.requests.FetchMetadata; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.internals.ImplicitLinkedHashCollection; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.server.FetchSession.EvictableKey; import org.apache.kafka.server.FetchSession.LastUsedKey; diff --git a/server/src/main/java/org/apache/kafka/server/NodeToControllerChannelManagerImpl.java b/server/src/main/java/org/apache/kafka/server/NodeToControllerChannelManagerImpl.java index c54fb97a65bdc..1306da48c5a7c 100644 --- a/server/src/main/java/org/apache/kafka/server/NodeToControllerChannelManagerImpl.java +++ b/server/src/main/java/org/apache/kafka/server/NodeToControllerChannelManagerImpl.java @@ -32,8 +32,8 @@ import org.apache.kafka.common.network.Selector; import org.apache.kafka.common.requests.AbstractRequest; import org.apache.kafka.common.security.JaasContext; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.raft.KRaftConfigs; import org.apache.kafka.server.common.ControllerRequestCompletionHandler; import org.apache.kafka.server.common.NodeToControllerChannelManager; diff --git a/server/src/main/java/org/apache/kafka/server/controller/ControllerRegistrationManager.java b/server/src/main/java/org/apache/kafka/server/controller/ControllerRegistrationManager.java index 7b8e20a64692b..f3ab825832875 100644 --- a/server/src/main/java/org/apache/kafka/server/controller/ControllerRegistrationManager.java +++ b/server/src/main/java/org/apache/kafka/server/controller/ControllerRegistrationManager.java @@ -22,9 +22,9 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.ControllerRegistrationRequest; import org.apache.kafka.common.requests.ControllerRegistrationResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.internals.ExponentialBackoff; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.image.MetadataDelta; import org.apache.kafka.image.MetadataImage; import org.apache.kafka.image.loader.LoaderManifest; diff --git a/server/src/main/java/org/apache/kafka/server/purgatory/DelayedFuture.java b/server/src/main/java/org/apache/kafka/server/purgatory/DelayedFuture.java index b9fde063f6583..49fd0280a52e4 100644 --- a/server/src/main/java/org/apache/kafka/server/purgatory/DelayedFuture.java +++ b/server/src/main/java/org/apache/kafka/server/purgatory/DelayedFuture.java @@ -18,7 +18,7 @@ package org.apache.kafka.server.purgatory; import org.apache.kafka.common.errors.TimeoutException; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/server/src/test/java/org/apache/kafka/server/KRaftTopicCreatorTest.java b/server/src/test/java/org/apache/kafka/server/KRaftTopicCreatorTest.java index 24c520d6ae76d..d1b728b94a177 100644 --- a/server/src/test/java/org/apache/kafka/server/KRaftTopicCreatorTest.java +++ b/server/src/test/java/org/apache/kafka/server/KRaftTopicCreatorTest.java @@ -43,8 +43,8 @@ import org.apache.kafka.common.security.auth.KafkaPrincipal; import org.apache.kafka.common.security.auth.KafkaPrincipalSerde; import org.apache.kafka.common.security.auth.SecurityProtocol; -import org.apache.kafka.common.utils.SecurityUtils; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.SecurityUtils; import org.apache.kafka.server.common.ControllerRequestCompletionHandler; import org.apache.kafka.server.common.NodeToControllerChannelManager; diff --git a/server/src/test/java/org/apache/kafka/server/requests/ProduceRequestTest.java b/server/src/test/java/org/apache/kafka/server/requests/ProduceRequestTest.java new file mode 100644 index 0000000000000..4dd43b609fcf1 --- /dev/null +++ b/server/src/test/java/org/apache/kafka/server/requests/ProduceRequestTest.java @@ -0,0 +1,322 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.kafka.server.requests; + +import kafka.server.KafkaBroker; + +import org.apache.kafka.clients.admin.Admin; +import org.apache.kafka.clients.admin.TopicDescription; +import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.TopicPartitionInfo; +import org.apache.kafka.common.Uuid; +import org.apache.kafka.common.compress.Compression; +import org.apache.kafka.common.config.TopicConfig; +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.TimestampType; +import org.apache.kafka.common.record.internal.DefaultRecordBatch; +import org.apache.kafka.common.record.internal.MemoryRecords; +import org.apache.kafka.common.record.internal.RecordBatch; +import org.apache.kafka.common.record.internal.SimpleRecord; +import org.apache.kafka.common.requests.ProduceRequest; +import org.apache.kafka.common.requests.ProduceResponse; +import org.apache.kafka.common.test.ClusterInstance; +import org.apache.kafka.common.test.api.ClusterTest; +import org.apache.kafka.common.test.api.ClusterTestDefaults; +import org.apache.kafka.server.IntegrationTestUtils; +import org.apache.kafka.server.metrics.KafkaYammerMetrics; + +import com.yammer.metrics.core.Meter; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.time.Duration; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ExecutionException; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * Integration tests for the produce request protocol. These tests require a running cluster and + * complement the unit tests in clients/src/test/java/org/apache/kafka/common/requests/ProduceRequestTest.java, + * which test request construction and serialization in isolation. + */ +@ClusterTestDefaults(brokers = 3) +public class ProduceRequestTest { + + private static final String TOPIC = "topic"; + private static final long FIVE_HOURS_IN_MS = Duration.ofHours(5).toMillis(); + private static final String INVALID_MESSAGE_CRC_RECORDS_PER_SEC = "InvalidMessageCrcRecordsPerSec"; + + private final ClusterInstance cluster; + + ProduceRequestTest(ClusterInstance cluster) { + this.cluster = cluster; + } + + @ClusterTest + public void testSimpleProduceRequest() throws Exception { + cluster.createTopic(TOPIC, 3, (short) 2); + TopicPartitionInfo partitionAndLeader = findPartitionWithLeader(); + int partition = partitionAndLeader.partition(); + int leaderId = partitionAndLeader.leader().id(); + sendAndCheckProduceResponse(leaderId, partition, + MemoryRecords.withRecords(Compression.NONE, + new SimpleRecord(System.currentTimeMillis(), "key".getBytes(), "value".getBytes())), + 0L); + + sendAndCheckProduceResponse(leaderId, partition, + MemoryRecords.withRecords(Compression.gzip().build(), + new SimpleRecord(System.currentTimeMillis(), "key1".getBytes(), "value1".getBytes()), + new SimpleRecord(System.currentTimeMillis(), "key2".getBytes(), "value2".getBytes())), + 1L); + } + + @ClusterTest + public void testProduceWithTimestampTooOld() throws Exception { + doTestProduceWithInvalidTimestamp( + TopicConfig.MESSAGE_TIMESTAMP_BEFORE_MAX_MS_CONFIG, + System.currentTimeMillis() - FIVE_HOURS_IN_MS + ); + } + + @ClusterTest + public void testProduceWithTimestampTooNew() throws Exception { + doTestProduceWithInvalidTimestamp( + TopicConfig.MESSAGE_TIMESTAMP_AFTER_MAX_MS_CONFIG, + System.currentTimeMillis() + FIVE_HOURS_IN_MS + ); + } + + @ClusterTest + public void testProduceToNonReplica() throws Exception { + cluster.createTopic(TOPIC, 1, (short) 1); + int leaderId = cluster.getLeaderBrokerId(new TopicPartition(TOPIC, 0)); + Uuid topicId = getTopicId(); + + int nonReplicaId = cluster.brokers().keySet().stream() + .filter(id -> id != leaderId) + .findFirst() + .orElseThrow(() -> new AssertionError("No non-replica broker found")); + + MemoryRecords records = MemoryRecords.withRecords(Compression.NONE, + new SimpleRecord("key".getBytes(), "value".getBytes())); + ProduceRequest request = ProduceRequest.builder(new ProduceRequestData() + .setTopicData(new ProduceRequestData.TopicProduceDataCollection(Collections.singletonList( + new ProduceRequestData.TopicProduceData() + .setTopicId(topicId) + .setPartitionData(Collections.singletonList( + new ProduceRequestData.PartitionProduceData() + .setIndex(0) + .setRecords(records)))) + .iterator())) + .setAcks((short) -1) + .setTimeoutMs(3000) + .setTransactionalId(null)).build(); + + ProduceResponse response = sendProduceRequest(nonReplicaId, request); + assertEquals(1, response.data().responses().size()); + var topicResponse = response.data().responses().iterator().next(); + assertEquals(1, topicResponse.partitionResponses().size()); + var partitionResponse = topicResponse.partitionResponses().get(0); + assertEquals(Errors.NOT_LEADER_OR_FOLLOWER, Errors.forCode(partitionResponse.errorCode())); + } + + @ClusterTest + public void testCorruptLz4ProduceRequest() throws Exception { + cluster.createTopic(TOPIC, 3, (short) 2); + TopicPartitionInfo partitionAndLeader = findPartitionWithLeader(); + int partition = partitionAndLeader.partition(); + int leaderId = partitionAndLeader.leader().id(); + Uuid topicId = getTopicId(); + + MemoryRecords memoryRecords = MemoryRecords.withRecords(Compression.lz4().build(), + new SimpleRecord(1000000L, "key".getBytes(), "value".getBytes())); + // Corrupt the lz4 frame checksum (not the kafka record CRC) to trigger CORRUPT_MESSAGE + int lz4ChecksumOffset = 6; + memoryRecords.buffer().array()[DefaultRecordBatch.RECORD_BATCH_OVERHEAD + lz4ChecksumOffset] = 0; + + ProduceRequest request = ProduceRequest.builder(new ProduceRequestData() + .setTopicData(new ProduceRequestData.TopicProduceDataCollection(Collections.singletonList( + new ProduceRequestData.TopicProduceData() + .setTopicId(topicId) + .setPartitionData(Collections.singletonList( + new ProduceRequestData.PartitionProduceData() + .setIndex(partition) + .setRecords(memoryRecords)))) + .iterator())) + .setAcks((short) -1) + .setTimeoutMs(3000) + .setTransactionalId(null)).build(); + + ProduceResponse response = sendProduceRequest(leaderId, request); + assertEquals(1, response.data().responses().size()); + var topicResponse = response.data().responses().iterator().next(); + assertEquals(1, topicResponse.partitionResponses().size()); + var partitionResponse = topicResponse.partitionResponses().get(0); + assertEquals(topicId, topicResponse.topicId()); + assertEquals(partition, partitionResponse.index()); + assertEquals(Errors.CORRUPT_MESSAGE, Errors.forCode(partitionResponse.errorCode())); + assertEquals(-1L, partitionResponse.baseOffset()); + assertEquals(-1L, partitionResponse.logAppendTimeMs()); + + long matchingMetricsCount = KafkaYammerMetrics.defaultRegistry().allMetrics().keySet().stream() + .filter(k -> k.getName().endsWith(INVALID_MESSAGE_CRC_RECORDS_PER_SEC)) + .count(); + assertEquals(1, matchingMetricsCount); + Meter meter = (Meter) KafkaYammerMetrics.defaultRegistry().allMetrics().entrySet().stream() + .filter(e -> e.getKey().getName().endsWith(INVALID_MESSAGE_CRC_RECORDS_PER_SEC)) + .map(Map.Entry::getValue) + .findFirst() + .orElseThrow(() -> new AssertionError("Metric not found: " + INVALID_MESSAGE_CRC_RECORDS_PER_SEC)); + assertTrue(meter.count() > 0); + } + + @ClusterTest + public void testZSTDProduceRequest() throws Exception { + cluster.createTopic(TOPIC, 1, (short) 1, + Map.of(TopicConfig.COMPRESSION_TYPE_CONFIG, "zstd")); + int leaderId = cluster.getLeaderBrokerId(new TopicPartition(TOPIC, 0)); + + MemoryRecords memoryRecords = MemoryRecords.withRecords(Compression.zstd().build(), + new SimpleRecord(System.currentTimeMillis(), "key".getBytes(), "value".getBytes())); + + // v7 uses topic name rather than topic ID + ProduceRequestData data = new ProduceRequestData() + .setTopicData(new ProduceRequestData.TopicProduceDataCollection(Collections.singletonList( + new ProduceRequestData.TopicProduceData() + .setName(TOPIC) + .setPartitionData(Collections.singletonList( + new ProduceRequestData.PartitionProduceData() + .setIndex(0) + .setRecords(memoryRecords)))) + .iterator())) + .setAcks((short) -1) + .setTimeoutMs(3000) + .setTransactionalId(null); + + ProduceResponse response = sendProduceRequest(leaderId, new ProduceRequest.Builder((short) 7, (short) 7, data).build()); + var topicResponse = response.data().responses().iterator().next(); + var partitionResponse = topicResponse.partitionResponses().get(0); + assertEquals(TOPIC, topicResponse.name()); + assertEquals(0, partitionResponse.index()); + assertEquals(Errors.NONE, Errors.forCode(partitionResponse.errorCode())); + assertEquals(0L, partitionResponse.baseOffset()); + assertEquals(-1L, partitionResponse.logAppendTimeMs()); + } + + private ProduceResponse sendProduceRequest(int brokerId, ProduceRequest request) throws IOException { + KafkaBroker broker = cluster.brokers().get(brokerId); + int port = broker.socketServer().boundPort(cluster.clientListener()); + return IntegrationTestUtils.connectAndReceive(request, port); + } + + private void sendAndCheckProduceResponse(int leaderId, int partition, + MemoryRecords records, long expectedOffset) throws IOException, ExecutionException, InterruptedException { + Uuid topicId = getTopicId(); + ProduceRequest request = ProduceRequest.builder(new ProduceRequestData() + .setTopicData(new ProduceRequestData.TopicProduceDataCollection(Collections.singletonList( + new ProduceRequestData.TopicProduceData() + .setTopicId(topicId) + .setPartitionData(Collections.singletonList( + new ProduceRequestData.PartitionProduceData() + .setIndex(partition) + .setRecords(records)))) + .iterator())) + .setAcks((short) -1) + .setTimeoutMs(3000) + .setTransactionalId(null)).build(); + + assertEquals(ApiKeys.PRODUCE.latestVersion(), request.version()); + ProduceResponse response = sendProduceRequest(leaderId, request); + assertEquals(1, response.data().responses().size()); + var topicResponse = response.data().responses().iterator().next(); + assertEquals(1, topicResponse.partitionResponses().size()); + var partitionResponse = topicResponse.partitionResponses().get(0); + assertEquals(topicId, topicResponse.topicId()); + assertEquals(partition, partitionResponse.index()); + assertEquals(Errors.NONE, Errors.forCode(partitionResponse.errorCode())); + assertEquals(expectedOffset, partitionResponse.baseOffset()); + assertEquals(-1L, partitionResponse.logAppendTimeMs()); + assertTrue(partitionResponse.recordErrors().isEmpty()); + } + + private void doTestProduceWithInvalidTimestamp(String timestampConfig, long recordTimestamp) throws Exception { + cluster.createTopic(TOPIC, 1, (short) 1, Map.of(timestampConfig, "1000")); + int leaderId = cluster.getLeaderBrokerId(new TopicPartition(TOPIC, 0)); + Uuid topicId = getTopicId(); + + ByteBuffer buf = ByteBuffer.allocate(512); + var builder = MemoryRecords.builder(buf, RecordBatch.MAGIC_VALUE_V2, + Compression.gzip().build(), TimestampType.CREATE_TIME, 0L); + builder.appendWithOffset(0, recordTimestamp, null, "hello".getBytes()); + builder.appendWithOffset(1, recordTimestamp, null, "there".getBytes()); + builder.appendWithOffset(2, recordTimestamp, null, "beautiful".getBytes()); + MemoryRecords records = builder.build(); + + ProduceResponse response = sendProduceRequest(leaderId, ProduceRequest.builder(new ProduceRequestData() + .setTopicData(new ProduceRequestData.TopicProduceDataCollection(Collections.singletonList( + new ProduceRequestData.TopicProduceData() + .setTopicId(topicId) + .setPartitionData(Collections.singletonList( + new ProduceRequestData.PartitionProduceData() + .setIndex(0) + .setRecords(records)))) + .iterator())) + .setAcks((short) -1) + .setTimeoutMs(3000) + .setTransactionalId(null)).build()); + + assertEquals(1, response.data().responses().size()); + var topicResponse = response.data().responses().iterator().next(); + assertEquals(1, topicResponse.partitionResponses().size()); + var partitionResponse = topicResponse.partitionResponses().get(0); + assertEquals(topicId, topicResponse.topicId()); + assertEquals(0, partitionResponse.index()); + assertEquals(Errors.INVALID_TIMESTAMP, Errors.forCode(partitionResponse.errorCode())); + assertEquals(3, partitionResponse.recordErrors().size()); + for (int i = 0; i < partitionResponse.recordErrors().size(); i++) { + assertEquals(i, partitionResponse.recordErrors().get(i).batchIndex()); + assertNotNull(partitionResponse.recordErrors().get(i).batchIndexErrorMessage()); + } + assertEquals("One or more records have been rejected due to invalid timestamp", + partitionResponse.errorMessage()); + } + + private Uuid getTopicId() throws ExecutionException, InterruptedException { + try (Admin admin = cluster.admin()) { + return admin.describeTopics(List.of(TOPIC)) + .topicNameValues().get(TOPIC).get().topicId(); + } + } + + private TopicPartitionInfo findPartitionWithLeader() throws ExecutionException, InterruptedException { + try (Admin admin = cluster.admin()) { + TopicDescription desc = admin.describeTopics(List.of(TOPIC)) + .topicNameValues().get(TOPIC).get(); + return desc.partitions().stream() + .filter(p -> p.leader() != null && p.leader().id() != -1) + .findFirst() + .orElseThrow(() -> new AssertionError("No partition with leader found for topic " + TOPIC)); + } + } +} diff --git a/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorService.java b/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorService.java index d5e11424486cb..1a30a8a13a351 100644 --- a/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorService.java +++ b/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorService.java @@ -39,9 +39,9 @@ import org.apache.kafka.common.requests.ReadShareGroupStateSummaryResponse; import org.apache.kafka.common.requests.RequestContext; import org.apache.kafka.common.requests.WriteShareGroupStateResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.common.runtime.CoordinatorEventProcessor; import org.apache.kafka.coordinator.common.runtime.CoordinatorLoader; import org.apache.kafka.coordinator.common.runtime.CoordinatorRecord; diff --git a/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorShard.java b/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorShard.java index 9eb4ea3f0da5f..dac6f3cc98055 100644 --- a/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorShard.java +++ b/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorShard.java @@ -38,8 +38,8 @@ import org.apache.kafka.common.requests.ReadShareGroupStateSummaryResponse; import org.apache.kafka.common.requests.TransactionResult; import org.apache.kafka.common.requests.WriteShareGroupStateResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.common.runtime.CoordinatorExecutor; import org.apache.kafka.coordinator.common.runtime.CoordinatorMetadataDelta; import org.apache.kafka.coordinator.common.runtime.CoordinatorMetadataImage; diff --git a/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorOffsetsManagerTest.java b/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorOffsetsManagerTest.java index 73d72bde9f01e..1cd377e740a67 100644 --- a/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorOffsetsManagerTest.java +++ b/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorOffsetsManagerTest.java @@ -18,7 +18,7 @@ package org.apache.kafka.coordinator.share; import org.apache.kafka.common.Uuid; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.server.share.SharePartitionKey; import org.apache.kafka.timeline.SnapshotRegistry; diff --git a/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorServiceTest.java b/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorServiceTest.java index 6ff5ab4c1150f..8800fbd233ac3 100644 --- a/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorServiceTest.java +++ b/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorServiceTest.java @@ -38,9 +38,9 @@ import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.common.runtime.CoordinatorRecord; import org.apache.kafka.coordinator.common.runtime.CoordinatorRuntime; import org.apache.kafka.coordinator.common.runtime.MetadataImageBuilder; diff --git a/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorShardTest.java b/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorShardTest.java index ecdbb991554e5..f1b6a8b1260cf 100644 --- a/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorShardTest.java +++ b/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorShardTest.java @@ -35,9 +35,9 @@ import org.apache.kafka.common.requests.ReadShareGroupStateResponse; import org.apache.kafka.common.requests.ReadShareGroupStateSummaryResponse; import org.apache.kafka.common.requests.WriteShareGroupStateResponse; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.common.runtime.CoordinatorMetadataImage; import org.apache.kafka.coordinator.common.runtime.CoordinatorMetrics; import org.apache.kafka.coordinator.common.runtime.CoordinatorMetricsShard; diff --git a/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/metrics/ShareCoordinatorMetricsTest.java b/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/metrics/ShareCoordinatorMetricsTest.java index 6797c5e53d745..1f88d536835c9 100644 --- a/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/metrics/ShareCoordinatorMetricsTest.java +++ b/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/metrics/ShareCoordinatorMetricsTest.java @@ -21,8 +21,8 @@ import org.apache.kafka.common.internals.Topic; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.metrics.internals.MetricsUtils; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.timeline.SnapshotRegistry; import org.junit.jupiter.api.Test; diff --git a/shell/src/main/java/org/apache/kafka/shell/node/LocalShellNode.java b/shell/src/main/java/org/apache/kafka/shell/node/LocalShellNode.java index 8e4eae2f436e6..cb9dbfd9cbfa7 100644 --- a/shell/src/main/java/org/apache/kafka/shell/node/LocalShellNode.java +++ b/shell/src/main/java/org/apache/kafka/shell/node/LocalShellNode.java @@ -17,7 +17,7 @@ package org.apache.kafka.shell.node; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.image.node.MetadataLeafNode; import org.apache.kafka.image.node.MetadataNode; diff --git a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerConfig.java b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerConfig.java index 29f117cd54e55..ec9d9ba826352 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerConfig.java +++ b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerConfig.java @@ -34,7 +34,7 @@ import static org.apache.kafka.common.config.ConfigDef.Type.INT; import static org.apache.kafka.common.config.ConfigDef.Type.LONG; import static org.apache.kafka.common.config.ConfigDef.Type.SHORT; -import static org.apache.kafka.common.utils.ConfigUtils.configMapToRedactedString; +import static org.apache.kafka.common.utils.internals.ConfigUtils.configMapToRedactedString; /** * This class defines the configuration of topic based {@link org.apache.kafka.server.log.remote.storage.RemoteLogMetadataManager} implementation. diff --git a/storage/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogManager.java b/storage/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogManager.java index f8943c68e1a18..8abd070ca98e0 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogManager.java +++ b/storage/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogManager.java @@ -38,11 +38,11 @@ import org.apache.kafka.common.record.internal.RemoteLogInputStream; import org.apache.kafka.common.requests.FetchRequest; import org.apache.kafka.common.utils.ChildFirstClassLoader; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.BufferSupplier; import org.apache.kafka.common.utils.internals.CloseableIterator; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.common.utils.internals.ThreadUtils; import org.apache.kafka.server.common.CheckpointFile; import org.apache.kafka.server.common.OffsetAndEpoch; diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CleanShutdownFileHandler.java b/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CleanShutdownFileHandler.java index 4f476f3a0557b..d5fff2e412055 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CleanShutdownFileHandler.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CleanShutdownFileHandler.java @@ -17,8 +17,8 @@ package org.apache.kafka.storage.internals.checkpoint; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.server.util.Json; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/epoch/LeaderEpochFileCache.java b/storage/src/main/java/org/apache/kafka/storage/internals/epoch/LeaderEpochFileCache.java index 568dc05c1e6a8..49a97f6c0d16c 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/epoch/LeaderEpochFileCache.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/epoch/LeaderEpochFileCache.java @@ -17,7 +17,7 @@ package org.apache.kafka.storage.internals.epoch; import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.server.util.Scheduler; import org.apache.kafka.storage.internals.checkpoint.LeaderEpochCheckpointFile; import org.apache.kafka.storage.internals.log.EpochEntry; diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/log/Cleaner.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/Cleaner.java index 9ec1c3e302d0e..5c111cc50f353 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/log/Cleaner.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/Cleaner.java @@ -26,10 +26,10 @@ import org.apache.kafka.common.record.internal.MutableRecordBatch; import org.apache.kafka.common.record.internal.Record; import org.apache.kafka.common.record.internal.RecordBatch; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.internals.BufferSupplier; import org.apache.kafka.common.utils.internals.CloseableIterator; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.storage.internals.utils.Throttler; import org.slf4j.Logger; diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/log/LocalLog.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/LocalLog.java index 5649b674a6791..6f88b3387e778 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/log/LocalLog.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/LocalLog.java @@ -25,9 +25,9 @@ import org.apache.kafka.common.record.internal.FileLogInputStream; import org.apache.kafka.common.record.internal.FileRecords; import org.apache.kafka.common.record.internal.MemoryRecords; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.server.util.Scheduler; import org.slf4j.Logger; diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/log/LogCleaner.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogCleaner.java index 72acdf3cfc13a..5b962f8fe457c 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/log/LogCleaner.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogCleaner.java @@ -20,8 +20,8 @@ import org.apache.kafka.common.config.AbstractConfig; import org.apache.kafka.common.config.ConfigException; import org.apache.kafka.common.errors.KafkaStorageException; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.config.BrokerReconfigurable; import org.apache.kafka.server.config.ServerConfigs; import org.apache.kafka.server.metrics.KafkaMetricsGroup; diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/log/LogConfig.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogConfig.java index 7c5153825cc58..2e520cb905ca4 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/log/LogConfig.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogConfig.java @@ -27,8 +27,8 @@ import org.apache.kafka.common.errors.InvalidConfigurationException; import org.apache.kafka.common.record.TimestampType; import org.apache.kafka.common.record.internal.CompressionType; -import org.apache.kafka.common.utils.ConfigUtils; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.ConfigUtils; import org.apache.kafka.server.config.QuotaConfig; import org.apache.kafka.server.config.ServerLogConfigs; import org.apache.kafka.server.config.ServerTopicConfigSynonyms; diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/log/LogLoader.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogLoader.java index dca7e298ceb08..e088de3445980 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/log/LogLoader.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogLoader.java @@ -19,9 +19,9 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.InvalidOffsetException; import org.apache.kafka.common.errors.KafkaStorageException; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.server.util.Scheduler; import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache; diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerStateManager.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerStateManager.java index 4d8772512e3ed..297d209d38fac 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerStateManager.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerStateManager.java @@ -20,11 +20,11 @@ import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.MessageUtil; import org.apache.kafka.common.record.internal.RecordBatch; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.ByteUtils; import org.apache.kafka.common.utils.internals.Crc32C; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.server.log.remote.metadata.storage.generated.ProducerSnapshot; import org.slf4j.Logger; diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/log/UnifiedLog.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/UnifiedLog.java index 8d38a02d209dc..f5e1f8de59e0a 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/log/UnifiedLog.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/UnifiedLog.java @@ -42,9 +42,9 @@ import org.apache.kafka.common.record.internal.RecordVersion; import org.apache.kafka.common.record.internal.Records; import org.apache.kafka.common.requests.ListOffsetsRequest; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.common.utils.internals.PrimitiveRef; import org.apache.kafka.server.common.OffsetAndEpoch; import org.apache.kafka.server.common.RequestLocal; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorage.java b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorage.java index 4f9884dd48b1e..fdf56db8e5013 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorage.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorage.java @@ -20,7 +20,7 @@ import org.apache.kafka.common.TopicIdPartition; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.errors.InvalidConfigurationException; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.server.log.remote.storage.LocalTieredStorageListener.LocalTieredStorageListeners; import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentMetadata.CustomMetadata; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2StoreIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2StoreIntegrationTest.java index d662a91a914d6..6cc843dde6494 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2StoreIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2StoreIntegrationTest.java @@ -1823,7 +1823,7 @@ public void shouldHandleWindowKeyQuery( final Integer key, final Instant timeFrom, final Instant timeTo, - final Function valueExtactor, + final Function valueExtractor, final Set expectedValues) { final WindowKeyQuery query = WindowKeyQuery.withKeyAndWindowStartRange( @@ -1864,7 +1864,7 @@ public void shouldHandleWindowKeyQuery( try (final WindowStoreIterator iterator = queryResult.get(partition).getResult()) { while (iterator.hasNext()) { - actualValues.add(valueExtactor.apply(iterator.next().value)); + actualValues.add(valueExtractor.apply(iterator.next().value)); } } assertThat(queryResult.get(partition).getExecutionInfo(), is(empty())); @@ -1877,7 +1877,7 @@ public void shouldHandleWindowKeyQuery( public void shouldHandleWindowRangeQuery( final Instant timeFrom, final Instant timeTo, - final Function valueExtactor, + final Function valueExtractor, final Set expectedValues) { final WindowRangeQuery query = WindowRangeQuery.withWindowStartRange(timeFrom, timeTo); @@ -1914,7 +1914,7 @@ public void shouldHandleWindowRangeQuery( try (final KeyValueIterator, V> iterator = queryResult.get(partition).getResult()) { while (iterator.hasNext()) { - actualValues.add(valueExtactor.apply(iterator.next().value)); + actualValues.add(valueExtractor.apply(iterator.next().value)); } } assertThat(queryResult.get(partition).getExecutionInfo(), is(empty())); @@ -2057,4 +2057,4 @@ private static Properties streamsConfiguration(final boolean cache, final boolea StreamsTestUtils.maybeSetDslStoreFormatHeaders(config, withHeaders); return config; } -} \ No newline at end of file +} diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsCloseOptionsIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsCloseOptionsIntegrationTest.java index 9615e4d78ba2b..db68b099ba197 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsCloseOptionsIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsCloseOptionsIntegrationTest.java @@ -115,7 +115,7 @@ public void before(final TestInfo testName) throws Exception { streamsConfig.put(ConsumerConfig.HEARTBEAT_INTERVAL_MS_CONFIG, 100); streamsConfig.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest"); // In this test, we set the SESSION_TIMEOUT_MS_CONFIG high in order to show that the call to - // `close(CloseOptions)` can remove the application from the Consumder Groups successfully. + // `close(CloseOptions)` can remove the application from the Consumer Groups successfully. streamsConfig.put(ConsumerConfig.SESSION_TIMEOUT_MS_CONFIG, Integer.MAX_VALUE); streamsConfig.putAll(commonClientConfig); diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionDurabilityIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionDurabilityIntegrationTest.java index 511d7675f4c4f..a864e4b0b6ed0 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionDurabilityIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionDurabilityIntegrationTest.java @@ -158,7 +158,7 @@ public void shouldRecoverBufferAfterShutdown(final boolean withHeaders, final Te try { // start by putting some stuff in the buffer // note, we send all input records to partition 0 - // to make sure that supppress doesn't erroneously send records to other partitions. + // to make sure that suppress doesn't erroneously send records to other partitions. produceSynchronouslyToPartitionZero( input, asList( @@ -316,4 +316,4 @@ private static void produceSynchronouslyToPartitionZero(final String topic, fina )); IntegrationTestUtils.produceSynchronously(producerConfig, false, topic, Optional.of(0), toProduce); } -} \ No newline at end of file +} diff --git a/streams/integration-tests/src/test/scala/org/apache/kafka/streams/integration/WordCountTest.scala b/streams/integration-tests/src/test/scala/org/apache/kafka/streams/integration/WordCountTest.scala index bb827afd63832..8ffaee9329162 100644 --- a/streams/integration-tests/src/test/scala/org/apache/kafka/streams/integration/WordCountTest.scala +++ b/streams/integration-tests/src/test/scala/org/apache/kafka/streams/integration/WordCountTest.scala @@ -28,9 +28,10 @@ import org.apache.kafka.streams.scala.kstream._ import org.apache.kafka.streams.integration.utils.{EmbeddedKafkaCluster, IntegrationTestUtils} import org.apache.kafka.clients.consumer.ConsumerConfig import org.apache.kafka.clients.producer.ProducerConfig -import org.apache.kafka.common.utils.{MockTime, Utils} +import org.apache.kafka.common.utils.Utils import org.apache.kafka.common.serialization.{LongDeserializer, StringDeserializer, StringSerializer} import org.apache.kafka.base.test.TestUtils +import org.apache.kafka.server.util.MockTime import org.junit.jupiter.api.Tag import java.io.File diff --git a/streams/integration-tests/src/test/scala/org/apache/kafka/streams/integration/utils/StreamToTableJoinScalaIntegrationTestBase.scala b/streams/integration-tests/src/test/scala/org/apache/kafka/streams/integration/utils/StreamToTableJoinScalaIntegrationTestBase.scala index f77a4256cda79..6f6da0da333bb 100644 --- a/streams/integration-tests/src/test/scala/org/apache/kafka/streams/integration/utils/StreamToTableJoinScalaIntegrationTestBase.scala +++ b/streams/integration-tests/src/test/scala/org/apache/kafka/streams/integration/utils/StreamToTableJoinScalaIntegrationTestBase.scala @@ -19,9 +19,10 @@ package org.apache.kafka.streams.integration.utils import org.apache.kafka.clients.consumer.ConsumerConfig import org.apache.kafka.clients.producer.ProducerConfig import org.apache.kafka.common.serialization._ -import org.apache.kafka.common.utils.{MockTime, Utils} +import org.apache.kafka.common.utils.Utils import org.apache.kafka.streams._ import org.apache.kafka.base.test.TestUtils +import org.apache.kafka.server.util.MockTime import org.junit.jupiter.api._ import java.io.File diff --git a/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java b/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java index a0e407e9bb77e..5403dbdea1868 100644 --- a/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java +++ b/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java @@ -36,10 +36,10 @@ import org.apache.kafka.common.metrics.Sensor; import org.apache.kafka.common.metrics.Sensor.RecordingLevel; import org.apache.kafka.common.serialization.Serializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.errors.InvalidStateStoreException; import org.apache.kafka.streams.errors.InvalidStateStorePartitionException; import org.apache.kafka.streams.errors.ProcessorStateException; diff --git a/streams/src/main/java/org/apache/kafka/streams/kstream/KStream.java b/streams/src/main/java/org/apache/kafka/streams/kstream/KStream.java index acbe1a6b7e251..5ccc84a12750c 100644 --- a/streams/src/main/java/org/apache/kafka/streams/kstream/KStream.java +++ b/streams/src/main/java/org/apache/kafka/streams/kstream/KStream.java @@ -757,7 +757,7 @@ KGroupedStream groupBy(final KeyValueMapperYou can retrieve all generated internal topic names via {@link Topology#describe()}. * To explicitly set key/value serdes, to customize the names of the repartition and changelog topic, or to * customize the used state store, use {@link #join(KStream, ValueJoiner, JoinWindows, StreamJoined)}. - * For more control over the repartitioning, use {@link #repartition(Repartitioned)} on eiter input before {@code join()}. + * For more control over the repartitioning, use {@link #repartition(Repartitioned)} on either input before {@code join()}. * * @param rightStream * the {@code KStream} to be joined with this stream @@ -1592,4 +1592,4 @@ KStream processValues( final Named named, final String... stateStoreNames ); -} \ No newline at end of file +} diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/AbstractTask.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/AbstractTask.java index 6a6333537cf9d..f7c18daa5a8cd 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/AbstractTask.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/AbstractTask.java @@ -18,7 +18,7 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.TimeoutException; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.TopologyConfig.TaskConfig; import org.apache.kafka.streams.errors.StreamsException; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ActiveTaskCreator.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ActiveTaskCreator.java index 1d5b7fbf7ed01..96590df079390 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ActiveTaskCreator.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ActiveTaskCreator.java @@ -23,8 +23,8 @@ import org.apache.kafka.common.MetricName; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.metrics.Sensor; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KafkaClientSupplier; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.errors.StreamsException; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ChangelogTopics.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ChangelogTopics.java index aaf8ba16a51b2..781bca7d09358 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ChangelogTopics.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ChangelogTopics.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.processor.internals; import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.processor.TaskId; import org.apache.kafka.streams.processor.internals.InternalTopologyBuilder.TopicsInfo; import org.apache.kafka.streams.processor.internals.TopologyMetadata.Subtopology; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdater.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdater.java index 1dea3f36eaca4..a3c0c2fb56ca1 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdater.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdater.java @@ -30,8 +30,8 @@ import org.apache.kafka.common.metrics.stats.Value; import org.apache.kafka.common.metrics.stats.WindowedCount; import org.apache.kafka.common.metrics.stats.WindowedSum; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.errors.StreamsException; import org.apache.kafka.streams.errors.TaskCorruptedException; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImpl.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImpl.java index 12aa60c0c79a4..8e7347e6fa472 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImpl.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImpl.java @@ -25,10 +25,10 @@ import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.metrics.Sensor; import org.apache.kafka.common.serialization.ByteArrayDeserializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.FixedOrderMap; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.errors.DeserializationExceptionHandler; import org.apache.kafka.streams.errors.ErrorHandlerContext; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateUpdateTask.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateUpdateTask.java index b5f8b464053e7..3717859845155 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateUpdateTask.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateUpdateTask.java @@ -18,9 +18,9 @@ import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.errors.DeserializationExceptionHandler; import org.apache.kafka.streams.errors.ProcessingExceptionHandler; import org.apache.kafka.streams.errors.StreamsException; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStreamThread.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStreamThread.java index 2f53a6afa6909..bede888525ad9 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStreamThread.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStreamThread.java @@ -27,8 +27,8 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.internals.KafkaFutureImpl; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.errors.ProcessingExceptionHandler; import org.apache.kafka.streams.errors.StreamsException; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopicManager.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopicManager.java index 554a646b48461..cfb376f0d1483 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopicManager.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopicManager.java @@ -38,9 +38,9 @@ import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.serialization.ByteArrayDeserializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.errors.StreamsException; import org.apache.kafka.streams.processor.internals.ClientUtils.QuietConsumerConfig; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/PartitionGroup.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/PartitionGroup.java index 95c5fc29f257e..f069c8e68b0ab 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/PartitionGroup.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/PartitionGroup.java @@ -19,7 +19,7 @@ import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.metrics.Sensor; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.slf4j.Logger; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorStateManager.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorStateManager.java index 0992d33f70095..ab0a9806c4523 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorStateManager.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorStateManager.java @@ -18,8 +18,8 @@ import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.internals.FixedOrderMap; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.errors.ProcessorStateException; import org.apache.kafka.streams.errors.StreamsException; import org.apache.kafka.streams.errors.TaskCorruptedException; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordCollectorImpl.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordCollectorImpl.java index c4178733ef319..dd9baeb67433d 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordCollectorImpl.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordCollectorImpl.java @@ -39,7 +39,7 @@ import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Sensor; import org.apache.kafka.common.serialization.Serializer; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.errors.ProductionExceptionHandler; import org.apache.kafka.streams.errors.StreamsException; import org.apache.kafka.streams.errors.TaskCorruptedException; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordDeserializer.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordDeserializer.java index 88e756d785a2d..2565c8659f65e 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordDeserializer.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordDeserializer.java @@ -20,7 +20,7 @@ import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.metrics.Sensor; import org.apache.kafka.common.record.TimestampType; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.errors.DeserializationExceptionHandler; import org.apache.kafka.streams.errors.StreamsException; import org.apache.kafka.streams.errors.internals.DefaultErrorHandlerContext; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordQueue.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordQueue.java index faa90572ca524..3d3d4de759963 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordQueue.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordQueue.java @@ -19,7 +19,7 @@ import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.metrics.Sensor; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.errors.DeserializationExceptionHandler; import org.apache.kafka.streams.errors.StreamsException; import org.apache.kafka.streams.processor.TimestampExtractor; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RepartitionTopics.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RepartitionTopics.java index 2a0358a866b3d..df3282ca2d97c 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RepartitionTopics.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RepartitionTopics.java @@ -20,7 +20,7 @@ import org.apache.kafka.common.Node; import org.apache.kafka.common.PartitionInfo; import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.errors.MissingSourceTopicException; import org.apache.kafka.streams.errors.StreamsException; import org.apache.kafka.streams.errors.TaskAssignmentException; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StandbyTaskCreator.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StandbyTaskCreator.java index 139efbd63de9f..e990d588fddd0 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StandbyTaskCreator.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StandbyTaskCreator.java @@ -18,7 +18,7 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.metrics.Sensor; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.internals.UpgradeFromValues; import org.apache.kafka.streams.processor.TaskId; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StateDirectory.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StateDirectory.java index 31ce759a3d84d..2eab9736b4acf 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StateDirectory.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StateDirectory.java @@ -19,9 +19,9 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.utils.Bytes; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.errors.LockException; import org.apache.kafka.streams.errors.ProcessorStateException; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StoreChangelogReader.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StoreChangelogReader.java index eab7da800d882..db5b415655004 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StoreChangelogReader.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StoreChangelogReader.java @@ -30,8 +30,8 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.InterruptException; import org.apache.kafka.common.errors.TimeoutException; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.errors.StreamsException; import org.apache.kafka.streams.errors.TaskCorruptedException; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamTask.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamTask.java index 05c049739b18c..495098f2a064c 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamTask.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamTask.java @@ -25,8 +25,8 @@ import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Sensor; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.TopologyConfig.TaskConfig; import org.apache.kafka.streams.errors.DeserializationExceptionHandler; import org.apache.kafka.streams.errors.ErrorHandlerContext; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamThread.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamThread.java index 833d42aeae4ea..f9a9ba0d5e215 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamThread.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamThread.java @@ -48,10 +48,10 @@ import org.apache.kafka.common.metrics.stats.WindowedSum; import org.apache.kafka.common.requests.StreamsGroupHeartbeatResponse; import org.apache.kafka.common.serialization.ByteArrayDeserializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.GroupProtocol; import org.apache.kafka.streams.KafkaClientSupplier; import org.apache.kafka.streams.StreamsConfig; @@ -1615,7 +1615,7 @@ private void resetOffsets(final Set partitions, final Exception // TODO // This may be null if the task we are currently processing was part of a named topology that was just removed. - // After named topologies are removed, we can update `topologyMetadata.offsetResetStrateg()` so it + // After named topologies are removed, we can update `topologyMetadata.offsetResetStrategy()` so it // will not return null any longer, and we can remove this check if (offsetResetStrategy != null) { if (offsetResetStrategy.isPresent()) { diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsMetadataState.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsMetadataState.java index ce019036e11b4..5d84c599cf4a0 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsMetadataState.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsMetadataState.java @@ -19,7 +19,7 @@ import org.apache.kafka.common.PartitionInfo; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.serialization.Serializer; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyQueryMetadata; import org.apache.kafka.streams.StreamsMetadata; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsPartitionAssignor.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsPartitionAssignor.java index f458629cf1f2c..745fec081d886 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsPartitionAssignor.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsPartitionAssignor.java @@ -29,9 +29,9 @@ import org.apache.kafka.common.PartitionInfo; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.TimeoutException; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.errors.MissingSourceTopicException; import org.apache.kafka.streams.errors.StreamsException; import org.apache.kafka.streams.errors.TaskAssignmentException; @@ -1129,7 +1129,7 @@ private boolean addClientAssignments(final Set statefulTasks, final List activePartitionsList = new ArrayList<>(); final List assignedActiveList = new ArrayList<>(); - final Set activeTasksRemovedPendingRevokation = populateActiveTaskAndPartitionsLists( + final Set activeTasksRemovedPendingRevocation = populateActiveTaskAndPartitionsLists( activePartitionsList, assignedActiveList, consumer, @@ -1142,7 +1142,7 @@ private boolean addClientAssignments(final Set statefulTasks, final Map> standbyTaskMap = buildStandbyTaskMap( consumer, standbyTaskAssignments.get(consumer), - activeTasksRemovedPendingRevokation, + activeTasksRemovedPendingRevocation, statefulTasks, partitionsForTask, clientMetadata.state @@ -1158,7 +1158,7 @@ private boolean addClientAssignments(final Set statefulTasks, AssignorError.NONE.code() ); - if (!activeTasksRemovedPendingRevokation.isEmpty()) { + if (!activeTasksRemovedPendingRevocation.isEmpty()) { // TODO: once KAFKA-10078 is resolved we can leave it to the client to trigger this rebalance log.info("Requesting followup rebalance be scheduled immediately by {} due to tasks changing ownership.", consumer); info.setNextRebalanceTime(0L); diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsProducer.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsProducer.java index c5fbdd788bc21..ec5bbbe9bbc38 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsProducer.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsProducer.java @@ -35,8 +35,8 @@ import org.apache.kafka.common.errors.ProducerFencedException; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.errors.UnknownProducerIdException; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.errors.StreamsException; import org.apache.kafka.streams.errors.TaskMigratedException; import org.apache.kafka.streams.internals.StreamsConfigUtils.ProcessingMode; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutionMetadata.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutionMetadata.java index 0e2f52446491f..dcc54800b16b0 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutionMetadata.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutionMetadata.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.processor.internals; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.internals.StreamsConfigUtils.ProcessingMode; import org.apache.kafka.streams.processor.TaskId; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutor.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutor.java index 641d9c72b1190..4735c91124c2e 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutor.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutor.java @@ -21,8 +21,8 @@ import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.TimeoutException; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.errors.StreamsException; import org.apache.kafka.streams.errors.TaskCorruptedException; import org.apache.kafka.streams.errors.TaskMigratedException; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskManager.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskManager.java index 4eb2ad36fc8ad..6834976756d54 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskManager.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskManager.java @@ -28,9 +28,9 @@ import org.apache.kafka.common.MetricName; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.TimeoutException; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.internals.ExponentialBackoff; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.errors.LockException; import org.apache.kafka.streams.errors.StreamsException; import org.apache.kafka.streams.errors.TaskCorruptedException; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/Tasks.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/Tasks.java index dd496e7a57e09..1f36007b76b9f 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/Tasks.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/Tasks.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.processor.internals; import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.processor.TaskId; import org.apache.kafka.streams.processor.internals.Task.State; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TopologyMetadata.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TopologyMetadata.java index fe04f2c4613f2..6b66a08333d4d 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TopologyMetadata.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TopologyMetadata.java @@ -20,7 +20,7 @@ import org.apache.kafka.common.KafkaFuture; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.internals.KafkaFutureImpl; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.TopologyConfig.TaskConfig; import org.apache.kafka.streams.errors.TopologyException; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/AssignorConfiguration.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/AssignorConfiguration.java index e13db1a4892cd..e3bc5452c2765 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/AssignorConfiguration.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/AssignorConfiguration.java @@ -19,8 +19,8 @@ import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.config.ConfigException; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.StreamsConfig.InternalConfig; import org.apache.kafka.streams.processor.assignment.AssignmentConfigs; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/CopartitionedTopicsEnforcer.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/CopartitionedTopicsEnforcer.java index 865db9e73b976..edcc6723e6d42 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/CopartitionedTopicsEnforcer.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/CopartitionedTopicsEnforcer.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.processor.internals.assignment; import org.apache.kafka.common.Cluster; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.errors.TopologyException; import org.apache.kafka.streams.processor.internals.InternalTopicConfig; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/Graph.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/Graph.java index 7f066bdccb741..7756e2a2fde17 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/Graph.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/Graph.java @@ -437,7 +437,7 @@ private void cancelNegativeCycles() { } private void cancelNegativeCycle(final V nodeInCycle, final Map parentNodes, final Map parentEdges) { - // Start from parentNode since nodeInCyle is used as exit condition in below loops + // Start from parentNode since nodeInCycle is used as exit condition in below loops final V parentNode = parentNodes.get(nodeInCycle); Edge parentEdge = parentEdges.get(nodeInCycle); diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/KafkaStreamsNamedTopologyWrapper.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/KafkaStreamsNamedTopologyWrapper.java index 943f00dc2e57b..5acc2f424a925 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/KafkaStreamsNamedTopologyWrapper.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/KafkaStreamsNamedTopologyWrapper.java @@ -22,7 +22,7 @@ import org.apache.kafka.common.errors.GroupSubscribedToTopicException; import org.apache.kafka.common.internals.KafkaFutureImpl; import org.apache.kafka.common.serialization.Serializer; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KafkaClientSupplier; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyQueryMetadata; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/RemoveNamedTopologyResult.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/RemoveNamedTopologyResult.java index a9c094f828102..dfb636bb3acbc 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/RemoveNamedTopologyResult.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/RemoveNamedTopologyResult.java @@ -18,7 +18,7 @@ import org.apache.kafka.common.KafkaFuture; import org.apache.kafka.common.internals.KafkaFutureImpl; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.slf4j.Logger; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutor.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutor.java index fc7550952be45..ff127e2071b4f 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutor.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutor.java @@ -19,8 +19,8 @@ import org.apache.kafka.common.KafkaFuture; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.internals.KafkaFutureImpl; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.errors.StreamsException; import org.apache.kafka.streams.errors.TaskMigratedException; import org.apache.kafka.streams.processor.internals.ProcessingThread; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskManager.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskManager.java index 53950c1008817..81a1bb02ff4c6 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskManager.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskManager.java @@ -18,8 +18,8 @@ import org.apache.kafka.common.KafkaFuture; import org.apache.kafka.common.internals.KafkaFutureImpl; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.errors.StreamsException; import org.apache.kafka.streams.processor.TaskId; import org.apache.kafka.streams.processor.internals.ReadOnlyTask; diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBuffer.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBuffer.java index 956d72f5ffa0b..d226e1fc24feb 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBuffer.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBuffer.java @@ -59,7 +59,7 @@ public class RocksDBTimeOrderedKeyValueBuffer implements TimeOrderedKeyVal private final boolean loggingEnabled; private int partition; private String changelogTopic; - private InternalProcessorContext iternalContext; + private InternalProcessorContext internalContext; private boolean minValid; public static class Builder implements StoreBuilder> { @@ -188,7 +188,7 @@ public String name() { @Override public void init(final StateStoreContext stateStoreContext, final StateStore root) { store.init(stateStoreContext, root); - iternalContext = ProcessorContextUtils.asInternalProcessorContext(stateStoreContext); + internalContext = ProcessorContextUtils.asInternalProcessorContext(stateStoreContext); partition = stateStoreContext.taskId().partition(); if (loggingEnabled) { changelogTopic = ProcessorContextUtils.changelogFor(stateStoreContext, name(), Boolean.TRUE); @@ -231,7 +231,7 @@ public void evictWhile(final Supplier predicate, final Consumer predicate, final Consumer(key, value, bufferValue.context())); @@ -332,7 +332,7 @@ private void logValue(final Bytes key, final BufferKey bufferKey, final BufferVa final ByteBuffer buffer = value.serialize(sizeOfBufferTime); buffer.putLong(bufferKey.time()); final byte[] array = buffer.array(); - ((RecordCollector.Supplier) iternalContext).recordCollector().send( + ((RecordCollector.Supplier) internalContext).recordCollector().send( changelogTopic, key, array, @@ -346,7 +346,7 @@ private void logValue(final Bytes key, final BufferKey bufferKey, final BufferVa } private void logTombstone(final Bytes key) { - ((RecordCollector.Supplier) iternalContext).recordCollector().send( + ((RecordCollector.Supplier) internalContext).recordCollector().send( changelogTopic, key, null, diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedSessionStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedSessionStore.java index 9e2caca3699eb..ab375907f5d9c 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedSessionStore.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedSessionStore.java @@ -124,11 +124,11 @@ public KeyValueIterator, byte[]> backwardFindSessions(final Byte @Override public byte[] fetchSession(final Bytes key, final long sessionStartTime, - final long sessiontEndTime) { + final long sessionEndTime) { return wrapped().fetchSession( key, sessionStartTime, - sessiontEndTime + sessionEndTime ); } diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/ThreadCache.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/ThreadCache.java index 90bac45871a2d..ddfc0e92c1300 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/ThreadCache.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/ThreadCache.java @@ -17,8 +17,8 @@ package org.apache.kafka.streams.state.internals; import org.apache.kafka.common.utils.Bytes; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.internals.CircularIterator; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.processor.internals.metrics.StreamsMetricsImpl; diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorder.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorder.java index 10e8cb804fece..43fe5181537db 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorder.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorder.java @@ -18,7 +18,7 @@ import org.apache.kafka.common.metrics.Gauge; import org.apache.kafka.common.metrics.Sensor; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.errors.ProcessorStateException; import org.apache.kafka.streams.processor.TaskId; import org.apache.kafka.streams.processor.internals.metrics.StreamsMetricsImpl; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamImplTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamImplTest.java index 1794a98bd319f..71bcef447f2e8 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamImplTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamImplTest.java @@ -1341,10 +1341,10 @@ public void shouldUseRecordMetadataTimestampExtractorWhenInternalRepartitioningT public void shouldPropagateRepartitionFlagAfterGlobalKTableJoin() { final StreamsBuilder builder = new StreamsBuilder(); final GlobalKTable globalKTable = builder.globalTable("globalTopic"); - final KeyValueMapper kvMappper = (k, v) -> k + v; + final KeyValueMapper kvMapper = (k, v) -> k + v; final ValueJoiner valueJoiner = (v1, v2) -> v1 + v2; builder.stream("topic").selectKey((k, v) -> v) - .join(globalKTable, kvMappper, valueJoiner) + .join(globalKTable, kvMapper, valueJoiner) .groupByKey() .count(); diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamSessionWindowAggregateProcessorTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamSessionWindowAggregateProcessorTest.java index 09004a6b2333d..b0c34a9611fab 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamSessionWindowAggregateProcessorTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamSessionWindowAggregateProcessorTest.java @@ -23,8 +23,8 @@ import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.LogCaptureAppender.Event; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.KeyValueTimestamp; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/AbstractProcessorContextTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/AbstractProcessorContextTest.java index ce45c608a4662..74cfa826a533b 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/AbstractProcessorContextTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/AbstractProcessorContextTest.java @@ -24,7 +24,7 @@ import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Bytes; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.processor.Cancellable; import org.apache.kafka.streams.processor.PunctuationType; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/ActiveTaskCreatorTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/ActiveTaskCreatorTest.java index 11f857820dafe..2b548ca0b75e2 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/ActiveTaskCreatorTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/ActiveTaskCreatorTest.java @@ -23,8 +23,8 @@ import org.apache.kafka.common.metrics.KafkaMetric; import org.apache.kafka.common.metrics.Measurable; import org.apache.kafka.common.metrics.Metrics; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.TopologyConfig; import org.apache.kafka.streams.errors.StreamsException; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImplTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImplTest.java index a86c7ff87ccec..ef8a769c19169 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImplTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImplTest.java @@ -26,8 +26,8 @@ import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.errors.LogAndContinueExceptionHandler; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateTaskTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateTaskTest.java index 60d8f3bba5ae7..2feea10bad63f 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateTaskTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateTaskTest.java @@ -25,8 +25,8 @@ import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.StringDeserializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.errors.ErrorHandlerContext; import org.apache.kafka.streams.errors.LogAndContinueExceptionHandler; import org.apache.kafka.streams.errors.LogAndFailExceptionHandler; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/PartitionGroupTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/PartitionGroupTest.java index 9b8d0fe2f0627..1f6d6c6b0d926 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/PartitionGroupTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/PartitionGroupTest.java @@ -29,9 +29,9 @@ import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.errors.LogAndContinueExceptionHandler; import org.apache.kafka.streams.processor.TimestampExtractor; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorStateManagerTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorStateManagerTest.java index 7a418bf9ab598..bcc4ab9c6d14c 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorStateManagerTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorStateManagerTest.java @@ -20,9 +20,9 @@ import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.errors.ProcessorStateException; @@ -635,7 +635,7 @@ public void shouldCommitAndCloseLegacyStoresWithUnknownOffsetPositions() throws assertThat(checkpointedOffsets, is(singletonMap(new TopicPartition(persistentStoreTopicName, 1), -4L))); try { - // Reopen to verify null commited offset + // Reopen to verify null committed offset stateMgr.registerStateStores(Arrays.asList(persistentStore, nonPersistentStore), context); assertNull(stateMgr.storeMetadata(persistentStorePartition).offset()); } finally { diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RecordCollectorTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RecordCollectorTest.java index 4923700666f6f..61c125058d54d 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RecordCollectorTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RecordCollectorTest.java @@ -45,8 +45,8 @@ import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.errors.DefaultProductionExceptionHandler; import org.apache.kafka.streams.errors.ErrorHandlerContext; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RecordDeserializerTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RecordDeserializerTest.java index a69b53211255c..2326f7a64b665 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RecordDeserializerTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RecordDeserializerTest.java @@ -25,7 +25,7 @@ import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.record.TimestampType; import org.apache.kafka.common.serialization.Serdes; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.errors.DeserializationExceptionHandler; import org.apache.kafka.streams.errors.ErrorHandlerContext; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RecordQueueTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RecordQueueTest.java index 1becc3d240d5d..2cb9a8a8d206b 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RecordQueueTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RecordQueueTest.java @@ -30,8 +30,8 @@ import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.utils.Bytes; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.errors.LogAndContinueExceptionHandler; import org.apache.kafka.streams.errors.LogAndFailExceptionHandler; import org.apache.kafka.streams.errors.StreamsException; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StandbyTaskTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StandbyTaskTest.java index 88ff231c31c96..b3a28e51770e2 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StandbyTaskTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StandbyTaskTest.java @@ -28,9 +28,9 @@ import org.apache.kafka.common.metrics.Sensor; import org.apache.kafka.common.metrics.stats.CumulativeSum; import org.apache.kafka.common.serialization.IntegerSerializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.TopologyConfig; import org.apache.kafka.streams.errors.LockException; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateConsumerTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateConsumerTest.java index afe01ff433c69..72c0fc38d8c6d 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateConsumerTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateConsumerTest.java @@ -20,7 +20,7 @@ import org.apache.kafka.clients.consumer.MockConsumer; import org.apache.kafka.clients.consumer.internals.AutoOffsetResetStrategy; import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateDirectoryTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateDirectoryTest.java index 6846b3d23620a..bb55285c4800b 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateDirectoryTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateDirectoryTest.java @@ -19,9 +19,9 @@ import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.TopologyConfig; import org.apache.kafka.streams.errors.ProcessorStateException; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateManagerUtilTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateManagerUtilTest.java index 7042e326bb3f4..963d8e45811d0 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateManagerUtilTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateManagerUtilTest.java @@ -17,8 +17,8 @@ package org.apache.kafka.streams.processor.internals; import org.apache.kafka.base.test.TestUtils; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.errors.LockException; import org.apache.kafka.streams.errors.ProcessorStateException; import org.apache.kafka.streams.processor.StateStore; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StoreChangelogReaderTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StoreChangelogReaderTest.java index 72954175f5b4a..f32ed66b71dd7 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StoreChangelogReaderTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StoreChangelogReaderTest.java @@ -33,8 +33,8 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.errors.StreamsException; import org.apache.kafka.streams.processor.StandbyUpdateListener.SuspendReason; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamTaskTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamTaskTest.java index e2665e6a66d66..421365e0cc3c1 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamTaskTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamTaskTest.java @@ -43,9 +43,9 @@ import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.TopologyConfig; import org.apache.kafka.streams.errors.DeserializationExceptionHandler; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamThreadTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamThreadTest.java index 6803f6b9a7008..eeb24423474c7 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamThreadTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamThreadTest.java @@ -59,9 +59,9 @@ import org.apache.kafka.common.requests.StreamsGroupHeartbeatResponse; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.CloseOptions; import org.apache.kafka.streams.GroupProtocol; import org.apache.kafka.streams.StreamsConfig; @@ -946,13 +946,13 @@ public void shouldRespectNumIterationsInMainLoopWithoutProcessingThreads() { runOnce(false); assertThat(thread.currentNumIterations(), equalTo(2)); - // system time based punctutation without processing any record, iteration stays as 2 + // system time based punctuation without processing any record, iteration stays as 2 mockTime.sleep(11L); runOnce(false); assertThat(thread.currentNumIterations(), equalTo(2)); - // system time based punctutation after processing a record, half iteration to 1 + // system time based punctuation after processing a record, half iteration to 1 mockTime.sleep(11L); addRecord(mockConsumer, ++offset, 5L); @@ -966,7 +966,7 @@ public void shouldRespectNumIterationsInMainLoopWithoutProcessingThreads() { assertThat(thread.currentNumIterations(), equalTo(3)); - // stream time based punctutation halves to 1 + // stream time based punctuation halves to 1 addRecord(mockConsumer, ++offset, 11L); runOnce(false); diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsMetadataStateTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsMetadataStateTest.java index ae4a19b79c4d0..4ea73fcbf0383 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsMetadataStateTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsMetadataStateTest.java @@ -20,7 +20,7 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.Serializer; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyQueryMetadata; import org.apache.kafka.streams.StreamsBuilder; import org.apache.kafka.streams.StreamsMetadata; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsProducerTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsProducerTest.java index 9998e94e808dd..5a7ffbf663db9 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsProducerTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsProducerTest.java @@ -35,8 +35,8 @@ import org.apache.kafka.common.errors.UnknownProducerIdException; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.ByteArraySerializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.errors.StreamsException; import org.apache.kafka.streams.errors.TaskMigratedException; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/TaskExecutorTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/TaskExecutorTest.java index 568998931c933..d2dd45bf23199 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/TaskExecutorTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/TaskExecutorTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.processor.internals; import org.apache.kafka.clients.consumer.ConsumerGroupMetadata; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/TaskManagerTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/TaskManagerTest.java index cc3cd12b91810..baee5286cae1a 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/TaskManagerTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/TaskManagerTest.java @@ -34,9 +34,9 @@ import org.apache.kafka.common.metrics.KafkaMetric; import org.apache.kafka.common.metrics.Measurable; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.errors.LockException; import org.apache.kafka.streams.errors.StreamsException; import org.apache.kafka.streams.errors.TaskCorruptedException; @@ -254,7 +254,7 @@ public void shouldLockAllTasksOnCorruptionWithProcessingThreads() { } @Test - public void shouldLockCommitableTasksOnCorruptionWithProcessingThreads() { + public void shouldLockCommittableTasksOnCorruptionWithProcessingThreads() { final StreamTask activeTask1 = statefulTask(taskId00, taskId00ChangelogPartitions) .inState(State.RUNNING) .withInputPartitions(taskId00Partitions).build(); diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/TasksTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/TasksTest.java index 30328735e9e5f..057158456fcf7 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/TasksTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/TasksTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.processor.internals; import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.processor.TaskId; import org.apache.kafka.streams.processor.internals.Task.State; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/KeyValueStoreTestDriver.java b/streams/src/test/java/org/apache/kafka/streams/state/KeyValueStoreTestDriver.java index eb55316495e40..51fe8f8797618 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/KeyValueStoreTestDriver.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/KeyValueStoreTestDriver.java @@ -24,8 +24,8 @@ import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.Serializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.errors.DefaultProductionExceptionHandler; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractDualSchemaRocksDBSegmentedBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractDualSchemaRocksDBSegmentedBytesStoreTest.java index ca664a9b9b3c8..8b44ea14154b2 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractDualSchemaRocksDBSegmentedBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractDualSchemaRocksDBSegmentedBytesStoreTest.java @@ -29,9 +29,9 @@ import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Bytes; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.StreamsConfig.InternalConfig; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractRocksDBSegmentedBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractRocksDBSegmentedBytesStoreTest.java index 2e05f841381fd..e89d0d76f3410 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractRocksDBSegmentedBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractRocksDBSegmentedBytesStoreTest.java @@ -33,9 +33,9 @@ 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.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.StreamsConfig.InternalConfig; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSegmentsTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSegmentsTest.java index c6162473bfa1e..21a72bd874a16 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSegmentsTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSegmentsTest.java @@ -23,7 +23,7 @@ import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.serialization.StringSerializer; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.errors.TaskCorruptedException; import org.apache.kafka.streams.processor.internals.MockStreamsMetrics; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSessionBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSessionBytesStoreTest.java index c36c6b16ad0e1..b6bee13912ffb 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSessionBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSessionBytesStoreTest.java @@ -28,8 +28,8 @@ import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.kstream.Windowed; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractWindowBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractWindowBytesStoreTest.java index a5d2103774637..82a9559a6d684 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractWindowBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractWindowBytesStoreTest.java @@ -26,8 +26,8 @@ import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.kstream.Windowed; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemoryKeyValueStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemoryKeyValueStoreTest.java index c68c00dc71aac..533199eb5aa30 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemoryKeyValueStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemoryKeyValueStoreTest.java @@ -23,7 +23,7 @@ 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.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.errors.InvalidStateStoreException; import org.apache.kafka.streams.processor.StateStoreContext; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemorySessionStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemorySessionStoreTest.java index b5d256623a421..28e5be304a535 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemorySessionStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemorySessionStoreTest.java @@ -24,7 +24,7 @@ import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.KeyValueTimestamp; import org.apache.kafka.streams.errors.InvalidStateStoreException; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentSessionStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentSessionStoreTest.java index b549e57538ba5..d984e0f69a8a1 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentSessionStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentSessionStoreTest.java @@ -24,7 +24,7 @@ import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.KeyValueTimestamp; import org.apache.kafka.streams.errors.InvalidStateStoreException; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentWindowStoreTest.java index 7bb60ee53946d..30c0dfcbb62de 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentWindowStoreTest.java @@ -26,7 +26,7 @@ import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsBuilder; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStoreTest.java index dd222334f5384..0694be843ff07 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStoreTest.java @@ -23,10 +23,10 @@ import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.common.utils.Bytes; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.internals.ByteUtils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.StreamsConfig.InternalConfig; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreTest.java index 4df8609207094..1e365c7b5609f 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreTest.java @@ -20,7 +20,7 @@ import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Bytes; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.processor.StateStore; import org.apache.kafka.streams.processor.internals.MockStreamsMetrics; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreWithHeadersTest.java index c38c1828a7d48..959eba7bfa3e5 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreWithHeadersTest.java @@ -22,7 +22,7 @@ import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Bytes; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.processor.StateStore; import org.apache.kafka.streams.processor.internals.MockStreamsMetrics; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreWithHeadersTest.java index c986f753fe2ee..7b393db64c125 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreWithHeadersTest.java @@ -25,9 +25,9 @@ import org.apache.kafka.common.serialization.ByteArraySerializer; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Bytes; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.kstream.Windowed; import org.apache.kafka.streams.processor.StateStore; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingVersionedKeyValueBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingVersionedKeyValueBytesStoreTest.java index 3579b425b5501..cc66f9f900607 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingVersionedKeyValueBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingVersionedKeyValueBytesStoreTest.java @@ -22,7 +22,7 @@ import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.common.utils.Bytes; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.processor.internals.MockStreamsMetrics; import org.apache.kafka.streams.state.ValueAndTimestamp; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ListValueStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ListValueStoreTest.java index 08890b7076a6b..8a24ef335b8d2 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ListValueStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ListValueStoreTest.java @@ -20,8 +20,8 @@ import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.common.serialization.Serdes; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.errors.InvalidStateStoreException; import org.apache.kafka.streams.processor.internals.MockStreamsMetrics; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MergedSortedCacheKeyValueBytesStoreIteratorTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MergedSortedCacheKeyValueBytesStoreIteratorTest.java index 1a63f835639d9..0676316588de2 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MergedSortedCacheKeyValueBytesStoreIteratorTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MergedSortedCacheKeyValueBytesStoreIteratorTest.java @@ -18,7 +18,7 @@ import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.utils.Bytes; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.processor.internals.MockStreamsMetrics; import org.apache.kafka.streams.state.KeyValueIterator; import org.apache.kafka.streams.state.KeyValueStore; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MergedSortedCacheWrappedWindowStoreIteratorTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MergedSortedCacheWrappedWindowStoreIteratorTest.java index 0675aaea48dde..54ec6665f7225 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MergedSortedCacheWrappedWindowStoreIteratorTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MergedSortedCacheWrappedWindowStoreIteratorTest.java @@ -21,7 +21,7 @@ import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Bytes; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.processor.internals.MockStreamsMetrics; import org.apache.kafka.streams.state.KeyValueIterator; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStoreTest.java index a4134b845fa6a..24ed73024735c 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStoreTest.java @@ -33,9 +33,9 @@ import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.common.utils.Bytes; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.processor.TaskId; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredSessionStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredSessionStoreTest.java index cb3eceb6313e0..6cb705770cc3f 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredSessionStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredSessionStoreTest.java @@ -33,9 +33,9 @@ import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.utils.Bytes; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.kstream.Windowed; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreTest.java index 8372e16678046..e164b0a24a97f 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreTest.java @@ -26,9 +26,9 @@ import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.utils.Bytes; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.errors.StreamsException; import org.apache.kafka.streams.processor.TaskId; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreWithHeadersTest.java index 6d50b5584d209..5591e25920ea7 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreWithHeadersTest.java @@ -27,9 +27,9 @@ import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.common.utils.Bytes; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.errors.StreamsException; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredWindowStoreTest.java index d311195270fac..9844bf38f612e 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredWindowStoreTest.java @@ -33,9 +33,9 @@ import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.utils.Bytes; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.kstream.Windowed; import org.apache.kafka.streams.processor.internals.ProcessorRecordContext; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBytesStoreTest.java index a0206d1b92ecf..988bb120e6a8d 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBytesStoreTest.java @@ -23,7 +23,7 @@ import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Bytes; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.processor.internals.MockStreamsMetrics; import org.apache.kafka.streams.processor.internals.ProcessorRecordContext; import org.apache.kafka.test.InternalMockProcessorContext; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/SegmentIteratorTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/SegmentIteratorTest.java index a2fd3065521e9..2e7323da51ac9 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/SegmentIteratorTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/SegmentIteratorTest.java @@ -20,7 +20,7 @@ import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Bytes; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.processor.internals.MockStreamsMetrics; import org.apache.kafka.streams.query.Position; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/StreamThreadStateStoreProviderTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/StreamThreadStateStoreProviderTest.java index 86a106fc99c46..7dfa9d6f228af 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/StreamThreadStateStoreProviderTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/StreamThreadStateStoreProviderTest.java @@ -28,10 +28,10 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serdes; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StoreQueryParameters; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.TopologyConfig; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ThreadCacheTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ThreadCacheTest.java index 93272fbaa0964..d2775c0f3bd06 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ThreadCacheTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ThreadCacheTest.java @@ -20,7 +20,7 @@ import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.utils.Bytes; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.processor.internals.MockStreamsMetrics; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedCachingPersistentWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedCachingPersistentWindowStoreTest.java index 0f89ede9af9d0..7ee21582544f8 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedCachingPersistentWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedCachingPersistentWindowStoreTest.java @@ -26,7 +26,7 @@ import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsBuilder; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreTest.java index ed8615a1ea276..98335725c6766 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreTest.java @@ -26,7 +26,7 @@ import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsBuilder; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/test-utils/src/main/java/org/apache/kafka/streams/TopologyTestDriver.java b/streams/test-utils/src/main/java/org/apache/kafka/streams/TopologyTestDriver.java index f9a85d83b0386..687825b1d1022 100644 --- a/streams/test-utils/src/main/java/org/apache/kafka/streams/TopologyTestDriver.java +++ b/streams/test-utils/src/main/java/org/apache/kafka/streams/TopologyTestDriver.java @@ -39,8 +39,8 @@ import org.apache.kafka.common.serialization.ByteArraySerializer; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Serializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.TopologyConfig.TaskConfig; import org.apache.kafka.streams.errors.LogAndContinueExceptionHandler; import org.apache.kafka.streams.errors.ProcessingExceptionHandler; diff --git a/streams/test-utils/src/main/java/org/apache/kafka/streams/processor/api/MockProcessorContext.java b/streams/test-utils/src/main/java/org/apache/kafka/streams/processor/api/MockProcessorContext.java index d44647526a839..6c6a55ca4c45c 100644 --- a/streams/test-utils/src/main/java/org/apache/kafka/streams/processor/api/MockProcessorContext.java +++ b/streams/test-utils/src/main/java/org/apache/kafka/streams/processor/api/MockProcessorContext.java @@ -22,8 +22,8 @@ import org.apache.kafka.common.metrics.Sensor; import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.common.utils.Bytes; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.StreamsMetrics; import org.apache.kafka.streams.Topology; diff --git a/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestUtils.java b/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestUtils.java index 60b2e26f9aa04..25e1f29ade668 100644 --- a/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestUtils.java +++ b/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestUtils.java @@ -42,7 +42,6 @@ import java.io.File; import java.io.IOException; -import java.lang.reflect.Field; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.nio.file.Files; diff --git a/tools/src/main/java/org/apache/kafka/tools/AclCommand.java b/tools/src/main/java/org/apache/kafka/tools/AclCommand.java index 19c5c6ea32880..8799a4f5d959b 100644 --- a/tools/src/main/java/org/apache/kafka/tools/AclCommand.java +++ b/tools/src/main/java/org/apache/kafka/tools/AclCommand.java @@ -30,9 +30,9 @@ import org.apache.kafka.common.resource.ResourcePatternFilter; import org.apache.kafka.common.resource.ResourceType; import org.apache.kafka.common.security.auth.KafkaPrincipal; -import org.apache.kafka.common.utils.SecurityUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.Exit; +import org.apache.kafka.common.utils.internals.SecurityUtils; import org.apache.kafka.security.authorizer.AclEntry; import org.apache.kafka.server.util.CommandDefaultOptions; import org.apache.kafka.server.util.CommandLineUtils; diff --git a/tools/src/main/java/org/apache/kafka/tools/BrokerApiVersionsCommand.java b/tools/src/main/java/org/apache/kafka/tools/BrokerApiVersionsCommand.java index 0f6e2810af9c5..66748dad6d628 100644 --- a/tools/src/main/java/org/apache/kafka/tools/BrokerApiVersionsCommand.java +++ b/tools/src/main/java/org/apache/kafka/tools/BrokerApiVersionsCommand.java @@ -44,10 +44,10 @@ import org.apache.kafka.common.requests.MetadataRequest; import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.security.auth.SecurityProtocol; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.Exit; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.server.util.CommandDefaultOptions; import org.apache.kafka.server.util.CommandLineUtils; diff --git a/tools/src/main/java/org/apache/kafka/tools/DelegationTokenCommand.java b/tools/src/main/java/org/apache/kafka/tools/DelegationTokenCommand.java index aa0d8c77982e6..e081a72168a2c 100644 --- a/tools/src/main/java/org/apache/kafka/tools/DelegationTokenCommand.java +++ b/tools/src/main/java/org/apache/kafka/tools/DelegationTokenCommand.java @@ -28,9 +28,9 @@ import org.apache.kafka.common.security.auth.KafkaPrincipal; import org.apache.kafka.common.security.token.delegation.DelegationToken; import org.apache.kafka.common.security.token.delegation.TokenInformation; -import org.apache.kafka.common.utils.SecurityUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.Exit; +import org.apache.kafka.common.utils.internals.SecurityUtils; import org.apache.kafka.server.util.CommandDefaultOptions; import org.apache.kafka.server.util.CommandLineUtils; diff --git a/tools/src/main/java/org/apache/kafka/tools/ManifestWorkspace.java b/tools/src/main/java/org/apache/kafka/tools/ManifestWorkspace.java index 305a91cfdc485..5cdffaeed7445 100644 --- a/tools/src/main/java/org/apache/kafka/tools/ManifestWorkspace.java +++ b/tools/src/main/java/org/apache/kafka/tools/ManifestWorkspace.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tools; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.connect.runtime.isolation.PluginSource; import org.apache.kafka.connect.runtime.isolation.PluginType; diff --git a/tools/src/main/java/org/apache/kafka/tools/PrintVersionAndExitAction.java b/tools/src/main/java/org/apache/kafka/tools/PrintVersionAndExitAction.java index 5a98270a43a4e..42fa3c47d87b7 100644 --- a/tools/src/main/java/org/apache/kafka/tools/PrintVersionAndExitAction.java +++ b/tools/src/main/java/org/apache/kafka/tools/PrintVersionAndExitAction.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tools; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.common.utils.internals.Exit; import net.sourceforge.argparse4j.inf.Argument; diff --git a/tools/src/main/java/org/apache/kafka/tools/ReplicaVerificationTool.java b/tools/src/main/java/org/apache/kafka/tools/ReplicaVerificationTool.java index 54bf8e928742a..16c23d10abbb1 100644 --- a/tools/src/main/java/org/apache/kafka/tools/ReplicaVerificationTool.java +++ b/tools/src/main/java/org/apache/kafka/tools/ReplicaVerificationTool.java @@ -48,10 +48,10 @@ import org.apache.kafka.common.requests.FetchResponse; import org.apache.kafka.common.requests.ListOffsetsRequest; import org.apache.kafka.common.serialization.StringDeserializer; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.Exit; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.server.util.CommandDefaultOptions; import org.apache.kafka.server.util.CommandLineUtils; import org.apache.kafka.server.util.ShutdownableThread; diff --git a/tools/src/test/java/org/apache/kafka/tools/AclCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/AclCommandTest.java index d4e3a4ff4583b..f55a7b207d395 100644 --- a/tools/src/test/java/org/apache/kafka/tools/AclCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/AclCommandTest.java @@ -32,10 +32,10 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; -import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.common.utils.LogCaptureAppender; -import org.apache.kafka.common.utils.SecurityUtils; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.common.utils.internals.Exit; +import org.apache.kafka.common.utils.internals.SecurityUtils; import org.apache.kafka.metadata.authorizer.StandardAuthorizer; import org.apache.logging.log4j.Level; diff --git a/tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java index 0c2e5d2ea0525..72f9f2d8b7f8d 100644 --- a/tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java @@ -72,8 +72,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import scala.jdk.javaapi.CollectionConverters; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -791,7 +789,7 @@ public void shouldAlterTopicConfig(boolean file) throws Exception { addedConfigs.put("delete.retention.ms", "1000000"); addedConfigs.put("min.insync.replicas", "2"); if (file) { - File f = kafka.utils.TestUtils.tempPropertiesFile(CollectionConverters.asScala(addedConfigs)); + File f = ToolsTestUtils.tempPropertiesFile(addedConfigs); filePath = f.getPath(); } @@ -1439,7 +1437,6 @@ public static Map concat(Map... maps) { return res; } - static class DummyAdminClient extends MockAdminClient { public DummyAdminClient(Node node) { super(List.of(node), node); diff --git a/tools/src/test/java/org/apache/kafka/tools/GetOffsetShellTest.java b/tools/src/test/java/org/apache/kafka/tools/GetOffsetShellTest.java index 208cf48404503..ab31fd8089caf 100644 --- a/tools/src/test/java/org/apache/kafka/tools/GetOffsetShellTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/GetOffsetShellTest.java @@ -35,7 +35,7 @@ import org.apache.kafka.common.test.api.ClusterTemplate; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.common.utils.internals.Exit; import org.apache.kafka.server.config.ServerLogConfigs; import org.apache.kafka.server.log.remote.metadata.storage.TopicBasedRemoteLogMetadataManagerConfig; diff --git a/tools/src/test/java/org/apache/kafka/tools/JmxToolTest.java b/tools/src/test/java/org/apache/kafka/tools/JmxToolTest.java index 01768802315d3..521a284a42125 100644 --- a/tools/src/test/java/org/apache/kafka/tools/JmxToolTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/JmxToolTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tools; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.common.utils.internals.Exit; import org.junit.jupiter.api.AfterAll; diff --git a/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java index 2f5f92a6ee7dc..511b2e08646e3 100644 --- a/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java @@ -16,12 +16,13 @@ */ package org.apache.kafka.tools; -import kafka.utils.TestUtils; - +import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.CreateTopicsResult; import org.apache.kafka.clients.admin.NewTopic; +import org.apache.kafka.clients.admin.TopicDescription; +import org.apache.kafka.common.Node; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; import org.apache.kafka.common.test.ClusterInstance; @@ -38,6 +39,7 @@ import java.nio.file.Path; import java.time.Duration; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -46,8 +48,7 @@ import java.util.Properties; import java.util.Set; import java.util.concurrent.ExecutionException; - -import scala.jdk.javaapi.CollectionConverters; +import java.util.stream.Collectors; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; @@ -71,7 +72,7 @@ public LeaderElectionCommandTest(ClusterInstance cluster) { } @ClusterTest - public void testAllTopicPartition() throws InterruptedException, ExecutionException { + public void testAllTopicPartition() throws Exception { String topic = "unclean-topic"; int partition = 0; List assignment = List.of(broker2, broker3); @@ -83,16 +84,16 @@ public void testAllTopicPartition() throws InterruptedException, ExecutionExcept TopicPartition topicPartition = new TopicPartition(topic, partition); - TestUtils.assertLeader(client, topicPartition, broker2); + assertLeader(client, topicPartition, broker2); cluster.shutdownBroker(broker3); - TestUtils.waitForBrokersOutOfIsr(client, - CollectionConverters.asScala(List.of(topicPartition)).toSet(), - CollectionConverters.asScala(List.of(broker3)).toSet() + waitForBrokersOutOfIsr(client, + Set.of(topicPartition), + Set.of(broker3) ); cluster.shutdownBroker(broker2); - TestUtils.assertNoLeader(client, topicPartition); + assertNoLeader(client, topicPartition); cluster.startBroker(broker3); - TestUtils.waitForOnlineBroker(client, broker3); + waitForOnlineBroker(client, broker3); assertEquals(0, LeaderElectionCommand.mainNoExit( "--bootstrap-server", cluster.bootstrapServers(), @@ -100,7 +101,7 @@ public void testAllTopicPartition() throws InterruptedException, ExecutionExcept "--all-topic-partitions" )); - TestUtils.assertLeader(client, topicPartition, broker3); + assertLeader(client, topicPartition, broker3); } } @@ -178,7 +179,7 @@ public void testCommandConfigAndDeprecatedConfigPresent() throws Exception { } @ClusterTest - public void testTopicPartition() throws InterruptedException, ExecutionException { + public void testTopicPartition() throws Exception { String topic = "unclean-topic"; int partition = 0; List assignment = List.of(broker2, broker3); @@ -189,17 +190,17 @@ public void testTopicPartition() throws InterruptedException, ExecutionException TopicPartition topicPartition = new TopicPartition(topic, partition); - TestUtils.assertLeader(client, topicPartition, broker2); + assertLeader(client, topicPartition, broker2); cluster.shutdownBroker(broker3); - TestUtils.waitForBrokersOutOfIsr(client, - CollectionConverters.asScala(List.of(topicPartition)).toSet(), - CollectionConverters.asScala(List.of(broker3)).toSet() + waitForBrokersOutOfIsr(client, + Set.of(topicPartition), + Set.of(broker3) ); cluster.shutdownBroker(broker2); - TestUtils.assertNoLeader(client, topicPartition); + assertNoLeader(client, topicPartition); cluster.startBroker(broker3); - TestUtils.waitForOnlineBroker(client, broker3); + waitForOnlineBroker(client, broker3); assertEquals(0, LeaderElectionCommand.mainNoExit( "--bootstrap-server", cluster.bootstrapServers(), @@ -208,7 +209,7 @@ public void testTopicPartition() throws InterruptedException, ExecutionException "--partition", Integer.toString(partition) )); - TestUtils.assertLeader(client, topicPartition, broker3); + assertLeader(client, topicPartition, broker3); } } @@ -227,17 +228,17 @@ public void testPathToJsonFile() throws Exception { TopicPartition topicPartition = new TopicPartition(topic, partition); - TestUtils.assertLeader(client, topicPartition, broker2); + assertLeader(client, topicPartition, broker2); cluster.shutdownBroker(broker3); - TestUtils.waitForBrokersOutOfIsr(client, - CollectionConverters.asScala(List.of(topicPartition)).toSet(), - CollectionConverters.asScala(List.of(broker3)).toSet() + waitForBrokersOutOfIsr(client, + Set.of(topicPartition), + Set.of(broker3) ); cluster.shutdownBroker(broker2); - TestUtils.assertNoLeader(client, topicPartition); + assertNoLeader(client, topicPartition); cluster.startBroker(broker3); - TestUtils.waitForOnlineBroker(client, broker3); + waitForOnlineBroker(client, broker3); Path topicPartitionPath = tempTopicPartitionFile(List.of(topicPartition)); @@ -247,12 +248,12 @@ public void testPathToJsonFile() throws Exception { "--path-to-json-file", topicPartitionPath.toString() )); - TestUtils.assertLeader(client, topicPartition, broker3); + assertLeader(client, topicPartition, broker3); } } @ClusterTest - public void testPreferredReplicaElection() throws InterruptedException, ExecutionException { + public void testPreferredReplicaElection() throws Exception { String topic = "preferred-topic"; int partition = 0; List assignment = List.of(broker2, broker3); @@ -266,14 +267,12 @@ public void testPreferredReplicaElection() throws InterruptedException, Executio TopicPartition topicPartition = new TopicPartition(topic, partition); - TestUtils.assertLeader(client, topicPartition, broker2); + assertLeader(client, topicPartition, broker2); cluster.shutdownBroker(broker2); - TestUtils.assertLeader(client, topicPartition, broker3); + assertLeader(client, topicPartition, broker3); cluster.startBroker(broker2); - TestUtils.waitForBrokersInIsr(client, topicPartition, - CollectionConverters.asScala(List.of(broker2)).toSet() - ); + waitForBrokersInIsr(client, topicPartition, Set.of(broker2)); assertEquals(0, LeaderElectionCommand.mainNoExit( "--bootstrap-server", cluster.bootstrapServers(), @@ -282,7 +281,7 @@ public void testPreferredReplicaElection() throws InterruptedException, Executio "--partition", Integer.toString(partition) )); - TestUtils.assertLeader(client, topicPartition, broker2); + assertLeader(client, topicPartition, broker2); } } @@ -319,18 +318,14 @@ public void testElectionResultOutput() throws Exception { topicPartition0 = new TopicPartition(topic, partition0); topicPartition1 = new TopicPartition(topic, partition1); - TestUtils.assertLeader(client, topicPartition0, broker2); - TestUtils.assertLeader(client, topicPartition1, broker3); + assertLeader(client, topicPartition0, broker2); + assertLeader(client, topicPartition1, broker3); cluster.shutdownBroker(broker2); - TestUtils.assertLeader(client, topicPartition0, broker3); + assertLeader(client, topicPartition0, broker3); cluster.startBroker(broker2); - TestUtils.waitForBrokersInIsr(client, topicPartition0, - CollectionConverters.asScala(List.of(broker2)).toSet() - ); - TestUtils.waitForBrokersInIsr(client, topicPartition1, - CollectionConverters.asScala(List.of(broker2)).toSet() - ); + waitForBrokersInIsr(client, topicPartition0, Set.of(broker2)); + waitForBrokersInIsr(client, topicPartition1, Set.of(broker2)); } Path topicPartitionPath = tempTopicPartitionFile(List.of(topicPartition0, topicPartition1)); @@ -396,4 +391,77 @@ private String stringifyTopicPartitions(Set topicPartitions) { sb.append("]}"); return sb.toString(); } + + private void waitForBrokersOutOfIsr( + Admin client, + Set partitions, + Set brokerIds + ) throws InterruptedException { + TestUtils.waitForCondition( + () -> { + Set topics = partitions.stream() + .map(TopicPartition::topic) + .collect(Collectors.toSet()); + + Map description = client.describeTopics(topics).allTopicNames().get(); + + Set isr = description.entrySet().stream() + .flatMap(e -> e.getValue().partitions().stream() + .filter(info -> partitions.contains(new TopicPartition(e.getKey(), info.partition()))) + .flatMap(info -> info.isr().stream())) + .map(Node::id) + .collect(Collectors.toSet()); + + return Collections.disjoint(brokerIds, isr); + }, + "Expected brokers " + brokerIds + " to no longer be in the ISR for " + partitions + ); + } + + private void waitForBrokersInIsr(Admin client, TopicPartition partition, Set brokerIds) throws InterruptedException { + TestUtils.waitForCondition( + () -> { + Set isr = client.describeTopics(Set.of(partition.topic())) + .allTopicNames() + .get() + .get(partition.topic()) + .partitions().stream() + .filter(info -> info.partition() == partition.partition()) + .flatMap(info -> info.isr().stream()) + .map(Node::id) + .collect(Collectors.toSet()); + + return isr.containsAll(brokerIds); + }, + "Expected brokers " + brokerIds + " to be in the ISR for " + partition + ); + } + + private void waitForOnlineBroker(Admin client, int brokerId) throws InterruptedException { + TestUtils.waitForCondition( + () -> client.describeCluster().nodes().get().stream() + .anyMatch(node -> node.id() == brokerId), + "Timed out waiting for brokerId " + brokerId + " to come online" + ); + } + + private void assertLeader(Admin client, TopicPartition topicPartition, int expectedLeader) throws Exception { + int leader = cluster.waitUntilLeaderIsElectedOrChangedWithAdmin(client, topicPartition.topic(), topicPartition.partition(), 30000); + assertEquals(expectedLeader, leader); + } + + private void assertNoLeader(Admin client, TopicPartition topicPartition) throws InterruptedException { + TestUtils.waitForCondition( + () -> { + TopicDescription desc = client.describeTopics(List.of(topicPartition.topic())) + .allTopicNames().get().get(topicPartition.topic()); + return desc.partitions().stream() + .filter(p -> p.partition() == topicPartition.partition()) + .findFirst() + .map(p -> p.leader() == null || p.leader().id() == Node.noNode().id()) + .orElse(false); + }, + "Timed out waiting for no leader for " + topicPartition + ); + } } diff --git a/tools/src/test/java/org/apache/kafka/tools/TopicCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/TopicCommandTest.java index bdbfa017cd36f..02c751295835a 100644 --- a/tools/src/test/java/org/apache/kafka/tools/TopicCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/TopicCommandTest.java @@ -1220,7 +1220,7 @@ public void testDescribeUnderReplicatedPartitionsWhenReassignmentIsInProgress(Cl ToolsTestUtils.removeReplicationThrottleForPartitions(adminClient, brokerIds, Set.of(tp)); TestUtils.waitForCondition( () -> adminClient.listPartitionReassignments().reassignments().get().isEmpty(), - CLUSTER_WAIT_MS, String.format("reassignmet not finished after %s ms", CLUSTER_WAIT_MS) + CLUSTER_WAIT_MS, String.format("reassignment not finished after %s ms", CLUSTER_WAIT_MS) ); } } diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/DescribeConsumerGroupTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/DescribeConsumerGroupTest.java index 35686d4e83d6f..cb2964e862d54 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/DescribeConsumerGroupTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/DescribeConsumerGroupTest.java @@ -41,7 +41,7 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; -import org.apache.kafka.common.utils.AppInfoParser; +import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.common.utils.internals.Exit; import org.apache.kafka.tools.ToolsTestUtils; diff --git a/tools/src/test/java/org/apache/kafka/tools/streams/DescribeStreamsGroupTest.java b/tools/src/test/java/org/apache/kafka/tools/streams/DescribeStreamsGroupTest.java index 5036d097d8935..d8eedd74c6376 100644 --- a/tools/src/test/java/org/apache/kafka/tools/streams/DescribeStreamsGroupTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/streams/DescribeStreamsGroupTest.java @@ -19,7 +19,6 @@ import org.apache.kafka.base.test.TestUtils; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.ConsumerConfig; -import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.internals.Exit; import org.apache.kafka.streams.GroupProtocol; @@ -46,7 +45,6 @@ import java.util.Map; import java.util.Properties; import java.util.Set; -import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; @@ -92,6 +90,7 @@ public static void setup() throws Exception { @AfterAll public static void closeCluster() { streams.close(); + cluster.deleteTopics(INPUT_TOPIC, OUTPUT_TOPIC, INPUT_TOPIC_2, OUTPUT_TOPIC_2); cluster.stop(); cluster = null; } @@ -215,35 +214,37 @@ public void testDescribeMultipleStreamsGroupWithMembersAndVerboseOptions() throw "Topic " + INPUT_TOPIC_2 + " not created" ); KafkaStreams streams2 = new KafkaStreams(topology(INPUT_TOPIC_2, OUTPUT_TOPIC_2), streamsProp(APP_ID_2)); - startApplicationAndWaitUntilRunning(streams2); - - final List expectedHeader = List.of("GROUP", "TARGET-ASSIGNMENT-EPOCH", "TOPOLOGY-EPOCH", "MEMBER", "MEMBER-PROTOCOL", "MEMBER-EPOCH", "PROCESS", "CLIENT-ID", "ASSIGNMENTS"); - final Set> expectedRows1 = Set.of( - List.of(APP_ID, "", "0", "", "streams", "", "", "", "ACTIVE:", "0:[1];", "1:[1];", "TARGET-ACTIVE:", "0:[1];", "1:[1];"), - List.of(APP_ID, "", "0", "", "streams", "", "", "", "ACTIVE:", "0:[0];", "1:[0];", "TARGET-ACTIVE:", "0:[0];", "1:[0];")); - final Set> expectedRows2 = Set.of( - List.of(APP_ID_2, "", "0", "", "streams", "", "", "", "ACTIVE:", "1:[0];", "TARGET-ACTIVE:", "1:[0];"), - List.of(APP_ID_2, "", "0", "", "streams", "", "", "", "ACTIVE:", "0:[0];", "TARGET-ACTIVE:", "0:[0];")); - final Map>> expectedRowsMap = new HashMap<>(); - expectedRowsMap.put(APP_ID, expectedRows1); - expectedRowsMap.put(APP_ID_2, expectedRows2); - - // The member and process names as well as client-id are not deterministic, so we don't care about them. - // The TARGET-ASSIGNMENT-EPOCH and MEMBER-EPOCH can vary due to rebalance timing, so we don't care about them either. - final List dontCares = List.of(1, 3, 5, 6, 7); - - validateDescribeOutput( - List.of("--bootstrap-server", bootstrapServers, "--describe", "--members", "--verbose", "--group", APP_ID, "--group", APP_ID_2), - expectedHeader, expectedRowsMap, dontCares); - validateDescribeOutput( - List.of("--bootstrap-server", bootstrapServers, "--describe", "--verbose", "--members", "--group", APP_ID, "--group", APP_ID_2), - expectedHeader, expectedRowsMap, dontCares); - validateDescribeOutput( - List.of("--bootstrap-server", bootstrapServers, "--describe", "--verbose", "--members", "--all-groups"), - expectedHeader, expectedRowsMap, dontCares); - - streams2.close(); - streams2.cleanUp(); + try { + startApplicationAndWaitUntilRunning(streams2); + + final List expectedHeader = List.of("GROUP", "TARGET-ASSIGNMENT-EPOCH", "TOPOLOGY-EPOCH", "MEMBER", "MEMBER-PROTOCOL", "MEMBER-EPOCH", "PROCESS", "CLIENT-ID", "ASSIGNMENTS"); + final Set> expectedRows1 = Set.of( + List.of(APP_ID, "", "0", "", "streams", "", "", "", "ACTIVE:", "0:[1];", "1:[1];", "TARGET-ACTIVE:", "0:[1];", "1:[1];"), + List.of(APP_ID, "", "0", "", "streams", "", "", "", "ACTIVE:", "0:[0];", "1:[0];", "TARGET-ACTIVE:", "0:[0];", "1:[0];")); + final Set> expectedRows2 = Set.of( + List.of(APP_ID_2, "", "0", "", "streams", "", "", "", "ACTIVE:", "1:[0];", "TARGET-ACTIVE:", "1:[0];"), + List.of(APP_ID_2, "", "0", "", "streams", "", "", "", "ACTIVE:", "0:[0];", "TARGET-ACTIVE:", "0:[0];")); + final Map>> expectedRowsMap = new HashMap<>(); + expectedRowsMap.put(APP_ID, expectedRows1); + expectedRowsMap.put(APP_ID_2, expectedRows2); + + // The member and process names as well as client-id are not deterministic, so we don't care about them. + // The TARGET-ASSIGNMENT-EPOCH and MEMBER-EPOCH can vary due to rebalance timing, so we don't care about them either. + final List dontCares = List.of(1, 3, 5, 6, 7); + + validateDescribeOutput( + List.of("--bootstrap-server", bootstrapServers, "--describe", "--members", "--verbose", "--group", APP_ID, "--group", APP_ID_2), + expectedHeader, expectedRowsMap, dontCares); + validateDescribeOutput( + List.of("--bootstrap-server", bootstrapServers, "--describe", "--verbose", "--members", "--group", APP_ID, "--group", APP_ID_2), + expectedHeader, expectedRowsMap, dontCares); + validateDescribeOutput( + List.of("--bootstrap-server", bootstrapServers, "--describe", "--verbose", "--members", "--all-groups"), + expectedHeader, expectedRowsMap, dontCares); + } finally { + streams2.close(); + streams2.cleanUp(); + } } @Test @@ -259,15 +260,6 @@ public void testDescribeNonExistingStreamsGroup() { List.of("--bootstrap-server", bootstrapServers, "--describe", "--verbose", "--members", "--group", nonExistingGroup), errorMessage); } - @Test - public void testDescribeStreamsGroupWithShortTimeout() { - // Note: 1ms timeout may not always trigger timeout on fast machines with warm groups - // Using 0ms to ensure timeout - List args = List.of("--bootstrap-server", bootstrapServers, "--describe", "--members", "--verbose", "--group", APP_ID, "--timeout", "0"); - Throwable e = assertThrows(ExecutionException.class, () -> getStreamsGroupService(args.toArray(new String[0])).describeGroups()); - assertEquals(TimeoutException.class, e.getCause().getClass()); - } - private static Topology topology(String inputTopic, String outputTopic) { final StreamsBuilder builder = new StreamsBuilder(); builder.stream(inputTopic, Consumed.with(Serdes.String(), Serdes.String())) diff --git a/trogdor/src/main/java/org/apache/kafka/trogdor/common/StringExpander.java b/trogdor/src/main/java/org/apache/kafka/trogdor/common/StringExpander.java index 8763b4db50a06..982105aee6c4c 100644 --- a/trogdor/src/main/java/org/apache/kafka/trogdor/common/StringExpander.java +++ b/trogdor/src/main/java/org/apache/kafka/trogdor/common/StringExpander.java @@ -24,7 +24,7 @@ /** * Utilities for expanding strings that have range expressions in them. * - * For example, 'foo[1-3]' would be expaneded to foo1, foo2, foo3. + * For example, 'foo[1-3]' would be expanded to foo1, foo2, foo3. * Strings that have no range expressions will not be expanded. */ public class StringExpander { diff --git a/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/NodeManager.java b/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/NodeManager.java index 60429f46927bd..94292874ada5e 100644 --- a/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/NodeManager.java +++ b/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/NodeManager.java @@ -150,7 +150,7 @@ public String toString() { private final NodeHeartbeat heartbeat; /** - * A future which can be used to cancel the periodic hearbeat task. + * A future which can be used to cancel the periodic heartbeat task. */ private ScheduledFuture heartbeatFuture; diff --git a/trogdor/src/main/java/org/apache/kafka/trogdor/rest/JsonRestServer.java b/trogdor/src/main/java/org/apache/kafka/trogdor/rest/JsonRestServer.java index 407a81c1e4f57..fe0678530ff72 100644 --- a/trogdor/src/main/java/org/apache/kafka/trogdor/rest/JsonRestServer.java +++ b/trogdor/src/main/java/org/apache/kafka/trogdor/rest/JsonRestServer.java @@ -210,7 +210,7 @@ public static HttpResponse httpRequest(Logger logger, String url, String is.close(); return new HttpResponse<>(result, null); } else { - // If the resposne code was not in the 200s, we assume that this is an error + // If the response code was not in the 200s, we assume that this is an error // response. InputStream es = connection.getErrorStream(); if (es == null) { diff --git a/trogdor/src/main/java/org/apache/kafka/trogdor/task/TaskController.java b/trogdor/src/main/java/org/apache/kafka/trogdor/task/TaskController.java index dbd0b09c1e70f..4aafb9492de20 100644 --- a/trogdor/src/main/java/org/apache/kafka/trogdor/task/TaskController.java +++ b/trogdor/src/main/java/org/apache/kafka/trogdor/task/TaskController.java @@ -26,7 +26,7 @@ */ public interface TaskController { /** - * Get the agent nodes which this task is targetting. + * Get the agent nodes which this task is targeting. * * @param topology The topology to use. * diff --git a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ConnectionStressWorker.java b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ConnectionStressWorker.java index 91e114f991417..01c00477b2985 100644 --- a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ConnectionStressWorker.java +++ b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ConnectionStressWorker.java @@ -32,9 +32,9 @@ import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.network.ChannelBuilder; import org.apache.kafka.common.network.Selector; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.common.utils.internals.ThreadUtils; import org.apache.kafka.trogdor.common.JsonUtil; import org.apache.kafka.trogdor.common.Platform; From 1546823778d315f3d66c112d8700c9e5772154e8 Mon Sep 17 00:00:00 2001 From: Igor Soarez Date: Sun, 3 May 2026 09:05:13 +0100 Subject: [PATCH 05/10] rm unnecessary import control rule --- checkstyle/import-control-jmh-benchmarks.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/checkstyle/import-control-jmh-benchmarks.xml b/checkstyle/import-control-jmh-benchmarks.xml index df968c425038f..a24d8adba51d8 100644 --- a/checkstyle/import-control-jmh-benchmarks.xml +++ b/checkstyle/import-control-jmh-benchmarks.xml @@ -57,7 +57,6 @@ - From 2e5fb8794be6aa03346eb3cdbb8e46389e66cad8 Mon Sep 17 00:00:00 2001 From: Igor Soarez Date: Sun, 3 May 2026 09:09:20 +0100 Subject: [PATCH 06/10] rename package --- checkstyle/import-control-coordinator-common.xml | 2 +- checkstyle/import-control-core.xml | 2 +- checkstyle/import-control-group-coordinator.xml | 2 +- checkstyle/import-control-jmh-benchmarks.xml | 2 +- checkstyle/import-control-metadata.xml | 6 +++--- checkstyle/import-control-server-common.xml | 8 ++++---- checkstyle/import-control-server.xml | 2 +- checkstyle/import-control-storage.xml | 8 ++++---- .../import-control-transaction-coordinator.xml | 2 +- checkstyle/import-control.xml | 16 ++++++++-------- .../kafka/clients/ClientRebootstrapTest.java | 2 +- .../apache/kafka/clients/ClientsTestUtils.java | 2 +- .../clients/MetadataVersionIntegrationTest.java | 2 +- .../clients/TransactionsExpirationTest.java | 4 ++-- .../TransactionsWithMaxInFlightOneTest.java | 2 +- .../AdminClientWithPoliciesIntegrationTest.java | 2 +- .../admin/ConcurrentListOffsetsRequestTest.java | 2 +- .../kafka/clients/admin/DeleteTopicTest.java | 2 +- .../admin/DescribeProducersWithBrokerIdTest.java | 2 +- .../admin/ListOffsetsIntegrationTest.java | 2 +- .../clients/consumer/ConsumerBounceTest.java | 4 ++-- .../consumer/ConsumerIntegrationTest.java | 2 +- .../consumer/PlaintextConsumerAssignTest.java | 2 +- .../consumer/PlaintextConsumerCommitTest.java | 2 +- .../consumer/PlaintextConsumerPollTest.java | 2 +- .../PlaintextConsumerSubscriptionTest.java | 2 +- .../clients/consumer/PlaintextConsumerTest.java | 2 +- .../consumer/ShareConsumerCallbackTest.java | 6 +++--- .../consumer/ShareConsumerDeliveryTest.java | 6 +++--- .../clients/consumer/ShareConsumerLagTest.java | 6 +++--- .../consumer/ShareConsumerRackAwareTest.java | 2 +- .../clients/consumer/ShareConsumerTest.java | 6 +++--- .../clients/consumer/ShareConsumerTestBase.java | 8 ++++---- .../producer/ProducerCompressionTest.java | 2 +- .../producer/ProducerIdExpirationTest.java | 4 ++-- .../producer/ProducerIntegrationTest.java | 2 +- .../producer/ProducerSendWhileDeletionTest.java | 2 +- .../security/GroupAuthorizerIntegrationTest.java | 2 +- .../server/quota/CustomQuotaCallbackTest.java | 2 +- .../kafka/clients/InFlightRequestsTest.java | 2 +- .../org/apache/kafka/clients/MetadataTest.java | 2 +- .../org/apache/kafka/clients/MockClient.java | 2 +- .../apache/kafka/clients/NetworkClientTest.java | 4 ++-- .../kafka/clients/NodeApiVersionsTest.java | 2 +- .../DeleteConsumerGroupOffsetsResultTest.java | 2 +- .../clients/admin/KafkaAdminClientTest.java | 2 +- .../admin/ListTransactionsResultTest.java | 2 +- ...RemoveMembersFromConsumerGroupResultTest.java | 2 +- .../AllBrokersStrategyIntegrationTest.java | 2 +- .../PartitionLeaderStrategyIntegrationTest.java | 2 +- .../clients/consumer/KafkaConsumerTest.java | 2 +- .../internals/AbstractCoordinatorTest.java | 2 +- ...AcknowledgementCommitCallbackHandlerTest.java | 2 +- .../internals/AsyncKafkaConsumerTest.java | 4 ++-- .../internals/CommitRequestManagerTest.java | 4 ++-- .../internals/ConsumerCoordinatorTest.java | 2 +- .../internals/ConsumerNetworkClientTest.java | 2 +- .../internals/ConsumerNetworkThreadTest.java | 6 +++--- .../internals/FetchRequestManagerTest.java | 6 +++--- .../clients/consumer/internals/FetcherTest.java | 4 ++-- .../internals/NetworkClientDelegateTest.java | 2 +- .../consumer/internals/OffsetFetcherTest.java | 2 +- .../internals/OffsetsRequestManagerTest.java | 2 +- .../consumer/internals/RequestManagersTest.java | 2 +- .../internals/SubscriptionStateTest.java | 2 +- .../events/ApplicationEventProcessorTest.java | 2 +- .../clients/producer/KafkaProducerTest.java | 2 +- .../producer/internals/BufferPoolTest.java | 2 +- .../producer/internals/ProducerBatchTest.java | 2 +- .../internals/RecordAccumulatorTest.java | 2 +- .../clients/producer/internals/SenderTest.java | 2 +- .../internals/TransactionManagerTest.java | 2 +- .../apache/kafka/common/internals/TopicTest.java | 2 +- .../apache/kafka/common/network/CertStores.java | 4 ++-- .../kafka/common/network/KafkaChannelTest.java | 2 +- .../kafka/common/network/NetworkReceiveTest.java | 2 +- .../kafka/common/network/NetworkTestUtils.java | 2 +- .../kafka/common/network/NioEchoServer.java | 2 +- .../common/network/SaslChannelBuilderTest.java | 2 +- .../kafka/common/network/SelectorTest.java | 6 +++--- .../kafka/common/network/SslSelectorTest.java | 4 ++-- .../common/network/SslTransportLayerTest.java | 4 ++-- .../network/SslVersionsTransportLayerTest.java | 2 +- .../kafka/common/network/Tls12SelectorTest.java | 2 +- .../kafka/common/network/Tls13SelectorTest.java | 4 ++-- .../record/internal/DefaultRecordBatchTest.java | 2 +- .../record/internal/FileLogInputStreamTest.java | 4 ++-- .../common/record/internal/FileRecordsTest.java | 4 ++-- .../internal/MemoryRecordsBuilderTest.java | 2 +- .../record/internal/MemoryRecordsTest.java | 2 +- .../record/internal/MultiRecordsSendTest.java | 2 +- .../internal/RemoteLogInputStreamTest.java | 4 ++-- .../internal/UnalignedFileRecordsTest.java | 2 +- .../common/replica/ReplicaSelectorTest.java | 2 +- .../common/requests/ApiVersionsResponseTest.java | 2 +- .../common/requests/JoinGroupRequestTest.java | 2 +- .../common/requests/RequestResponseTest.java | 3 +-- .../kafka/common/security/JaasContextTest.java | 2 +- .../ClientAuthenticationFailureTest.java | 2 +- .../SaslAuthenticatorFailureDelayTest.java | 2 +- .../authenticator/SaslAuthenticatorTest.java | 4 ++-- .../SaslServerAuthenticatorTest.java | 2 +- .../oauthbearer/DefaultJwtRetrieverTest.java | 2 +- .../oauthbearer/DefaultJwtValidatorTest.java | 2 +- .../oauthbearer/JwtBearerJwtRetrieverTest.java | 2 +- .../OAuthBearerLoginCallbackHandlerTest.java | 2 +- .../internals/secured/CachedFileTest.java | 2 +- ...ntCredentialsRequestFormatterFactoryTest.java | 2 +- .../secured/ConfigurationUtilsTest.java | 2 +- .../VerificationKeyResolverFactoryTest.java | 2 +- .../assertion/AssertionSupplierFactoryTest.java | 2 +- .../assertion/FileAssertionCreatorTest.java | 2 +- .../assertion/FileAssertionJwtTemplateTest.java | 2 +- ...ameLoggingTrustManagerFactoryWrapperTest.java | 2 +- .../ssl/DefaultSslEngineFactoryTest.java | 2 +- .../common/security/ssl/SslFactoryTest.java | 4 ++-- .../security/ssl/mock/TestKeyManagerFactory.java | 6 +++--- .../org/apache/kafka/common/utils/UtilsTest.java | 2 +- .../utils/internals/ByteBufferUnmapperTest.java | 2 +- .../auth/extension/JaasBasicAuthFilterTest.java | 2 +- .../FileStreamSinkConnectorIntegrationTest.java | 2 +- ...FileStreamSourceConnectorIntegrationTest.java | 2 +- .../DedicatedMirrorIntegrationTest.java | 4 ++-- .../MirrorConnectorsIntegrationBaseTest.java | 4 ++-- .../MirrorConnectorsIntegrationSSLTest.java | 4 ++-- ...WithCustomForwardingAdminIntegrationTest.java | 2 +- .../kafka/connect/cli/ConnectStandaloneTest.java | 2 +- .../ConnectWorkerIntegrationTest.java | 4 ++-- .../ErrorHandlingIntegrationTest.java | 2 +- .../ExactlyOnceSourceIntegrationTest.java | 4 ++-- .../ExampleConnectIntegrationTest.java | 2 +- .../MonitorableSinkIntegrationTest.java | 2 +- .../integration/OffsetsApiIntegrationTest.java | 4 ++-- ...RebalanceSourceConnectorsIntegrationTest.java | 2 +- .../RestExtensionIntegrationTest.java | 2 +- .../RestForwardingIntegrationTest.java | 4 ++-- .../SinkConnectorsIntegrationTest.java | 2 +- .../StandaloneWorkerIntegrationTest.java | 2 +- .../TransformationIntegrationTest.java | 2 +- .../connect/util/clusters/ConnectAssertions.java | 2 +- .../util/clusters/EmbeddedConnectStandalone.java | 2 +- .../runtime/CoordinatorLoaderImplTest.java | 2 +- .../common/runtime/CoordinatorRuntimeTest.java | 2 +- .../runtime/MultiThreadedEventProcessorTest.java | 4 ++-- .../test/java/kafka/security/JaasTestUtils.java | 2 +- .../kafka/server/share/ShareFetchUtilsTest.java | 2 +- .../server/share/SharePartitionManagerTest.java | 2 +- .../kafka/server/share/SharePartitionTest.java | 4 ++-- .../kafka/api/AbstractConsumerTest.scala | 2 +- .../kafka/api/AuthorizerIntegrationTest.scala | 2 +- .../kafka/api/BaseAdminIntegrationTest.scala | 2 +- .../kafka/api/ClientOAuthIntegrationTest.scala | 2 +- .../api/GroupCoordinatorIntegrationTest.scala | 2 +- .../api/PlaintextAdminIntegrationTest.scala | 2 +- .../SaslPlainSslEndToEndAuthorizationTest.scala | 2 +- .../SaslScramSslEndToEndAuthorizationTest.scala | 2 +- .../kafka/api/SaslSslAdminIntegrationTest.scala | 2 +- .../integration/kafka/api/TransactionsTest.scala | 5 +++-- .../DynamicBrokerReconfigurationTest.scala | 2 +- .../kafka/server/GssapiAuthenticationTest.scala | 3 ++- .../group/CoordinatorPartitionWriterTest.scala | 2 +- .../unit/kafka/network/SocketServerTest.scala | 3 +-- .../server/AbstractApiVersionsRequestTest.scala | 2 +- .../unit/kafka/server/ControllerApisTest.scala | 2 +- .../server/ControllerMutationQuotaTest.scala | 2 +- .../ControllerRegistrationManagerTest.scala | 2 +- .../kafka/server/DynamicConfigChangeTest.scala | 2 +- .../kafka/server/KafkaMetricsReporterTest.scala | 2 +- .../unit/kafka/server/KafkaRaftServerTest.scala | 2 +- .../unit/kafka/server/LogRecoveryTest.scala | 3 ++- .../epoch/LeaderEpochIntegrationTest.scala | 2 +- .../test/scala/unit/kafka/utils/TestUtils.scala | 2 +- gradle/spotbugs-exclude.xml | 2 +- .../group/GroupCoordinatorServiceTest.java | 2 +- .../org/apache/kafka/jmh/log/StressTestLog.java | 2 +- .../kafka/jmh/util/BenchmarkConfigUtils.java | 2 +- .../kafka/controller/MockRaftClientTest.java | 2 +- .../kafka/controller/MockRaftClientTestEnv.java | 2 +- .../QuorumControllerMetricsIntegrationTest.java | 2 +- .../kafka/controller/QuorumControllerTest.java | 2 +- .../controller/QuorumControllerTestEnv.java | 2 +- .../kafka/image/loader/MetadataLoaderTest.java | 2 +- .../image/publisher/SnapshotGeneratorTest.java | 2 +- .../bootstrap/BootstrapDirectoryTest.java | 2 +- .../kafka/metadata/storage/FormatterTest.java | 2 +- .../kafka/metadata/storage/ScramParserTest.java | 2 +- .../metadata/util/BatchFileWriterReaderTest.java | 2 +- .../kafka/raft/FileQuorumStateStoreTest.java | 2 +- .../apache/kafka/raft/KafkaRaftClientTest.java | 4 ++-- .../kafka/raft/MockExpirationServiceTest.java | 2 +- .../apache/kafka/raft/RaftClientTestContext.java | 4 ++-- .../kafka/raft/internals/KafkaRaftLogTest.java | 4 ++-- .../raft/internals/RecordsBatchReaderTest.java | 2 +- .../raft/internals/RecordsIteratorTest.java | 2 +- .../raft/internals/ThresholdPurgatoryTest.java | 2 +- .../kafka/snapshot/FileRawSnapshotTest.java | 2 +- .../org/apache/kafka/snapshot/SnapshotsTest.java | 2 +- .../properties/MetaPropertiesEnsembleTest.java | 2 +- .../metadata/properties/PropertiesUtilsTest.java | 2 +- .../apache/kafka/queue/KafkaEventQueueTest.java | 2 +- .../persister/DefaultStatePersisterTest.java | 2 +- .../persister/PersisterStateManagerTest.java | 2 +- .../apache/kafka/server/util/FileLockTest.java | 2 +- .../server/util/ShutdownableThreadTest.java | 2 +- .../server/util/timer/SystemTimerReaperTest.java | 2 +- .../kafka/server/util/timer/TimerTest.java | 2 +- .../apache/kafka/api/EndToEndClusterIdTest.java | 4 ++-- .../kafka/server/AssignmentsManagerTest.java | 2 +- .../BootstrapControllersIntegrationTest.java | 2 +- .../kafka/server/ClientMetricsManagerTest.java | 2 +- .../server/CordonedLogDirsIntegrationTest.java | 2 +- .../EligibleLeaderReplicasIntegrationTest.java | 4 ++-- .../apache/kafka/server/KRaftClusterTest.java | 2 +- .../kafka/server/LogManagerIntegrationTest.java | 2 +- .../apache/kafka/server/MetadataRequestTest.java | 2 +- .../ReconfigurableQuorumIntegrationTest.java | 4 ++-- .../java/org/apache/kafka/server/TestUtils.java | 4 ++-- .../kafka/server/UncleanLeaderElectionTest.java | 4 ++-- .../kafka/server/config/DynamicConfigTest.java | 2 +- .../server/metrics/ClientMetricsTestUtils.java | 2 +- .../metrics/LinuxIoMetricsCollectorTest.java | 2 +- .../partition/AlterPartitionManagerTest.java | 2 +- .../server/purgatory/DelayedFutureTest.java | 2 +- .../server/quota/ClientQuotasRequestTest.java | 2 +- .../server/share/fetch/ShareFetchTestUtils.java | 4 ++-- .../share/session/ShareSessionCacheTest.java | 2 +- .../apache/kafka/server/util/SchedulerTest.java | 2 +- .../log/remote/storage/LogSegmentDataTest.java | 2 +- .../apache/kafka/admin/RemoteTopicCrudTest.java | 6 +++--- .../kafka/server/log/LogAppendTimeTest.java | 2 +- .../RemoteLogMetadataManagerTestUtils.java | 2 +- .../storage/RemoteLogSegmentLifecycleTest.java | 2 +- ...cBasedRemoteLogMetadataManagerConfigTest.java | 2 +- ...BasedRemoteLogMetadataManagerRestartTest.java | 2 +- .../TopicBasedRemoteLogMetadataManagerTest.java | 2 +- .../log/remote/storage/LocalTieredStorage.java | 2 +- .../log/remote/storage/RemoteLogManagerTest.java | 4 ++-- .../storage/RemoteLogOffsetReaderTest.java | 2 +- ...pochCheckpointFileWithFailureHandlerTest.java | 2 +- ...fsetCheckpointFileWithFailureHandlerTest.java | 2 +- .../checkpoint/PartitionMetadataFileTest.java | 2 +- .../storage/internals/log/AbstractIndexTest.java | 2 +- .../internals/log/BrokerCompressionTest.java | 2 +- .../storage/internals/log/LocalLogTest.java | 2 +- .../internals/log/LogCleanerIntegrationTest.java | 2 +- .../internals/log/LogCleanerManagerTest.java | 2 +- .../internals/log/LogConcurrencyTest.java | 2 +- .../storage/internals/log/LogSegmentTest.java | 2 +- .../storage/internals/log/LogSegmentsTest.java | 2 +- .../storage/internals/log/LogValidatorTest.java | 2 +- .../storage/internals/log/OffsetIndexTest.java | 2 +- .../internals/log/ProducerStateManagerTest.java | 2 +- .../internals/log/RemoteIndexCacheTest.java | 2 +- .../storage/internals/log/TimeIndexTest.java | 2 +- .../internals/log/TransactionIndexTest.java | 2 +- .../storage/internals/log/UnifiedLogTest.java | 2 +- .../tiered/storage/TieredStorageTestHarness.java | 2 +- .../storage/actions/AlterLogDirAction.java | 2 +- .../storage/actions/ExpectBrokerInISRAction.java | 2 +- .../actions/ExpectEmptyRemoteStorageAction.java | 2 +- .../storage/actions/ExpectLeaderAction.java | 2 +- .../ExpectLeaderEpochCheckpointAction.java | 2 +- .../storage/actions/ReassignReplicaAction.java | 2 +- .../storage/actions/ShrinkReplicaAction.java | 2 +- .../TransactionsWithTieredStoreTest.java | 2 +- .../examples/wordcount/WordCountDemoTest.java | 2 +- .../integration/AbstractJoinIntegrationTest.java | 2 +- .../integration/AdjustStreamThreadCountTest.java | 4 ++-- ...stOnceDeliveryMessageLossIntegrationTest.java | 8 ++++---- .../ConsistencyVectorIntegrationTest.java | 2 +- .../DeadLetterQueueIntegrationTest.java | 2 +- .../EOSUncleanShutdownIntegrationTest.java | 2 +- .../integration/EmitOnChangeIntegrationTest.java | 2 +- .../streams/integration/EosIntegrationTest.java | 6 +++--- .../FineGrainedAutoResetIntegrationTest.java | 4 ++-- .../GlobalKTableEOSIntegrationTest.java | 2 +- .../integration/GlobalKTableIntegrationTest.java | 2 +- .../integration/GlobalStateReprocessTest.java | 2 +- .../GlobalThreadShutDownOrderTest.java | 2 +- ...ndlingSourceTopicDeletionIntegrationTest.java | 2 +- .../HeadersStoreUpgradeIntegrationTest.java | 2 +- ...hAvailabilityTaskAssignorIntegrationTest.java | 4 ++-- .../IQv2EndpointToPartitionsIntegrationTest.java | 4 ++-- .../streams/integration/IQv2IntegrationTest.java | 2 +- .../integration/IQv2StoreIntegrationTest.java | 2 +- .../InternalTopicIntegrationTest.java | 2 +- ...JoinGracePeriodDurabilityIntegrationTest.java | 2 +- .../integration/JoinStoreIntegrationTest.java | 2 +- ...oinWithIncompleteMetadataIntegrationTest.java | 2 +- .../KStreamAggregationDedupIntegrationTest.java | 2 +- .../KStreamAggregationIntegrationTest.java | 2 +- .../KStreamKStreamIntegrationTest.java | 2 +- .../KStreamRepartitionIntegrationTest.java | 2 +- .../KTableEfficientRangeQueryTest.java | 2 +- ...nnerJoinCustomPartitionerIntegrationTest.java | 2 +- ...eForeignKeyInnerJoinMultiIntegrationTest.java | 2 +- ...TableKTableForeignKeyJoinDistributedTest.java | 2 +- ...TableKTableForeignKeyJoinIntegrationTest.java | 2 +- ...ignKeyJoinMaterializationIntegrationTest.java | 2 +- .../KTableSourceTopicRestartIntegrationTest.java | 2 +- .../KafkaStreamsCloseOptionsIntegrationTest.java | 2 +- .../KafkaStreamsTelemetryIntegrationTest.java | 4 ++-- .../integration/LagFetchIntegrationTest.java | 2 +- .../integration/MetricsIntegrationTest.java | 2 +- .../NamedTopologyIntegrationTest.java | 2 +- .../OptimizedKTableIntegrationTest.java | 4 ++-- .../OuterJoinListValueStoreRestorationTest.java | 2 +- .../integration/PauseResumeIntegrationTest.java | 4 ++-- .../PositionRestartIntegrationTest.java | 2 +- .../PurgeRepartitionTopicIntegrationTest.java | 4 ++-- .../QueryableStateIntegrationTest.java | 6 +++--- .../integration/RangeQueryIntegrationTest.java | 2 +- .../integration/RebalanceIntegrationTest.java | 2 +- ...ebalanceProtocolMigrationIntegrationTest.java | 2 +- .../RebalanceTaskClosureIntegrationTest.java | 2 +- .../integration/RegexSourceIntegrationTest.java | 4 ++-- .../ResetPartitionTimeIntegrationTest.java | 2 +- .../integration/RestoreIntegrationTest.java | 4 ++-- .../RocksDBMetricsIntegrationTest.java | 2 +- .../SelfJoinUpgradeIntegrationTest.java | 2 +- ...elfManagedOffsetLifecycleIntegrationTest.java | 2 +- ...SelfManagedOffsetRecoveryIntegrationTest.java | 2 +- .../SessionsStoreWithHeadersTest.java | 2 +- .../SlidingWindowedKStreamIntegrationTest.java | 2 +- .../StandbyTaskCreationIntegrationTest.java | 2 +- .../StandbyTaskEOSIntegrationTest.java | 4 ++-- ...ndbyTaskEOSMultiRebalanceIntegrationTest.java | 4 ++-- .../StateDirectoryIntegrationTest.java | 2 +- .../StateUpdaterFailureIntegrationTest.java | 2 +- .../integration/StoreQueryIntegrationTest.java | 4 ++-- ...eJoinTopologyOptimizationIntegrationTest.java | 2 +- ...sUncaughtExceptionHandlerIntegrationTest.java | 2 +- .../StreamsUpgradeTestIntegrationTest.java | 2 +- .../SuppressionDurabilityIntegrationTest.java | 2 +- .../integration/SuppressionIntegrationTest.java | 4 ++-- .../SwallowUnknownTopicErrorIntegrationTest.java | 2 +- .../integration/TaskAssignorIntegrationTest.java | 2 +- .../integration/TaskMetadataIntegrationTest.java | 2 +- .../TimeWindowedKStreamIntegrationTest.java | 2 +- .../TimestampedKeyValueStoreWithHeadersTest.java | 2 +- .../TimestampedStoreUpgradeIntegrationTest.java | 2 +- .../TimestampedWindowStoreWithHeadersTest.java | 2 +- .../VersionedKeyValueStoreIntegrationTest.java | 2 +- .../integration/utils/EmbeddedKafkaCluster.java | 4 ++-- .../integration/utils/IntegrationTestUtils.java | 6 +++--- .../streams/integration/WordCountTest.scala | 2 +- ...reamToTableJoinScalaIntegrationTestBase.scala | 2 +- .../apache/kafka/streams/KafkaStreamsTest.java | 4 ++-- .../kafka/streams/kstream/PrintedTest.java | 2 +- ...treamSessionWindowAggregateProcessorTest.java | 2 +- .../internals/KStreamWindowAggregateTest.java | 2 +- .../kstream/internals/KTableAggregateTest.java | 2 +- .../KTableKTableForeignKeyJoinScenarioTest.java | 2 +- .../internals/KTableTransformValuesTest.java | 2 +- .../kstream/internals/SuppressScenarioTest.java | 2 +- .../ForeignTableJoinProcessorSupplierTests.java | 2 +- ...SubscriptionReceiveProcessorSupplierTest.java | 2 +- .../KTableSuppressProcessorMetricsTest.java | 2 +- .../internals/DefaultStateUpdaterTest.java | 2 +- .../internals/GlobalStateManagerImplTest.java | 2 +- .../processor/internals/GlobalStateTaskTest.java | 2 +- .../internals/GlobalStreamThreadTest.java | 2 +- .../processor/internals/NamedTopologyTest.java | 2 +- .../internals/ProcessorStateManagerTest.java | 2 +- .../internals/ProcessorTopologyTest.java | 2 +- .../processor/internals/StandbyTaskTest.java | 2 +- .../processor/internals/StateDirectoryTest.java | 2 +- .../internals/StateManagerUtilTest.java | 2 +- .../processor/internals/StreamTaskTest.java | 2 +- .../processor/internals/StreamThreadTest.java | 8 ++++---- .../internals/tasks/DefaultTaskExecutorTest.java | 4 ++-- .../streams/state/KeyValueStoreTestDriver.java | 2 +- ...DualSchemaRocksDBSegmentedBytesStoreTest.java | 2 +- .../AbstractRocksDBSegmentedBytesStoreTest.java | 2 +- .../state/internals/AbstractSegmentsTest.java | 2 +- .../internals/AbstractSessionBytesStoreTest.java | 2 +- .../internals/AbstractWindowBytesStoreTest.java | 2 +- .../CachingInMemoryKeyValueStoreTest.java | 2 +- .../CachingInMemorySessionStoreTest.java | 2 +- .../CachingPersistentSessionStoreTest.java | 2 +- .../CachingPersistentWindowStoreTest.java | 2 +- .../ChangeLoggingKeyValueBytesStoreTest.java | 2 +- ...LoggingTimestampedKeyValueBytesStoreTest.java | 2 +- ...stampedKeyValueBytesStoreWithHeadersTest.java | 2 +- ...mestampedWindowBytesStoreWithHeadersTest.java | 2 +- ...geLoggingVersionedKeyValueBytesStoreTest.java | 2 +- .../state/internals/InMemoryWindowStoreTest.java | 2 +- .../state/internals/KeyValueSegmentTest.java | 2 +- .../LegacyCheckpointingStateStoreTest.java | 2 +- .../state/internals/ListValueStoreTest.java | 2 +- .../internals/LogicalKeyValueSegmentTest.java | 2 +- .../internals/MeteredKeyValueStoreTest.java | 2 +- .../state/internals/MeteredSessionStoreTest.java | 2 +- .../MeteredTimestampedWindowStoreTest.java | 2 +- ...redTimestampedWindowStoreWithHeadersTest.java | 2 +- .../state/internals/MeteredWindowStoreTest.java | 2 +- .../state/internals/OffsetCheckpointTest.java | 2 +- .../PlainToHeadersWindowStoreAdapterTest.java | 2 +- .../RocksDBSessionStoreWithHeadersTest.java | 2 +- .../state/internals/RocksDBStoreTest.java | 2 +- .../RocksDBTimeOrderedKeyValueBufferTest.java | 2 +- ...RocksDBTimeOrderedKeyValueBytesStoreTest.java | 2 +- ...DBTimeOrderedSessionStoreWithHeadersTest.java | 2 +- ...sDBTimeOrderedWindowStoreWithHeadersTest.java | 2 +- ...sDBTimestampedWindowStoreWithHeadersTest.java | 2 +- .../internals/RocksDBVersionedStoreTest.java | 2 +- .../state/internals/SegmentIteratorTest.java | 2 +- .../internals/SessionSegmentWithHeadersTest.java | 2 +- .../state/internals/SessionStoreFetchTest.java | 2 +- .../StreamThreadStateStoreProviderTest.java | 2 +- ...eOrderedCachingPersistentWindowStoreTest.java | 2 +- .../internals/TimeOrderedKeyValueBufferTest.java | 2 +- .../TimeOrderedSessionStoreUpgradeTest.java | 2 +- .../internals/TimeOrderedWindowStoreTest.java | 2 +- .../TimeOrderedWindowStoreUpgradeTest.java | 2 +- ...ampedKeyValueStoreBuilderWithHeadersTest.java | 2 +- .../state/internals/TimestampedSegmentTest.java | 2 +- .../TimestampedSegmentWithHeadersTest.java | 2 +- ...mestampedToHeadersWindowStoreAdapterTest.java | 2 +- ...StoreWithHeadersSerializerSideEffectTest.java | 2 +- .../state/internals/WindowStoreFetchTest.java | 2 +- .../metrics/RocksDBBlockCacheMetricsTest.java | 2 +- .../streams/tests/RelationalSmokeTestTest.java | 2 +- .../kafka/streams/tests/SmokeTestClient.java | 2 +- .../apache/kafka/streams/utils/TestUtils.java | 2 +- .../org/apache/kafka/test/StreamsTestUtils.java | 2 +- .../kafka/streams/scala/utils/TestDriver.scala | 2 +- .../kafka/streams/TopologyTestDriverTest.java | 2 +- .../test/MockProcessorContextStateStoreTest.java | 2 +- .../WindowedWordCountProcessorTest.java | 2 +- .../test/base}/NoRetryException.java | 2 +- .../test/base}/ReflectionUtils.java | 2 +- .../test => common/test/base}/TestCondition.java | 2 +- .../test => common/test/base}/TestSslUtils.java | 2 +- .../test => common/test/base}/TestUtils.java | 2 +- .../test/base}/ValuelessCallable.java | 2 +- .../tools/AbstractResetIntegrationTest.java | 2 +- .../org/apache/kafka/tools/AclCommandTest.java | 2 +- .../org/apache/kafka/tools/ClusterToolTest.java | 2 +- .../tools/ConfigCommandIntegrationTest.java | 4 ++-- .../apache/kafka/tools/ConfigCommandTest.java | 2 +- .../apache/kafka/tools/GetOffsetShellTest.java | 2 +- .../apache/kafka/tools/GroupsCommandTest.java | 2 +- .../kafka/tools/LeaderElectionCommandTest.java | 2 +- .../kafka/tools/MetadataQuorumCommandTest.java | 2 +- .../tools/MetadataQuorumCommandUnitTest.java | 2 +- .../apache/kafka/tools/ResetIntegrationTest.java | 2 +- .../kafka/tools/ResetIntegrationWithSslTest.java | 4 ++-- .../org/apache/kafka/tools/ToolsTestUtils.java | 3 ++- .../org/apache/kafka/tools/TopicCommandTest.java | 2 +- .../tools/UserScramCredentialsCommandTest.java | 4 ++-- .../consumer/group/DeleteConsumerGroupsTest.java | 2 +- ...fsetsConsumerGroupCommandIntegrationTest.java | 2 +- .../group/DescribeConsumerGroupTest.java | 4 ++-- .../consumer/group/ListConsumerGroupTest.java | 2 +- .../group/ResetConsumerGroupOffsetTest.java | 4 ++-- .../SaslClientsWithInvalidCredentialsTest.java | 2 +- .../consumer/group/ShareGroupCommandTest.java | 2 +- .../tools/other/ReplicationQuotasTestRig.java | 2 +- .../reassign/ReassignPartitionsCommandTest.java | 2 +- .../streams/DeleteStreamsGroupOffsetTest.java | 2 +- .../tools/streams/DeleteStreamsGroupTest.java | 2 +- .../tools/streams/DescribeStreamsGroupTest.java | 2 +- .../tools/streams/ListStreamsGroupTest.java | 2 +- .../streams/ResetStreamsGroupOffsetTest.java | 2 +- .../tools/streams/StreamsGroupCommandTest.java | 2 +- .../transaction/ProducerIdManagerTest.java | 2 +- .../apache/kafka/trogdor/agent/AgentTest.java | 2 +- .../kafka/trogdor/basic/BasicPlatformTest.java | 2 +- .../kafka/trogdor/common/ExpectedTasks.java | 2 +- .../kafka/trogdor/common/JsonUtilTest.java | 2 +- .../trogdor/coordinator/CoordinatorTest.java | 2 +- .../workload/ExternalCommandWorkerTest.java | 2 +- 473 files changed, 583 insertions(+), 581 deletions(-) rename test-common/test-common-base/src/main/java/org/apache/kafka/{base/test => common/test/base}/NoRetryException.java (96%) rename test-common/test-common-base/src/main/java/org/apache/kafka/{base/test => common/test/base}/ReflectionUtils.java (97%) rename test-common/test-common-base/src/main/java/org/apache/kafka/{base/test => common/test/base}/TestCondition.java (96%) rename test-common/test-common-base/src/main/java/org/apache/kafka/{base/test => common/test/base}/TestSslUtils.java (99%) rename test-common/test-common-base/src/main/java/org/apache/kafka/{base/test => common/test/base}/TestUtils.java (99%) rename test-common/test-common-base/src/main/java/org/apache/kafka/{base/test => common/test/base}/ValuelessCallable.java (95%) diff --git a/checkstyle/import-control-coordinator-common.xml b/checkstyle/import-control-coordinator-common.xml index 1e7d87d535694..73866de808135 100644 --- a/checkstyle/import-control-coordinator-common.xml +++ b/checkstyle/import-control-coordinator-common.xml @@ -65,7 +65,7 @@ - + diff --git a/checkstyle/import-control-core.xml b/checkstyle/import-control-core.xml index 426490bd5a2a5..6c4f3c8f45e06 100644 --- a/checkstyle/import-control-core.xml +++ b/checkstyle/import-control-core.xml @@ -71,7 +71,7 @@ - + diff --git a/checkstyle/import-control-group-coordinator.xml b/checkstyle/import-control-group-coordinator.xml index 8324192688960..5dc3899984ed1 100644 --- a/checkstyle/import-control-group-coordinator.xml +++ b/checkstyle/import-control-group-coordinator.xml @@ -72,7 +72,7 @@ - + diff --git a/checkstyle/import-control-jmh-benchmarks.xml b/checkstyle/import-control-jmh-benchmarks.xml index a24d8adba51d8..1ab87def5dfc6 100644 --- a/checkstyle/import-control-jmh-benchmarks.xml +++ b/checkstyle/import-control-jmh-benchmarks.xml @@ -54,7 +54,7 @@ - + diff --git a/checkstyle/import-control-metadata.xml b/checkstyle/import-control-metadata.xml index e50a6ce28d38e..b1c27b5415758 100644 --- a/checkstyle/import-control-metadata.xml +++ b/checkstyle/import-control-metadata.xml @@ -89,7 +89,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -163,7 +163,7 @@ - + diff --git a/checkstyle/import-control-server-common.xml b/checkstyle/import-control-server-common.xml index 7497c9f9d38d8..3ad30d1c14100 100644 --- a/checkstyle/import-control-server-common.xml +++ b/checkstyle/import-control-server-common.xml @@ -54,7 +54,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -111,7 +111,7 @@ - + @@ -128,7 +128,7 @@ - + diff --git a/checkstyle/import-control-server.xml b/checkstyle/import-control-server.xml index ef108b6fe926a..0ac9c53ad5d5b 100644 --- a/checkstyle/import-control-server.xml +++ b/checkstyle/import-control-server.xml @@ -69,7 +69,7 @@ - + diff --git a/checkstyle/import-control-storage.xml b/checkstyle/import-control-storage.xml index 289cc11b1c05a..11d779e2426da 100644 --- a/checkstyle/import-control-storage.xml +++ b/checkstyle/import-control-storage.xml @@ -65,7 +65,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -135,7 +135,7 @@ - + @@ -143,7 +143,7 @@ - + diff --git a/checkstyle/import-control-transaction-coordinator.xml b/checkstyle/import-control-transaction-coordinator.xml index d80062b1e9059..6dd5446b6e0aa 100644 --- a/checkstyle/import-control-transaction-coordinator.xml +++ b/checkstyle/import-control-transaction-coordinator.xml @@ -37,7 +37,7 @@ - + diff --git a/checkstyle/import-control.xml b/checkstyle/import-control.xml index 8d36d81e44feb..4f0f73b889a89 100644 --- a/checkstyle/import-control.xml +++ b/checkstyle/import-control.xml @@ -59,7 +59,7 @@ - + @@ -230,7 +230,7 @@ - + @@ -308,7 +308,7 @@ - + @@ -369,7 +369,7 @@ - + @@ -387,7 +387,7 @@ - + @@ -476,7 +476,7 @@ - + @@ -488,7 +488,7 @@ - + @@ -499,7 +499,7 @@ - + diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientRebootstrapTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientRebootstrapTest.java index ee38abdb53cff..f61a08ad4136e 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientRebootstrapTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientRebootstrapTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.GroupProtocol; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientsTestUtils.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientsTestUtils.java index 1eaf58b487e7d..efbf651890b91 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientsTestUtils.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientsTestUtils.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerRebalanceListener; import org.apache.kafka.clients.consumer.ConsumerRecord; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/MetadataVersionIntegrationTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/MetadataVersionIntegrationTest.java index de77d6a9780ea..1a864d6007411 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/MetadataVersionIntegrationTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/MetadataVersionIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.FeatureUpdate; import org.apache.kafka.common.test.ClusterInstance; import org.apache.kafka.common.test.api.ClusterTest; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/TransactionsExpirationTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/TransactionsExpirationTest.java index d7cc616ef1e84..acb0e2d2a8c87 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/TransactionsExpirationTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/TransactionsExpirationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.ProducerState; import org.apache.kafka.clients.consumer.Consumer; @@ -137,7 +137,7 @@ private void testFatalErrorAfterInvalidProducerIdMapping(ClusterInstance cluster Future failedFuture = producer.send( new ProducerRecord<>(TOPIC1, 3, "1".getBytes(), "1".getBytes(), Collections.singleton(new RecordHeader(HEADER_KEY, ABORTED_VALUE)))); TestUtils.waitForCondition(failedFuture::isDone, "Producer future never completed."); - org.apache.kafka.base.test.TestUtils.assertFutureThrows(InvalidPidMappingException.class, failedFuture); + TestUtils.assertFutureThrows(InvalidPidMappingException.class, failedFuture); // Assert that aborting the transaction throws a KafkaException due to the fatal error. assertThrows(KafkaException.class, producer::abortTransaction); diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/TransactionsWithMaxInFlightOneTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/TransactionsWithMaxInFlightOneTest.java index fcdb0bcd7e923..8c7239f4ac3ec 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/TransactionsWithMaxInFlightOneTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/TransactionsWithMaxInFlightOneTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/AdminClientWithPoliciesIntegrationTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/AdminClientWithPoliciesIntegrationTest.java index ec6b8be7a24ef..44ea0fa4ebeb2 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/AdminClientWithPoliciesIntegrationTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/AdminClientWithPoliciesIntegrationTest.java @@ -43,7 +43,7 @@ import java.util.Map; import java.util.Set; -import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ConcurrentListOffsetsRequestTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ConcurrentListOffsetsRequestTest.java index b853343709303..17f0aa6ff3ebf 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ConcurrentListOffsetsRequestTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ConcurrentListOffsetsRequestTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.admin; -import org.apache.kafka.base.test.ReflectionUtils; +import org.apache.kafka.common.test.base.ReflectionUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.DefaultHostResolver; import org.apache.kafka.clients.NetworkClient; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DeleteTopicTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DeleteTopicTest.java index 7f9962db493de..84f672312bafd 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DeleteTopicTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DeleteTopicTest.java @@ -18,7 +18,7 @@ import kafka.server.KafkaBroker; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.errors.TopicDeletionDisabledException; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DescribeProducersWithBrokerIdTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DescribeProducersWithBrokerIdTest.java index 2994682d085e2..a2d8558565028 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DescribeProducersWithBrokerIdTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DescribeProducersWithBrokerIdTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.admin; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.Node; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ListOffsetsIntegrationTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ListOffsetsIntegrationTest.java index 31cae135eaa4f..22e6846a2cf19 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ListOffsetsIntegrationTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ListOffsetsIntegrationTest.java @@ -18,7 +18,7 @@ import kafka.server.KafkaBroker; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.ListOffsetsResult.ListOffsetsResultInfo; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerConfig; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerBounceTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerBounceTest.java index 8076c5310d21d..9520fb352deb9 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerBounceTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerBounceTest.java @@ -18,7 +18,7 @@ import kafka.server.KafkaBroker; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientsTestUtils; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerRecord; @@ -66,7 +66,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.IntStream; -import static org.apache.kafka.base.test.TestUtils.SEEDED_RANDOM; +import static org.apache.kafka.common.test.base.TestUtils.SEEDED_RANDOM; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerIntegrationTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerIntegrationTest.java index f02a5f8a878e0..a5a5f782669c9 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerIntegrationTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.consumer; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewPartitionReassignment; import org.apache.kafka.clients.admin.NewPartitions; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerAssignTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerAssignTest.java index d7ef50473f49c..c1cbb3bf2374a 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerAssignTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerAssignTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.clients.consumer; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientsTestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.test.ClusterInstance; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerCommitTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerCommitTest.java index 5d3ecf2e65cba..773df88e7e385 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerCommitTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerCommitTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.consumer; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientsTestUtils; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerConfig; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerPollTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerPollTest.java index abaf59005ef6f..9ffc43447c779 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerPollTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerPollTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.clients.consumer; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientsTestUtils; import org.apache.kafka.clients.ClientsTestUtils.TestConsumerReassignmentListener; import org.apache.kafka.clients.producer.Producer; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerSubscriptionTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerSubscriptionTest.java index e3127ebf55e90..0ddda58f94b66 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerSubscriptionTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerSubscriptionTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.consumer; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientsTestUtils.TestConsumerReassignmentListener; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.common.TopicPartition; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerTest.java index d0c8b083a9667..e1c0cb2e0cf47 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerTest.java @@ -18,7 +18,7 @@ import kafka.server.KafkaBroker; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientsTestUtils.TestConsumerReassignmentListener; import org.apache.kafka.clients.admin.NewPartitions; import org.apache.kafka.clients.producer.Producer; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerCallbackTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerCallbackTest.java index 699aa1b4351a4..518687f92253c 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerCallbackTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerCallbackTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.clients.consumer; -import org.apache.kafka.base.test.NoRetryException; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.NoRetryException; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.KafkaException; @@ -41,7 +41,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicBoolean; -import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.common.test.base.TestUtils.DEFAULT_MAX_WAIT_MS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerDeliveryTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerDeliveryTest.java index c4deef778d491..045f5d75e8386 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerDeliveryTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerDeliveryTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.consumer; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterConfigOp; import org.apache.kafka.clients.admin.ConfigEntry; @@ -51,8 +51,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerLagTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerLagTest.java index e16e63ef8725e..1a918cc79c306 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerLagTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerLagTest.java @@ -18,7 +18,7 @@ import kafka.server.KafkaBroker; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerRecord; @@ -37,8 +37,8 @@ import java.util.Objects; import java.util.concurrent.ExecutionException; -import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; -import static org.apache.kafka.base.test.TestUtils.DEFAULT_POLL_INTERVAL_MS; +import static org.apache.kafka.common.test.base.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.common.test.base.TestUtils.DEFAULT_POLL_INTERVAL_MS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerRackAwareTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerRackAwareTest.java index aeb78c76b41d0..5f8d9f377a0b6 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerRackAwareTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerRackAwareTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.consumer; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewPartitionReassignment; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerTest.java index 62a7e20311d33..cc2f071dcd37a 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerTest.java @@ -18,7 +18,7 @@ import kafka.server.KafkaBroker; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.RecordsToDelete; import org.apache.kafka.clients.admin.SharePartitionOffsetInfo; @@ -83,8 +83,8 @@ import java.util.function.Function; import java.util.stream.Stream; -import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerTestBase.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerTestBase.java index 183d85e9feb02..e36a25ce678b6 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerTestBase.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerTestBase.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.consumer; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterConfigOp; import org.apache.kafka.clients.admin.AlterConfigsOptions; @@ -78,9 +78,9 @@ import java.util.function.Predicate; import java.util.stream.IntStream; -import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; -import static org.apache.kafka.base.test.TestUtils.DEFAULT_POLL_INTERVAL_MS; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.common.test.base.TestUtils.DEFAULT_POLL_INTERVAL_MS; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerCompressionTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerCompressionTest.java index dae753ed8a530..b124f0e1695f6 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerCompressionTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerCompressionTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.clients.producer; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.CloseOptions; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerIdExpirationTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerIdExpirationTest.java index f508fa2e8833e..73b5caece1e3b 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerIdExpirationTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerIdExpirationTest.java @@ -47,8 +47,8 @@ import java.util.concurrent.TimeUnit; import static kafka.utils.TestUtils.consumeRecords; -import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; -import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.common.test.base.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; import static org.apache.kafka.clients.consumer.ConsumerConfig.ISOLATION_LEVEL_CONFIG; import static org.apache.kafka.clients.producer.ProducerConfig.ENABLE_IDEMPOTENCE_CONFIG; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.GROUP_INITIAL_REBALANCE_DELAY_MS_CONFIG; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerIntegrationTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerIntegrationTest.java index 43336a209a56f..c6e2f4442b4fe 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerIntegrationTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.producer; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.admin.TransactionState; import org.apache.kafka.clients.consumer.Consumer; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerSendWhileDeletionTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerSendWhileDeletionTest.java index 312a0bdb89e8b..da4b56e92fac0 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerSendWhileDeletionTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerSendWhileDeletionTest.java @@ -18,7 +18,7 @@ import kafka.server.KafkaBroker; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewPartitionReassignment; import org.apache.kafka.clients.admin.NewTopic; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/security/GroupAuthorizerIntegrationTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/security/GroupAuthorizerIntegrationTest.java index 5ea53c7f018a2..81036cac6fff6 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/security/GroupAuthorizerIntegrationTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/security/GroupAuthorizerIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.security; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.NewTopic; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/server/quota/CustomQuotaCallbackTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/server/quota/CustomQuotaCallbackTest.java index eb77e68e50710..224483b0bdf9d 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/server/quota/CustomQuotaCallbackTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/server/quota/CustomQuotaCallbackTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.quota; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.common.Cluster; diff --git a/clients/src/test/java/org/apache/kafka/clients/InFlightRequestsTest.java b/clients/src/test/java/org/apache/kafka/clients/InFlightRequestsTest.java index 904e39f7928bf..f51320a3c4293 100644 --- a/clients/src/test/java/org/apache/kafka/clients/InFlightRequestsTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/InFlightRequestsTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.clients; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.requests.RequestHeader; import org.apache.kafka.common.utils.MockTime; diff --git a/clients/src/test/java/org/apache/kafka/clients/MetadataTest.java b/clients/src/test/java/org/apache/kafka/clients/MetadataTest.java index abbb04a1838eb..432e73766756c 100644 --- a/clients/src/test/java/org/apache/kafka/clients/MetadataTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/MetadataTest.java @@ -60,7 +60,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import static org.apache.kafka.base.test.TestUtils.assertOptional; +import static org.apache.kafka.common.test.base.TestUtils.assertOptional; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/src/test/java/org/apache/kafka/clients/MockClient.java b/clients/src/test/java/org/apache/kafka/clients/MockClient.java index b162863b78a9f..76682e4c3737d 100644 --- a/clients/src/test/java/org/apache/kafka/clients/MockClient.java +++ b/clients/src/test/java/org/apache/kafka/clients/MockClient.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Node; import org.apache.kafka.common.errors.AuthenticationException; import org.apache.kafka.common.errors.InterruptException; diff --git a/clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java b/clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java index aef858384de9c..c8552ef20b5ba 100644 --- a/clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.clients; -import org.apache.kafka.base.test.ReflectionUtils; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.ReflectionUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Cluster; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.Node; diff --git a/clients/src/test/java/org/apache/kafka/clients/NodeApiVersionsTest.java b/clients/src/test/java/org/apache/kafka/clients/NodeApiVersionsTest.java index 9b535f9e51389..f4b0ea3fee445 100644 --- a/clients/src/test/java/org/apache/kafka/clients/NodeApiVersionsTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/NodeApiVersionsTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.feature.SupportedVersionRange; import org.apache.kafka.common.message.ApiMessageType; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsResultTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsResultTest.java index 132915b21d784..50f3239b2281b 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsResultTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsResultTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.admin; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.GroupAuthorizationException; import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java index 1873c18a42105..560c3281f7abc 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.admin; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientDnsLookup; import org.apache.kafka.clients.ClientRequest; import org.apache.kafka.clients.ClientUtils; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/ListTransactionsResultTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/ListTransactionsResultTest.java index cbfc3b51db692..da4fbb57ea33d 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/ListTransactionsResultTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/ListTransactionsResultTest.java @@ -31,7 +31,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.singletonList; -import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertEquals; public class ListTransactionsResultTest { diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/RemoveMembersFromConsumerGroupResultTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/RemoveMembersFromConsumerGroupResultTest.java index 83a1c5e243d2f..e12d9fda3af20 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/RemoveMembersFromConsumerGroupResultTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/RemoveMembersFromConsumerGroupResultTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.admin; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.errors.FencedInstanceIdException; import org.apache.kafka.common.errors.GroupAuthorizationException; import org.apache.kafka.common.internals.KafkaFutureImpl; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyIntegrationTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyIntegrationTest.java index f494f4b71b71d..ddfcd72dd92f4 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyIntegrationTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.admin.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Node; import org.apache.kafka.common.errors.DisconnectException; import org.apache.kafka.common.errors.UnknownServerException; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategyIntegrationTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategyIntegrationTest.java index acb282e1843d4..009fd5d7cea86 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategyIntegrationTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategyIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.admin.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Node; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.DisconnectException; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java index 86787295b68d3..437026be6a828 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.consumer; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientRequest; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.KafkaClient; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinatorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinatorTest.java index 50d6426043871..0e20ad11ba4a9 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinatorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinatorTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.GroupRebalanceConfig; import org.apache.kafka.clients.MockClient; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AcknowledgementCommitCallbackHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AcknowledgementCommitCallbackHandlerTest.java index c4656634942d1..7027f27b38ed8 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AcknowledgementCommitCallbackHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AcknowledgementCommitCallbackHandlerTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.AcknowledgeType; import org.apache.kafka.clients.consumer.AcknowledgementCommitCallback; import org.apache.kafka.common.TopicIdPartition; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumerTest.java index 1fe17c0c41294..642bddf349718 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumerTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.Metadata.LeaderAndEpoch; import org.apache.kafka.clients.MockClient; import org.apache.kafka.clients.NodeApiVersions; @@ -135,7 +135,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.singleton; import static java.util.Collections.singletonList; -import static org.apache.kafka.base.test.TestUtils.requiredConsumerConfig; +import static org.apache.kafka.common.test.base.TestUtils.requiredConsumerConfig; import static org.apache.kafka.clients.consumer.internals.AbstractMembershipManager.TOPIC_PARTITION_COMPARATOR; import static org.apache.kafka.clients.consumer.internals.ConsumerRebalanceListenerMethodName.ON_PARTITIONS_ASSIGNED; import static org.apache.kafka.clients.consumer.internals.ConsumerRebalanceListenerMethodName.ON_PARTITIONS_LOST; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java index c4aedae73496c..8a739c564bcee 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientResponse; import org.apache.kafka.clients.consumer.CommitFailedException; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -75,7 +75,7 @@ import java.util.stream.Stream; import static java.util.Collections.singleton; -import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; import static org.apache.kafka.clients.consumer.ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG; import static org.apache.kafka.clients.consumer.ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG; import static org.apache.kafka.clients.consumer.ConsumerConfig.GROUP_ID_CONFIG; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinatorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinatorTest.java index 6fa93b5eabc90..0b7a8b8648ee2 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinatorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinatorTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientResponse; import org.apache.kafka.clients.GroupRebalanceConfig; import org.apache.kafka.clients.MockClient; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClientTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClientTest.java index a04b7c22df092..1e199064085d3 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClientTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClientTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientResponse; import org.apache.kafka.clients.Metadata; import org.apache.kafka.clients.MockClient; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThreadTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThreadTest.java index a5b06cc98d375..1fb5851ba6e68 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThreadTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThreadTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.base.test.TestCondition; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestCondition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.internals.events.ApplicationEvent; import org.apache.kafka.clients.consumer.internals.events.ApplicationEventProcessor; import org.apache.kafka.clients.consumer.internals.events.AsyncPollEvent; @@ -43,7 +43,7 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.function.Supplier; -import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.common.test.base.TestUtils.DEFAULT_MAX_WAIT_MS; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java index 23546d4b6270c..bda96274a6ae2 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.ClientRequest; import org.apache.kafka.clients.CommonClientConfigs; @@ -131,8 +131,8 @@ import static java.util.Collections.singleton; import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; -import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; -import static org.apache.kafka.base.test.TestUtils.assertOptional; +import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; +import static org.apache.kafka.common.test.base.TestUtils.assertOptional; import static org.apache.kafka.clients.consumer.ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG; import static org.apache.kafka.clients.consumer.ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG; import static org.apache.kafka.common.requests.FetchMetadata.INVALID_SESSION_ID; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java index 66c317a8c8856..3599ee5d766f6 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.ClientRequest; import org.apache.kafka.clients.CommonClientConfigs; @@ -128,7 +128,7 @@ import static java.util.Collections.singleton; import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; -import static org.apache.kafka.base.test.TestUtils.assertOptional; +import static org.apache.kafka.common.test.base.TestUtils.assertOptional; import static org.apache.kafka.common.requests.FetchMetadata.INVALID_SESSION_ID; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegateTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegateTest.java index 58203cab3595c..cf161504d059c 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegateTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegateTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientResponse; import org.apache.kafka.clients.Metadata; import org.apache.kafka.clients.MockClient; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherTest.java index b801ce8fa522f..e497290f221c9 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherTest.java @@ -82,7 +82,7 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.singleton; import static java.util.Collections.singletonMap; -import static org.apache.kafka.base.test.TestUtils.assertOptional; +import static org.apache.kafka.common.test.base.TestUtils.assertOptional; import static org.apache.kafka.common.requests.OffsetsForLeaderEpochResponse.UNDEFINED_EPOCH; import static org.apache.kafka.common.requests.OffsetsForLeaderEpochResponse.UNDEFINED_EPOCH_OFFSET; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManagerTest.java index 6c5fb9d31245e..240a3beeffc07 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManagerTest.java @@ -65,7 +65,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/RequestManagersTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/RequestManagersTest.java index bcb2c5dc8e774..530aac75eaa63 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/RequestManagersTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/RequestManagersTest.java @@ -31,7 +31,7 @@ import java.util.Properties; import java.util.UUID; -import static org.apache.kafka.base.test.TestUtils.requiredConsumerConfig; +import static org.apache.kafka.common.test.base.TestUtils.requiredConsumerConfig; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/SubscriptionStateTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/SubscriptionStateTest.java index 4815d3cfa27d3..a62f5b9de1de5 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/SubscriptionStateTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/SubscriptionStateTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.Metadata; import org.apache.kafka.clients.NodeApiVersions; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessorTest.java index 2b94a80ad8283..41c30301cddfd 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessorTest.java @@ -65,7 +65,7 @@ import java.util.regex.Pattern; import java.util.stream.Stream; -import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; import static org.apache.kafka.clients.consumer.internals.events.CompletableEvent.calculateDeadlineMs; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java index f641848dc72b3..1877a8f6732c1 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.producer; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.KafkaClient; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/BufferPoolTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/BufferPoolTest.java index c0859980a8e3f..9237bf7bb61df 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/BufferPoolTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/BufferPoolTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.producer.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.producer.BufferExhaustedException; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.metrics.Metrics; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerBatchTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerBatchTest.java index 7408dea443167..3e99baaae4043 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerBatchTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerBatchTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.producer.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.producer.Callback; import org.apache.kafka.clients.producer.RecordMetadata; import org.apache.kafka.common.KafkaException; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/RecordAccumulatorTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/RecordAccumulatorTest.java index f4339f33b254a..62c6f1223fa3f 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/RecordAccumulatorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/RecordAccumulatorTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.producer.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.MetadataSnapshot; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java index ecc2e755d10da..5897aad9fc1ea 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.producer.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.ClientRequest; import org.apache.kafka.clients.ClientResponse; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/TransactionManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/TransactionManagerTest.java index 6f0fcbbd31512..121ec8d3032ca 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/TransactionManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/TransactionManagerTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.producer.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.MetadataSnapshot; import org.apache.kafka.clients.MockClient; diff --git a/clients/src/test/java/org/apache/kafka/common/internals/TopicTest.java b/clients/src/test/java/org/apache/kafka/common/internals/TopicTest.java index 75f3292b907ff..9f98238afb2a3 100644 --- a/clients/src/test/java/org/apache/kafka/common/internals/TopicTest.java +++ b/clients/src/test/java/org/apache/kafka/common/internals/TopicTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.errors.InvalidTopicException; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/network/CertStores.java b/clients/src/test/java/org/apache/kafka/common/network/CertStores.java index b68fd75365c6b..c7a589ce0f7c0 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/CertStores.java +++ b/clients/src/test/java/org/apache/kafka/common/network/CertStores.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.common.network; -import org.apache.kafka.base.test.TestSslUtils; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestSslUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.config.SslConfigs; import java.io.File; diff --git a/clients/src/test/java/org/apache/kafka/common/network/KafkaChannelTest.java b/clients/src/test/java/org/apache/kafka/common/network/KafkaChannelTest.java index 699443e18bc9b..7573de9258a80 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/KafkaChannelTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/KafkaChannelTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.network; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.memory.MemoryPool; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/network/NetworkReceiveTest.java b/clients/src/test/java/org/apache/kafka/common/network/NetworkReceiveTest.java index 6a914b6915173..82c0e133bfe56 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/NetworkReceiveTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/NetworkReceiveTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.network; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; diff --git a/clients/src/test/java/org/apache/kafka/common/network/NetworkTestUtils.java b/clients/src/test/java/org/apache/kafka/common/network/NetworkTestUtils.java index 0c1b6ef303b94..5dbcf2d76e535 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/NetworkTestUtils.java +++ b/clients/src/test/java/org/apache/kafka/common/network/NetworkTestUtils.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.network; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.config.AbstractConfig; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.security.auth.SecurityProtocol; diff --git a/clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java b/clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java index 747d7072ae97a..f9f3ae87bff8f 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java +++ b/clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.network; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.config.AbstractConfig; import org.apache.kafka.common.message.ApiMessageType; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SaslChannelBuilderTest.java b/clients/src/test/java/org/apache/kafka/common/network/SaslChannelBuilderTest.java index 92764b8ab5a52..6e6ea959f4e65 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SaslChannelBuilderTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SaslChannelBuilderTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.network; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.SaslConfigs; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java b/clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java index 2bd3e61774f59..37f35e8372578 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.common.network; -import org.apache.kafka.base.test.ReflectionUtils; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.ReflectionUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.memory.MemoryPool; import org.apache.kafka.common.memory.SimpleMemoryPool; @@ -59,7 +59,7 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SslSelectorTest.java b/clients/src/test/java/org/apache/kafka/common/network/SslSelectorTest.java index c476f22484022..a6ca6e5d6f21e 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SslSelectorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SslSelectorTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.common.network; -import org.apache.kafka.base.test.TestSslUtils; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestSslUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.config.SecurityConfig; import org.apache.kafka.common.memory.MemoryPool; import org.apache.kafka.common.memory.SimpleMemoryPool; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SslTransportLayerTest.java b/clients/src/test/java/org/apache/kafka/common/network/SslTransportLayerTest.java index 219b59ef9ddc0..78a32aca495a1 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SslTransportLayerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SslTransportLayerTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.common.network; -import org.apache.kafka.base.test.TestSslUtils; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestSslUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.config.SslConfigs; import org.apache.kafka.common.config.internals.BrokerSecurityConfigs; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SslVersionsTransportLayerTest.java b/clients/src/test/java/org/apache/kafka/common/network/SslVersionsTransportLayerTest.java index 3fd6eeab3d53a..a59c515149ae3 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SslVersionsTransportLayerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SslVersionsTransportLayerTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.network; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.config.SslConfigs; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.security.TestSecurityConfig; diff --git a/clients/src/test/java/org/apache/kafka/common/network/Tls12SelectorTest.java b/clients/src/test/java/org/apache/kafka/common/network/Tls12SelectorTest.java index cad5ce41ee522..b30e2c61489ec 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/Tls12SelectorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/Tls12SelectorTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.common.network; -import org.apache.kafka.base.test.TestSslUtils; +import org.apache.kafka.common.test.base.TestSslUtils; import org.apache.kafka.common.config.SslConfigs; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/network/Tls13SelectorTest.java b/clients/src/test/java/org/apache/kafka/common/network/Tls13SelectorTest.java index d978cb30e0be9..87b227f76dd1d 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/Tls13SelectorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/Tls13SelectorTest.java @@ -17,8 +17,8 @@ package org.apache.kafka.common.network; -import org.apache.kafka.base.test.TestSslUtils; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestSslUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.config.SslConfigs; import org.apache.kafka.common.test.api.Flaky; diff --git a/clients/src/test/java/org/apache/kafka/common/record/internal/DefaultRecordBatchTest.java b/clients/src/test/java/org/apache/kafka/common/record/internal/DefaultRecordBatchTest.java index 8e3887dc4e34b..6e108a70800c2 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/internal/DefaultRecordBatchTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/internal/DefaultRecordBatchTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.record.internal; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.InvalidRecordException; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.compress.ZstdCompression; diff --git a/clients/src/test/java/org/apache/kafka/common/record/internal/FileLogInputStreamTest.java b/clients/src/test/java/org/apache/kafka/common/record/internal/FileLogInputStreamTest.java index df28d1b1ccf80..cacc216756309 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/internal/FileLogInputStreamTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/internal/FileLogInputStreamTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.record.internal; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.record.internal.FileLogInputStream.FileChannelRecordBatch; import org.apache.kafka.common.utils.Utils; @@ -35,7 +35,7 @@ import java.util.stream.Stream; import static java.util.Arrays.asList; -import static org.apache.kafka.base.test.TestUtils.tempFile; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.apache.kafka.common.record.TimestampType.CREATE_TIME; import static org.apache.kafka.common.record.TimestampType.NO_TIMESTAMP_TYPE; import static org.apache.kafka.common.record.internal.RecordBatch.MAGIC_VALUE_V0; diff --git a/clients/src/test/java/org/apache/kafka/common/record/internal/FileRecordsTest.java b/clients/src/test/java/org/apache/kafka/common/record/internal/FileRecordsTest.java index f298002fbb4a2..394b2d619180e 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/internal/FileRecordsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/internal/FileRecordsTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.record.internal; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.header.Header; @@ -46,7 +46,7 @@ import java.util.stream.IntStream; import static java.util.Arrays.asList; -import static org.apache.kafka.base.test.TestUtils.tempFile; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsBuilderTest.java b/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsBuilderTest.java index 3c277dbb54177..b63f390324eee 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsBuilderTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsBuilderTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.record.internal; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.message.LeaderChangeMessage; import org.apache.kafka.common.message.LeaderChangeMessage.Voter; diff --git a/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsTest.java b/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsTest.java index 90112531f736d..b64485b75f056 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.record.internal; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.errors.CorruptRecordException; import org.apache.kafka.common.header.internals.RecordHeaders; diff --git a/clients/src/test/java/org/apache/kafka/common/record/internal/MultiRecordsSendTest.java b/clients/src/test/java/org/apache/kafka/common/record/internal/MultiRecordsSendTest.java index ac4065a6061ce..11bbe7696ab8e 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/internal/MultiRecordsSendTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/internal/MultiRecordsSendTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.record.internal; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.network.ByteBufferSend; import org.apache.kafka.common.network.Send; diff --git a/clients/src/test/java/org/apache/kafka/common/record/internal/RemoteLogInputStreamTest.java b/clients/src/test/java/org/apache/kafka/common/record/internal/RemoteLogInputStreamTest.java index 4d9c2242b5552..b70434ca79786 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/internal/RemoteLogInputStreamTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/internal/RemoteLogInputStreamTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.record.internal; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.internals.RecordHeader; @@ -36,7 +36,7 @@ import java.util.stream.Stream; import static java.util.Arrays.asList; -import static org.apache.kafka.base.test.TestUtils.tempFile; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.apache.kafka.common.record.TimestampType.CREATE_TIME; import static org.apache.kafka.common.record.TimestampType.NO_TIMESTAMP_TYPE; import static org.apache.kafka.common.record.internal.RecordBatch.MAGIC_VALUE_V0; diff --git a/clients/src/test/java/org/apache/kafka/common/record/internal/UnalignedFileRecordsTest.java b/clients/src/test/java/org/apache/kafka/common/record/internal/UnalignedFileRecordsTest.java index aee085514cfdf..2c71b282aa134 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/internal/UnalignedFileRecordsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/internal/UnalignedFileRecordsTest.java @@ -27,7 +27,7 @@ import java.nio.ByteBuffer; import java.util.Iterator; -import static org.apache.kafka.base.test.TestUtils.tempFile; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/clients/src/test/java/org/apache/kafka/common/replica/ReplicaSelectorTest.java b/clients/src/test/java/org/apache/kafka/common/replica/ReplicaSelectorTest.java index 534666968c432..1c526677c8279 100644 --- a/clients/src/test/java/org/apache/kafka/common/replica/ReplicaSelectorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/replica/ReplicaSelectorTest.java @@ -30,7 +30,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.apache.kafka.base.test.TestUtils.assertOptional; +import static org.apache.kafka.common.test.base.TestUtils.assertOptional; import static org.junit.jupiter.api.Assertions.assertEquals; public class ReplicaSelectorTest { diff --git a/clients/src/test/java/org/apache/kafka/common/requests/ApiVersionsResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/ApiVersionsResponseTest.java index bca7a7ed1d46c..5da9af12de2a5 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/ApiVersionsResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/ApiVersionsResponseTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.common.requests; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.feature.Features; import org.apache.kafka.common.feature.SupportedVersionRange; import org.apache.kafka.common.message.ApiMessageType; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/JoinGroupRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/JoinGroupRequestTest.java index c4aab66ffd254..64f6a709c26d7 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/JoinGroupRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/JoinGroupRequestTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.requests; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.errors.InvalidConfigurationException; import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.message.JoinGroupRequestData; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java index ad1f7949c9d4a..a2b31c1350c2a 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.requests; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.ElectionType; import org.apache.kafka.common.GroupState; import org.apache.kafka.common.IsolationLevel; @@ -297,7 +297,6 @@ import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static org.apache.kafka.common.protocol.ApiKeys.API_VERSIONS; -import static org.apache.kafka.common.protocol.ApiKeys.CREATE_DELEGATION_TOKEN; import static org.apache.kafka.common.protocol.ApiKeys.CREATE_PARTITIONS; import static org.apache.kafka.common.protocol.ApiKeys.CREATE_TOPICS; import static org.apache.kafka.common.protocol.ApiKeys.DELETE_ACLS; diff --git a/clients/src/test/java/org/apache/kafka/common/security/JaasContextTest.java b/clients/src/test/java/org/apache/kafka/common/security/JaasContextTest.java index 610560903b5c3..24110bb7d7a13 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/JaasContextTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/JaasContextTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.security; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.config.SaslConfigs; import org.apache.kafka.common.config.types.Password; import org.apache.kafka.common.network.ListenerName; diff --git a/clients/src/test/java/org/apache/kafka/common/security/authenticator/ClientAuthenticationFailureTest.java b/clients/src/test/java/org/apache/kafka/common/security/authenticator/ClientAuthenticationFailureTest.java index 03290ba9dd893..030908e81b80b 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/authenticator/ClientAuthenticationFailureTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/authenticator/ClientAuthenticationFailureTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.security.authenticator; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.TopicDescription; diff --git a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorFailureDelayTest.java b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorFailureDelayTest.java index 56c1c7ee2045f..a3265b96dc376 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorFailureDelayTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorFailureDelayTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.security.authenticator; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.config.SaslConfigs; import org.apache.kafka.common.config.internals.BrokerSecurityConfigs; import org.apache.kafka.common.errors.SaslAuthenticationException; diff --git a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java index 7b732b6a2c532..202e023ca9239 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.common.security.authenticator; -import org.apache.kafka.base.test.ReflectionUtils; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.ReflectionUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.NetworkClient; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.config.SaslConfigs; diff --git a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticatorTest.java b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticatorTest.java index f89f358ff06b8..85223661ecdbf 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticatorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticatorTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.security.authenticator; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.config.internals.BrokerSecurityConfigs; import org.apache.kafka.common.errors.InvalidRequestException; import org.apache.kafka.common.errors.SaslAuthenticationException; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/DefaultJwtRetrieverTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/DefaultJwtRetrieverTest.java index 7bca12f424fb5..ae43ec08333d6 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/DefaultJwtRetrieverTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/DefaultJwtRetrieverTest.java @@ -35,7 +35,7 @@ import java.util.Map; import java.util.stream.Stream; -import static org.apache.kafka.base.test.TestUtils.tempFile; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.apache.kafka.common.config.SaslConfigs.DEFAULT_SASL_OAUTHBEARER_HEADER_URLENCODE; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_HEADER_URLENCODE; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_TOKEN_ENDPOINT_URL; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/DefaultJwtValidatorTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/DefaultJwtValidatorTest.java index 940e70cca03a0..ab2603bb210b9 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/DefaultJwtValidatorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/DefaultJwtValidatorTest.java @@ -32,7 +32,7 @@ import java.util.Map; -import static org.apache.kafka.base.test.TestUtils.tempFile; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.apache.kafka.common.config.internals.BrokerSecurityConfigs.ALLOWED_SASL_OAUTHBEARER_URLS_CONFIG; import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule.OAUTHBEARER_MECHANISM; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/JwtBearerJwtRetrieverTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/JwtBearerJwtRetrieverTest.java index 4abe2c4d5f605..4eedbdd22a67c 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/JwtBearerJwtRetrieverTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/JwtBearerJwtRetrieverTest.java @@ -30,7 +30,7 @@ import javax.security.auth.login.AppConfigurationEntry; -import static org.apache.kafka.base.test.TestUtils.tempFile; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.apache.kafka.common.config.SaslConfigs.DEFAULT_SASL_OAUTHBEARER_ASSERTION_ALGORITHM; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_ALGORITHM; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_FILE; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginCallbackHandlerTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginCallbackHandlerTest.java index a1b43ace933b8..a27d37a057128 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginCallbackHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginCallbackHandlerTest.java @@ -34,7 +34,7 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.UnsupportedCallbackException; -import static org.apache.kafka.base.test.TestUtils.tempFile; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_TOKEN_ENDPOINT_URL; import static org.apache.kafka.common.config.internals.BrokerSecurityConfigs.ALLOWED_SASL_OAUTHBEARER_URLS_CONFIG; import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginCallbackHandler.CLIENT_ID_CONFIG; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/CachedFileTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/CachedFileTest.java index be02c98f7e3dc..0f4d103e47a3c 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/CachedFileTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/CachedFileTest.java @@ -30,7 +30,7 @@ import java.nio.file.StandardOpenOption; import java.util.List; -import static org.apache.kafka.base.test.TestUtils.tempFile; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ClientCredentialsRequestFormatterFactoryTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ClientCredentialsRequestFormatterFactoryTest.java index 0be348ecb3028..62dfcfd3eb067 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ClientCredentialsRequestFormatterFactoryTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ClientCredentialsRequestFormatterFactoryTest.java @@ -35,7 +35,7 @@ import java.util.Map; import java.util.stream.Stream; -import static org.apache.kafka.base.test.TestUtils.tempFile; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.apache.kafka.common.config.SaslConfigs.DEFAULT_SASL_OAUTHBEARER_HEADER_URLENCODE; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_ALGORITHM; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_CLAIM_AUD; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ConfigurationUtilsTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ConfigurationUtilsTest.java index 534f835ac6714..7927a9ca0b27c 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ConfigurationUtilsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ConfigurationUtilsTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.config.ConfigException; import org.junit.jupiter.api.AfterEach; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/VerificationKeyResolverFactoryTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/VerificationKeyResolverFactoryTest.java index e932eef4cc242..5301613d98db5 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/VerificationKeyResolverFactoryTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/VerificationKeyResolverFactoryTest.java @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.Map; -import static org.apache.kafka.base.test.TestUtils.tempFile; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_URL; import static org.apache.kafka.common.config.internals.BrokerSecurityConfigs.ALLOWED_SASL_OAUTHBEARER_URLS_CONFIG; import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule.OAUTHBEARER_MECHANISM; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/AssertionSupplierFactoryTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/AssertionSupplierFactoryTest.java index 5e7adacd8aaeb..97a58c05da113 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/AssertionSupplierFactoryTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/AssertionSupplierFactoryTest.java @@ -31,7 +31,7 @@ import java.io.IOException; import java.security.KeyPair; -import static org.apache.kafka.base.test.TestUtils.tempFile; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_ALGORITHM; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_CLAIM_AUD; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_CLAIM_EXP_SECONDS; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/FileAssertionCreatorTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/FileAssertionCreatorTest.java index 7a5357a0f5d99..e5116045bd04d 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/FileAssertionCreatorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/FileAssertionCreatorTest.java @@ -22,7 +22,7 @@ import java.io.File; -import static org.apache.kafka.base.test.TestUtils.tempFile; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertEquals; public class FileAssertionCreatorTest extends OAuthBearerTest { diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/FileAssertionJwtTemplateTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/FileAssertionJwtTemplateTest.java index 36d9f0ae7e812..ee28b68a5b20d 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/FileAssertionJwtTemplateTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/FileAssertionJwtTemplateTest.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; -import static org.apache.kafka.base.test.TestUtils.tempFile; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/clients/src/test/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapperTest.java b/clients/src/test/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapperTest.java index f4f908784e0e5..96c92189eec13 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapperTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapperTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.security.ssl; -import org.apache.kafka.base.test.TestSslUtils; +import org.apache.kafka.common.test.base.TestSslUtils; import org.apache.kafka.common.security.ssl.CommonNameLoggingTrustManagerFactoryWrapper.CommonNameLoggingTrustManager; import org.apache.kafka.common.security.ssl.CommonNameLoggingTrustManagerFactoryWrapper.NeverExpiringX509Certificate; import org.apache.kafka.common.utils.LogCaptureAppender; diff --git a/clients/src/test/java/org/apache/kafka/common/security/ssl/DefaultSslEngineFactoryTest.java b/clients/src/test/java/org/apache/kafka/common/security/ssl/DefaultSslEngineFactoryTest.java index 02a16b88e212e..e740fa5886bb5 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/ssl/DefaultSslEngineFactoryTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/ssl/DefaultSslEngineFactoryTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.security.ssl; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.config.SslConfigs; import org.apache.kafka.common.config.types.Password; diff --git a/clients/src/test/java/org/apache/kafka/common/security/ssl/SslFactoryTest.java b/clients/src/test/java/org/apache/kafka/common/security/ssl/SslFactoryTest.java index 030aa8c1903d6..95662266e45c2 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/ssl/SslFactoryTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/ssl/SslFactoryTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.common.security.ssl; -import org.apache.kafka.base.test.TestSslUtils; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestSslUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.config.ConfigException; import org.apache.kafka.common.config.SecurityConfig; diff --git a/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestKeyManagerFactory.java b/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestKeyManagerFactory.java index 254ecff4378a0..2b1f84ff8cbc7 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestKeyManagerFactory.java +++ b/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestKeyManagerFactory.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.common.security.ssl.mock; -import org.apache.kafka.base.test.TestSslUtils; -import org.apache.kafka.base.test.TestSslUtils.CertificateBuilder; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestSslUtils; +import org.apache.kafka.common.test.base.TestSslUtils.CertificateBuilder; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.config.types.Password; import java.io.File; diff --git a/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java b/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java index 24b12598ee24f..e5b1d5710d5f6 100755 --- a/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.utils; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.config.ConfigException; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/utils/internals/ByteBufferUnmapperTest.java b/clients/src/test/java/org/apache/kafka/common/utils/internals/ByteBufferUnmapperTest.java index e391e40b30778..83e71e6ba938b 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/internals/ByteBufferUnmapperTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/internals/ByteBufferUnmapperTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.common.utils.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.Test; diff --git a/connect/basic-auth-extension/src/test/java/org/apache/kafka/connect/rest/basic/auth/extension/JaasBasicAuthFilterTest.java b/connect/basic-auth-extension/src/test/java/org/apache/kafka/connect/rest/basic/auth/extension/JaasBasicAuthFilterTest.java index 5d915d7b2c9b2..645bd559f5f29 100644 --- a/connect/basic-auth-extension/src/test/java/org/apache/kafka/connect/rest/basic/auth/extension/JaasBasicAuthFilterTest.java +++ b/connect/basic-auth-extension/src/test/java/org/apache/kafka/connect/rest/basic/auth/extension/JaasBasicAuthFilterTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.connect.rest.basic.auth.extension; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.security.authenticator.TestJaasConfig; import org.apache.kafka.connect.errors.ConnectException; diff --git a/connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSinkConnectorIntegrationTest.java b/connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSinkConnectorIntegrationTest.java index 15ebf341ed747..fb6811a7445f2 100644 --- a/connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSinkConnectorIntegrationTest.java +++ b/connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSinkConnectorIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.connect.file.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.connect.file.FileStreamSinkConnector; import org.apache.kafka.connect.util.clusters.EmbeddedConnectCluster; diff --git a/connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSourceConnectorIntegrationTest.java b/connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSourceConnectorIntegrationTest.java index e789363816589..2855fcd218bd9 100644 --- a/connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSourceConnectorIntegrationTest.java +++ b/connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSourceConnectorIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.connect.file.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.connect.file.FileStreamSourceConnector; import org.apache.kafka.connect.util.clusters.EmbeddedConnectCluster; diff --git a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/DedicatedMirrorIntegrationTest.java b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/DedicatedMirrorIntegrationTest.java index c89d12d5300f3..e7bf25c050525 100644 --- a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/DedicatedMirrorIntegrationTest.java +++ b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/DedicatedMirrorIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.connect.mirror.integration; -import org.apache.kafka.base.test.NoRetryException; +import org.apache.kafka.common.test.base.NoRetryException; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.TopicDescription; import org.apache.kafka.clients.consumer.Consumer; @@ -57,7 +57,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Predicate; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.clients.consumer.ConsumerConfig.AUTO_OFFSET_RESET_CONFIG; import static org.apache.kafka.connect.mirror.MirrorMaker.CONNECTOR_CLASSES; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationBaseTest.java b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationBaseTest.java index 39d600886b99d..ac333c7f271ef 100644 --- a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationBaseTest.java +++ b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationBaseTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.connect.mirror.integration; -import org.apache.kafka.base.test.TestCondition; +import org.apache.kafka.common.test.base.TestCondition; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; @@ -95,7 +95,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.clients.consumer.ConsumerConfig.AUTO_OFFSET_RESET_CONFIG; import static org.apache.kafka.connect.mirror.MirrorConnectorConfig.METRIC_NAMES_LEGACY; import static org.apache.kafka.connect.mirror.MirrorConnectorConfig.METRIC_NAMES_NEW; diff --git a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationSSLTest.java b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationSSLTest.java index 4046a4c0552ec..f0229f98b67b1 100644 --- a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationSSLTest.java +++ b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationSSLTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.connect.mirror.integration; -import org.apache.kafka.base.test.TestSslUtils; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestSslUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.common.config.SslConfigs; import org.apache.kafka.common.config.types.Password; diff --git a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsWithCustomForwardingAdminIntegrationTest.java b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsWithCustomForwardingAdminIntegrationTest.java index bf88b00b26eaf..be7dc72fc49c1 100644 --- a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsWithCustomForwardingAdminIntegrationTest.java +++ b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsWithCustomForwardingAdminIntegrationTest.java @@ -50,7 +50,7 @@ import java.util.Set; import java.util.stream.Collectors; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.connect.mirror.MirrorConnectorConfig.FORWARDING_ADMIN_CLASS; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLIENT_ADMIN_OVERRIDES_PREFIX; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLIENT_CONSUMER_OVERRIDES_PREFIX; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/cli/ConnectStandaloneTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/cli/ConnectStandaloneTest.java index e6ddf230d6fa4..2a55884687ee8 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/cli/ConnectStandaloneTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/cli/ConnectStandaloneTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.connect.cli; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.connect.runtime.rest.entities.CreateConnectorRequest; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ConnectWorkerIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ConnectWorkerIntegrationTest.java index 6fd3f03e7dd19..fbb754fb2c56a 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ConnectWorkerIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ConnectWorkerIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.connect.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.MetadataRecoveryStrategy; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.config.ConfigDef; @@ -72,7 +72,7 @@ import jakarta.ws.rs.core.Response; import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.clients.CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG; import static org.apache.kafka.clients.CommonClientConfigs.METADATA_RECOVERY_STRATEGY_CONFIG; import static org.apache.kafka.common.config.AbstractConfig.CONFIG_PROVIDERS_CONFIG; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ErrorHandlingIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ErrorHandlingIntegrationTest.java index a94f269628556..f60b53b4215c7 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ErrorHandlingIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ErrorHandlingIntegrationTest.java @@ -42,7 +42,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLIENT_CONSUMER_OVERRIDES_PREFIX; import static org.apache.kafka.connect.runtime.ConnectorConfig.ERRORS_LOG_ENABLE_CONFIG; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ExactlyOnceSourceIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ExactlyOnceSourceIntegrationTest.java index 5abf17e03e0cb..c66dff203610c 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ExactlyOnceSourceIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ExactlyOnceSourceIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.connect.integration; -import org.apache.kafka.base.test.NoRetryException; +import org.apache.kafka.common.test.base.NoRetryException; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -79,7 +79,7 @@ import java.util.stream.IntStream; import java.util.stream.LongStream; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.clients.producer.ProducerConfig.BOOTSTRAP_SERVERS_CONFIG; import static org.apache.kafka.clients.producer.ProducerConfig.CLIENT_ID_CONFIG; import static org.apache.kafka.clients.producer.ProducerConfig.ENABLE_IDEMPOTENCE_CONFIG; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ExampleConnectIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ExampleConnectIntegrationTest.java index 35f48e2cbdd6a..138091d301f41 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ExampleConnectIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ExampleConnectIntegrationTest.java @@ -32,7 +32,7 @@ import java.util.Properties; import java.util.concurrent.TimeUnit; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.KEY_CONVERTER_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.TASKS_MAX_CONFIG; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/MonitorableSinkIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/MonitorableSinkIntegrationTest.java index 0e2ce1f29a144..1ccdbfe84493b 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/MonitorableSinkIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/MonitorableSinkIntegrationTest.java @@ -33,7 +33,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.KEY_CONVERTER_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.TASKS_MAX_CONFIG; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/OffsetsApiIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/OffsetsApiIntegrationTest.java index 0d4bf401f9428..93d89118e74aa 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/OffsetsApiIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/OffsetsApiIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.connect.integration; -import org.apache.kafka.base.test.NoRetryException; +import org.apache.kafka.common.test.base.NoRetryException; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.GroupListing; @@ -58,7 +58,7 @@ import jakarta.ws.rs.core.Response; import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.connect.integration.TestableSourceConnector.TOPIC_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.TASKS_MAX_CONFIG; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RebalanceSourceConnectorsIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RebalanceSourceConnectorsIntegrationTest.java index 8f89723c7cefd..5c0cbf5a2dcf8 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RebalanceSourceConnectorsIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RebalanceSourceConnectorsIntegrationTest.java @@ -37,7 +37,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.IntStream; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.connect.integration.TestableSourceConnector.TOPIC_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.KEY_CONVERTER_CLASS_CONFIG; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RestExtensionIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RestExtensionIntegrationTest.java index 9596f1a290f55..fccfe34aa4c15 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RestExtensionIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RestExtensionIntegrationTest.java @@ -40,7 +40,7 @@ import jakarta.ws.rs.core.Response; import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.NAME_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.TASKS_MAX_CONFIG; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RestForwardingIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RestForwardingIntegrationTest.java index aa34fa33434eb..4378597e954c3 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RestForwardingIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RestForwardingIntegrationTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.connect.integration; -import org.apache.kafka.base.test.TestSslUtils; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestSslUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.common.config.types.Password; import org.apache.kafka.common.network.ConnectionMode; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/SinkConnectorsIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/SinkConnectorsIntegrationTest.java index 6e5eb073b5f92..29449f78f0838 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/SinkConnectorsIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/SinkConnectorsIntegrationTest.java @@ -38,7 +38,7 @@ import java.util.Set; import java.util.function.Consumer; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.clients.consumer.ConsumerConfig.DEFAULT_API_TIMEOUT_MS_CONFIG; import static org.apache.kafka.clients.consumer.ConsumerConfig.PARTITION_ASSIGNMENT_STRATEGY_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLASS_CONFIG; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/StandaloneWorkerIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/StandaloneWorkerIntegrationTest.java index 382764f04c99c..d3ccd7c9df2d9 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/StandaloneWorkerIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/StandaloneWorkerIntegrationTest.java @@ -40,7 +40,7 @@ import jakarta.ws.rs.core.Response; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.connect.integration.BlockingConnectorTest.Block.BLOCK_CONFIG; import static org.apache.kafka.connect.integration.BlockingConnectorTest.CONNECTOR_START; import static org.apache.kafka.connect.integration.BlockingConnectorTest.CONNECTOR_TASK_CONFIGS; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/TransformationIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/TransformationIntegrationTest.java index ba2f079a5d3af..b3ffb7dbd5567 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/TransformationIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/TransformationIntegrationTest.java @@ -34,7 +34,7 @@ import java.util.Properties; import java.util.concurrent.TimeUnit; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.KEY_CONVERTER_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.PREDICATES_CONFIG; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/util/clusters/ConnectAssertions.java b/connect/runtime/src/test/java/org/apache/kafka/connect/util/clusters/ConnectAssertions.java index c7b1ad97ce704..697ddb9feb2f8 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/util/clusters/ConnectAssertions.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/util/clusters/ConnectAssertions.java @@ -38,7 +38,7 @@ import jakarta.ws.rs.core.Response; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; /** * A set of common assertions that can be applied to a Connect cluster during integration testing diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/util/clusters/EmbeddedConnectStandalone.java b/connect/runtime/src/test/java/org/apache/kafka/connect/util/clusters/EmbeddedConnectStandalone.java index 21a5aef641c6f..8bf01ae0215f4 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/util/clusters/EmbeddedConnectStandalone.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/util/clusters/EmbeddedConnectStandalone.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.connect.util.clusters; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.connect.cli.ConnectStandalone; import org.apache.kafka.connect.runtime.Connect; import org.apache.kafka.connect.runtime.ConnectMetrics; diff --git a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorLoaderImplTest.java b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorLoaderImplTest.java index 835ac77770420..b2430faa05515 100644 --- a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorLoaderImplTest.java +++ b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorLoaderImplTest.java @@ -50,7 +50,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Function; -import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorRuntimeTest.java b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorRuntimeTest.java index 7a5f0635e6500..0905af7afa19d 100644 --- a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorRuntimeTest.java +++ b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/CoordinatorRuntimeTest.java @@ -67,7 +67,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; import static org.apache.kafka.coordinator.common.runtime.CoordinatorRuntime.CoordinatorState.ACTIVE; import static org.apache.kafka.coordinator.common.runtime.CoordinatorRuntime.CoordinatorState.CLOSED; import static org.apache.kafka.coordinator.common.runtime.CoordinatorRuntime.CoordinatorState.FAILED; diff --git a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/MultiThreadedEventProcessorTest.java b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/MultiThreadedEventProcessorTest.java index 97c3038fac80c..8974861e64685 100644 --- a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/MultiThreadedEventProcessorTest.java +++ b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/MultiThreadedEventProcessorTest.java @@ -36,8 +36,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; -import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/core/src/test/java/kafka/security/JaasTestUtils.java b/core/src/test/java/kafka/security/JaasTestUtils.java index 3ba9c7212865e..e5430c4e11a05 100644 --- a/core/src/test/java/kafka/security/JaasTestUtils.java +++ b/core/src/test/java/kafka/security/JaasTestUtils.java @@ -18,7 +18,7 @@ import kafka.utils.TestUtils; -import org.apache.kafka.base.test.TestSslUtils; +import org.apache.kafka.common.test.base.TestSslUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.ScramMechanism; import org.apache.kafka.common.config.SaslConfigs; diff --git a/core/src/test/java/kafka/server/share/ShareFetchUtilsTest.java b/core/src/test/java/kafka/server/share/ShareFetchUtilsTest.java index 0673e43a4f8d2..ce93414c8ad1b 100644 --- a/core/src/test/java/kafka/server/share/ShareFetchUtilsTest.java +++ b/core/src/test/java/kafka/server/share/ShareFetchUtilsTest.java @@ -18,7 +18,7 @@ import kafka.server.ReplicaManager; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.internals.ShareAcquireMode; import org.apache.kafka.common.TopicIdPartition; import org.apache.kafka.common.TopicPartition; diff --git a/core/src/test/java/kafka/server/share/SharePartitionManagerTest.java b/core/src/test/java/kafka/server/share/SharePartitionManagerTest.java index 90f1179cf90ea..a4c4c5bc39197 100644 --- a/core/src/test/java/kafka/server/share/SharePartitionManagerTest.java +++ b/core/src/test/java/kafka/server/share/SharePartitionManagerTest.java @@ -20,7 +20,7 @@ import kafka.server.ReplicaManager; import kafka.server.share.SharePartitionManager.SharePartitionListener; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.AcknowledgeType; import org.apache.kafka.clients.consumer.internals.ShareAcquireMode; import org.apache.kafka.common.TopicIdPartition; diff --git a/core/src/test/java/kafka/server/share/SharePartitionTest.java b/core/src/test/java/kafka/server/share/SharePartitionTest.java index a5244fd7ec4fc..d17e17622ded6 100644 --- a/core/src/test/java/kafka/server/share/SharePartitionTest.java +++ b/core/src/test/java/kafka/server/share/SharePartitionTest.java @@ -21,7 +21,7 @@ import kafka.server.share.SharePartition.SharePartitionState; import kafka.server.share.SharePartitionManager.SharePartitionListener; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.AcknowledgeType; import org.apache.kafka.clients.consumer.internals.ShareAcquireMode; import org.apache.kafka.common.TopicIdPartition; @@ -99,7 +99,7 @@ import java.util.function.Supplier; import static kafka.server.share.SharePartition.EMPTY_MEMBER_ID; -import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; import static org.apache.kafka.server.share.fetch.ShareFetchTestUtils.memoryRecordsBuilder; import static org.apache.kafka.server.util.ServerTestUtils.clearYammerMetrics; import static org.apache.kafka.server.util.ServerTestUtils.yammerMetricValue; diff --git a/core/src/test/scala/integration/kafka/api/AbstractConsumerTest.scala b/core/src/test/scala/integration/kafka/api/AbstractConsumerTest.scala index 1268a47f4ec43..beb6f79ba9cd5 100644 --- a/core/src/test/scala/integration/kafka/api/AbstractConsumerTest.scala +++ b/core/src/test/scala/integration/kafka/api/AbstractConsumerTest.scala @@ -23,7 +23,6 @@ import org.apache.kafka.clients.consumer._ import org.apache.kafka.clients.producer.{ProducerConfig, ProducerRecord} import org.apache.kafka.common.record.TimestampType import org.apache.kafka.common.TopicPartition -import org.apache.kafka.base.test.{TestUtils => JTestUtils} import kafka.utils.TestUtils import kafka.server.BaseRequestTest import org.junit.jupiter.api.Assertions._ @@ -33,6 +32,7 @@ import scala.jdk.CollectionConverters._ import scala.collection.mutable.ArrayBuffer import org.apache.kafka.clients.producer.KafkaProducer import org.apache.kafka.common.errors.WakeupException +import org.apache.kafka.common.test.base.{TestUtils => JTestUtils} import org.apache.kafka.coordinator.group.GroupCoordinatorConfig import org.apache.kafka.server.config.ServerConfigs import org.apache.kafka.server.util.ShutdownableThread diff --git a/core/src/test/scala/integration/kafka/api/AuthorizerIntegrationTest.scala b/core/src/test/scala/integration/kafka/api/AuthorizerIntegrationTest.scala index 6f6959ed78614..a87c14e7560aa 100644 --- a/core/src/test/scala/integration/kafka/api/AuthorizerIntegrationTest.scala +++ b/core/src/test/scala/integration/kafka/api/AuthorizerIntegrationTest.scala @@ -49,7 +49,6 @@ import org.apache.kafka.common.resource.{PatternType, Resource, ResourcePattern, import org.apache.kafka.common.security.auth.KafkaPrincipal import org.apache.kafka.common.utils.Utils import org.apache.kafka.common.{ElectionType, IsolationLevel, KafkaException, TopicIdPartition, TopicPartition, Uuid, requests} -import org.apache.kafka.base.test.{TestUtils => JTestUtils} import org.apache.kafka.security.authorizer.AclEntry import org.apache.kafka.security.authorizer.AclEntry.WILDCARD_HOST import org.junit.jupiter.api.Assertions._ @@ -57,6 +56,7 @@ import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.{CsvSource, MethodSource, ValueSource} import org.apache.kafka.common.message.MetadataRequestData.MetadataRequestTopic import org.apache.kafka.common.message.WriteTxnMarkersRequestData.{WritableTxnMarker, WritableTxnMarkerTopic} +import org.apache.kafka.common.test.base.{TestUtils => JTestUtils} import org.apache.kafka.coordinator.group.GroupConfig import org.junit.jupiter.api.Test import org.junit.jupiter.api.function.Executable diff --git a/core/src/test/scala/integration/kafka/api/BaseAdminIntegrationTest.scala b/core/src/test/scala/integration/kafka/api/BaseAdminIntegrationTest.scala index a9c8c803fe7ad..7ffe2cb9fbf58 100644 --- a/core/src/test/scala/integration/kafka/api/BaseAdminIntegrationTest.scala +++ b/core/src/test/scala/integration/kafka/api/BaseAdminIntegrationTest.scala @@ -30,7 +30,7 @@ import org.apache.kafka.common.resource.ResourceType import org.apache.kafka.common.utils.Utils import org.apache.kafka.coordinator.group.GroupCoordinatorConfig import org.apache.kafka.security.authorizer.AclEntry -import org.apache.kafka.base.test.TestUtils.assertFutureThrows +import org.apache.kafka.common.test.base.TestUtils.assertFutureThrows import org.apache.kafka.server.config.{ReplicationConfigs, ServerConfigs, ServerLogConfigs} import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Test, TestInfo, Timeout} diff --git a/core/src/test/scala/integration/kafka/api/ClientOAuthIntegrationTest.scala b/core/src/test/scala/integration/kafka/api/ClientOAuthIntegrationTest.scala index de9661d99593b..c0f1018d3744b 100644 --- a/core/src/test/scala/integration/kafka/api/ClientOAuthIntegrationTest.scala +++ b/core/src/test/scala/integration/kafka/api/ClientOAuthIntegrationTest.scala @@ -33,8 +33,8 @@ import org.apache.kafka.common.config.internals.BrokerSecurityConfigs import org.apache.kafka.common.errors.SaslAuthenticationException import org.apache.kafka.common.security.auth.SecurityProtocol import org.apache.kafka.common.security.oauthbearer.{JwtRetriever, OAuthBearerLoginCallbackHandler, OAuthBearerLoginModule, OAuthBearerValidatorCallbackHandler} +import org.apache.kafka.common.test.base.TestUtils import org.apache.kafka.common.utils.Utils -import org.apache.kafka.base.test.TestUtils import org.junit.jupiter.api.Assertions.{assertDoesNotThrow, assertEquals, assertNotNull, assertThrows} import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.MethodSource diff --git a/core/src/test/scala/integration/kafka/api/GroupCoordinatorIntegrationTest.scala b/core/src/test/scala/integration/kafka/api/GroupCoordinatorIntegrationTest.scala index 0e0d500478943..4bc991da61294 100644 --- a/core/src/test/scala/integration/kafka/api/GroupCoordinatorIntegrationTest.scala +++ b/core/src/test/scala/integration/kafka/api/GroupCoordinatorIntegrationTest.scala @@ -26,12 +26,12 @@ import scala.jdk.CollectionConverters._ import org.apache.kafka.common.internals.Topic import org.apache.kafka.common.record.internal.CompressionType import org.apache.kafka.common.test.ClusterInstance +import org.apache.kafka.common.test.base.{TestUtils => JTestUtils} import org.apache.kafka.coordinator.group.GroupCoordinatorConfig import org.apache.kafka.server.config.ServerConfigs import org.apache.kafka.streams.{KafkaStreams, StreamsBuilder, StreamsConfig} import org.apache.kafka.streams.{GroupProtocol => StreamsGroupProtocol} import org.apache.kafka.storage.internals.log.UnifiedLog -import org.apache.kafka.base.test.{TestUtils => JTestUtils} import org.junit.jupiter.api.Timeout import java.time.Duration diff --git a/core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala b/core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala index 449d83133f0ba..4f7d785ee0560 100644 --- a/core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala +++ b/core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala @@ -57,7 +57,7 @@ import org.apache.kafka.server.common.{EligibleLeaderReplicasVersion, MetadataVe import org.apache.kafka.server.config.{QuotaConfig, ServerConfigs, ServerLogConfigs} import org.apache.kafka.server.logger.LoggingController import org.apache.kafka.storage.internals.log.{CleanerConfig, LogConfig, LogFileUtils} -import org.apache.kafka.base.test.TestUtils.{DEFAULT_MAX_WAIT_MS, assertFutureThrows} +import org.apache.kafka.common.test.base.TestUtils.{DEFAULT_MAX_WAIT_MS, assertFutureThrows} import org.apache.logging.log4j.core.config.Configurator import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{BeforeEach, Test, TestInfo, Timeout} diff --git a/core/src/test/scala/integration/kafka/api/SaslPlainSslEndToEndAuthorizationTest.scala b/core/src/test/scala/integration/kafka/api/SaslPlainSslEndToEndAuthorizationTest.scala index 8bd3140e4336c..13e6e840567b6 100644 --- a/core/src/test/scala/integration/kafka/api/SaslPlainSslEndToEndAuthorizationTest.scala +++ b/core/src/test/scala/integration/kafka/api/SaslPlainSslEndToEndAuthorizationTest.scala @@ -26,7 +26,7 @@ import org.apache.kafka.common.network.ConnectionMode import org.apache.kafka.common.security.auth._ import org.apache.kafka.common.security.authenticator.DefaultKafkaPrincipalBuilder import org.apache.kafka.common.security.plain.PlainAuthenticateCallback -import org.apache.kafka.base.test.TestSslUtils +import org.apache.kafka.common.test.base.TestSslUtils import org.junit.jupiter.api.Assertions.assertTrue import java.util diff --git a/core/src/test/scala/integration/kafka/api/SaslScramSslEndToEndAuthorizationTest.scala b/core/src/test/scala/integration/kafka/api/SaslScramSslEndToEndAuthorizationTest.scala index 24b2447539693..a9fb34a470f5b 100644 --- a/core/src/test/scala/integration/kafka/api/SaslScramSslEndToEndAuthorizationTest.scala +++ b/core/src/test/scala/integration/kafka/api/SaslScramSslEndToEndAuthorizationTest.scala @@ -22,8 +22,8 @@ import java.util.Properties import kafka.utils._ import org.apache.kafka.common.security.auth.KafkaPrincipal import org.apache.kafka.common.security.scram.internals.ScramMechanism +import org.apache.kafka.common.test.base.TestSslUtils import org.apache.kafka.metadata.storage.Formatter -import org.apache.kafka.base.test.TestSslUtils import scala.jdk.CollectionConverters._ import org.junit.jupiter.api.Assertions._ diff --git a/core/src/test/scala/integration/kafka/api/SaslSslAdminIntegrationTest.scala b/core/src/test/scala/integration/kafka/api/SaslSslAdminIntegrationTest.scala index 4987a4c9e73f9..e0942e24fca3a 100644 --- a/core/src/test/scala/integration/kafka/api/SaslSslAdminIntegrationTest.scala +++ b/core/src/test/scala/integration/kafka/api/SaslSslAdminIntegrationTest.scala @@ -34,7 +34,7 @@ import org.apache.kafka.security.authorizer.AclEntry.{WILDCARD_HOST, WILDCARD_PR import org.apache.kafka.server.config.{DelegationTokenManagerConfigs, ServerConfigs, ServerLogConfigs} import org.apache.kafka.metadata.authorizer.StandardAuthorizer import org.apache.kafka.server.authorizer.{Authorizer => JAuthorizer} -import org.apache.kafka.base.test.TestUtils.assertFutureThrows +import org.apache.kafka.common.test.base.TestUtils.assertFutureThrows import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, Test, TestInfo, Timeout} diff --git a/core/src/test/scala/integration/kafka/api/TransactionsTest.scala b/core/src/test/scala/integration/kafka/api/TransactionsTest.scala index 28e0cc76fd925..a1448598a237d 100644 --- a/core/src/test/scala/integration/kafka/api/TransactionsTest.scala +++ b/core/src/test/scala/integration/kafka/api/TransactionsTest.scala @@ -24,6 +24,7 @@ import org.apache.kafka.clients.consumer._ import org.apache.kafka.clients.producer.{KafkaProducer, ProducerRecord} import org.apache.kafka.common.{KafkaException, TopicPartition} import org.apache.kafka.common.errors.{ConcurrentTransactionsException, InvalidProducerEpochException, ProducerFencedException, TimeoutException} +import org.apache.kafka.common.test.base import org.apache.kafka.coordinator.group.GroupCoordinatorConfig import org.apache.kafka.coordinator.transaction.{TransactionLogConfig, TransactionStateManagerConfig} import org.apache.kafka.server.config.{ReplicationConfigs, ServerConfigs, ServerLogConfigs} @@ -850,7 +851,7 @@ class TransactionsTest extends IntegrationTestHarness { Thread.sleep(6000) // Wait for the record to time out restartDeadBrokers() - org.apache.kafka.base.test.TestUtils.assertFutureThrows(classOf[TimeoutException], failedFuture) + base.TestUtils.assertFutureThrows(classOf[TimeoutException], failedFuture) // Ensure the producer transitions to abortable_error state. TestUtils.waitUntilTrue(() => { var failed = false @@ -935,7 +936,7 @@ class TransactionsTest extends IntegrationTestHarness { Thread.sleep(6000) // Wait for the record to time out restartDeadBrokers() - org.apache.kafka.base.test.TestUtils.assertFutureThrows(classOf[TimeoutException], failedFuture) + base.TestUtils.assertFutureThrows(classOf[TimeoutException], failedFuture) producer.abortTransaction() // Third transaction: commit diff --git a/core/src/test/scala/integration/kafka/server/DynamicBrokerReconfigurationTest.scala b/core/src/test/scala/integration/kafka/server/DynamicBrokerReconfigurationTest.scala index d0c600eba92b4..139a28885a10b 100644 --- a/core/src/test/scala/integration/kafka/server/DynamicBrokerReconfigurationTest.scala +++ b/core/src/test/scala/integration/kafka/server/DynamicBrokerReconfigurationTest.scala @@ -53,6 +53,7 @@ import org.apache.kafka.common.network.CertStores.{KEYSTORE_PROPS, TRUSTSTORE_PR import org.apache.kafka.common.record.TimestampType import org.apache.kafka.common.security.auth.SecurityProtocol import org.apache.kafka.common.serialization.{StringDeserializer, StringSerializer} +import org.apache.kafka.common.test.base.TestSslUtils import org.apache.kafka.coordinator.transaction.TransactionLogConfig import org.apache.kafka.network.SocketServerConfigs import org.apache.kafka.raft.MetadataLogConfig @@ -63,7 +64,6 @@ import org.apache.kafka.server.record.BrokerCompressionType import org.apache.kafka.server.util.ShutdownableThread import org.apache.kafka.server.quota.{ClientQuotaEntity, ClientQuotaManager} import org.apache.kafka.storage.internals.log.{CleanerConfig, LogConfig, UnifiedLog} -import org.apache.kafka.base.test.TestSslUtils import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, BeforeEach, TestInfo} import org.junit.jupiter.params.ParameterizedTest diff --git a/core/src/test/scala/integration/kafka/server/GssapiAuthenticationTest.scala b/core/src/test/scala/integration/kafka/server/GssapiAuthenticationTest.scala index d90f2a122123c..a9a5310d2a7ac 100644 --- a/core/src/test/scala/integration/kafka/server/GssapiAuthenticationTest.scala +++ b/core/src/test/scala/integration/kafka/server/GssapiAuthenticationTest.scala @@ -34,6 +34,7 @@ import org.apache.kafka.common.network._ import org.apache.kafka.common.security.{JaasContext, TestSecurityConfig} import org.apache.kafka.common.security.auth.{Login, SecurityProtocol} import org.apache.kafka.common.security.kerberos.KerberosLogin +import org.apache.kafka.common.test.base import org.apache.kafka.common.utils.MockTime import org.apache.kafka.common.utils.internals.LogContext import org.apache.kafka.network.SocketServerConfigs @@ -269,7 +270,7 @@ class GssapiAuthenticationTest extends IntegrationTestHarness with SaslSetup { val jaasContexts = java.util.Map.of("GSSAPI", JaasContext.loadClientContext(config.values())) val channelBuilder = new SaslChannelBuilder(ConnectionMode.CLIENT, jaasContexts, securityProtocol, null, false, kafkaClientSaslMechanism, null, null, null, time, new LogContext(), - _ => org.apache.kafka.base.test.TestUtils.defaultApiVersionsResponse(ListenerType.BROKER)) { + _ => base.TestUtils.defaultApiVersionsResponse(ListenerType.BROKER)) { override protected def defaultLoginClass(): Class[_ <: Login] = classOf[TestableKerberosLogin] } channelBuilder.configure(config.values()) diff --git a/core/src/test/scala/unit/kafka/coordinator/group/CoordinatorPartitionWriterTest.scala b/core/src/test/scala/unit/kafka/coordinator/group/CoordinatorPartitionWriterTest.scala index 40cddfafbbbf9..d5ea2f7f17f05 100644 --- a/core/src/test/scala/unit/kafka/coordinator/group/CoordinatorPartitionWriterTest.scala +++ b/core/src/test/scala/unit/kafka/coordinator/group/CoordinatorPartitionWriterTest.scala @@ -28,7 +28,7 @@ import org.apache.kafka.server.LogAppendResult import org.apache.kafka.server.LogAppendResult.LogAppendSummary import org.apache.kafka.server.common.TransactionVersion import org.apache.kafka.storage.internals.log.{AppendOrigin, LogAppendInfo, LogConfig, RecordValidationStats, VerificationGuard} -import org.apache.kafka.base.test.TestUtils.assertFutureThrows +import org.apache.kafka.common.test.base.TestUtils.assertFutureThrows import org.junit.jupiter.api.Assertions.{assertEquals, assertNull, assertThrows, assertTrue} import org.junit.jupiter.api.Test import org.junit.jupiter.params.ParameterizedTest diff --git a/core/src/test/scala/unit/kafka/network/SocketServerTest.scala b/core/src/test/scala/unit/kafka/network/SocketServerTest.scala index 39e97eca8eb47..b41e6bb323253 100644 --- a/core/src/test/scala/unit/kafka/network/SocketServerTest.scala +++ b/core/src/test/scala/unit/kafka/network/SocketServerTest.scala @@ -46,8 +46,7 @@ import org.apache.kafka.server.metrics.KafkaYammerMetrics import org.apache.kafka.server.network.ConnectionDisconnectListener import org.apache.kafka.server.quota.{ThrottleCallback, ThrottledChannel} import org.apache.kafka.server.util.ServerTestUtils -import org.apache.kafka.base.test.TestSslUtils -import org.apache.kafka.base.test.ReflectionUtils +import org.apache.kafka.common.test.base.{ReflectionUtils, TestSslUtils} import org.apache.logging.log4j.{Level, LogManager} import org.apache.logging.log4j.core.config.Configurator import org.junit.jupiter.api.Assertions._ diff --git a/core/src/test/scala/unit/kafka/server/AbstractApiVersionsRequestTest.scala b/core/src/test/scala/unit/kafka/server/AbstractApiVersionsRequestTest.scala index ec01e2468b2ca..351fe19f883b6 100644 --- a/core/src/test/scala/unit/kafka/server/AbstractApiVersionsRequestTest.scala +++ b/core/src/test/scala/unit/kafka/server/AbstractApiVersionsRequestTest.scala @@ -24,10 +24,10 @@ import org.apache.kafka.common.network.ListenerName import org.apache.kafka.common.protocol.ApiKeys import org.apache.kafka.common.requests.{ApiVersionsRequest, ApiVersionsResponse, RequestUtils} import org.apache.kafka.common.test.ClusterInstance +import org.apache.kafka.common.test.base.TestUtils import org.apache.kafka.common.utils.Utils import org.apache.kafka.server.IntegrationTestUtils import org.apache.kafka.server.common.{EligibleLeaderReplicasVersion, GroupVersion, MetadataVersion, ShareVersion, StreamsVersion, TransactionVersion} -import org.apache.kafka.base.test.TestUtils import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.Tag diff --git a/core/src/test/scala/unit/kafka/server/ControllerApisTest.scala b/core/src/test/scala/unit/kafka/server/ControllerApisTest.scala index 9c1acc489d0f1..d6144a9e17fec 100644 --- a/core/src/test/scala/unit/kafka/server/ControllerApisTest.scala +++ b/core/src/test/scala/unit/kafka/server/ControllerApisTest.scala @@ -48,6 +48,7 @@ import org.apache.kafka.common.test.MockController import org.apache.kafka.common.utils.MockTime import org.apache.kafka.common.{ElectionType, Uuid} import org.apache.kafka.common.requests.RequestHeader +import org.apache.kafka.common.test.base.TestUtils import org.apache.kafka.controller.ControllerRequestContextUtil.ANONYMOUS_CONTEXT import org.apache.kafka.controller.{Controller, ControllerRequestContext, ResultOrError} import org.apache.kafka.image.publisher.ControllerRegistrationsPublisher @@ -61,7 +62,6 @@ import org.apache.kafka.server.common.{ApiMessageAndVersion, FinalizedFeatures, import org.apache.kafka.server.config.ServerConfigs import org.apache.kafka.server.quota.{ClientQuotaManager, ControllerMutationQuota, ControllerMutationQuotaManager, ReplicationQuotaManager} import org.apache.kafka.storage.internals.log.CleanerConfig -import org.apache.kafka.base.test.TestUtils import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{AfterEach, Test} import org.junit.jupiter.params.ParameterizedTest diff --git a/core/src/test/scala/unit/kafka/server/ControllerMutationQuotaTest.scala b/core/src/test/scala/unit/kafka/server/ControllerMutationQuotaTest.scala index ec74399ffb11c..407d50e18bc7b 100644 --- a/core/src/test/scala/unit/kafka/server/ControllerMutationQuotaTest.scala +++ b/core/src/test/scala/unit/kafka/server/ControllerMutationQuotaTest.scala @@ -41,10 +41,10 @@ import org.apache.kafka.common.requests.DeleteTopicsResponse import org.apache.kafka.common.security.auth.AuthenticationContext import org.apache.kafka.common.security.auth.KafkaPrincipal import org.apache.kafka.common.security.authenticator.DefaultKafkaPrincipalBuilder +import org.apache.kafka.common.test.base.{TestUtils => JTestUtils} import org.apache.kafka.server.config.{QuotaConfig, ServerConfigs} import org.apache.kafka.server.quota.{ClientQuotaManager, QuotaType} import org.apache.kafka.coordinator.group.GroupCoordinatorConfig -import org.apache.kafka.base.test.{TestUtils => JTestUtils} import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Assertions.fail diff --git a/core/src/test/scala/unit/kafka/server/ControllerRegistrationManagerTest.scala b/core/src/test/scala/unit/kafka/server/ControllerRegistrationManagerTest.scala index d4484ac187891..df85b7e9a686e 100644 --- a/core/src/test/scala/unit/kafka/server/ControllerRegistrationManagerTest.scala +++ b/core/src/test/scala/unit/kafka/server/ControllerRegistrationManagerTest.scala @@ -22,6 +22,7 @@ import org.apache.kafka.common.message.ControllerRegistrationResponseData import org.apache.kafka.common.metadata.{FeatureLevelRecord, RegisterControllerRecord} import org.apache.kafka.common.protocol.Errors import org.apache.kafka.common.requests.ControllerRegistrationResponse +import org.apache.kafka.common.test.base.TestUtils import org.apache.kafka.common.utils.internals.ExponentialBackoff import org.apache.kafka.image.loader.{LogDeltaManifest, SnapshotManifest} import org.apache.kafka.image.{MetadataDelta, MetadataImage, MetadataProvenance} @@ -31,7 +32,6 @@ import org.apache.kafka.raft.{KRaftConfigs, LeaderAndEpoch, QuorumConfig} import org.apache.kafka.server.common.MetadataVersion import org.apache.kafka.server.config.ServerLogConfigs import org.apache.kafka.server.controller.ControllerRegistrationManager -import org.apache.kafka.base.test.TestUtils import org.junit.jupiter.api.Assertions.{assertEquals, assertFalse, assertTrue} import org.junit.jupiter.api.{Test, Timeout} import org.junit.jupiter.params.ParameterizedTest diff --git a/core/src/test/scala/unit/kafka/server/DynamicConfigChangeTest.scala b/core/src/test/scala/unit/kafka/server/DynamicConfigChangeTest.scala index eb15b7bb81447..56f4a819129ae 100644 --- a/core/src/test/scala/unit/kafka/server/DynamicConfigChangeTest.scala +++ b/core/src/test/scala/unit/kafka/server/DynamicConfigChangeTest.scala @@ -40,7 +40,7 @@ import org.apache.kafka.server.log.remote.TopicPartitionLog import org.apache.kafka.server.log.remote.storage.RemoteLogManager import org.apache.kafka.server.quota.ReplicationQuotaManager import org.apache.kafka.storage.internals.log.{LogConfig, UnifiedLog} -import org.apache.kafka.base.test.TestUtils.assertFutureThrows +import org.apache.kafka.common.test.base.TestUtils.assertFutureThrows import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.{Test, Timeout} import org.mockito.ArgumentCaptor diff --git a/core/src/test/scala/unit/kafka/server/KafkaMetricsReporterTest.scala b/core/src/test/scala/unit/kafka/server/KafkaMetricsReporterTest.scala index e84b116e1793d..3e694cba390bd 100644 --- a/core/src/test/scala/unit/kafka/server/KafkaMetricsReporterTest.scala +++ b/core/src/test/scala/unit/kafka/server/KafkaMetricsReporterTest.scala @@ -20,10 +20,10 @@ import java.util import java.util.concurrent.atomic.AtomicReference import kafka.utils.TestUtils import org.apache.kafka.common.metrics.{KafkaMetric, MetricsContext, MetricsReporter} +import org.apache.kafka.common.test.base.{TestUtils => JTestUtils} import org.apache.kafka.common.utils.Utils import org.apache.kafka.server.config.ServerConfigs import org.apache.kafka.server.metrics.MetricConfigs -import org.apache.kafka.base.test.{TestUtils => JTestUtils} import org.junit.jupiter.api.{AfterEach, BeforeEach, Test, TestInfo} import org.junit.jupiter.api.Assertions._ diff --git a/core/src/test/scala/unit/kafka/server/KafkaRaftServerTest.scala b/core/src/test/scala/unit/kafka/server/KafkaRaftServerTest.scala index 322f954076fff..14c840a6b9f9d 100644 --- a/core/src/test/scala/unit/kafka/server/KafkaRaftServerTest.scala +++ b/core/src/test/scala/unit/kafka/server/KafkaRaftServerTest.scala @@ -16,6 +16,7 @@ */ package kafka.server +import org.apache.kafka.common.test.base.TestUtils import java.io.File import java.nio.file.Files import java.util.{Optional, Properties} @@ -28,7 +29,6 @@ import org.apache.kafka.network.SocketServerConfigs import org.apache.kafka.server.config.ServerLogConfigs import org.apache.kafka.server.common.MetadataVersion import org.apache.kafka.storage.internals.log.UnifiedLog -import org.apache.kafka.base.test.TestUtils import org.junit.jupiter.api.Assertions._ import org.junit.jupiter.api.Test diff --git a/core/src/test/scala/unit/kafka/server/LogRecoveryTest.scala b/core/src/test/scala/unit/kafka/server/LogRecoveryTest.scala index e844bcff9000a..e32c4660209e2 100755 --- a/core/src/test/scala/unit/kafka/server/LogRecoveryTest.scala +++ b/core/src/test/scala/unit/kafka/server/LogRecoveryTest.scala @@ -24,6 +24,7 @@ import org.apache.kafka.common.TopicPartition import org.apache.kafka.common.network.ListenerName import org.apache.kafka.common.security.auth.SecurityProtocol import org.apache.kafka.common.serialization.{IntegerSerializer, StringSerializer} +import org.apache.kafka.common.test.base import org.apache.kafka.server.config.ReplicationConfigs import org.apache.kafka.storage.internals.checkpoint.OffsetCheckpointFile import org.junit.jupiter.api.Assertions._ @@ -260,7 +261,7 @@ class LogRecoveryTest extends QuorumTestHarness { private def getLeaderIdForPartition[B <: KafkaBroker]( brokers: Seq[B], tp: TopicPartition, - timeout: Long = org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS): Int = { + timeout: Long = base.TestUtils.DEFAULT_MAX_WAIT_MS): Int = { def leaderExists: Option[Int] = { brokers.find { broker => broker.replicaManager.onlinePartition(tp).exists(_.leaderLogIfLocal.isDefined) diff --git a/core/src/test/scala/unit/kafka/server/epoch/LeaderEpochIntegrationTest.scala b/core/src/test/scala/unit/kafka/server/epoch/LeaderEpochIntegrationTest.scala index cb6c3431e4f86..f0720d9d9db76 100644 --- a/core/src/test/scala/unit/kafka/server/epoch/LeaderEpochIntegrationTest.scala +++ b/core/src/test/scala/unit/kafka/server/epoch/LeaderEpochIntegrationTest.scala @@ -31,10 +31,10 @@ import org.apache.kafka.common.requests.OffsetsForLeaderEpochResponse.UNDEFINED_ import org.apache.kafka.common.requests.{OffsetsForLeaderEpochRequest, OffsetsForLeaderEpochResponse} import org.apache.kafka.common.security.auth.SecurityProtocol import org.apache.kafka.common.serialization.StringSerializer +import org.apache.kafka.common.test.base.{TestUtils => JTestUtils} import org.apache.kafka.common.utils.Time import org.apache.kafka.common.utils.internals.LogContext import org.apache.kafka.server.network.BrokerEndPoint -import org.apache.kafka.base.test.{TestUtils => JTestUtils} import org.junit.jupiter.api.{AfterEach, Test} import org.junit.jupiter.api.Assertions._ diff --git a/core/src/test/scala/unit/kafka/utils/TestUtils.scala b/core/src/test/scala/unit/kafka/utils/TestUtils.scala index 784b5a74d1224..1780af5f14eb2 100755 --- a/core/src/test/scala/unit/kafka/utils/TestUtils.scala +++ b/core/src/test/scala/unit/kafka/utils/TestUtils.scala @@ -38,6 +38,7 @@ import org.apache.kafka.common.requests._ import org.apache.kafka.common.resource.ResourcePattern import org.apache.kafka.common.security.auth.SecurityProtocol import org.apache.kafka.common.serialization._ +import org.apache.kafka.common.test.base.{TestUtils => JTestUtils} import org.apache.kafka.common.utils.Utils import org.apache.kafka.common.utils.Utils.formatAddress import org.apache.kafka.coordinator.group.GroupCoordinatorConfig @@ -51,7 +52,6 @@ import org.apache.kafka.server.metrics.KafkaYammerMetrics import org.apache.kafka.server.util.MockTime import org.apache.kafka.storage.internals.log._ import org.apache.kafka.storage.log.metrics.BrokerTopicStats -import org.apache.kafka.base.test.{TestUtils => JTestUtils} import org.junit.jupiter.api.Assertions._ import org.mockito.ArgumentMatchers.{any, anyBoolean} import org.mockito.Mockito diff --git a/gradle/spotbugs-exclude.xml b/gradle/spotbugs-exclude.xml index 14382159ef913..82b81d3b5e19f 100644 --- a/gradle/spotbugs-exclude.xml +++ b/gradle/spotbugs-exclude.xml @@ -429,7 +429,7 @@ For a detailed description of spotbugs bug categories, see https://spotbugs.read - + diff --git a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorServiceTest.java b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorServiceTest.java index 5945cf811d1bf..3c12a80b9fe15 100644 --- a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorServiceTest.java +++ b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorServiceTest.java @@ -142,7 +142,7 @@ import java.util.concurrent.TimeoutException; import java.util.stream.Stream; -import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; import static org.apache.kafka.common.requests.ConsumerGroupHeartbeatRequest.LEAVE_GROUP_STATIC_MEMBER_EPOCH; import static org.apache.kafka.common.requests.JoinGroupRequest.UNKNOWN_MEMBER_ID; import static org.apache.kafka.coordinator.common.runtime.TestUtil.requestContext; diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/log/StressTestLog.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/log/StressTestLog.java index fa5d9a7fa01f2..ca21983d75f3e 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/log/StressTestLog.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/log/StressTestLog.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.jmh.log; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.OffsetOutOfRangeException; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.config.TopicConfig; diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/util/BenchmarkConfigUtils.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/util/BenchmarkConfigUtils.java index 7cc75751440fb..dd235749dfd11 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/util/BenchmarkConfigUtils.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/util/BenchmarkConfigUtils.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.jmh.util; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; import org.apache.kafka.network.SocketServerConfigs; import org.apache.kafka.raft.KRaftConfigs; diff --git a/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTest.java b/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTest.java index 27ed6a7f4da04..3386b153dafa1 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.controller; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.metadata.RegisterBrokerRecord; import org.apache.kafka.raft.LeaderAndEpoch; import org.apache.kafka.server.common.ApiMessageAndVersion; diff --git a/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTestEnv.java b/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTestEnv.java index 7fd425ecdd9c9..71740db4fd532 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTestEnv.java +++ b/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTestEnv.java @@ -17,7 +17,7 @@ package org.apache.kafka.controller; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.LogContext; diff --git a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerMetricsIntegrationTest.java b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerMetricsIntegrationTest.java index 8ac3b22ff99d8..985d9105c058f 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerMetricsIntegrationTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerMetricsIntegrationTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.controller; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.message.BrokerHeartbeatRequestData; import org.apache.kafka.common.message.RequestHeaderData; diff --git a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java index e7fb0d9b60adf..3836c01f67661 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.controller; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.config.ConfigResource; import org.apache.kafka.common.config.TopicConfig; diff --git a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTestEnv.java b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTestEnv.java index 43bf2e156037a..19a4e9225a18f 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTestEnv.java +++ b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTestEnv.java @@ -17,7 +17,7 @@ package org.apache.kafka.controller; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.metadata.FakeKafkaConfigSchema; import org.apache.kafka.metadata.bootstrap.BootstrapMetadata; import org.apache.kafka.raft.LeaderAndEpoch; diff --git a/metadata/src/test/java/org/apache/kafka/image/loader/MetadataLoaderTest.java b/metadata/src/test/java/org/apache/kafka/image/loader/MetadataLoaderTest.java index 3dec0b726a64a..a36dcd89cbf31 100644 --- a/metadata/src/test/java/org/apache/kafka/image/loader/MetadataLoaderTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/loader/MetadataLoaderTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.image.loader; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.config.ConfigResource; import org.apache.kafka.common.message.KRaftVersionRecord; diff --git a/metadata/src/test/java/org/apache/kafka/image/publisher/SnapshotGeneratorTest.java b/metadata/src/test/java/org/apache/kafka/image/publisher/SnapshotGeneratorTest.java index b19490f834ce0..c79e431870983 100644 --- a/metadata/src/test/java/org/apache/kafka/image/publisher/SnapshotGeneratorTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/publisher/SnapshotGeneratorTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.image.publisher; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.image.MetadataDelta; import org.apache.kafka.image.MetadataImage; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapDirectoryTest.java b/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapDirectoryTest.java index 1c336879b4e90..bc5d47a143733 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapDirectoryTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapDirectoryTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.metadata.bootstrap; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.metadata.FeatureLevelRecord; import org.apache.kafka.common.metadata.NoOpRecord; import org.apache.kafka.common.utils.Utils; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/storage/FormatterTest.java b/metadata/src/test/java/org/apache/kafka/metadata/storage/FormatterTest.java index 5778eb14315c6..b578be1bd5d7c 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/storage/FormatterTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/storage/FormatterTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.metadata.storage; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.metadata.FeatureLevelRecord; import org.apache.kafka.common.metadata.UserScramCredentialRecord; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/storage/ScramParserTest.java b/metadata/src/test/java/org/apache/kafka/metadata/storage/ScramParserTest.java index c342fc87ffbdd..cb4eb6f4112ba 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/storage/ScramParserTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/storage/ScramParserTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.metadata.storage; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.metadata.UserScramCredentialRecord; import org.apache.kafka.common.security.scram.internals.ScramFormatter; import org.apache.kafka.common.security.scram.internals.ScramMechanism; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/util/BatchFileWriterReaderTest.java b/metadata/src/test/java/org/apache/kafka/metadata/util/BatchFileWriterReaderTest.java index 85d83dd655ce8..05a40b4c68524 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/util/BatchFileWriterReaderTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/util/BatchFileWriterReaderTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.metadata.util; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.message.SnapshotFooterRecord; import org.apache.kafka.common.message.SnapshotHeaderRecord; diff --git a/raft/src/test/java/org/apache/kafka/raft/FileQuorumStateStoreTest.java b/raft/src/test/java/org/apache/kafka/raft/FileQuorumStateStoreTest.java index 703a41e1990c8..28dd68ba1a31b 100644 --- a/raft/src/test/java/org/apache/kafka/raft/FileQuorumStateStoreTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/FileQuorumStateStoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.raft; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.protocol.types.TaggedFields; import org.apache.kafka.raft.generated.QuorumStateData; diff --git a/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientTest.java b/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientTest.java index a0bfc60363706..cc5a2bdd55f91 100644 --- a/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.raft; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.errors.RecordBatchTooLargeException; import org.apache.kafka.common.memory.MemoryPool; @@ -64,7 +64,7 @@ import java.util.concurrent.TimeoutException; import java.util.stream.Stream; -import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; import static org.apache.kafka.raft.RaftClientTestContext.Builder.DEFAULT_ELECTION_TIMEOUT_MS; import static org.apache.kafka.raft.RaftClientTestContext.RaftProtocol.KIP_853_PROTOCOL; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/raft/src/test/java/org/apache/kafka/raft/MockExpirationServiceTest.java b/raft/src/test/java/org/apache/kafka/raft/MockExpirationServiceTest.java index 189c0421bc88a..95a00b38642a7 100644 --- a/raft/src/test/java/org/apache/kafka/raft/MockExpirationServiceTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/MockExpirationServiceTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.raft; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.utils.MockTime; diff --git a/raft/src/test/java/org/apache/kafka/raft/RaftClientTestContext.java b/raft/src/test/java/org/apache/kafka/raft/RaftClientTestContext.java index bbab73071671c..7e08b269f2cd4 100644 --- a/raft/src/test/java/org/apache/kafka/raft/RaftClientTestContext.java +++ b/raft/src/test/java/org/apache/kafka/raft/RaftClientTestContext.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.raft; -import org.apache.kafka.base.test.TestCondition; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestCondition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Node; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; diff --git a/raft/src/test/java/org/apache/kafka/raft/internals/KafkaRaftLogTest.java b/raft/src/test/java/org/apache/kafka/raft/internals/KafkaRaftLogTest.java index 2e60c77d24efe..b01983726a992 100644 --- a/raft/src/test/java/org/apache/kafka/raft/internals/KafkaRaftLogTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/internals/KafkaRaftLogTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.raft.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.config.AbstractConfig; @@ -79,7 +79,7 @@ import java.util.Optional; import java.util.Properties; -import static org.apache.kafka.base.test.TestUtils.assertOptional; +import static org.apache.kafka.common.test.base.TestUtils.assertOptional; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/raft/src/test/java/org/apache/kafka/raft/internals/RecordsBatchReaderTest.java b/raft/src/test/java/org/apache/kafka/raft/internals/RecordsBatchReaderTest.java index 83265573581eb..558271b1b7a3d 100644 --- a/raft/src/test/java/org/apache/kafka/raft/internals/RecordsBatchReaderTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/internals/RecordsBatchReaderTest.java @@ -40,7 +40,7 @@ import java.util.NoSuchElementException; import java.util.Set; -import static org.apache.kafka.base.test.TestUtils.tempFile; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/raft/src/test/java/org/apache/kafka/raft/internals/RecordsIteratorTest.java b/raft/src/test/java/org/apache/kafka/raft/internals/RecordsIteratorTest.java index 4d05391125b9e..fc1d99047c758 100644 --- a/raft/src/test/java/org/apache/kafka/raft/internals/RecordsIteratorTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/internals/RecordsIteratorTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.raft.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.errors.CorruptRecordException; import org.apache.kafka.common.message.KRaftVersionRecord; diff --git a/raft/src/test/java/org/apache/kafka/raft/internals/ThresholdPurgatoryTest.java b/raft/src/test/java/org/apache/kafka/raft/internals/ThresholdPurgatoryTest.java index 79ac82dfdc9ff..d5b0d8e16fce4 100644 --- a/raft/src/test/java/org/apache/kafka/raft/internals/ThresholdPurgatoryTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/internals/ThresholdPurgatoryTest.java @@ -25,7 +25,7 @@ import java.util.concurrent.CompletableFuture; -import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/raft/src/test/java/org/apache/kafka/snapshot/FileRawSnapshotTest.java b/raft/src/test/java/org/apache/kafka/snapshot/FileRawSnapshotTest.java index 278758c87b88d..a1033c75a4d29 100644 --- a/raft/src/test/java/org/apache/kafka/snapshot/FileRawSnapshotTest.java +++ b/raft/src/test/java/org/apache/kafka/snapshot/FileRawSnapshotTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.snapshot; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.record.internal.MemoryRecords; import org.apache.kafka.common.record.internal.Record; diff --git a/raft/src/test/java/org/apache/kafka/snapshot/SnapshotsTest.java b/raft/src/test/java/org/apache/kafka/snapshot/SnapshotsTest.java index 4708152ba3d57..1a5d67222de62 100644 --- a/raft/src/test/java/org/apache/kafka/snapshot/SnapshotsTest.java +++ b/raft/src/test/java/org/apache/kafka/snapshot/SnapshotsTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.snapshot; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.server.common.OffsetAndEpoch; diff --git a/server-common/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesEnsembleTest.java b/server-common/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesEnsembleTest.java index 84e0e10c609f0..35cb0fd812a1c 100644 --- a/server-common/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesEnsembleTest.java +++ b/server-common/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesEnsembleTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.metadata.properties; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Uuid; import org.junit.jupiter.api.Test; diff --git a/server-common/src/test/java/org/apache/kafka/metadata/properties/PropertiesUtilsTest.java b/server-common/src/test/java/org/apache/kafka/metadata/properties/PropertiesUtilsTest.java index 0b0598b521bbc..b52afc069b53e 100644 --- a/server-common/src/test/java/org/apache/kafka/metadata/properties/PropertiesUtilsTest.java +++ b/server-common/src/test/java/org/apache/kafka/metadata/properties/PropertiesUtilsTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.metadata.properties; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/server-common/src/test/java/org/apache/kafka/queue/KafkaEventQueueTest.java b/server-common/src/test/java/org/apache/kafka/queue/KafkaEventQueueTest.java index c74747491796e..e59599fa27edf 100644 --- a/server-common/src/test/java/org/apache/kafka/queue/KafkaEventQueueTest.java +++ b/server-common/src/test/java/org/apache/kafka/queue/KafkaEventQueueTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.queue; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; diff --git a/server-common/src/test/java/org/apache/kafka/server/share/persister/DefaultStatePersisterTest.java b/server-common/src/test/java/org/apache/kafka/server/share/persister/DefaultStatePersisterTest.java index 7a075aa8d9211..2b287d0203eef 100644 --- a/server-common/src/test/java/org/apache/kafka/server/share/persister/DefaultStatePersisterTest.java +++ b/server-common/src/test/java/org/apache/kafka/server/share/persister/DefaultStatePersisterTest.java @@ -57,7 +57,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; -import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; diff --git a/server-common/src/test/java/org/apache/kafka/server/share/persister/PersisterStateManagerTest.java b/server-common/src/test/java/org/apache/kafka/server/share/persister/PersisterStateManagerTest.java index 8d1957fbf411a..0c4eddf581b73 100644 --- a/server-common/src/test/java/org/apache/kafka/server/share/persister/PersisterStateManagerTest.java +++ b/server-common/src/test/java/org/apache/kafka/server/share/persister/PersisterStateManagerTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.server.share.persister; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientResponse; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.KafkaClient; diff --git a/server-common/src/test/java/org/apache/kafka/server/util/FileLockTest.java b/server-common/src/test/java/org/apache/kafka/server/util/FileLockTest.java index a999c0633cb26..eb423760f6f4e 100644 --- a/server-common/src/test/java/org/apache/kafka/server/util/FileLockTest.java +++ b/server-common/src/test/java/org/apache/kafka/server/util/FileLockTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.util; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.Test; diff --git a/server-common/src/test/java/org/apache/kafka/server/util/ShutdownableThreadTest.java b/server-common/src/test/java/org/apache/kafka/server/util/ShutdownableThreadTest.java index 25227c1355ac0..9df7ce3511086 100644 --- a/server-common/src/test/java/org/apache/kafka/server/util/ShutdownableThreadTest.java +++ b/server-common/src/test/java/org/apache/kafka/server/util/ShutdownableThreadTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.util; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.internals.FatalExitError; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.Exit; diff --git a/server-common/src/test/java/org/apache/kafka/server/util/timer/SystemTimerReaperTest.java b/server-common/src/test/java/org/apache/kafka/server/util/timer/SystemTimerReaperTest.java index 9c4c0444000d8..20bd705269f16 100644 --- a/server-common/src/test/java/org/apache/kafka/server/util/timer/SystemTimerReaperTest.java +++ b/server-common/src/test/java/org/apache/kafka/server/util/timer/SystemTimerReaperTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.util.timer; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.errors.TimeoutException; import org.junit.jupiter.api.Test; diff --git a/server-common/src/test/java/org/apache/kafka/server/util/timer/TimerTest.java b/server-common/src/test/java/org/apache/kafka/server/util/timer/TimerTest.java index 8e8d3d8318192..b2ef9d2b32af7 100644 --- a/server-common/src/test/java/org/apache/kafka/server/util/timer/TimerTest.java +++ b/server-common/src/test/java/org/apache/kafka/server/util/timer/TimerTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.util.timer; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import org.junit.jupiter.api.AfterEach; diff --git a/server/src/test/java/org/apache/kafka/api/EndToEndClusterIdTest.java b/server/src/test/java/org/apache/kafka/api/EndToEndClusterIdTest.java index 4fd693c3feae9..eee237a806901 100644 --- a/server/src/test/java/org/apache/kafka/api/EndToEndClusterIdTest.java +++ b/server/src/test/java/org/apache/kafka/api/EndToEndClusterIdTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.api; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; @@ -47,7 +47,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import static org.apache.kafka.base.test.TestUtils.isValidClusterId; +import static org.apache.kafka.common.test.base.TestUtils.isValidClusterId; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java b/server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java index 52042119aee63..d1283090b1e39 100644 --- a/server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java +++ b/server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientResponse; import org.apache.kafka.clients.NodeApiVersions; import org.apache.kafka.common.Uuid; diff --git a/server/src/test/java/org/apache/kafka/server/BootstrapControllersIntegrationTest.java b/server/src/test/java/org/apache/kafka/server/BootstrapControllersIntegrationTest.java index 203c70da9b251..6042ebab4d05d 100644 --- a/server/src/test/java/org/apache/kafka/server/BootstrapControllersIntegrationTest.java +++ b/server/src/test/java/org/apache/kafka/server/BootstrapControllersIntegrationTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.server; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterConfigOp; import org.apache.kafka.clients.admin.Config; diff --git a/server/src/test/java/org/apache/kafka/server/ClientMetricsManagerTest.java b/server/src/test/java/org/apache/kafka/server/ClientMetricsManagerTest.java index 5f173d135ddd3..a96b05ce4b9d2 100644 --- a/server/src/test/java/org/apache/kafka/server/ClientMetricsManagerTest.java +++ b/server/src/test/java/org/apache/kafka/server/ClientMetricsManagerTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.errors.InvalidRequestException; diff --git a/server/src/test/java/org/apache/kafka/server/CordonedLogDirsIntegrationTest.java b/server/src/test/java/org/apache/kafka/server/CordonedLogDirsIntegrationTest.java index f5655dfb5ee43..71d1a8b821638 100644 --- a/server/src/test/java/org/apache/kafka/server/CordonedLogDirsIntegrationTest.java +++ b/server/src/test/java/org/apache/kafka/server/CordonedLogDirsIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterConfigOp; import org.apache.kafka.clients.admin.Config; diff --git a/server/src/test/java/org/apache/kafka/server/EligibleLeaderReplicasIntegrationTest.java b/server/src/test/java/org/apache/kafka/server/EligibleLeaderReplicasIntegrationTest.java index a2dfc0be38086..61ec753930461 100644 --- a/server/src/test/java/org/apache/kafka/server/EligibleLeaderReplicasIntegrationTest.java +++ b/server/src/test/java/org/apache/kafka/server/EligibleLeaderReplicasIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterConfigOp; import org.apache.kafka.clients.admin.ConfigEntry; @@ -57,7 +57,7 @@ import java.util.function.BiFunction; import java.util.stream.Collectors; -import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.common.test.base.TestUtils.DEFAULT_MAX_WAIT_MS; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/server/src/test/java/org/apache/kafka/server/KRaftClusterTest.java b/server/src/test/java/org/apache/kafka/server/KRaftClusterTest.java index 3b4e0764e83d3..51ee343661de4 100644 --- a/server/src/test/java/org/apache/kafka/server/KRaftClusterTest.java +++ b/server/src/test/java/org/apache/kafka/server/KRaftClusterTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.AlterClientQuotasResult; diff --git a/server/src/test/java/org/apache/kafka/server/LogManagerIntegrationTest.java b/server/src/test/java/org/apache/kafka/server/LogManagerIntegrationTest.java index 5d7982208c195..8c3fdede9da96 100644 --- a/server/src/test/java/org/apache/kafka/server/LogManagerIntegrationTest.java +++ b/server/src/test/java/org/apache/kafka/server/LogManagerIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.consumer.Consumer; diff --git a/server/src/test/java/org/apache/kafka/server/MetadataRequestTest.java b/server/src/test/java/org/apache/kafka/server/MetadataRequestTest.java index ea4efb19f0685..a104b6dbd347b 100644 --- a/server/src/test/java/org/apache/kafka/server/MetadataRequestTest.java +++ b/server/src/test/java/org/apache/kafka/server/MetadataRequestTest.java @@ -19,7 +19,7 @@ import kafka.network.SocketServer; import kafka.server.KafkaBroker; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Cluster; import org.apache.kafka.common.Node; import org.apache.kafka.common.PartitionInfo; diff --git a/server/src/test/java/org/apache/kafka/server/ReconfigurableQuorumIntegrationTest.java b/server/src/test/java/org/apache/kafka/server/ReconfigurableQuorumIntegrationTest.java index ccde05c0edf04..9e5d606a170af 100644 --- a/server/src/test/java/org/apache/kafka/server/ReconfigurableQuorumIntegrationTest.java +++ b/server/src/test/java/org/apache/kafka/server/ReconfigurableQuorumIntegrationTest.java @@ -40,8 +40,8 @@ import java.util.Set; import java.util.TreeMap; -import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; -import static org.apache.kafka.base.test.TestUtils.retryOnExceptionWithTimeout; +import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; +import static org.apache.kafka.common.test.base.TestUtils.retryOnExceptionWithTimeout; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/server/src/test/java/org/apache/kafka/server/TestUtils.java b/server/src/test/java/org/apache/kafka/server/TestUtils.java index f2687e6111be7..5c30bf1247395 100644 --- a/server/src/test/java/org/apache/kafka/server/TestUtils.java +++ b/server/src/test/java/org/apache/kafka/server/TestUtils.java @@ -42,8 +42,8 @@ import java.util.function.Function; import java.util.function.Supplier; -import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; public class TestUtils { diff --git a/server/src/test/java/org/apache/kafka/server/UncleanLeaderElectionTest.java b/server/src/test/java/org/apache/kafka/server/UncleanLeaderElectionTest.java index 5f9fb0bae6a82..775738d057bda 100644 --- a/server/src/test/java/org/apache/kafka/server/UncleanLeaderElectionTest.java +++ b/server/src/test/java/org/apache/kafka/server/UncleanLeaderElectionTest.java @@ -65,8 +65,8 @@ import java.util.Set; import java.util.concurrent.ExecutionException; -import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.server.TestUtils.awaitLeaderChange; import static org.apache.kafka.server.TestUtils.produceMessage; import static org.apache.kafka.server.TestUtils.waitForPartitionMetadata; diff --git a/server/src/test/java/org/apache/kafka/server/config/DynamicConfigTest.java b/server/src/test/java/org/apache/kafka/server/config/DynamicConfigTest.java index 4f8c886022c98..6c5b243340af3 100644 --- a/server/src/test/java/org/apache/kafka/server/config/DynamicConfigTest.java +++ b/server/src/test/java/org/apache/kafka/server/config/DynamicConfigTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.config; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterConfigOp; import org.apache.kafka.clients.admin.ConfigEntry; diff --git a/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsTestUtils.java b/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsTestUtils.java index efb7d352e98c6..91361c64a1a85 100644 --- a/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsTestUtils.java +++ b/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsTestUtils.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.metrics; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.network.ClientInformation; import org.apache.kafka.common.network.ListenerName; import org.apache.kafka.common.protocol.ApiKeys; diff --git a/server/src/test/java/org/apache/kafka/server/metrics/LinuxIoMetricsCollectorTest.java b/server/src/test/java/org/apache/kafka/server/metrics/LinuxIoMetricsCollectorTest.java index 1df0a0bb5d009..1a110d7db7b8c 100644 --- a/server/src/test/java/org/apache/kafka/server/metrics/LinuxIoMetricsCollectorTest.java +++ b/server/src/test/java/org/apache/kafka/server/metrics/LinuxIoMetricsCollectorTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.metrics; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; diff --git a/server/src/test/java/org/apache/kafka/server/partition/AlterPartitionManagerTest.java b/server/src/test/java/org/apache/kafka/server/partition/AlterPartitionManagerTest.java index 8d574157dfba9..1df2e06dc0c29 100644 --- a/server/src/test/java/org/apache/kafka/server/partition/AlterPartitionManagerTest.java +++ b/server/src/test/java/org/apache/kafka/server/partition/AlterPartitionManagerTest.java @@ -57,7 +57,7 @@ import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; -import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/server/src/test/java/org/apache/kafka/server/purgatory/DelayedFutureTest.java b/server/src/test/java/org/apache/kafka/server/purgatory/DelayedFutureTest.java index 8c76e53eb468d..8bd760b642f8e 100644 --- a/server/src/test/java/org/apache/kafka/server/purgatory/DelayedFutureTest.java +++ b/server/src/test/java/org/apache/kafka/server/purgatory/DelayedFutureTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.purgatory; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.utils.Time; diff --git a/server/src/test/java/org/apache/kafka/server/quota/ClientQuotasRequestTest.java b/server/src/test/java/org/apache/kafka/server/quota/ClientQuotasRequestTest.java index 7188fa752a287..fa6c52992b61e 100644 --- a/server/src/test/java/org/apache/kafka/server/quota/ClientQuotasRequestTest.java +++ b/server/src/test/java/org/apache/kafka/server/quota/ClientQuotasRequestTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.quota; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterClientQuotasOptions; import org.apache.kafka.clients.admin.AlterUserScramCredentialsResult; diff --git a/server/src/test/java/org/apache/kafka/server/share/fetch/ShareFetchTestUtils.java b/server/src/test/java/org/apache/kafka/server/share/fetch/ShareFetchTestUtils.java index b662da15658fb..36db75521ae07 100644 --- a/server/src/test/java/org/apache/kafka/server/share/fetch/ShareFetchTestUtils.java +++ b/server/src/test/java/org/apache/kafka/server/share/fetch/ShareFetchTestUtils.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.share.fetch; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicIdPartition; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.message.ShareFetchResponseData.AcquiredRecords; @@ -31,7 +31,7 @@ import java.util.Map; import java.util.Map.Entry; -import static org.apache.kafka.base.test.TestUtils.tempFile; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertArrayEquals; /** diff --git a/server/src/test/java/org/apache/kafka/server/share/session/ShareSessionCacheTest.java b/server/src/test/java/org/apache/kafka/server/share/session/ShareSessionCacheTest.java index 17d38ee25f4db..c50252d80bf75 100644 --- a/server/src/test/java/org/apache/kafka/server/share/session/ShareSessionCacheTest.java +++ b/server/src/test/java/org/apache/kafka/server/share/session/ShareSessionCacheTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.share.session; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.utils.internals.ImplicitLinkedHashCollection; import org.apache.kafka.server.share.CachedSharePartition; diff --git a/server/src/test/java/org/apache/kafka/server/util/SchedulerTest.java b/server/src/test/java/org/apache/kafka/server/util/SchedulerTest.java index 9f3748c70a6cf..8d7344f79e613 100644 --- a/server/src/test/java/org/apache/kafka/server/util/SchedulerTest.java +++ b/server/src/test/java/org/apache/kafka/server/util/SchedulerTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.util; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.coordinator.transaction.TransactionLogConfig; import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache; diff --git a/storage/api/src/test/java/org/apache/kafka/server/log/remote/storage/LogSegmentDataTest.java b/storage/api/src/test/java/org/apache/kafka/server/log/remote/storage/LogSegmentDataTest.java index 9a47d1eb39033..d81719ec4c6e1 100644 --- a/storage/api/src/test/java/org/apache/kafka/server/log/remote/storage/LogSegmentDataTest.java +++ b/storage/api/src/test/java/org/apache/kafka/server/log/remote/storage/LogSegmentDataTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.log.remote.storage; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/storage/src/test/java/org/apache/kafka/admin/RemoteTopicCrudTest.java b/storage/src/test/java/org/apache/kafka/admin/RemoteTopicCrudTest.java index 46596ea9a793d..844e750ba6d89 100644 --- a/storage/src/test/java/org/apache/kafka/admin/RemoteTopicCrudTest.java +++ b/storage/src/test/java/org/apache/kafka/admin/RemoteTopicCrudTest.java @@ -17,8 +17,8 @@ package org.apache.kafka.admin; -import org.apache.kafka.base.test.TestCondition; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestCondition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.AlterConfigOp; import org.apache.kafka.clients.admin.ConfigEntry; import org.apache.kafka.clients.admin.NewTopic; @@ -59,7 +59,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import static org.apache.kafka.base.test.TestUtils.assertFutureThrows; +import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/storage/src/test/java/org/apache/kafka/server/log/LogAppendTimeTest.java b/storage/src/test/java/org/apache/kafka/server/log/LogAppendTimeTest.java index ad19f11e51ad6..ce9346d5c48e5 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/LogAppendTimeTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/LogAppendTimeTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.log; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.consumer.Consumer; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogMetadataManagerTestUtils.java b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogMetadataManagerTestUtils.java index 128182caca11a..9a92276791a85 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogMetadataManagerTestUtils.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogMetadataManagerTestUtils.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.log.remote.metadata.storage; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import java.util.HashMap; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogSegmentLifecycleTest.java b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogSegmentLifecycleTest.java index d8696e189ab29..fdef8703e4b44 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogSegmentLifecycleTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogSegmentLifecycleTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.log.remote.metadata.storage; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicIdPartition; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerConfigTest.java b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerConfigTest.java index 1e218a3e54152..f7728461b7e2d 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerConfigTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerConfigTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.log.remote.metadata.storage; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.ConsumerConfig; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerRestartTest.java b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerRestartTest.java index 2d5fdcdc6169f..f9d54804b2c05 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerRestartTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerRestartTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.log.remote.metadata.storage; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.common.TopicIdPartition; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerTest.java b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerTest.java index 0d4e88d0b8299..7390299468b8f 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.log.remote.metadata.storage; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.Config; import org.apache.kafka.clients.admin.ConfigEntry; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorage.java b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorage.java index fdf56db8e5013..efea8eefe4437 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorage.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorage.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.log.remote.storage; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicIdPartition; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.errors.InvalidConfigurationException; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogManagerTest.java b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogManagerTest.java index bbdc31d724546..6a77c2ef092c4 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogManagerTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogManagerTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.log.remote.storage; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Endpoint; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.TopicIdPartition; @@ -118,7 +118,7 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import static org.apache.kafka.base.test.TestUtils.tempFile; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.apache.kafka.common.record.TimestampType.CREATE_TIME; import static org.apache.kafka.server.log.remote.metadata.storage.TopicBasedRemoteLogMetadataManagerConfig.REMOTE_LOG_METADATA_COMMON_CLIENT_PREFIX; import static org.apache.kafka.server.log.remote.metadata.storage.TopicBasedRemoteLogMetadataManagerConfig.REMOTE_LOG_METADATA_CONSUMER_PREFIX; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogOffsetReaderTest.java b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogOffsetReaderTest.java index fec5a030c4b08..a129eb2d2ff15 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogOffsetReaderTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogOffsetReaderTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.server.log.remote.storage; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.config.AbstractConfig; import org.apache.kafka.common.metrics.Metrics; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/LeaderEpochCheckpointFileWithFailureHandlerTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/LeaderEpochCheckpointFileWithFailureHandlerTest.java index 3ca415de7c519..9785c74903095 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/LeaderEpochCheckpointFileWithFailureHandlerTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/LeaderEpochCheckpointFileWithFailureHandlerTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.storage.internals.checkpoint; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.storage.internals.log.EpochEntry; import org.apache.kafka.storage.internals.log.LogDirFailureChannel; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/OffsetCheckpointFileWithFailureHandlerTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/OffsetCheckpointFileWithFailureHandlerTest.java index 0b0ec8a1c61a6..e365cd025b0f5 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/OffsetCheckpointFileWithFailureHandlerTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/OffsetCheckpointFileWithFailureHandlerTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.storage.internals.checkpoint; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.KafkaStorageException; import org.apache.kafka.storage.internals.log.EpochEntry; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/PartitionMetadataFileTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/PartitionMetadataFileTest.java index 11bb29bb09a9c..9b218c1f4398d 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/PartitionMetadataFileTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/PartitionMetadataFileTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.storage.internals.checkpoint; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.errors.InconsistentTopicIdException; import org.apache.kafka.storage.internals.log.LogDirFailureChannel; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/AbstractIndexTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/AbstractIndexTest.java index dd4035b6fe176..5b63d2e210c7c 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/AbstractIndexTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/AbstractIndexTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.Test; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/BrokerCompressionTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/BrokerCompressionTest.java index d373926a9ad2e..0c81f4c62287c 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/BrokerCompressionTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/BrokerCompressionTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.config.TopicConfig; import org.apache.kafka.common.record.internal.CompressionType; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/LocalLogTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/LocalLogTest.java index cd16c665e7ee8..8c85d6d80903c 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/LocalLogTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/LocalLogTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.compress.Compression; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogCleanerIntegrationTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogCleanerIntegrationTest.java index 9d851cdaa509c..b5fe57bdc612d 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogCleanerIntegrationTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogCleanerIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.config.AbstractConfig; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogCleanerManagerTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogCleanerManagerTest.java index 7341ff2820d5d..bd410bb140bd8 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogCleanerManagerTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogCleanerManagerTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.compress.Compression; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogConcurrencyTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogConcurrencyTest.java index b91ed7df00d45..6460fcc61ba02 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogConcurrencyTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogConcurrencyTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.record.internal.MemoryRecords; import org.apache.kafka.common.record.internal.RecordBatch; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogSegmentTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogSegmentTest.java index c08f9829f9f94..2cc93117173a5 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogSegmentTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogSegmentTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.config.TopicConfig; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogSegmentsTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogSegmentsTest.java index 1c1b9c485b39f..eb240607ebe33 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogSegmentsTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogSegmentsTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogValidatorTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogValidatorTest.java index f3fefdafcce6e..b75f0ae2fc26d 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogValidatorTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogValidatorTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.InvalidRecordException; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.compress.Compression; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/OffsetIndexTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/OffsetIndexTest.java index 1a79b9ef800fb..491a944be1b3d 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/OffsetIndexTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/OffsetIndexTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.errors.InvalidOffsetException; import org.junit.jupiter.api.AfterEach; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/ProducerStateManagerTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/ProducerStateManagerTest.java index ce0597202d07e..1feb786185345 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/ProducerStateManagerTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/ProducerStateManagerTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.InvalidProducerEpochException; import org.apache.kafka.common.errors.InvalidTxnStateException; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/RemoteIndexCacheTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/RemoteIndexCacheTest.java index c41ed024c8c71..f189516fd7fec 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/RemoteIndexCacheTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/RemoteIndexCacheTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicIdPartition; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/TimeIndexTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/TimeIndexTest.java index 91908e28cf51f..ca86b883120e3 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/TimeIndexTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/TimeIndexTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.errors.InvalidOffsetException; import org.apache.kafka.common.record.internal.RecordBatch; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/TransactionIndexTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/TransactionIndexTest.java index 45e7d686203b1..f0a4a86fb5e9d 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/TransactionIndexTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/TransactionIndexTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.message.AbortedTxn; import org.apache.kafka.common.protocol.MessageUtil; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/UnifiedLogTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/UnifiedLogTest.java index eedd21a6a615e..b3d5d45672a7d 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/UnifiedLogTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/UnifiedLogTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.InvalidRecordException; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestHarness.java b/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestHarness.java index f17f0c0a23012..3f125356e23b0 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestHarness.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestHarness.java @@ -19,7 +19,7 @@ import kafka.api.IntegrationTestHarness; import kafka.server.KafkaBroker; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.replica.ReplicaSelector; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.server.config.ReplicationConfigs; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/AlterLogDirAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/AlterLogDirAction.java index fff935a080a87..0dfcf380c1bec 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/AlterLogDirAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/AlterLogDirAction.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tiered.storage.actions; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.AlterReplicaLogDirsResult; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.TopicPartitionReplica; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectBrokerInISRAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectBrokerInISRAction.java index 276e5b2893fcd..5f679e77753d7 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectBrokerInISRAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectBrokerInISRAction.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tiered.storage.actions; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.TopicDescription; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.TopicPartitionInfo; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectEmptyRemoteStorageAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectEmptyRemoteStorageAction.java index 28a4edc76da9d..4ae4b56d1097e 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectEmptyRemoteStorageAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectEmptyRemoteStorageAction.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tiered.storage.actions; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.server.log.remote.storage.LocalTieredStorageSnapshot; import org.apache.kafka.tiered.storage.TieredStorageTestAction; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderAction.java index e5d9702e6d3e2..c534c6f869c2b 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderAction.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tiered.storage.actions; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.AlterPartitionReassignmentsResult; import org.apache.kafka.clients.admin.NewPartitionReassignment; import org.apache.kafka.clients.admin.TopicDescription; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderEpochCheckpointAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderEpochCheckpointAction.java index 3974a9ea272e2..b02cba0d53700 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderEpochCheckpointAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderEpochCheckpointAction.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tiered.storage.actions; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache; import org.apache.kafka.storage.internals.log.EpochEntry; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ReassignReplicaAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ReassignReplicaAction.java index ed38d98ed0863..b9595cd2a4524 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ReassignReplicaAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ReassignReplicaAction.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tiered.storage.actions; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.NewPartitionReassignment; import org.apache.kafka.clients.admin.TopicDescription; import org.apache.kafka.common.Node; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ShrinkReplicaAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ShrinkReplicaAction.java index 146aac569aa21..d1a4ace4a7572 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ShrinkReplicaAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ShrinkReplicaAction.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tiered.storage.actions; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.NewPartitionReassignment; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.TopicPartitionInfo; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/integration/TransactionsWithTieredStoreTest.java b/storage/src/test/java/org/apache/kafka/tiered/storage/integration/TransactionsWithTieredStoreTest.java index dd1b71321a790..9b76f41916ce3 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/integration/TransactionsWithTieredStoreTest.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/integration/TransactionsWithTieredStoreTest.java @@ -19,7 +19,7 @@ import kafka.api.TransactionsTest; import kafka.server.KafkaBroker; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.server.HostedPartition; import org.apache.kafka.tiered.storage.utils.BrokerLocalStorage; diff --git a/streams/examples/src/test/java/org/apache/kafka/streams/examples/wordcount/WordCountDemoTest.java b/streams/examples/src/test/java/org/apache/kafka/streams/examples/wordcount/WordCountDemoTest.java index e13cbbf49eeea..f5507c13b902a 100644 --- a/streams/examples/src/test/java/org/apache/kafka/streams/examples/wordcount/WordCountDemoTest.java +++ b/streams/examples/src/test/java/org/apache/kafka/streams/examples/wordcount/WordCountDemoTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.examples.wordcount; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.common.serialization.LongDeserializer; import org.apache.kafka.common.serialization.StringDeserializer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AbstractJoinIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AbstractJoinIntegrationTest.java index e762374e5276e..59111c6a7f53e 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AbstractJoinIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AbstractJoinIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.LongDeserializer; import org.apache.kafka.common.serialization.LongSerializer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AdjustStreamThreadCountTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AdjustStreamThreadCountTest.java index 8c3642d7d2abb..c99c24f53aa78 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AdjustStreamThreadCountTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AdjustStreamThreadCountTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerConfig; @@ -65,7 +65,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.common.utils.Utils.mkEntry; import static org.apache.kafka.common.utils.Utils.mkMap; import static org.apache.kafka.common.utils.Utils.mkObjectProperties; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AtLeastOnceDeliveryMessageLossIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AtLeastOnceDeliveryMessageLossIntegrationTest.java index 7cb70b6ca52f1..17de11dea4f71 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AtLeastOnceDeliveryMessageLossIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AtLeastOnceDeliveryMessageLossIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.producer.ProducerConfig; @@ -52,9 +52,9 @@ import java.util.List; import java.util.Properties; -import static org.apache.kafka.base.test.TestUtils.consumerConfig; -import static org.apache.kafka.base.test.TestUtils.producerConfig; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.consumerConfig; +import static org.apache.kafka.common.test.base.TestUtils.producerConfig; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.common.utils.Utils.mkEntry; import static org.apache.kafka.common.utils.Utils.mkMap; import static org.apache.kafka.streams.integration.utils.IntegrationTestUtils.DEFAULT_TIMEOUT; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/ConsistencyVectorIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/ConsistencyVectorIntegrationTest.java index 8e19eeb6011ae..6e02e88122c18 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/ConsistencyVectorIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/ConsistencyVectorIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.IntegerSerializer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/DeadLetterQueueIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/DeadLetterQueueIntegrationTest.java index 1cd1900d012a1..09fa46389804e 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/DeadLetterQueueIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/DeadLetterQueueIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.serialization.ByteArrayDeserializer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EOSUncleanShutdownIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EOSUncleanShutdownIntegrationTest.java index 07a0e640e69a4..abc3be8ab7e5c 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EOSUncleanShutdownIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EOSUncleanShutdownIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.Serdes; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EmitOnChangeIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EmitOnChangeIntegrationTest.java index 8a910a7767b00..3c6e756625733 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EmitOnChangeIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EmitOnChangeIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.IntegerDeserializer; import org.apache.kafka.common.serialization.IntegerSerializer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EosIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EosIntegrationTest.java index 3cd4437a3b1cf..2a8891404704c 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EosIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EosIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.Consumer; @@ -102,8 +102,8 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import static org.apache.kafka.base.test.TestUtils.consumerConfig; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.consumerConfig; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.common.utils.Utils.mkEntry; import static org.apache.kafka.common.utils.Utils.mkMap; import static org.apache.kafka.streams.integration.utils.IntegrationTestUtils.DEFAULT_TIMEOUT; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/FineGrainedAutoResetIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/FineGrainedAutoResetIntegrationTest.java index d5148b0fd5616..ef3f4e6527b11 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/FineGrainedAutoResetIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/FineGrainedAutoResetIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.clients.consumer.OffsetAndMetadata; @@ -58,7 +58,7 @@ import java.util.Properties; import java.util.regex.Pattern; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.common.utils.Utils.mkProperties; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalKTableEOSIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalKTableEOSIntegrationTest.java index c09fd28e8f747..8b252cbeebbc9 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalKTableEOSIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalKTableEOSIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.LongSerializer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalKTableIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalKTableIntegrationTest.java index 62526b2a147c8..91661d39598f8 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalKTableIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalKTableIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.Serdes; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalStateReprocessTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalStateReprocessTest.java index 47ccfdee64b1b..351458a49b4eb 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalStateReprocessTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalStateReprocessTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.Serdes; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalThreadShutDownOrderTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalThreadShutDownOrderTest.java index 80f6118a01ced..f81722e881ead 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalThreadShutDownOrderTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalThreadShutDownOrderTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.Serdes; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HandlingSourceTopicDeletionIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HandlingSourceTopicDeletionIntegrationTest.java index 089f864b3029a..d0166b59e5419 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HandlingSourceTopicDeletionIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HandlingSourceTopicDeletionIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KafkaStreams.State; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HeadersStoreUpgradeIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HeadersStoreUpgradeIntegrationTest.java index cfbe7c64ae775..12c5798127432 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HeadersStoreUpgradeIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HeadersStoreUpgradeIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HighAvailabilityTaskAssignorIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HighAvailabilityTaskAssignorIntegrationTest.java index 8c6c35a103469..cb6d0e5f86bef 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HighAvailabilityTaskAssignorIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HighAvailabilityTaskAssignorIntegrationTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.NoRetryException; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.NoRetryException; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2EndpointToPartitionsIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2EndpointToPartitionsIntegrationTest.java index 9411cc7e0ffcf..384d783a99c25 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2EndpointToPartitionsIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2EndpointToPartitionsIntegrationTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.serialization.Serdes; @@ -51,7 +51,7 @@ import java.util.Set; import java.util.stream.Stream; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.streams.utils.TestUtils.safeUniqueTestName; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2IntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2IntegrationTest.java index 792131cb1ac82..2ad6634e3ea49 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2IntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2IntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.Producer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2StoreIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2StoreIntegrationTest.java index 6cc843dde6494..95886a1433de0 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2StoreIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2StoreIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.Producer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/InternalTopicIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/InternalTopicIntegrationTest.java index d30a58e937a70..281e8f03506df 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/InternalTopicIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/InternalTopicIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.Config; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinGracePeriodDurabilityIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinGracePeriodDurabilityIntegrationTest.java index 2f0cda3c65624..f28ad3cacabdd 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinGracePeriodDurabilityIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinGracePeriodDurabilityIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.Deserializer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinStoreIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinStoreIntegrationTest.java index ebeeb7b9d594e..14b708c2f2ee0 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinStoreIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinStoreIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.ConsumerConfig; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinWithIncompleteMetadataIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinWithIncompleteMetadataIntegrationTest.java index 5f278c2d17367..7a366c05ba591 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinWithIncompleteMetadataIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinWithIncompleteMetadataIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.streams.GroupProtocol; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamAggregationDedupIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamAggregationDedupIntegrationTest.java index 7d679fc183a20..cbdf77aa731c2 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamAggregationDedupIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamAggregationDedupIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.IntegerSerializer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamAggregationIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamAggregationIntegrationTest.java index ec151ff930bdc..81820f548696c 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamAggregationIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamAggregationIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeader; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamKStreamIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamKStreamIntegrationTest.java index 12cead5f89e50..8fb2522c599c5 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamKStreamIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamKStreamIntegrationTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.Serdes; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamRepartitionIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamRepartitionIntegrationTest.java index bf983b5a93e47..1efc568bcc9e6 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamRepartitionIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamRepartitionIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.TopicDescription; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableEfficientRangeQueryTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableEfficientRangeQueryTest.java index bc9844b06b807..c17b68f6c64bb 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableEfficientRangeQueryTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableEfficientRangeQueryTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.common.utils.Bytes; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinCustomPartitionerIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinCustomPartitionerIntegrationTest.java index 197e4b020364f..9fbe833b6d63d 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinCustomPartitionerIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinCustomPartitionerIntegrationTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.Serdes; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java index 0afca772a8b60..32fbf3bc89d37 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.FloatSerializer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinDistributedTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinDistributedTest.java index 571cfd7dec4a2..23f8ec693fb92 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinDistributedTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinDistributedTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.Serdes; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinIntegrationTest.java index 7525e98de4228..c53087210a5e8 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinMaterializationIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinMaterializationIntegrationTest.java index f8a9d05a2b4cf..c5e285eadd2f1 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinMaterializationIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinMaterializationIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableSourceTopicRestartIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableSourceTopicRestartIntegrationTest.java index f7d72c08bcac9..60ee1d3086fb0 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableSourceTopicRestartIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableSourceTopicRestartIntegrationTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.TopicPartition; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsCloseOptionsIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsCloseOptionsIntegrationTest.java index db68b099ba197..6992bfefa1fb7 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsCloseOptionsIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsCloseOptionsIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.consumer.ConsumerConfig; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsTelemetryIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsTelemetryIntegrationTest.java index 61fc30a9bda30..622dd3720ad43 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsTelemetryIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsTelemetryIntegrationTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.Consumer; @@ -86,7 +86,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Stream; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.common.utils.Utils.mkEntry; import static org.apache.kafka.common.utils.Utils.mkMap; import static org.apache.kafka.common.utils.Utils.mkObjectProperties; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/LagFetchIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/LagFetchIntegrationTest.java index a08fe5a62ecc9..2828983b7be72 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/LagFetchIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/LagFetchIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.serialization.LongDeserializer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/MetricsIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/MetricsIntegrationTest.java index 1526cdabe0c63..abeda18212e98 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/MetricsIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/MetricsIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Metric; import org.apache.kafka.common.metrics.Sensor; import org.apache.kafka.common.serialization.IntegerSerializer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/NamedTopologyIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/NamedTopologyIntegrationTest.java index badfeba10ec20..1a674fd885258 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/NamedTopologyIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/NamedTopologyIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.serialization.LongDeserializer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/OptimizedKTableIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/OptimizedKTableIntegrationTest.java index 24b5124d21e3d..7d2e823f60a3f 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/OptimizedKTableIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/OptimizedKTableIntegrationTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.NoRetryException; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.NoRetryException; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.IntegerSerializer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/OuterJoinListValueStoreRestorationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/OuterJoinListValueStoreRestorationTest.java index 04c628d4735c5..ca7d4deed5a49 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/OuterJoinListValueStoreRestorationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/OuterJoinListValueStoreRestorationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.Serdes; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PauseResumeIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PauseResumeIntegrationTest.java index e8181ba3de93a..0617474b63001 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PauseResumeIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PauseResumeIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.LongDeserializer; import org.apache.kafka.common.serialization.LongSerializer; @@ -55,7 +55,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.singletonList; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.streams.KeyValue.pair; import static org.apache.kafka.streams.integration.utils.IntegrationTestUtils.cleanStateBeforeTest; import static org.apache.kafka.streams.integration.utils.IntegrationTestUtils.getTopicSize; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PositionRestartIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PositionRestartIntegrationTest.java index 0632897a8af03..5fbcf5cf81307 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PositionRestartIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PositionRestartIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.Producer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PurgeRepartitionTopicIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PurgeRepartitionTopicIntegrationTest.java index c063803132d9e..c9cecb5737d15 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PurgeRepartitionTopicIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PurgeRepartitionTopicIntegrationTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestCondition; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestCondition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.Config; import org.apache.kafka.clients.admin.LogDirDescription; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/QueryableStateIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/QueryableStateIntegrationTest.java index 3dc93ed1eb364..e93ef081f722a 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/QueryableStateIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/QueryableStateIntegrationTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.NoRetryException; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.NoRetryException; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerConfig; @@ -99,7 +99,7 @@ import static java.time.Duration.ofMillis; import static java.time.Duration.ofSeconds; import static java.time.Instant.ofEpochMilli; -import static org.apache.kafka.base.test.TestUtils.retryOnExceptionWithTimeout; +import static org.apache.kafka.common.test.base.TestUtils.retryOnExceptionWithTimeout; import static org.apache.kafka.common.utils.Utils.mkEntry; import static org.apache.kafka.common.utils.Utils.mkMap; import static org.apache.kafka.common.utils.Utils.mkProperties; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RangeQueryIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RangeQueryIntegrationTest.java index bf31faa8e30e6..d014a140e585c 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RangeQueryIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RangeQueryIntegrationTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceIntegrationTest.java index ae47f8b6c7f2a..10879a59173bb 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.LongDeserializer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceProtocolMigrationIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceProtocolMigrationIntegrationTest.java index 6e24115834da0..54cfd0c9504d2 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceProtocolMigrationIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceProtocolMigrationIntegrationTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.ConsumerConfig; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceTaskClosureIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceTaskClosureIntegrationTest.java index 7b078b0c3c777..beeae3f637961 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceTaskClosureIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceTaskClosureIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.Serdes; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RegexSourceIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RegexSourceIntegrationTest.java index 170eca0b3e156..b31b3da822d6d 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RegexSourceIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RegexSourceIntegrationTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestCondition; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestCondition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRebalanceListener; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/ResetPartitionTimeIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/ResetPartitionTimeIntegrationTest.java index 655c4759403a0..928a49f78514a 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/ResetPartitionTimeIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/ResetPartitionTimeIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.producer.ProducerConfig; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RestoreIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RestoreIntegrationTest.java index 5c308895b206b..9b8e75d6bf29c 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RestoreIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RestoreIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.ListOffsetsResult; @@ -100,7 +100,7 @@ import java.util.stream.IntStream; import static java.util.Arrays.asList; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.common.utils.Utils.mkEntry; import static org.apache.kafka.common.utils.Utils.mkMap; import static org.apache.kafka.common.utils.Utils.mkObjectProperties; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RocksDBMetricsIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RocksDBMetricsIntegrationTest.java index 8c98e92812c06..e1257d2bb3756 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RocksDBMetricsIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RocksDBMetricsIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Metric; import org.apache.kafka.common.metrics.Sensor; import org.apache.kafka.common.serialization.IntegerSerializer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfJoinUpgradeIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfJoinUpgradeIntegrationTest.java index cc6609542731d..e442f81de24dc 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfJoinUpgradeIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfJoinUpgradeIntegrationTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringDeserializer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfManagedOffsetLifecycleIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfManagedOffsetLifecycleIntegrationTest.java index 66aedfb3172ad..a82bf5f0a5a33 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfManagedOffsetLifecycleIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfManagedOffsetLifecycleIntegrationTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.TopicPartition; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfManagedOffsetRecoveryIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfManagedOffsetRecoveryIntegrationTest.java index ea1363d0eb65c..c16bc5432da9b 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfManagedOffsetRecoveryIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfManagedOffsetRecoveryIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.TopicPartition; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SessionsStoreWithHeadersTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SessionsStoreWithHeadersTest.java index 0132f0177cc57..6a48339d65026 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SessionsStoreWithHeadersTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SessionsStoreWithHeadersTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SlidingWindowedKStreamIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SlidingWindowedKStreamIntegrationTest.java index 6e07e2c3af742..623087bdad4aa 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SlidingWindowedKStreamIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SlidingWindowedKStreamIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Serde; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskCreationIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskCreationIntegrationTest.java index 804586cb2afb3..71f0b63e8b5e7 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskCreationIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskCreationIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.streams.GroupProtocol; import org.apache.kafka.streams.KafkaStreams; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSIntegrationTest.java index e915b197e3cc1..690139b7306cb 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.serialization.IntegerDeserializer; @@ -60,7 +60,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import static java.util.Arrays.asList; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.streams.integration.utils.IntegrationTestUtils.startApplicationAndWaitUntilRunning; import static org.apache.kafka.streams.utils.TestUtils.safeUniqueTestName; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSMultiRebalanceIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSMultiRebalanceIntegrationTest.java index 019e42a2fb97c..24d4a9142786b 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSMultiRebalanceIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSMultiRebalanceIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.producer.ProducerConfig; @@ -57,7 +57,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.streams.integration.utils.IntegrationTestUtils.startApplicationAndWaitUntilRunning; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StateDirectoryIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StateDirectoryIntegrationTest.java index a80ebc922ae70..0b6ae55dca6b5 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StateDirectoryIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StateDirectoryIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.clients.producer.ProducerRecord; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StateUpdaterFailureIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StateUpdaterFailureIntegrationTest.java index f1a836302f81e..60d4a84f73978 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StateUpdaterFailureIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StateUpdaterFailureIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.MockTime; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StoreQueryIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StoreQueryIntegrationTest.java index fe41de1564fd3..4bd208957cd52 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StoreQueryIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StoreQueryIntegrationTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestCondition; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestCondition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.IntegerSerializer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamTableJoinTopologyOptimizationIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamTableJoinTopologyOptimizationIntegrationTest.java index 8a7fad1fba378..1fbf6d6a3582f 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamTableJoinTopologyOptimizationIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamTableJoinTopologyOptimizationIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.TopicDescription; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamsUncaughtExceptionHandlerIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamsUncaughtExceptionHandlerIntegrationTest.java index 0eb4442fd437d..e65e77d19da58 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamsUncaughtExceptionHandlerIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamsUncaughtExceptionHandlerIntegrationTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.IntegerDeserializer; import org.apache.kafka.common.serialization.IntegerSerializer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamsUpgradeTestIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamsUpgradeTestIntegrationTest.java index fd40fd2653976..777d3c681986b 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamsUpgradeTestIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamsUpgradeTestIntegrationTest.java @@ -34,7 +34,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import static org.apache.kafka.base.test.TestUtils.retryOnExceptionWithTimeout; +import static org.apache.kafka.common.test.base.TestUtils.retryOnExceptionWithTimeout; import static org.apache.kafka.common.utils.Utils.mkEntry; import static org.apache.kafka.common.utils.Utils.mkMap; import static org.apache.kafka.common.utils.Utils.mkProperties; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionDurabilityIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionDurabilityIntegrationTest.java index a864e4b0b6ed0..1c081e3921293 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionDurabilityIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionDurabilityIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.Deserializer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionIntegrationTest.java index 80ba470f5875d..ab099928479a0 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecords; @@ -67,7 +67,7 @@ import static java.lang.Long.MAX_VALUE; import static java.time.Duration.ofMillis; import static java.util.Arrays.asList; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.common.utils.Utils.mkEntry; import static org.apache.kafka.common.utils.Utils.mkMap; import static org.apache.kafka.common.utils.Utils.mkProperties; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SwallowUnknownTopicErrorIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SwallowUnknownTopicErrorIntegrationTest.java index 511a83d9d6b66..bd8c3af551502 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SwallowUnknownTopicErrorIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SwallowUnknownTopicErrorIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TaskAssignorIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TaskAssignorIntegrationTest.java index 463f9528baa00..077252dfceea0 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TaskAssignorIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TaskAssignorIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerPartitionAssignor; import org.apache.kafka.clients.consumer.KafkaConsumer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TaskMetadataIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TaskMetadataIntegrationTest.java index b37d3be38d9c2..f01e1d0ed48f1 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TaskMetadataIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TaskMetadataIntegrationTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimeWindowedKStreamIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimeWindowedKStreamIntegrationTest.java index 7e4a5d308ea47..72011ef3071f3 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimeWindowedKStreamIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimeWindowedKStreamIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Serde; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedKeyValueStoreWithHeadersTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedKeyValueStoreWithHeadersTest.java index 3365ac98330fe..a506843977ac6 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedKeyValueStoreWithHeadersTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedKeyValueStoreWithHeadersTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedStoreUpgradeIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedStoreUpgradeIntegrationTest.java index 30f5f46154ff3..09993a9be710d 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedStoreUpgradeIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedStoreUpgradeIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.Serdes; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedWindowStoreWithHeadersTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedWindowStoreWithHeadersTest.java index c3ad7925f62b6..26eeead5e7645 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedWindowStoreWithHeadersTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedWindowStoreWithHeadersTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/VersionedKeyValueStoreIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/VersionedKeyValueStoreIntegrationTest.java index e5366a90921bc..7744e283346e0 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/VersionedKeyValueStoreIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/VersionedKeyValueStoreIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.config.TopicConfig; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/utils/EmbeddedKafkaCluster.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/utils/EmbeddedKafkaCluster.java index 501261e788856..711b856d3e032 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/utils/EmbeddedKafkaCluster.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/utils/EmbeddedKafkaCluster.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.integration.utils; -import org.apache.kafka.base.test.TestCondition; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestCondition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterConfigOp; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/utils/IntegrationTestUtils.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/utils/IntegrationTestUtils.java index 464b92487117e..c181548d60196 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/utils/IntegrationTestUtils.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/utils/IntegrationTestUtils.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.integration.utils; -import org.apache.kafka.base.test.TestCondition; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestCondition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.ConsumerGroupDescription; import org.apache.kafka.clients.consumer.Consumer; @@ -91,7 +91,7 @@ import java.util.stream.Collectors; import static java.util.Collections.singletonList; -import static org.apache.kafka.base.test.TestUtils.retryOnExceptionWithTimeout; +import static org.apache.kafka.common.test.base.TestUtils.retryOnExceptionWithTimeout; import static org.apache.kafka.common.utils.Utils.sleep; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThanOrEqualTo; diff --git a/streams/integration-tests/src/test/scala/org/apache/kafka/streams/integration/WordCountTest.scala b/streams/integration-tests/src/test/scala/org/apache/kafka/streams/integration/WordCountTest.scala index 8ffaee9329162..170391b3ecc07 100644 --- a/streams/integration-tests/src/test/scala/org/apache/kafka/streams/integration/WordCountTest.scala +++ b/streams/integration-tests/src/test/scala/org/apache/kafka/streams/integration/WordCountTest.scala @@ -30,7 +30,7 @@ import org.apache.kafka.clients.consumer.ConsumerConfig import org.apache.kafka.clients.producer.ProducerConfig import org.apache.kafka.common.utils.Utils import org.apache.kafka.common.serialization.{LongDeserializer, StringDeserializer, StringSerializer} -import org.apache.kafka.base.test.TestUtils +import org.apache.kafka.common.test.base.TestUtils import org.apache.kafka.server.util.MockTime import org.junit.jupiter.api.Tag diff --git a/streams/integration-tests/src/test/scala/org/apache/kafka/streams/integration/utils/StreamToTableJoinScalaIntegrationTestBase.scala b/streams/integration-tests/src/test/scala/org/apache/kafka/streams/integration/utils/StreamToTableJoinScalaIntegrationTestBase.scala index 6f6da0da333bb..fabc919185185 100644 --- a/streams/integration-tests/src/test/scala/org/apache/kafka/streams/integration/utils/StreamToTableJoinScalaIntegrationTestBase.scala +++ b/streams/integration-tests/src/test/scala/org/apache/kafka/streams/integration/utils/StreamToTableJoinScalaIntegrationTestBase.scala @@ -19,9 +19,9 @@ package org.apache.kafka.streams.integration.utils import org.apache.kafka.clients.consumer.ConsumerConfig import org.apache.kafka.clients.producer.ProducerConfig import org.apache.kafka.common.serialization._ +import org.apache.kafka.common.test.base.TestUtils import org.apache.kafka.common.utils.Utils import org.apache.kafka.streams._ -import org.apache.kafka.base.test.TestUtils import org.apache.kafka.server.util.MockTime import org.junit.jupiter.api._ diff --git a/streams/src/test/java/org/apache/kafka/streams/KafkaStreamsTest.java b/streams/src/test/java/org/apache/kafka/streams/KafkaStreamsTest.java index 242af2d6346b2..44ca2a923b6ff 100644 --- a/streams/src/test/java/org/apache/kafka/streams/KafkaStreamsTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/KafkaStreamsTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.ListOffsetsResult.ListOffsetsResultInfo; import org.apache.kafka.clients.admin.MockAdminClient; @@ -99,7 +99,7 @@ import java.util.concurrent.atomic.AtomicReference; import static java.util.Collections.singletonList; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.streams.state.QueryableStoreTypes.keyValueStore; import static org.apache.kafka.streams.utils.TestUtils.safeUniqueTestName; import static org.apache.kafka.streams.utils.TestUtils.waitForApplicationState; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/PrintedTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/PrintedTest.java index 3b6f755923db3..4b60f6825dc91 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/PrintedTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/PrintedTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.kstream; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.streams.errors.TopologyException; import org.apache.kafka.streams.kstream.internals.PrintedInternal; import org.apache.kafka.streams.processor.api.Processor; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamSessionWindowAggregateProcessorTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamSessionWindowAggregateProcessorTest.java index b0c34a9611fab..ea5235c39a509 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamSessionWindowAggregateProcessorTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamSessionWindowAggregateProcessorTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.kstream.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregateTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregateTest.java index 8ecde7f13dedd..8440821aac1c1 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregateTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregateTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.kstream.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringDeserializer; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableAggregateTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableAggregateTest.java index 4140173217b21..c37d2cd1eb733 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableAggregateTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableAggregateTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.kstream.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeader; import org.apache.kafka.common.header.internals.RecordHeaders; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableKTableForeignKeyJoinScenarioTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableKTableForeignKeyJoinScenarioTest.java index 57c3438867f50..515ecb0b6a85c 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableKTableForeignKeyJoinScenarioTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableKTableForeignKeyJoinScenarioTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.kstream.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.IntegerDeserializer; import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.Serdes; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableTransformValuesTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableTransformValuesTest.java index 0a87d59ac6665..f3ed232253530 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableTransformValuesTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableTransformValuesTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.kstream.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/SuppressScenarioTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/SuppressScenarioTest.java index 015d3da711f19..1b6603fad5101 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/SuppressScenarioTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/SuppressScenarioTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.kstream.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.LongDeserializer; import org.apache.kafka.common.serialization.Serde; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/ForeignTableJoinProcessorSupplierTests.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/ForeignTableJoinProcessorSupplierTests.java index 9edb20a2f72c6..6dd6ea757e747 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/ForeignTableJoinProcessorSupplierTests.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/ForeignTableJoinProcessorSupplierTests.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.kstream.internals.foreignkeyjoin; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.common.serialization.Serdes; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/SubscriptionReceiveProcessorSupplierTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/SubscriptionReceiveProcessorSupplierTest.java index 413af17875adf..857d6c67a6406 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/SubscriptionReceiveProcessorSupplierTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/SubscriptionReceiveProcessorSupplierTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.kstream.internals.foreignkeyjoin; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serde; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/suppress/KTableSuppressProcessorMetricsTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/suppress/KTableSuppressProcessorMetricsTest.java index d0228456197b3..efd23251f4431 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/suppress/KTableSuppressProcessorMetricsTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/suppress/KTableSuppressProcessorMetricsTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.kstream.internals.suppress; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.serialization.Serdes; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdaterTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdaterTest.java index a404284a34d39..657f6a73a18f5 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdaterTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdaterTest.java @@ -53,7 +53,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.common.utils.Utils.mkEntry; import static org.apache.kafka.common.utils.Utils.mkMap; import static org.apache.kafka.common.utils.Utils.mkObjectProperties; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImplTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImplTest.java index ef8a769c19169..e0ce52892c8cb 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImplTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImplTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.processor.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.MockConsumer; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateTaskTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateTaskTest.java index 2feea10bad63f..34f20f6719f61 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateTaskTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateTaskTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.processor.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.header.internals.RecordHeaders; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStreamThreadTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStreamThreadTest.java index ebdaa6e9a6c13..12b81d03bbdd6 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStreamThreadTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStreamThreadTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.processor.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.InvalidOffsetException; import org.apache.kafka.clients.consumer.MockConsumer; import org.apache.kafka.clients.consumer.internals.AutoOffsetResetStrategy; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/NamedTopologyTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/NamedTopologyTest.java index 5de9505405148..ad17cc8463e5f 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/NamedTopologyTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/NamedTopologyTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.processor.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.errors.TopologyException; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorStateManagerTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorStateManagerTest.java index bcc4ab9c6d14c..f749d4a6b5fa4 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorStateManagerTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorStateManagerTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.processor.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.utils.LogCaptureAppender; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorTopologyTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorTopologyTest.java index 3b3aa5476aa40..56bcf71a82c9e 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorTopologyTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorTopologyTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.processor.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.Headers; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StandbyTaskTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StandbyTaskTest.java index b3a28e51770e2..7897d0cdf64d0 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StandbyTaskTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StandbyTaskTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.processor.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.Node; import org.apache.kafka.common.PartitionInfo; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateDirectoryTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateDirectoryTest.java index bb55285c4800b..9b5692c57bbdf 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateDirectoryTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateDirectoryTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.processor.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.MockTime; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateManagerUtilTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateManagerUtilTest.java index 963d8e45811d0..f060d4718acb8 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateManagerUtilTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateManagerUtilTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.processor.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.errors.LockException; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamTaskTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamTaskTest.java index 421365e0cc3c1..3609bb06a60e8 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamTaskTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamTaskTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.processor.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.InvalidOffsetException; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamThreadTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamThreadTest.java index eeb24423474c7..0713167cea2dd 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamThreadTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamThreadTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.processor.internals; -import org.apache.kafka.base.test.TestCondition; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestCondition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.MockAdminClient; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerGroupMetadata; @@ -142,8 +142,8 @@ import static java.util.Collections.emptySet; import static java.util.Collections.singleton; import static java.util.Collections.singletonMap; -import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.common.utils.Utils.mkEntry; import static org.apache.kafka.common.utils.Utils.mkMap; import static org.apache.kafka.common.utils.Utils.mkProperties; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutorTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutorTest.java index 726f909b201e1..42094251a5acf 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutorTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutorTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.processor.internals.tasks; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.KafkaFuture; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.utils.MockTime; @@ -33,7 +33,7 @@ import java.time.Duration; import java.util.Collections; -import static org.apache.kafka.base.test.TestUtils.waitForCondition; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/KeyValueStoreTestDriver.java b/streams/src/test/java/org/apache/kafka/streams/state/KeyValueStoreTestDriver.java index 51fe8f8797618..eb0a50728eb93 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/KeyValueStoreTestDriver.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/KeyValueStoreTestDriver.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.producer.MockProducer; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractDualSchemaRocksDBSegmentedBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractDualSchemaRocksDBSegmentedBytesStoreTest.java index 8b44ea14154b2..40323c397db3d 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractDualSchemaRocksDBSegmentedBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractDualSchemaRocksDBSegmentedBytesStoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractRocksDBSegmentedBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractRocksDBSegmentedBytesStoreTest.java index e89d0d76f3410..0bfdaa684adb0 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractRocksDBSegmentedBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractRocksDBSegmentedBytesStoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSegmentsTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSegmentsTest.java index 21a72bd874a16..f82de6b01f2a5 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSegmentsTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSegmentsTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.Serdes; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSessionBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSessionBytesStoreTest.java index b6bee13912ffb..ae9d2b905b33d 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSessionBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSessionBytesStoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractWindowBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractWindowBytesStoreTest.java index 82a9559a6d684..23801dc279217 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractWindowBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractWindowBytesStoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemoryKeyValueStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemoryKeyValueStoreTest.java index 533199eb5aa30..280f0660b8b3e 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemoryKeyValueStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemoryKeyValueStoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serde; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemorySessionStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemorySessionStoreTest.java index 28e5be304a535..51dfc0ceb96fa 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemorySessionStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemorySessionStoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Deserializer; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentSessionStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentSessionStoreTest.java index d984e0f69a8a1..58bcf55222447 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentSessionStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentSessionStoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Deserializer; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentWindowStoreTest.java index 30c0dfcbb62de..c913631974aae 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentWindowStoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStoreTest.java index 0694be843ff07..d5841503a67c1 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreTest.java index 1e365c7b5609f..06c5c925c7857 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Bytes; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreWithHeadersTest.java index 959eba7bfa3e5..fb2edd5e8b32f 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreWithHeadersTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreWithHeadersTest.java index 7b393db64c125..0ee2d51fdaab5 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreWithHeadersTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeader; import org.apache.kafka.common.header.internals.RecordHeaders; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingVersionedKeyValueBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingVersionedKeyValueBytesStoreTest.java index cc66f9f900607..60c1b151b188f 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingVersionedKeyValueBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingVersionedKeyValueBytesStoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.Serializer; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryWindowStoreTest.java index f0c36cfe8f819..fbabd5c8f7f17 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryWindowStoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.common.serialization.Serdes; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/KeyValueSegmentTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/KeyValueSegmentTest.java index 08bc95f81c193..421c5ef5890b4 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/KeyValueSegmentTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/KeyValueSegmentTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.processor.TaskId; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/LegacyCheckpointingStateStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/LegacyCheckpointingStateStoreTest.java index d20acd16f6373..d5c196c70f653 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/LegacyCheckpointingStateStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/LegacyCheckpointingStateStoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.MockTime; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ListValueStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ListValueStoreTest.java index 8a24ef335b8d2..64c562777662d 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ListValueStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ListValueStoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.common.serialization.Serdes; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/LogicalKeyValueSegmentTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/LogicalKeyValueSegmentTest.java index 8f6baac818dc4..cb48dd42e20e2 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/LogicalKeyValueSegmentTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/LogicalKeyValueSegmentTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.Serializer; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStoreTest.java index 24ed73024735c..1e7bcbdb349c7 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.Headers; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredSessionStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredSessionStoreTest.java index 6cb705770cc3f..aaefc2f386f17 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredSessionStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredSessionStoreTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.Headers; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreTest.java index e164b0a24a97f..354d193c24c52 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.MetricConfig; import org.apache.kafka.common.metrics.Metrics; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreWithHeadersTest.java index 5591e25920ea7..3c05dd2111c01 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreWithHeadersTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.MetricConfig; import org.apache.kafka.common.metrics.Metrics; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredWindowStoreTest.java index 9844bf38f612e..d066d159b8400 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredWindowStoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.Headers; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/OffsetCheckpointTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/OffsetCheckpointTest.java index b4fcb54b73381..2728f23883bf1 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/OffsetCheckpointTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/OffsetCheckpointTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.junit.jupiter.api.Test; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/PlainToHeadersWindowStoreAdapterTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/PlainToHeadersWindowStoreAdapterTest.java index 2099e856233df..d0abbfdac3973 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/PlainToHeadersWindowStoreAdapterTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/PlainToHeadersWindowStoreAdapterTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serdes; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBSessionStoreWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBSessionStoreWithHeadersTest.java index 49fdfa53df4a1..65cdbbc004c29 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBSessionStoreWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBSessionStoreWithHeadersTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBStoreTest.java index 2c8390c6287c8..08b897399f427 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBStoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBufferTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBufferTest.java index 8b64a675223fb..57e795c403677 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBufferTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBufferTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.metrics.Sensor; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBytesStoreTest.java index 988bb120e6a8d..cae8e1aeed15c 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBytesStoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedSessionStoreWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedSessionStoreWithHeadersTest.java index d81a2acd49783..ccfb49a497b1b 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedSessionStoreWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedSessionStoreWithHeadersTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedWindowStoreWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedWindowStoreWithHeadersTest.java index b3083f448f231..04a46fc6822e8 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedWindowStoreWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedWindowStoreWithHeadersTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimestampedWindowStoreWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimestampedWindowStoreWithHeadersTest.java index ff65c15eed35c..90d6c0bc353ec 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimestampedWindowStoreWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimestampedWindowStoreWithHeadersTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBVersionedStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBVersionedStoreTest.java index c0e78d4d593f4..4604a5dd25eda 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBVersionedStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBVersionedStoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/SegmentIteratorTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/SegmentIteratorTest.java index 2e7323da51ac9..95be8bb3a609b 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/SegmentIteratorTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/SegmentIteratorTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Bytes; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionSegmentWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionSegmentWithHeadersTest.java index 3a415d2fc82b4..3bc7b4b404247 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionSegmentWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionSegmentWithHeadersTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.processor.TaskId; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionStoreFetchTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionStoreFetchTest.java index 4cae9214f4641..8ab6e75e2085b 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionStoreFetchTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionStoreFetchTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.common.utils.Bytes; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/StreamThreadStateStoreProviderTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/StreamThreadStateStoreProviderTest.java index 7dfa9d6f228af..82e5611cf9a0a 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/StreamThreadStateStoreProviderTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/StreamThreadStateStoreProviderTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.MockAdminClient; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedCachingPersistentWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedCachingPersistentWindowStoreTest.java index 7ee21582544f8..84d4775225f44 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedCachingPersistentWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedCachingPersistentWindowStoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedKeyValueBufferTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedKeyValueBufferTest.java index 54b7f743f4131..2c7d0475fbd33 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedKeyValueBufferTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedKeyValueBufferTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.header.Header; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedSessionStoreUpgradeTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedSessionStoreUpgradeTest.java index fa3dc62b6707f..67eaaaca8b4c7 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedSessionStoreUpgradeTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedSessionStoreUpgradeTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serdes; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreTest.java index 98335725c6766..7270c12a56cf9 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreUpgradeTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreUpgradeTest.java index 192c309ce22a3..cc85778629ee5 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreUpgradeTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreUpgradeTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serdes; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedKeyValueStoreBuilderWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedKeyValueStoreBuilderWithHeadersTest.java index cbc87773dd61a..37035b8b2633a 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedKeyValueStoreBuilderWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedKeyValueStoreBuilderWithHeadersTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serdes; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentTest.java index 5160ea00f0769..67edea869ccbb 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.processor.TaskId; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentWithHeadersTest.java index 12a8c5fd750ba..e951038769ee2 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentWithHeadersTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.processor.TaskId; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedToHeadersWindowStoreAdapterTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedToHeadersWindowStoreAdapterTest.java index 84a243e660b56..b48011cc3a39e 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedToHeadersWindowStoreAdapterTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedToHeadersWindowStoreAdapterTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serdes; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedWindowStoreWithHeadersSerializerSideEffectTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedWindowStoreWithHeadersSerializerSideEffectTest.java index f5538b56a8ede..986e2359f6703 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedWindowStoreWithHeadersSerializerSideEffectTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedWindowStoreWithHeadersSerializerSideEffectTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.serialization.Deserializer; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/WindowStoreFetchTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/WindowStoreFetchTest.java index 0a0f6ab87588b..549e7abd7d87c 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/WindowStoreFetchTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/WindowStoreFetchTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.common.utils.Bytes; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBBlockCacheMetricsTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBBlockCacheMetricsTest.java index 100a25b1a1a6b..9ed14f64dab4e 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBBlockCacheMetricsTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBBlockCacheMetricsTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.state.internals.metrics; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.metrics.KafkaMetric; import org.apache.kafka.common.utils.Utils; diff --git a/streams/src/test/java/org/apache/kafka/streams/tests/RelationalSmokeTestTest.java b/streams/src/test/java/org/apache/kafka/streams/tests/RelationalSmokeTestTest.java index 6bc53427d85bd..fec0709a1a0f9 100644 --- a/streams/src/test/java/org/apache/kafka/streams/tests/RelationalSmokeTestTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/tests/RelationalSmokeTestTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.tests; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.IntegerDeserializer; import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/src/test/java/org/apache/kafka/streams/tests/SmokeTestClient.java b/streams/src/test/java/org/apache/kafka/streams/tests/SmokeTestClient.java index 3887b3316d4b0..0fa06cded97b2 100644 --- a/streams/src/test/java/org/apache/kafka/streams/tests/SmokeTestClient.java +++ b/streams/src/test/java/org/apache/kafka/streams/tests/SmokeTestClient.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.tests; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.internals.KafkaThread; diff --git a/streams/src/test/java/org/apache/kafka/streams/utils/TestUtils.java b/streams/src/test/java/org/apache/kafka/streams/utils/TestUtils.java index f471ed160ca00..0c7a0c33578dc 100644 --- a/streams/src/test/java/org/apache/kafka/streams/utils/TestUtils.java +++ b/streams/src/test/java/org/apache/kafka/streams/utils/TestUtils.java @@ -42,7 +42,7 @@ import java.util.Set; import java.util.stream.Collectors; -import static org.apache.kafka.base.test.TestUtils.retryOnExceptionWithTimeout; +import static org.apache.kafka.common.test.base.TestUtils.retryOnExceptionWithTimeout; import static org.apache.kafka.streams.StreamsConfig.APPLICATION_ID_CONFIG; import static org.apache.kafka.streams.StreamsConfig.BOOTSTRAP_SERVERS_CONFIG; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/streams/src/test/java/org/apache/kafka/test/StreamsTestUtils.java b/streams/src/test/java/org/apache/kafka/test/StreamsTestUtils.java index a72312d44d140..443842e6a49d7 100644 --- a/streams/src/test/java/org/apache/kafka/test/StreamsTestUtils.java +++ b/streams/src/test/java/org/apache/kafka/test/StreamsTestUtils.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.test; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.TopicPartition; diff --git a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/utils/TestDriver.scala b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/utils/TestDriver.scala index 8ec942e9c9aeb..9cf514c444e19 100644 --- a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/utils/TestDriver.scala +++ b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/utils/TestDriver.scala @@ -20,9 +20,9 @@ import java.time.Instant import java.util.Properties import org.apache.kafka.common.serialization.Serde +import org.apache.kafka.common.test.base.TestUtils import org.apache.kafka.streams.scala.StreamsBuilder import org.apache.kafka.streams.{StreamsConfig, TestInputTopic, TestOutputTopic, TopologyTestDriver} -import org.apache.kafka.base.test.TestUtils trait TestDriver { def createTestDriver(builder: StreamsBuilder, initialWallClockTime: Instant = Instant.now()): TopologyTestDriver = { diff --git a/streams/test-utils/src/test/java/org/apache/kafka/streams/TopologyTestDriverTest.java b/streams/test-utils/src/test/java/org/apache/kafka/streams/TopologyTestDriverTest.java index b15f19ca75c49..7a654a71c01c3 100644 --- a/streams/test-utils/src/test/java/org/apache/kafka/streams/TopologyTestDriverTest.java +++ b/streams/test-utils/src/test/java/org/apache/kafka/streams/TopologyTestDriverTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.Headers; diff --git a/streams/test-utils/src/test/java/org/apache/kafka/streams/test/MockProcessorContextStateStoreTest.java b/streams/test-utils/src/test/java/org/apache/kafka/streams/test/MockProcessorContextStateStoreTest.java index 31197d434700c..13fc871c0ab09 100644 --- a/streams/test-utils/src/test/java/org/apache/kafka/streams/test/MockProcessorContextStateStoreTest.java +++ b/streams/test-utils/src/test/java/org/apache/kafka/streams/test/MockProcessorContextStateStoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.test; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/test-utils/src/test/java/org/apache/kafka/streams/test/wordcount/WindowedWordCountProcessorTest.java b/streams/test-utils/src/test/java/org/apache/kafka/streams/test/wordcount/WindowedWordCountProcessorTest.java index 49dfb53f4faa2..29437bce6b643 100644 --- a/streams/test-utils/src/test/java/org/apache/kafka/streams/test/wordcount/WindowedWordCountProcessorTest.java +++ b/streams/test-utils/src/test/java/org/apache/kafka/streams/test/wordcount/WindowedWordCountProcessorTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.streams.test.wordcount; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.processor.StateStore; diff --git a/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/NoRetryException.java b/test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/NoRetryException.java similarity index 96% rename from test-common/test-common-base/src/main/java/org/apache/kafka/base/test/NoRetryException.java rename to test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/NoRetryException.java index e5e0c7b2c9277..8057d3f99beeb 100644 --- a/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/NoRetryException.java +++ b/test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/NoRetryException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.base.test; +package org.apache.kafka.common.test.base; /** * This class can be used in the callback given to {@link TestUtils#retryOnExceptionWithTimeout(long, long, ValuelessCallable)} diff --git a/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/ReflectionUtils.java b/test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/ReflectionUtils.java similarity index 97% rename from test-common/test-common-base/src/main/java/org/apache/kafka/base/test/ReflectionUtils.java rename to test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/ReflectionUtils.java index f50c5c36d6f29..3ac4548423c7e 100644 --- a/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/ReflectionUtils.java +++ b/test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/ReflectionUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.base.test; +package org.apache.kafka.common.test.base; import java.lang.reflect.Field; diff --git a/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestCondition.java b/test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/TestCondition.java similarity index 96% rename from test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestCondition.java rename to test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/TestCondition.java index 666e9b0348ee4..add2cdeafc7df 100644 --- a/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestCondition.java +++ b/test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/TestCondition.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.base.test; +package org.apache.kafka.common.test.base; /** * Interface to wrap actions that are required to wait until a condition is met diff --git a/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestSslUtils.java b/test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/TestSslUtils.java similarity index 99% rename from test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestSslUtils.java rename to test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/TestSslUtils.java index 0b78b692404e5..f57e4da007df6 100644 --- a/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestSslUtils.java +++ b/test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/TestSslUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.base.test; +package org.apache.kafka.common.test.base; import org.apache.kafka.common.config.SslConfigs; import org.apache.kafka.common.config.types.Password; diff --git a/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestUtils.java b/test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/TestUtils.java similarity index 99% rename from test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestUtils.java rename to test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/TestUtils.java index 25e1f29ade668..eb6812587d784 100644 --- a/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/TestUtils.java +++ b/test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/TestUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.base.test; +package org.apache.kafka.common.test.base; import org.apache.kafka.clients.MetadataSnapshot; import org.apache.kafka.clients.consumer.ConsumerConfig; diff --git a/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/ValuelessCallable.java b/test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/ValuelessCallable.java similarity index 95% rename from test-common/test-common-base/src/main/java/org/apache/kafka/base/test/ValuelessCallable.java rename to test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/ValuelessCallable.java index 336e30a841430..9d5b5b779bb1d 100644 --- a/test-common/test-common-base/src/main/java/org/apache/kafka/base/test/ValuelessCallable.java +++ b/test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/ValuelessCallable.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.base.test; +package org.apache.kafka.common.test.base; /** * Like a {@link Runnable} that allows exceptions to be thrown or a {@link java.util.concurrent.Callable} diff --git a/tools/src/test/java/org/apache/kafka/tools/AbstractResetIntegrationTest.java b/tools/src/test/java/org/apache/kafka/tools/AbstractResetIntegrationTest.java index 391442a53edac..4042f8a8b13ec 100644 --- a/tools/src/test/java/org/apache/kafka/tools/AbstractResetIntegrationTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/AbstractResetIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tools; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.consumer.ConsumerConfig; diff --git a/tools/src/test/java/org/apache/kafka/tools/AclCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/AclCommandTest.java index f55a7b207d395..ec2eda70d1397 100644 --- a/tools/src/test/java/org/apache/kafka/tools/AclCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/AclCommandTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tools; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.acl.AccessControlEntry; import org.apache.kafka.common.acl.AclBinding; import org.apache.kafka.common.acl.AclBindingFilter; diff --git a/tools/src/test/java/org/apache/kafka/tools/ClusterToolTest.java b/tools/src/test/java/org/apache/kafka/tools/ClusterToolTest.java index 3bbb80bafb140..1f94c299e6532 100644 --- a/tools/src/test/java/org/apache/kafka/tools/ClusterToolTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/ClusterToolTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tools; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.MockAdminClient; diff --git a/tools/src/test/java/org/apache/kafka/tools/ConfigCommandIntegrationTest.java b/tools/src/test/java/org/apache/kafka/tools/ConfigCommandIntegrationTest.java index 761a319161e5a..9b88bfe433ce8 100644 --- a/tools/src/test/java/org/apache/kafka/tools/ConfigCommandIntegrationTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/ConfigCommandIntegrationTest.java @@ -18,7 +18,7 @@ import kafka.server.KafkaBroker; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientTestUtils; import org.apache.kafka.clients.admin.AlterConfigsOptions; @@ -746,7 +746,7 @@ public void testUpdateBrokerConfigNotAffectedByInvalidConfig() throws Exception .map(KafkaBroker::config) .allMatch(config -> config.getInt("log.cleaner.threads") == 2), () -> "Timeout waiting for topic config propagating to broker", - org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS, + TestUtils.DEFAULT_MAX_WAIT_MS, 100L); } } diff --git a/tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java index 72f9f2d8b7f8d..21ab799ca65a3 100644 --- a/tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tools; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterClientQuotasOptions; import org.apache.kafka.clients.admin.AlterClientQuotasResult; diff --git a/tools/src/test/java/org/apache/kafka/tools/GetOffsetShellTest.java b/tools/src/test/java/org/apache/kafka/tools/GetOffsetShellTest.java index ab31fd8089caf..9537569fb3542 100644 --- a/tools/src/test/java/org/apache/kafka/tools/GetOffsetShellTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/GetOffsetShellTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.tools; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewTopic; diff --git a/tools/src/test/java/org/apache/kafka/tools/GroupsCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/GroupsCommandTest.java index 21d8d64857095..ff159eea21ec3 100644 --- a/tools/src/test/java/org/apache/kafka/tools/GroupsCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/GroupsCommandTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tools; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.AdminClientTestUtils; diff --git a/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java index 511b2e08646e3..1cb6f8fa0f51a 100644 --- a/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tools; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.CreateTopicsResult; diff --git a/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java index 331a598605e4a..15cebc65aa1d3 100644 --- a/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tools; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.common.test.ClusterInstance; import org.apache.kafka.common.test.api.ClusterTest; diff --git a/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandUnitTest.java b/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandUnitTest.java index e0ae07034c6d1..fcb93e3af5411 100644 --- a/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandUnitTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandUnitTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tools; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.RaftVoterEndpoint; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.utils.Utils; diff --git a/tools/src/test/java/org/apache/kafka/tools/ResetIntegrationTest.java b/tools/src/test/java/org/apache/kafka/tools/ResetIntegrationTest.java index 632dcb611c33e..6031424ddee17 100644 --- a/tools/src/test/java/org/apache/kafka/tools/ResetIntegrationTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/ResetIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tools; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.ConsumerConfig; diff --git a/tools/src/test/java/org/apache/kafka/tools/ResetIntegrationWithSslTest.java b/tools/src/test/java/org/apache/kafka/tools/ResetIntegrationWithSslTest.java index eed8237549f4a..1a77723b8c496 100644 --- a/tools/src/test/java/org/apache/kafka/tools/ResetIntegrationWithSslTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/ResetIntegrationWithSslTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.tools; -import org.apache.kafka.base.test.TestSslUtils; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestSslUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.network.ConnectionMode; import org.apache.kafka.network.SocketServerConfigs; import org.apache.kafka.streams.integration.utils.EmbeddedKafkaCluster; diff --git a/tools/src/test/java/org/apache/kafka/tools/ToolsTestUtils.java b/tools/src/test/java/org/apache/kafka/tools/ToolsTestUtils.java index 5bd502587eeb8..59aae171d223d 100644 --- a/tools/src/test/java/org/apache/kafka/tools/ToolsTestUtils.java +++ b/tools/src/test/java/org/apache/kafka/tools/ToolsTestUtils.java @@ -21,6 +21,7 @@ import org.apache.kafka.clients.admin.ConfigEntry; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.config.ConfigResource; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.internals.Exit; import org.apache.kafka.server.config.QuotaConfig; @@ -166,7 +167,7 @@ public static File tempPropertiesFile(Map properties) throws IOE for (Entry entry : properties.entrySet()) { sb.append(entry.getKey() + "=" + entry.getValue() + System.lineSeparator()); } - return org.apache.kafka.base.test.TestUtils.tempFile(sb.toString()); + return TestUtils.tempFile(sb.toString()); } /** diff --git a/tools/src/test/java/org/apache/kafka/tools/TopicCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/TopicCommandTest.java index 02c751295835a..b8c338367ec6e 100644 --- a/tools/src/test/java/org/apache/kafka/tools/TopicCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/TopicCommandTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.tools; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientTestUtils; import org.apache.kafka.clients.admin.Config; diff --git a/tools/src/test/java/org/apache/kafka/tools/UserScramCredentialsCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/UserScramCredentialsCommandTest.java index 73b218c69ad14..97156290dc9cb 100644 --- a/tools/src/test/java/org/apache/kafka/tools/UserScramCredentialsCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/UserScramCredentialsCommandTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.tools; -import org.apache.kafka.base.test.NoRetryException; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.NoRetryException; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.test.ClusterInstance; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.utils.internals.Exit; diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/DeleteConsumerGroupsTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/DeleteConsumerGroupsTest.java index 9648d5960e192..6ceb65470dc02 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/DeleteConsumerGroupsTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/DeleteConsumerGroupsTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tools.consumer.group; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.GroupProtocol; import org.apache.kafka.clients.consumer.KafkaConsumer; diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/DeleteOffsetsConsumerGroupCommandIntegrationTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/DeleteOffsetsConsumerGroupCommandIntegrationTest.java index 1bfeb66c73eee..941183b30377e 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/DeleteOffsetsConsumerGroupCommandIntegrationTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/DeleteOffsetsConsumerGroupCommandIntegrationTest.java @@ -46,7 +46,7 @@ import java.util.Map; import java.util.Map.Entry; -import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.common.test.base.TestUtils.DEFAULT_MAX_WAIT_MS; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.CONSUMER_GROUP_HEARTBEAT_INTERVAL_MS_CONFIG; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.CONSUMER_GROUP_MIN_HEARTBEAT_INTERVAL_MS_CONFIG; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.GROUP_INITIAL_REBALANCE_DELAY_MS_CONFIG; diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/DescribeConsumerGroupTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/DescribeConsumerGroupTest.java index cb2964e862d54..bf49c5dcdea6e 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/DescribeConsumerGroupTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/DescribeConsumerGroupTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tools.consumer.group; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; @@ -67,7 +67,7 @@ import java.util.stream.IntStream; import java.util.stream.Stream; -import static org.apache.kafka.base.test.TestUtils.RANDOM; +import static org.apache.kafka.common.test.base.TestUtils.RANDOM; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.CONSUMER_GROUP_HEARTBEAT_INTERVAL_MS_CONFIG; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.CONSUMER_GROUP_MIN_HEARTBEAT_INTERVAL_MS_CONFIG; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.GROUP_INITIAL_REBALANCE_DELAY_MS_CONFIG; diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ListConsumerGroupTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ListConsumerGroupTest.java index fc283f7b2b898..1dde9105e0e17 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ListConsumerGroupTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ListConsumerGroupTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tools.consumer.group; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ResetConsumerGroupOffsetTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ResetConsumerGroupOffsetTest.java index b912c48826ffa..e664d5420e36b 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ResetConsumerGroupOffsetTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ResetConsumerGroupOffsetTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tools.consumer.group; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.consumer.GroupProtocol; @@ -62,7 +62,7 @@ import static java.time.LocalDateTime.now; import static java.util.stream.Collectors.toMap; -import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.common.test.base.TestUtils.DEFAULT_MAX_WAIT_MS; import static org.apache.kafka.clients.CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG; import static org.apache.kafka.clients.admin.AdminClientConfig.RETRIES_CONFIG; import static org.apache.kafka.clients.consumer.ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG; diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/SaslClientsWithInvalidCredentialsTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/SaslClientsWithInvalidCredentialsTest.java index 08580c2295e5d..3da2062206707 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/SaslClientsWithInvalidCredentialsTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/SaslClientsWithInvalidCredentialsTest.java @@ -19,7 +19,7 @@ import kafka.api.AbstractSaslTest; import kafka.security.JaasTestUtils; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.consumer.Consumer; diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandTest.java index cb7a002af633c..6a8516e71b534 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tools.consumer.group; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientTestUtils; import org.apache.kafka.clients.admin.AlterShareGroupOffsetsOptions; diff --git a/tools/src/test/java/org/apache/kafka/tools/other/ReplicationQuotasTestRig.java b/tools/src/test/java/org/apache/kafka/tools/other/ReplicationQuotasTestRig.java index 2e2dfd17ebd8b..0c5fe970606c7 100644 --- a/tools/src/test/java/org/apache/kafka/tools/other/ReplicationQuotasTestRig.java +++ b/tools/src/test/java/org/apache/kafka/tools/other/ReplicationQuotasTestRig.java @@ -77,7 +77,7 @@ import static java.nio.file.StandardOpenOption.APPEND; import static java.nio.file.StandardOpenOption.CREATE; -import static org.apache.kafka.base.test.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.common.test.base.TestUtils.DEFAULT_MAX_WAIT_MS; /** * Test rig for measuring throttling performance. Configure the parameters for a set of experiments, then execute them diff --git a/tools/src/test/java/org/apache/kafka/tools/reassign/ReassignPartitionsCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/reassign/ReassignPartitionsCommandTest.java index b51e97c36d110..21584f95fb075 100644 --- a/tools/src/test/java/org/apache/kafka/tools/reassign/ReassignPartitionsCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/reassign/ReassignPartitionsCommandTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tools.reassign; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; diff --git a/tools/src/test/java/org/apache/kafka/tools/streams/DeleteStreamsGroupOffsetTest.java b/tools/src/test/java/org/apache/kafka/tools/streams/DeleteStreamsGroupOffsetTest.java index 76a646eda8da2..ad2ac43e3c8d7 100644 --- a/tools/src/test/java/org/apache/kafka/tools/streams/DeleteStreamsGroupOffsetTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/streams/DeleteStreamsGroupOffsetTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tools.streams; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.GroupListing; import org.apache.kafka.clients.admin.ListGroupsOptions; diff --git a/tools/src/test/java/org/apache/kafka/tools/streams/DeleteStreamsGroupTest.java b/tools/src/test/java/org/apache/kafka/tools/streams/DeleteStreamsGroupTest.java index 3e612b298621e..fbd007cfb3f2b 100644 --- a/tools/src/test/java/org/apache/kafka/tools/streams/DeleteStreamsGroupTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/streams/DeleteStreamsGroupTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tools.streams; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.FeatureUpdate; diff --git a/tools/src/test/java/org/apache/kafka/tools/streams/DescribeStreamsGroupTest.java b/tools/src/test/java/org/apache/kafka/tools/streams/DescribeStreamsGroupTest.java index d8eedd74c6376..5346137496150 100644 --- a/tools/src/test/java/org/apache/kafka/tools/streams/DescribeStreamsGroupTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/streams/DescribeStreamsGroupTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tools.streams; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.Serdes; diff --git a/tools/src/test/java/org/apache/kafka/tools/streams/ListStreamsGroupTest.java b/tools/src/test/java/org/apache/kafka/tools/streams/ListStreamsGroupTest.java index 2a4b4482f27ac..37261f687c523 100644 --- a/tools/src/test/java/org/apache/kafka/tools/streams/ListStreamsGroupTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/streams/ListStreamsGroupTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tools.streams; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.GroupListing; import org.apache.kafka.clients.consumer.ConsumerConfig; diff --git a/tools/src/test/java/org/apache/kafka/tools/streams/ResetStreamsGroupOffsetTest.java b/tools/src/test/java/org/apache/kafka/tools/streams/ResetStreamsGroupOffsetTest.java index 4371a22050664..e74481b0af753 100644 --- a/tools/src/test/java/org/apache/kafka/tools/streams/ResetStreamsGroupOffsetTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/streams/ResetStreamsGroupOffsetTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tools.streams; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.GroupListing; diff --git a/tools/src/test/java/org/apache/kafka/tools/streams/StreamsGroupCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/streams/StreamsGroupCommandTest.java index 461ae602ba25b..2f5edcdddeabf 100644 --- a/tools/src/test/java/org/apache/kafka/tools/streams/StreamsGroupCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/streams/StreamsGroupCommandTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.tools.streams; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.DeleteStreamsGroupsOptions; import org.apache.kafka.clients.admin.DeleteStreamsGroupsResult; diff --git a/transaction-coordinator/src/test/java/org/apache/kafka/coordinator/transaction/ProducerIdManagerTest.java b/transaction-coordinator/src/test/java/org/apache/kafka/coordinator/transaction/ProducerIdManagerTest.java index d7558e73001ca..9e573dfa0d4a9 100644 --- a/transaction-coordinator/src/test/java/org/apache/kafka/coordinator/transaction/ProducerIdManagerTest.java +++ b/transaction-coordinator/src/test/java/org/apache/kafka/coordinator/transaction/ProducerIdManagerTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.coordinator.transaction; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientResponse; import org.apache.kafka.common.errors.AuthenticationException; import org.apache.kafka.common.errors.CoordinatorLoadInProgressException; diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/agent/AgentTest.java b/trogdor/src/test/java/org/apache/kafka/trogdor/agent/AgentTest.java index 0eda89f973fd3..de1c768ff1d71 100644 --- a/trogdor/src/test/java/org/apache/kafka/trogdor/agent/AgentTest.java +++ b/trogdor/src/test/java/org/apache/kafka/trogdor/agent/AgentTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.trogdor.agent; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.trogdor.basic.BasicNode; diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/basic/BasicPlatformTest.java b/trogdor/src/test/java/org/apache/kafka/trogdor/basic/BasicPlatformTest.java index e34f743d91e2f..9219bfd343fd1 100644 --- a/trogdor/src/test/java/org/apache/kafka/trogdor/basic/BasicPlatformTest.java +++ b/trogdor/src/test/java/org/apache/kafka/trogdor/basic/BasicPlatformTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.trogdor.basic; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.trogdor.common.Platform; import org.junit.jupiter.api.Test; diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/common/ExpectedTasks.java b/trogdor/src/test/java/org/apache/kafka/trogdor/common/ExpectedTasks.java index d17ec4ab10adb..366b5a93d8d6e 100644 --- a/trogdor/src/test/java/org/apache/kafka/trogdor/common/ExpectedTasks.java +++ b/trogdor/src/test/java/org/apache/kafka/trogdor/common/ExpectedTasks.java @@ -17,7 +17,7 @@ package org.apache.kafka.trogdor.common; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.trogdor.agent.AgentClient; import org.apache.kafka.trogdor.coordinator.CoordinatorClient; import org.apache.kafka.trogdor.rest.AgentStatusResponse; diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/common/JsonUtilTest.java b/trogdor/src/test/java/org/apache/kafka/trogdor/common/JsonUtilTest.java index 1b11220925ef2..66f636c8c0230 100644 --- a/trogdor/src/test/java/org/apache/kafka/trogdor/common/JsonUtilTest.java +++ b/trogdor/src/test/java/org/apache/kafka/trogdor/common/JsonUtilTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.trogdor.common; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/coordinator/CoordinatorTest.java b/trogdor/src/test/java/org/apache/kafka/trogdor/coordinator/CoordinatorTest.java index e511fe7383b83..998e3f40c0d58 100644 --- a/trogdor/src/test/java/org/apache/kafka/trogdor/coordinator/CoordinatorTest.java +++ b/trogdor/src/test/java/org/apache/kafka/trogdor/coordinator/CoordinatorTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.trogdor.coordinator; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.trogdor.agent.AgentClient; import org.apache.kafka.trogdor.common.CapturingCommandRunner; diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/workload/ExternalCommandWorkerTest.java b/trogdor/src/test/java/org/apache/kafka/trogdor/workload/ExternalCommandWorkerTest.java index c2ae1385f434b..da9e3039f81b2 100644 --- a/trogdor/src/test/java/org/apache/kafka/trogdor/workload/ExternalCommandWorkerTest.java +++ b/trogdor/src/test/java/org/apache/kafka/trogdor/workload/ExternalCommandWorkerTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.trogdor.workload; -import org.apache.kafka.base.test.TestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.internals.KafkaFutureImpl; import org.apache.kafka.common.utils.internals.OperatingSystem; import org.apache.kafka.trogdor.task.AgentWorkerStatusTracker; From 61b6ae76e52f9984375fe5e7ef70707dc09eb29e Mon Sep 17 00:00:00 2001 From: Igor Soarez Date: Sun, 3 May 2026 09:10:51 +0100 Subject: [PATCH 07/10] rename ReflectionUtils to TestReflectionUtils --- .../ConcurrentListOffsetsRequestTest.java | 8 +++---- .../kafka/clients/NetworkClientTest.java | 4 ++-- .../kafka/common/network/SelectorTest.java | 10 ++++---- .../authenticator/SaslAuthenticatorTest.java | 4 ++-- .../unit/kafka/network/SocketServerTest.scala | 24 +++++++++---------- gradle/spotbugs-exclude.xml | 2 +- ...ionUtils.java => TestReflectionUtils.java} | 2 +- 7 files changed, 27 insertions(+), 27 deletions(-) rename test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/{ReflectionUtils.java => TestReflectionUtils.java} (97%) diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ConcurrentListOffsetsRequestTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ConcurrentListOffsetsRequestTest.java index 17f0aa6ff3ebf..61f524cee9e74 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ConcurrentListOffsetsRequestTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ConcurrentListOffsetsRequestTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients.admin; -import org.apache.kafka.common.test.base.ReflectionUtils; +import org.apache.kafka.common.test.base.TestReflectionUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.DefaultHostResolver; import org.apache.kafka.clients.NetworkClient; @@ -79,7 +79,7 @@ public void setup() throws Exception { adminClient = KafkaAdminClient.createInternal(new AdminClientConfig(clusterInstance.setClientSaslConfig(props), true), null, new TestHostResolver()); - networkClient = ReflectionUtils.fieldValue(adminClient, KafkaAdminClient.class, "client"); + networkClient = TestReflectionUtils.fieldValue(adminClient, KafkaAdminClient.class, "client"); } @AfterEach @@ -119,10 +119,10 @@ public void correctlyHandleConcurrentModificationOfPartitionLeaderCache() throws } private TestPartitionLeaderCache replacePartitionLeaderCache(CountDownLatch invalidationLatch) throws Exception { - PartitionLeaderCache oldPartitionLeaderCache = ReflectionUtils.fieldValue(adminClient, KafkaAdminClient.class, "partitionLeaderCache"); + PartitionLeaderCache oldPartitionLeaderCache = TestReflectionUtils.fieldValue(adminClient, KafkaAdminClient.class, "partitionLeaderCache"); TestPartitionLeaderCache partitionLeaderCache = new TestPartitionLeaderCache(oldPartitionLeaderCache.get(getTopicPartitions()), invalidationLatch); - ReflectionUtils.setFieldValue(adminClient, "partitionLeaderCache", partitionLeaderCache); + TestReflectionUtils.setFieldValue(adminClient, "partitionLeaderCache", partitionLeaderCache); return partitionLeaderCache; } diff --git a/clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java b/clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java index c8552ef20b5ba..ef5be7a52814b 100644 --- a/clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.clients; -import org.apache.kafka.common.test.base.ReflectionUtils; +import org.apache.kafka.common.test.base.TestReflectionUtils; import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Cluster; import org.apache.kafka.common.KafkaException; @@ -262,7 +262,7 @@ public synchronized void rebootstrap() { defaultRequestTimeoutMs, connectionSetupTimeoutMsTest, connectionSetupTimeoutMaxMsTest, time, false, new ApiVersions(), new LogContext(), rebootstrapTriggerMs, MetadataRecoveryStrategy.REBOOTSTRAP); - MetadataUpdater metadataUpdater = ReflectionUtils.fieldValue(client, NetworkClient.class, "metadataUpdater"); + MetadataUpdater metadataUpdater = TestReflectionUtils.fieldValue(client, NetworkClient.class, "metadataUpdater"); metadata.bootstrap(Collections.singletonList(new InetSocketAddress("localhost", 9999))); metadata.requestUpdate(true); diff --git a/clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java b/clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java index 37f35e8372578..752ee074b8c09 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.network; -import org.apache.kafka.common.test.base.ReflectionUtils; +import org.apache.kafka.common.test.base.TestReflectionUtils; import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.memory.MemoryPool; @@ -965,7 +965,7 @@ public void testWriteCompletesSendWithNoBytesWritten() throws IOException { @Test public void testChannelCloseWhileProcessingReceives() throws Exception { int numChannels = 4; - Map channels = ReflectionUtils.fieldValue(selector, Selector.class, "channels"); + Map channels = TestReflectionUtils.fieldValue(selector, Selector.class, "channels"); Set selectionKeys = new HashSet<>(); for (int i = 0; i < numChannels; i++) { String id = String.valueOf(i); @@ -1161,9 +1161,9 @@ private void sendNoReceive(KafkaChannel channel, int numRequests) throws Excepti */ private void injectNetworkReceive(KafkaChannel channel, int size) throws Exception { NetworkReceive receive = new NetworkReceive(); - ReflectionUtils.setFieldValue(channel, "receive", receive); - ByteBuffer sizeBuffer = ReflectionUtils.fieldValue(receive, NetworkReceive.class, "size"); + TestReflectionUtils.setFieldValue(channel, "receive", receive); + ByteBuffer sizeBuffer = TestReflectionUtils.fieldValue(receive, NetworkReceive.class, "size"); sizeBuffer.putInt(size); - ReflectionUtils.setFieldValue(receive, "buffer", ByteBuffer.allocate(size)); + TestReflectionUtils.setFieldValue(receive, "buffer", ByteBuffer.allocate(size)); } } diff --git a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java index 202e023ca9239..5201a55259eea 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java @@ -16,7 +16,7 @@ */ package org.apache.kafka.common.security.authenticator; -import org.apache.kafka.common.test.base.ReflectionUtils; +import org.apache.kafka.common.test.base.TestReflectionUtils; import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.NetworkClient; import org.apache.kafka.common.KafkaException; @@ -1936,7 +1936,7 @@ public void testServerSidePendingSendDuringReauthentication() throws Exception { // Set the client's channel `send` to null to allow setting a new send on the server's selector. // Without this, NioEchoServer will throw an error while processing the client request, // since we're manually setting a server side send to simulate the issue. - ReflectionUtils.setFieldValue(selector.channel(node), "send", null); + TestReflectionUtils.setFieldValue(selector.channel(node), "send", null); // extract the channel id from the server's selector and directly set a send on it. String channelId = server.selector().channels().get(0).id(); diff --git a/core/src/test/scala/unit/kafka/network/SocketServerTest.scala b/core/src/test/scala/unit/kafka/network/SocketServerTest.scala index b41e6bb323253..a246aa092fea1 100644 --- a/core/src/test/scala/unit/kafka/network/SocketServerTest.scala +++ b/core/src/test/scala/unit/kafka/network/SocketServerTest.scala @@ -46,7 +46,7 @@ import org.apache.kafka.server.metrics.KafkaYammerMetrics import org.apache.kafka.server.network.ConnectionDisconnectListener import org.apache.kafka.server.quota.{ThrottleCallback, ThrottledChannel} import org.apache.kafka.server.util.ServerTestUtils -import org.apache.kafka.common.test.base.{ReflectionUtils, TestSslUtils} +import org.apache.kafka.common.test.base.{TestReflectionUtils, TestSslUtils} import org.apache.logging.log4j.{Level, LogManager} import org.apache.logging.log4j.core.config.Configurator import org.junit.jupiter.api.Assertions._ @@ -558,15 +558,15 @@ class SocketServerTest { val connectionId = request1.context.connectionId val channel = server.dataPlaneAcceptor(listener).get.processors(0).channel(connectionId).getOrElse(throw new IllegalStateException("Channel not found")) - val transportLayer: SslTransportLayer = ReflectionUtils.fieldValue(channel, classOf[KafkaChannel], "transportLayer") - val netReadBuffer: ByteBuffer = ReflectionUtils.fieldValue(transportLayer, classOf[SslTransportLayer], "netReadBuffer") + val transportLayer: SslTransportLayer = TestReflectionUtils.fieldValue(channel, classOf[KafkaChannel], "transportLayer") + val netReadBuffer: ByteBuffer = TestReflectionUtils.fieldValue(transportLayer, classOf[SslTransportLayer], "netReadBuffer") proxyServer.enableBuffering(netReadBuffer) (1 to numBufferedRequests).foreach { _ => sendRequest(socket, requestBytes) } - val keysWithBufferedRead: util.Set[SelectionKey] = ReflectionUtils.fieldValue(serverSelector, classOf[Selector], "keysWithBufferedRead") + val keysWithBufferedRead: util.Set[SelectionKey] = TestReflectionUtils.fieldValue(serverSelector, classOf[Selector], "keysWithBufferedRead") keysWithBufferedRead.add(channel.selectionKey) - ReflectionUtils.setFieldValue(transportLayer, "hasBytesBuffered", true) + TestReflectionUtils.setFieldValue(transportLayer, "hasBytesBuffered", true) (socket, request1) } @@ -1459,9 +1459,9 @@ class SocketServerTest { // Truncates the last request in the SSL buffers by directly updating the buffers to simulate partial buffered request def truncateBufferedRequest(channel: KafkaChannel): Unit = { - val transportLayer: SslTransportLayer = ReflectionUtils.fieldValue(channel, classOf[KafkaChannel], "transportLayer") - val netReadBuffer: ByteBuffer = ReflectionUtils.fieldValue(transportLayer, classOf[SslTransportLayer], "netReadBuffer") - val appReadBuffer: ByteBuffer = ReflectionUtils.fieldValue(transportLayer, classOf[SslTransportLayer], "appReadBuffer") + val transportLayer: SslTransportLayer = TestReflectionUtils.fieldValue(channel, classOf[KafkaChannel], "transportLayer") + val netReadBuffer: ByteBuffer = TestReflectionUtils.fieldValue(transportLayer, classOf[SslTransportLayer], "netReadBuffer") + val appReadBuffer: ByteBuffer = TestReflectionUtils.fieldValue(transportLayer, classOf[SslTransportLayer], "appReadBuffer") if (appReadBuffer.position() > 4) { appReadBuffer.position(4) netReadBuffer.position(0) @@ -1583,7 +1583,7 @@ class SocketServerTest { val (socket, request) = makeSocketWithBufferedRequests(testableServer, testableSelector, proxyServer) testableSelector.operationCounts.clear() testableSelector.waitForOperations(SelectorOperation.Poll, 1) - val keysWithBufferedRead: util.Set[SelectionKey] = ReflectionUtils.fieldValue(testableSelector, classOf[Selector], "keysWithBufferedRead") + val keysWithBufferedRead: util.Set[SelectionKey] = TestReflectionUtils.fieldValue(testableSelector, classOf[Selector], "keysWithBufferedRead") assertEquals(Set.empty, keysWithBufferedRead.asScala) processRequest(testableServer.dataPlaneRequestChannel, request) // buffered requests should be processed after channel is unmuted @@ -2207,7 +2207,7 @@ class SocketServerTest { } class CompletedReceivesPollData(selector: TestableSelector) extends PollData[NetworkReceive] { - val completedReceivesMap: util.Map[String, NetworkReceive] = ReflectionUtils.fieldValue(selector, classOf[Selector], "completedReceives") + val completedReceivesMap: util.Map[String, NetworkReceive] = TestReflectionUtils.fieldValue(selector, classOf[Selector], "completedReceives") override def updateResults(): Unit = { val currentReceives = update(selector.completedReceives.asScala.toBuffer) @@ -2360,8 +2360,8 @@ class SocketServerTest { } private def makeClosing(channel: KafkaChannel): Unit = { - val channels: util.Map[String, KafkaChannel] = ReflectionUtils.fieldValue(this, classOf[Selector], "channels") - val closingChannels: util.Map[String, KafkaChannel] = ReflectionUtils.fieldValue(this, classOf[Selector], "closingChannels") + val channels: util.Map[String, KafkaChannel] = TestReflectionUtils.fieldValue(this, classOf[Selector], "channels") + val closingChannels: util.Map[String, KafkaChannel] = TestReflectionUtils.fieldValue(this, classOf[Selector], "closingChannels") closingChannels.put(channel.id, channel) channels.remove(channel.id) } diff --git a/gradle/spotbugs-exclude.xml b/gradle/spotbugs-exclude.xml index 82b81d3b5e19f..a1af53d4590d6 100644 --- a/gradle/spotbugs-exclude.xml +++ b/gradle/spotbugs-exclude.xml @@ -429,7 +429,7 @@ For a detailed description of spotbugs bug categories, see https://spotbugs.read - + diff --git a/test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/ReflectionUtils.java b/test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/TestReflectionUtils.java similarity index 97% rename from test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/ReflectionUtils.java rename to test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/TestReflectionUtils.java index 3ac4548423c7e..0dc67e918393c 100644 --- a/test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/ReflectionUtils.java +++ b/test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/TestReflectionUtils.java @@ -18,7 +18,7 @@ import java.lang.reflect.Field; -public class ReflectionUtils { +public class TestReflectionUtils { @SuppressWarnings("unchecked") public static T fieldValue(Object o, Class clazz, String fieldName) { From 811ba3681f1607c4ed001058376c1c81e889e1ef Mon Sep 17 00:00:00 2001 From: Igor Soarez Date: Sun, 3 May 2026 11:22:18 +0100 Subject: [PATCH 08/10] spotlessApply --- .../org/apache/kafka/clients/ClientRebootstrapTest.java | 2 +- .../java/org/apache/kafka/clients/ClientsTestUtils.java | 2 +- .../kafka/clients/MetadataVersionIntegrationTest.java | 2 +- .../apache/kafka/clients/TransactionsExpirationTest.java | 2 +- .../kafka/clients/TransactionsWithMaxInFlightOneTest.java | 2 +- .../clients/admin/ConcurrentListOffsetsRequestTest.java | 2 +- .../org/apache/kafka/clients/admin/DeleteTopicTest.java | 2 +- .../clients/admin/DescribeProducersWithBrokerIdTest.java | 2 +- .../kafka/clients/admin/ListOffsetsIntegrationTest.java | 2 +- .../apache/kafka/clients/consumer/ConsumerBounceTest.java | 2 +- .../kafka/clients/consumer/ConsumerIntegrationTest.java | 2 +- .../kafka/clients/consumer/PlaintextConsumerAssignTest.java | 2 +- .../kafka/clients/consumer/PlaintextConsumerCommitTest.java | 2 +- .../kafka/clients/consumer/PlaintextConsumerPollTest.java | 2 +- .../clients/consumer/PlaintextConsumerSubscriptionTest.java | 2 +- .../kafka/clients/consumer/PlaintextConsumerTest.java | 2 +- .../kafka/clients/consumer/ShareConsumerCallbackTest.java | 4 ++-- .../kafka/clients/consumer/ShareConsumerDeliveryTest.java | 2 +- .../apache/kafka/clients/consumer/ShareConsumerLagTest.java | 2 +- .../kafka/clients/consumer/ShareConsumerRackAwareTest.java | 2 +- .../apache/kafka/clients/consumer/ShareConsumerTest.java | 2 +- .../kafka/clients/consumer/ShareConsumerTestBase.java | 2 +- .../kafka/clients/producer/ProducerCompressionTest.java | 2 +- .../kafka/clients/producer/ProducerIdExpirationTest.java | 4 ++-- .../kafka/clients/producer/ProducerIntegrationTest.java | 2 +- .../clients/producer/ProducerSendWhileDeletionTest.java | 2 +- .../clients/security/GroupAuthorizerIntegrationTest.java | 2 +- .../apache/kafka/server/quota/CustomQuotaCallbackTest.java | 2 +- .../java/org/apache/kafka/clients/InFlightRequestsTest.java | 2 +- .../src/test/java/org/apache/kafka/clients/MockClient.java | 2 +- .../java/org/apache/kafka/clients/NetworkClientTest.java | 4 ++-- .../java/org/apache/kafka/clients/NodeApiVersionsTest.java | 2 +- .../clients/admin/DeleteConsumerGroupOffsetsResultTest.java | 2 +- .../apache/kafka/clients/admin/KafkaAdminClientTest.java | 2 +- .../admin/RemoveMembersFromConsumerGroupResultTest.java | 2 +- .../admin/internals/AllBrokersStrategyIntegrationTest.java | 2 +- .../internals/PartitionLeaderStrategyIntegrationTest.java | 2 +- .../apache/kafka/clients/consumer/KafkaConsumerTest.java | 2 +- .../clients/consumer/internals/AbstractCoordinatorTest.java | 2 +- .../internals/AcknowledgementCommitCallbackHandlerTest.java | 2 +- .../clients/consumer/internals/AsyncKafkaConsumerTest.java | 4 ++-- .../consumer/internals/CommitRequestManagerTest.java | 4 ++-- .../clients/consumer/internals/ConsumerCoordinatorTest.java | 2 +- .../consumer/internals/ConsumerNetworkClientTest.java | 2 +- .../consumer/internals/ConsumerNetworkThreadTest.java | 4 ++-- .../clients/consumer/internals/FetchRequestManagerTest.java | 6 +++--- .../kafka/clients/consumer/internals/FetcherTest.java | 4 ++-- .../consumer/internals/NetworkClientDelegateTest.java | 2 +- .../kafka/clients/consumer/internals/OffsetFetcherTest.java | 2 +- .../clients/consumer/internals/SubscriptionStateTest.java | 2 +- .../internals/events/ApplicationEventProcessorTest.java | 2 +- .../apache/kafka/clients/producer/KafkaProducerTest.java | 2 +- .../kafka/clients/producer/internals/BufferPoolTest.java | 2 +- .../kafka/clients/producer/internals/ProducerBatchTest.java | 2 +- .../clients/producer/internals/RecordAccumulatorTest.java | 2 +- .../apache/kafka/clients/producer/internals/SenderTest.java | 2 +- .../clients/producer/internals/TransactionManagerTest.java | 2 +- .../java/org/apache/kafka/common/internals/TopicTest.java | 2 +- .../java/org/apache/kafka/common/network/CertStores.java | 2 +- .../org/apache/kafka/common/network/KafkaChannelTest.java | 2 +- .../org/apache/kafka/common/network/NetworkTestUtils.java | 2 +- .../java/org/apache/kafka/common/network/NioEchoServer.java | 2 +- .../apache/kafka/common/network/SaslChannelBuilderTest.java | 2 +- .../java/org/apache/kafka/common/network/SelectorTest.java | 4 ++-- .../org/apache/kafka/common/network/SslSelectorTest.java | 4 ++-- .../apache/kafka/common/network/SslTransportLayerTest.java | 4 ++-- .../kafka/common/network/SslVersionsTransportLayerTest.java | 2 +- .../org/apache/kafka/common/network/Tls12SelectorTest.java | 2 +- .../org/apache/kafka/common/network/Tls13SelectorTest.java | 4 ++-- .../common/record/internal/DefaultRecordBatchTest.java | 2 +- .../common/record/internal/FileLogInputStreamTest.java | 4 ++-- .../kafka/common/record/internal/FileRecordsTest.java | 2 +- .../common/record/internal/MemoryRecordsBuilderTest.java | 2 +- .../kafka/common/record/internal/MemoryRecordsTest.java | 2 +- .../kafka/common/record/internal/MultiRecordsSendTest.java | 2 +- .../common/record/internal/RemoteLogInputStreamTest.java | 4 ++-- .../kafka/common/requests/ApiVersionsResponseTest.java | 2 +- .../apache/kafka/common/requests/JoinGroupRequestTest.java | 2 +- .../apache/kafka/common/requests/RequestResponseTest.java | 2 +- .../org/apache/kafka/common/security/JaasContextTest.java | 2 +- .../authenticator/ClientAuthenticationFailureTest.java | 2 +- .../authenticator/SaslAuthenticatorFailureDelayTest.java | 2 +- .../security/authenticator/SaslAuthenticatorTest.java | 4 ++-- .../security/authenticator/SaslServerAuthenticatorTest.java | 2 +- .../security/oauthbearer/DefaultJwtRetrieverTest.java | 2 +- .../security/oauthbearer/DefaultJwtValidatorTest.java | 2 +- .../security/oauthbearer/JwtBearerJwtRetrieverTest.java | 2 +- .../oauthbearer/OAuthBearerLoginCallbackHandlerTest.java | 2 +- .../ClientCredentialsRequestFormatterFactoryTest.java | 2 +- .../internals/secured/ConfigurationUtilsTest.java | 2 +- .../secured/VerificationKeyResolverFactoryTest.java | 2 +- .../secured/assertion/AssertionSupplierFactoryTest.java | 2 +- .../CommonNameLoggingTrustManagerFactoryWrapperTest.java | 2 +- .../common/security/ssl/DefaultSslEngineFactoryTest.java | 2 +- .../apache/kafka/common/security/ssl/SslFactoryTest.java | 4 ++-- .../common/security/ssl/mock/TestKeyManagerFactory.java | 2 +- .../test/java/org/apache/kafka/common/utils/UtilsTest.java | 2 +- .../rest/basic/auth/extension/JaasBasicAuthFilterTest.java | 2 +- .../integration/FileStreamSinkConnectorIntegrationTest.java | 2 +- .../FileStreamSourceConnectorIntegrationTest.java | 2 +- .../mirror/integration/DedicatedMirrorIntegrationTest.java | 4 ++-- .../integration/MirrorConnectorsIntegrationBaseTest.java | 4 ++-- .../integration/MirrorConnectorsIntegrationSSLTest.java | 4 ++-- .../connect/integration/ConnectWorkerIntegrationTest.java | 4 ++-- .../integration/ExactlyOnceSourceIntegrationTest.java | 4 ++-- .../connect/integration/OffsetsApiIntegrationTest.java | 2 +- .../connect/integration/RestForwardingIntegrationTest.java | 4 ++-- .../connect/integration/SinkConnectorsIntegrationTest.java | 2 +- core/src/test/java/kafka/security/JaasTestUtils.java | 2 +- .../test/java/kafka/server/share/ShareFetchUtilsTest.java | 2 +- .../java/kafka/server/share/SharePartitionManagerTest.java | 2 +- .../test/java/kafka/server/share/SharePartitionTest.java | 2 +- .../coordinator/group/GroupCoordinatorServiceTest.java | 2 +- .../main/java/org/apache/kafka/jmh/log/StressTestLog.java | 2 +- .../org/apache/kafka/controller/MockRaftClientTest.java | 2 +- .../org/apache/kafka/controller/MockRaftClientTestEnv.java | 2 +- .../controller/QuorumControllerMetricsIntegrationTest.java | 2 +- .../org/apache/kafka/controller/QuorumControllerTest.java | 2 +- .../org/apache/kafka/image/loader/MetadataLoaderTest.java | 2 +- .../kafka/metadata/bootstrap/BootstrapDirectoryTest.java | 2 +- .../org/apache/kafka/metadata/storage/FormatterTest.java | 2 +- .../org/apache/kafka/metadata/storage/ScramParserTest.java | 2 +- .../kafka/metadata/util/BatchFileWriterReaderTest.java | 2 +- .../org/apache/kafka/raft/FileQuorumStateStoreTest.java | 2 +- .../java/org/apache/kafka/raft/KafkaRaftClientTest.java | 2 +- .../org/apache/kafka/raft/MockExpirationServiceTest.java | 2 +- .../java/org/apache/kafka/raft/RaftClientTestContext.java | 4 ++-- .../org/apache/kafka/raft/internals/KafkaRaftLogTest.java | 2 +- .../apache/kafka/raft/internals/RecordsIteratorTest.java | 2 +- .../java/org/apache/kafka/snapshot/FileRawSnapshotTest.java | 2 +- .../metadata/properties/MetaPropertiesEnsembleTest.java | 2 +- .../java/org/apache/kafka/queue/KafkaEventQueueTest.java | 2 +- .../server/share/persister/PersisterStateManagerTest.java | 2 +- .../apache/kafka/server/util/ShutdownableThreadTest.java | 2 +- .../kafka/server/util/timer/SystemTimerReaperTest.java | 2 +- .../java/org/apache/kafka/api/EndToEndClusterIdTest.java | 2 +- .../org/apache/kafka/server/AssignmentsManagerTest.java | 2 +- .../kafka/server/BootstrapControllersIntegrationTest.java | 2 +- .../org/apache/kafka/server/ClientMetricsManagerTest.java | 2 +- .../apache/kafka/server/CordonedLogDirsIntegrationTest.java | 2 +- .../kafka/server/EligibleLeaderReplicasIntegrationTest.java | 2 +- .../test/java/org/apache/kafka/server/KRaftClusterTest.java | 2 +- .../org/apache/kafka/server/LogManagerIntegrationTest.java | 2 +- .../java/org/apache/kafka/server/MetadataRequestTest.java | 2 +- .../org/apache/kafka/server/config/DynamicConfigTest.java | 2 +- .../apache/kafka/server/metrics/ClientMetricsTestUtils.java | 2 +- .../apache/kafka/server/purgatory/DelayedFutureTest.java | 2 +- .../apache/kafka/server/quota/ClientQuotasRequestTest.java | 2 +- .../kafka/server/share/fetch/ShareFetchTestUtils.java | 2 +- .../kafka/server/share/session/ShareSessionCacheTest.java | 2 +- .../java/org/apache/kafka/server/util/SchedulerTest.java | 2 +- .../java/org/apache/kafka/admin/RemoteTopicCrudTest.java | 4 ++-- .../java/org/apache/kafka/server/log/LogAppendTimeTest.java | 2 +- .../metadata/storage/RemoteLogMetadataManagerTestUtils.java | 2 +- .../metadata/storage/RemoteLogSegmentLifecycleTest.java | 2 +- .../TopicBasedRemoteLogMetadataManagerConfigTest.java | 2 +- .../TopicBasedRemoteLogMetadataManagerRestartTest.java | 2 +- .../storage/TopicBasedRemoteLogMetadataManagerTest.java | 2 +- .../kafka/server/log/remote/storage/LocalTieredStorage.java | 2 +- .../server/log/remote/storage/RemoteLogManagerTest.java | 4 ++-- .../log/remote/storage/RemoteLogOffsetReaderTest.java | 2 +- .../OffsetCheckpointFileWithFailureHandlerTest.java | 2 +- .../internals/checkpoint/PartitionMetadataFileTest.java | 2 +- .../kafka/storage/internals/log/BrokerCompressionTest.java | 2 +- .../apache/kafka/storage/internals/log/LocalLogTest.java | 2 +- .../storage/internals/log/LogCleanerIntegrationTest.java | 2 +- .../kafka/storage/internals/log/LogCleanerManagerTest.java | 2 +- .../kafka/storage/internals/log/LogConcurrencyTest.java | 2 +- .../apache/kafka/storage/internals/log/LogSegmentTest.java | 2 +- .../apache/kafka/storage/internals/log/LogSegmentsTest.java | 2 +- .../kafka/storage/internals/log/LogValidatorTest.java | 2 +- .../apache/kafka/storage/internals/log/OffsetIndexTest.java | 2 +- .../storage/internals/log/ProducerStateManagerTest.java | 2 +- .../kafka/storage/internals/log/RemoteIndexCacheTest.java | 2 +- .../apache/kafka/storage/internals/log/TimeIndexTest.java | 2 +- .../kafka/storage/internals/log/TransactionIndexTest.java | 2 +- .../apache/kafka/storage/internals/log/UnifiedLogTest.java | 2 +- .../kafka/tiered/storage/TieredStorageTestHarness.java | 2 +- .../kafka/tiered/storage/actions/AlterLogDirAction.java | 2 +- .../tiered/storage/actions/ExpectBrokerInISRAction.java | 2 +- .../storage/actions/ExpectEmptyRemoteStorageAction.java | 2 +- .../kafka/tiered/storage/actions/ExpectLeaderAction.java | 2 +- .../storage/actions/ExpectLeaderEpochCheckpointAction.java | 2 +- .../kafka/tiered/storage/actions/ReassignReplicaAction.java | 2 +- .../kafka/tiered/storage/actions/ShrinkReplicaAction.java | 2 +- .../integration/TransactionsWithTieredStoreTest.java | 2 +- .../kafka/streams/examples/wordcount/WordCountDemoTest.java | 2 +- .../streams/integration/AbstractJoinIntegrationTest.java | 2 +- .../streams/integration/AdjustStreamThreadCountTest.java | 2 +- .../AtLeastOnceDeliveryMessageLossIntegrationTest.java | 2 +- .../integration/ConsistencyVectorIntegrationTest.java | 2 +- .../streams/integration/DeadLetterQueueIntegrationTest.java | 2 +- .../integration/EOSUncleanShutdownIntegrationTest.java | 2 +- .../streams/integration/EmitOnChangeIntegrationTest.java | 2 +- .../kafka/streams/integration/EosIntegrationTest.java | 2 +- .../integration/FineGrainedAutoResetIntegrationTest.java | 2 +- .../streams/integration/GlobalKTableEOSIntegrationTest.java | 2 +- .../streams/integration/GlobalKTableIntegrationTest.java | 2 +- .../kafka/streams/integration/GlobalStateReprocessTest.java | 2 +- .../streams/integration/GlobalThreadShutDownOrderTest.java | 2 +- .../HandlingSourceTopicDeletionIntegrationTest.java | 2 +- .../integration/HeadersStoreUpgradeIntegrationTest.java | 2 +- .../HighAvailabilityTaskAssignorIntegrationTest.java | 4 ++-- .../IQv2EndpointToPartitionsIntegrationTest.java | 2 +- .../kafka/streams/integration/IQv2IntegrationTest.java | 2 +- .../kafka/streams/integration/IQv2StoreIntegrationTest.java | 2 +- .../streams/integration/InternalTopicIntegrationTest.java | 2 +- .../JoinGracePeriodDurabilityIntegrationTest.java | 2 +- .../kafka/streams/integration/JoinStoreIntegrationTest.java | 2 +- .../JoinWithIncompleteMetadataIntegrationTest.java | 2 +- .../integration/KStreamAggregationDedupIntegrationTest.java | 2 +- .../integration/KStreamAggregationIntegrationTest.java | 2 +- .../streams/integration/KStreamKStreamIntegrationTest.java | 2 +- .../integration/KStreamRepartitionIntegrationTest.java | 2 +- .../streams/integration/KTableEfficientRangeQueryTest.java | 2 +- ...ForeignKeyInnerJoinCustomPartitionerIntegrationTest.java | 2 +- ...KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java | 2 +- .../KTableKTableForeignKeyJoinDistributedTest.java | 2 +- .../KTableKTableForeignKeyJoinIntegrationTest.java | 2 +- ...eKTableForeignKeyJoinMaterializationIntegrationTest.java | 2 +- .../KTableSourceTopicRestartIntegrationTest.java | 2 +- .../KafkaStreamsCloseOptionsIntegrationTest.java | 2 +- .../integration/KafkaStreamsTelemetryIntegrationTest.java | 2 +- .../kafka/streams/integration/LagFetchIntegrationTest.java | 2 +- .../kafka/streams/integration/MetricsIntegrationTest.java | 2 +- .../streams/integration/NamedTopologyIntegrationTest.java | 2 +- .../streams/integration/OptimizedKTableIntegrationTest.java | 4 ++-- .../integration/OuterJoinListValueStoreRestorationTest.java | 2 +- .../streams/integration/PauseResumeIntegrationTest.java | 2 +- .../streams/integration/PositionRestartIntegrationTest.java | 2 +- .../integration/PurgeRepartitionTopicIntegrationTest.java | 4 ++-- .../streams/integration/QueryableStateIntegrationTest.java | 4 ++-- .../streams/integration/RangeQueryIntegrationTest.java | 2 +- .../kafka/streams/integration/RebalanceIntegrationTest.java | 2 +- .../RebalanceProtocolMigrationIntegrationTest.java | 2 +- .../integration/RebalanceTaskClosureIntegrationTest.java | 2 +- .../streams/integration/RegexSourceIntegrationTest.java | 4 ++-- .../integration/ResetPartitionTimeIntegrationTest.java | 2 +- .../kafka/streams/integration/RestoreIntegrationTest.java | 2 +- .../streams/integration/RocksDBMetricsIntegrationTest.java | 2 +- .../streams/integration/SelfJoinUpgradeIntegrationTest.java | 2 +- .../SelfManagedOffsetLifecycleIntegrationTest.java | 2 +- .../SelfManagedOffsetRecoveryIntegrationTest.java | 2 +- .../streams/integration/SessionsStoreWithHeadersTest.java | 2 +- .../integration/SlidingWindowedKStreamIntegrationTest.java | 2 +- .../integration/StandbyTaskCreationIntegrationTest.java | 2 +- .../streams/integration/StandbyTaskEOSIntegrationTest.java | 2 +- .../StandbyTaskEOSMultiRebalanceIntegrationTest.java | 2 +- .../streams/integration/StateDirectoryIntegrationTest.java | 2 +- .../integration/StateUpdaterFailureIntegrationTest.java | 2 +- .../streams/integration/StoreQueryIntegrationTest.java | 4 ++-- .../StreamTableJoinTopologyOptimizationIntegrationTest.java | 2 +- .../StreamsUncaughtExceptionHandlerIntegrationTest.java | 2 +- .../integration/SuppressionDurabilityIntegrationTest.java | 2 +- .../streams/integration/SuppressionIntegrationTest.java | 2 +- .../SwallowUnknownTopicErrorIntegrationTest.java | 2 +- .../streams/integration/TaskAssignorIntegrationTest.java | 2 +- .../streams/integration/TaskMetadataIntegrationTest.java | 2 +- .../integration/TimeWindowedKStreamIntegrationTest.java | 2 +- .../TimestampedKeyValueStoreWithHeadersTest.java | 2 +- .../integration/TimestampedStoreUpgradeIntegrationTest.java | 2 +- .../integration/TimestampedWindowStoreWithHeadersTest.java | 2 +- .../integration/VersionedKeyValueStoreIntegrationTest.java | 2 +- .../streams/integration/utils/EmbeddedKafkaCluster.java | 4 ++-- .../streams/integration/utils/IntegrationTestUtils.java | 4 ++-- .../java/org/apache/kafka/streams/KafkaStreamsTest.java | 2 +- .../KStreamSessionWindowAggregateProcessorTest.java | 2 +- .../kstream/internals/KStreamWindowAggregateTest.java | 2 +- .../streams/kstream/internals/KTableAggregateTest.java | 2 +- .../internals/KTableKTableForeignKeyJoinScenarioTest.java | 2 +- .../kstream/internals/KTableTransformValuesTest.java | 2 +- .../streams/kstream/internals/SuppressScenarioTest.java | 2 +- .../ForeignTableJoinProcessorSupplierTests.java | 2 +- .../SubscriptionReceiveProcessorSupplierTest.java | 2 +- .../suppress/KTableSuppressProcessorMetricsTest.java | 2 +- .../processor/internals/GlobalStateManagerImplTest.java | 2 +- .../streams/processor/internals/GlobalStateTaskTest.java | 2 +- .../streams/processor/internals/GlobalStreamThreadTest.java | 2 +- .../streams/processor/internals/NamedTopologyTest.java | 2 +- .../processor/internals/ProcessorStateManagerTest.java | 2 +- .../streams/processor/internals/ProcessorTopologyTest.java | 2 +- .../kafka/streams/processor/internals/StandbyTaskTest.java | 2 +- .../streams/processor/internals/StateDirectoryTest.java | 2 +- .../kafka/streams/processor/internals/StreamTaskTest.java | 2 +- .../kafka/streams/processor/internals/StreamThreadTest.java | 4 ++-- .../processor/internals/tasks/DefaultTaskExecutorTest.java | 2 +- .../apache/kafka/streams/state/KeyValueStoreTestDriver.java | 2 +- .../AbstractDualSchemaRocksDBSegmentedBytesStoreTest.java | 2 +- .../internals/AbstractRocksDBSegmentedBytesStoreTest.java | 2 +- .../kafka/streams/state/internals/AbstractSegmentsTest.java | 2 +- .../state/internals/AbstractSessionBytesStoreTest.java | 2 +- .../state/internals/AbstractWindowBytesStoreTest.java | 2 +- .../state/internals/CachingInMemoryKeyValueStoreTest.java | 2 +- .../state/internals/CachingInMemorySessionStoreTest.java | 2 +- .../state/internals/CachingPersistentSessionStoreTest.java | 2 +- .../state/internals/CachingPersistentWindowStoreTest.java | 2 +- .../internals/ChangeLoggingKeyValueBytesStoreTest.java | 2 +- .../ChangeLoggingTimestampedKeyValueBytesStoreTest.java | 2 +- ...LoggingTimestampedKeyValueBytesStoreWithHeadersTest.java | 2 +- ...geLoggingTimestampedWindowBytesStoreWithHeadersTest.java | 2 +- .../ChangeLoggingVersionedKeyValueBytesStoreTest.java | 2 +- .../streams/state/internals/InMemoryWindowStoreTest.java | 2 +- .../kafka/streams/state/internals/KeyValueSegmentTest.java | 2 +- .../state/internals/LegacyCheckpointingStateStoreTest.java | 2 +- .../kafka/streams/state/internals/ListValueStoreTest.java | 2 +- .../streams/state/internals/LogicalKeyValueSegmentTest.java | 2 +- .../streams/state/internals/MeteredKeyValueStoreTest.java | 2 +- .../streams/state/internals/MeteredSessionStoreTest.java | 2 +- .../state/internals/MeteredTimestampedWindowStoreTest.java | 2 +- .../MeteredTimestampedWindowStoreWithHeadersTest.java | 2 +- .../streams/state/internals/MeteredWindowStoreTest.java | 2 +- .../kafka/streams/state/internals/OffsetCheckpointTest.java | 2 +- .../internals/PlainToHeadersWindowStoreAdapterTest.java | 2 +- .../state/internals/RocksDBSessionStoreWithHeadersTest.java | 2 +- .../kafka/streams/state/internals/RocksDBStoreTest.java | 2 +- .../internals/RocksDBTimeOrderedKeyValueBufferTest.java | 2 +- .../internals/RocksDBTimeOrderedKeyValueBytesStoreTest.java | 2 +- .../RocksDBTimeOrderedSessionStoreWithHeadersTest.java | 2 +- .../RocksDBTimeOrderedWindowStoreWithHeadersTest.java | 2 +- .../RocksDBTimestampedWindowStoreWithHeadersTest.java | 2 +- .../streams/state/internals/RocksDBVersionedStoreTest.java | 2 +- .../kafka/streams/state/internals/SegmentIteratorTest.java | 2 +- .../state/internals/SessionSegmentWithHeadersTest.java | 2 +- .../streams/state/internals/SessionStoreFetchTest.java | 2 +- .../state/internals/StreamThreadStateStoreProviderTest.java | 2 +- .../TimeOrderedCachingPersistentWindowStoreTest.java | 2 +- .../state/internals/TimeOrderedKeyValueBufferTest.java | 2 +- .../state/internals/TimeOrderedSessionStoreUpgradeTest.java | 2 +- .../streams/state/internals/TimeOrderedWindowStoreTest.java | 2 +- .../state/internals/TimeOrderedWindowStoreUpgradeTest.java | 2 +- .../TimestampedKeyValueStoreBuilderWithHeadersTest.java | 2 +- .../streams/state/internals/TimestampedSegmentTest.java | 2 +- .../state/internals/TimestampedSegmentWithHeadersTest.java | 2 +- .../TimestampedToHeadersWindowStoreAdapterTest.java | 2 +- ...ampedWindowStoreWithHeadersSerializerSideEffectTest.java | 2 +- .../kafka/streams/state/internals/WindowStoreFetchTest.java | 2 +- .../internals/metrics/RocksDBBlockCacheMetricsTest.java | 2 +- .../apache/kafka/streams/tests/RelationalSmokeTestTest.java | 2 +- .../org/apache/kafka/streams/tests/SmokeTestClient.java | 2 +- .../test/java/org/apache/kafka/test/StreamsTestUtils.java | 2 +- .../org/apache/kafka/streams/TopologyTestDriverTest.java | 2 +- .../streams/test/MockProcessorContextStateStoreTest.java | 2 +- .../test/wordcount/WindowedWordCountProcessorTest.java | 2 +- .../apache/kafka/tools/AbstractResetIntegrationTest.java | 2 +- .../test/java/org/apache/kafka/tools/AclCommandTest.java | 2 +- .../test/java/org/apache/kafka/tools/ClusterToolTest.java | 2 +- .../apache/kafka/tools/ConfigCommandIntegrationTest.java | 2 +- .../test/java/org/apache/kafka/tools/ConfigCommandTest.java | 2 +- .../java/org/apache/kafka/tools/GetOffsetShellTest.java | 2 +- .../test/java/org/apache/kafka/tools/GroupsCommandTest.java | 2 +- .../org/apache/kafka/tools/LeaderElectionCommandTest.java | 2 +- .../org/apache/kafka/tools/MetadataQuorumCommandTest.java | 2 +- .../apache/kafka/tools/MetadataQuorumCommandUnitTest.java | 2 +- .../java/org/apache/kafka/tools/ResetIntegrationTest.java | 2 +- .../org/apache/kafka/tools/ResetIntegrationWithSslTest.java | 2 +- .../test/java/org/apache/kafka/tools/TopicCommandTest.java | 2 +- .../apache/kafka/tools/UserScramCredentialsCommandTest.java | 4 ++-- .../tools/consumer/group/DeleteConsumerGroupsTest.java | 2 +- .../tools/consumer/group/DescribeConsumerGroupTest.java | 2 +- .../kafka/tools/consumer/group/ListConsumerGroupTest.java | 2 +- .../tools/consumer/group/ResetConsumerGroupOffsetTest.java | 4 ++-- .../group/SaslClientsWithInvalidCredentialsTest.java | 2 +- .../kafka/tools/consumer/group/ShareGroupCommandTest.java | 2 +- .../kafka/tools/reassign/ReassignPartitionsCommandTest.java | 2 +- .../kafka/tools/streams/DeleteStreamsGroupOffsetTest.java | 2 +- .../apache/kafka/tools/streams/DeleteStreamsGroupTest.java | 2 +- .../kafka/tools/streams/DescribeStreamsGroupTest.java | 2 +- .../apache/kafka/tools/streams/ListStreamsGroupTest.java | 2 +- .../kafka/tools/streams/ResetStreamsGroupOffsetTest.java | 2 +- .../apache/kafka/tools/streams/StreamsGroupCommandTest.java | 2 +- .../coordinator/transaction/ProducerIdManagerTest.java | 2 +- .../kafka/trogdor/workload/ExternalCommandWorkerTest.java | 2 +- 372 files changed, 409 insertions(+), 409 deletions(-) diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientRebootstrapTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientRebootstrapTest.java index f61a08ad4136e..6ef228550be44 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientRebootstrapTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientRebootstrapTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.GroupProtocol; @@ -28,6 +27,7 @@ import org.apache.kafka.common.test.api.ClusterConfigProperty; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; import java.time.Duration; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientsTestUtils.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientsTestUtils.java index efbf651890b91..8f8c8b8193174 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientsTestUtils.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/ClientsTestUtils.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerRebalanceListener; import org.apache.kafka.clients.consumer.ConsumerRecord; @@ -34,6 +33,7 @@ import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.test.ClusterInstance; +import org.apache.kafka.common.test.base.TestUtils; import java.time.Duration; import java.util.ArrayList; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/MetadataVersionIntegrationTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/MetadataVersionIntegrationTest.java index 1a864d6007411..c2c084660221c 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/MetadataVersionIntegrationTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/MetadataVersionIntegrationTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.clients; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.FeatureUpdate; import org.apache.kafka.common.test.ClusterInstance; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTests; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.server.common.MetadataVersion; import java.util.Map; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/TransactionsExpirationTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/TransactionsExpirationTest.java index acb0e2d2a8c87..26faddde44b2f 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/TransactionsExpirationTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/TransactionsExpirationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.ProducerState; import org.apache.kafka.clients.consumer.Consumer; @@ -40,6 +39,7 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; import org.apache.kafka.coordinator.transaction.TransactionLogConfig; import org.apache.kafka.coordinator.transaction.TransactionStateManagerConfig; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/TransactionsWithMaxInFlightOneTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/TransactionsWithMaxInFlightOneTest.java index 8c7239f4ac3ec..b7a8568122107 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/TransactionsWithMaxInFlightOneTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/TransactionsWithMaxInFlightOneTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; @@ -32,6 +31,7 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; import org.apache.kafka.coordinator.transaction.TransactionLogConfig; import org.apache.kafka.coordinator.transaction.TransactionStateManagerConfig; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ConcurrentListOffsetsRequestTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ConcurrentListOffsetsRequestTest.java index 61f524cee9e74..d6a6730743716 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ConcurrentListOffsetsRequestTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ConcurrentListOffsetsRequestTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.admin; -import org.apache.kafka.common.test.base.TestReflectionUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.DefaultHostResolver; import org.apache.kafka.clients.NetworkClient; @@ -28,6 +27,7 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestReflectionUtils; import org.apache.kafka.common.utils.Utils; import org.junit.jupiter.api.AfterEach; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DeleteTopicTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DeleteTopicTest.java index 84f672312bafd..5762577437cc5 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DeleteTopicTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DeleteTopicTest.java @@ -18,7 +18,6 @@ import kafka.server.KafkaBroker; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.errors.TopicDeletionDisabledException; @@ -30,6 +29,7 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; import org.apache.kafka.metadata.BrokerState; import org.apache.kafka.server.common.RequestLocal; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DescribeProducersWithBrokerIdTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DescribeProducersWithBrokerIdTest.java index a2d8558565028..a2c4385e1fa3c 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DescribeProducersWithBrokerIdTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DescribeProducersWithBrokerIdTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.admin; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.Node; @@ -25,6 +24,7 @@ import org.apache.kafka.common.test.ClusterInstance; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ListOffsetsIntegrationTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ListOffsetsIntegrationTest.java index 22e6846a2cf19..85eac92429648 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ListOffsetsIntegrationTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/ListOffsetsIntegrationTest.java @@ -18,7 +18,6 @@ import kafka.server.KafkaBroker; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.ListOffsetsResult.ListOffsetsResultInfo; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerConfig; @@ -33,6 +32,7 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.junit.jupiter.api.AfterEach; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerBounceTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerBounceTest.java index 9520fb352deb9..c97465620e919 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerBounceTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerBounceTest.java @@ -18,7 +18,6 @@ import kafka.server.KafkaBroker; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientsTestUtils; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerRecord; @@ -34,6 +33,7 @@ import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.ClusterTests; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; import org.apache.kafka.raft.KRaftConfigs; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerIntegrationTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerIntegrationTest.java index a5a5f782669c9..72b74e6d3d116 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerIntegrationTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.consumer; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewPartitionReassignment; import org.apache.kafka.clients.admin.NewPartitions; @@ -39,6 +38,7 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTests; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; import org.apache.kafka.coordinator.group.metrics.GroupCoordinatorRuntimeMetrics; import org.apache.kafka.server.common.Feature; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerAssignTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerAssignTest.java index c1cbb3bf2374a..fd114e7bd1943 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerAssignTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerAssignTest.java @@ -17,7 +17,6 @@ package org.apache.kafka.clients.consumer; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientsTestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.test.ClusterInstance; @@ -25,6 +24,7 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerCommitTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerCommitTest.java index 773df88e7e385..7b67a7a11eff5 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerCommitTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerCommitTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.consumer; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientsTestUtils; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerConfig; @@ -28,6 +27,7 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.test.MockConsumerInterceptor; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerPollTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerPollTest.java index 9ffc43447c779..00f05bc8ff5d0 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerPollTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerPollTest.java @@ -17,7 +17,6 @@ package org.apache.kafka.clients.consumer; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientsTestUtils; import org.apache.kafka.clients.ClientsTestUtils.TestConsumerReassignmentListener; import org.apache.kafka.clients.producer.Producer; @@ -28,6 +27,7 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerSubscriptionTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerSubscriptionTest.java index 0ddda58f94b66..b309e33ebc82c 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerSubscriptionTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerSubscriptionTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.consumer; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientsTestUtils.TestConsumerReassignmentListener; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.common.TopicPartition; @@ -28,6 +27,7 @@ import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.ClusterTests; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerTest.java index e1c0cb2e0cf47..fa93b05137d28 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/PlaintextConsumerTest.java @@ -18,7 +18,6 @@ import kafka.server.KafkaBroker; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientsTestUtils.TestConsumerReassignmentListener; import org.apache.kafka.clients.admin.NewPartitions; import org.apache.kafka.clients.producer.Producer; @@ -49,6 +48,7 @@ import org.apache.kafka.common.test.api.ClusterTests; import org.apache.kafka.common.test.api.Flaky; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.server.quota.QuotaType; import org.apache.kafka.test.MockConsumerInterceptor; import org.apache.kafka.test.MockProducerInterceptor; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerCallbackTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerCallbackTest.java index 518687f92253c..d3a304798970c 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerCallbackTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerCallbackTest.java @@ -16,8 +16,6 @@ */ package org.apache.kafka.clients.consumer; -import org.apache.kafka.common.test.base.NoRetryException; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.KafkaException; @@ -30,6 +28,8 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.NoRetryException; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.Timeout; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerDeliveryTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerDeliveryTest.java index 045f5d75e8386..f8707e4ae5dbb 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerDeliveryTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerDeliveryTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.consumer; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterConfigOp; import org.apache.kafka.clients.admin.ConfigEntry; @@ -33,6 +32,7 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.coordinator.group.GroupConfig; import org.junit.jupiter.api.Timeout; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerLagTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerLagTest.java index 1a918cc79c306..509cb8e7262bd 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerLagTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerLagTest.java @@ -18,7 +18,6 @@ import kafka.server.KafkaBroker; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerRecord; @@ -29,6 +28,7 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.Timeout; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerRackAwareTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerRackAwareTest.java index 5f8d9f377a0b6..04dcc23527ac7 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerRackAwareTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerRackAwareTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.consumer; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewPartitionReassignment; @@ -32,6 +31,7 @@ import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.ClusterTests; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; import java.time.Duration; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerTest.java index cc2f071dcd37a..476e7737b68f5 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerTest.java @@ -18,7 +18,6 @@ import kafka.server.KafkaBroker; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.RecordsToDelete; import org.apache.kafka.clients.admin.SharePartitionOffsetInfo; @@ -54,6 +53,7 @@ import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.ClusterTests; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; import org.apache.kafka.server.share.SharePartitionKey; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerTestBase.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerTestBase.java index e36a25ce678b6..e630cfccbec59 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerTestBase.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ShareConsumerTestBase.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.consumer; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterConfigOp; import org.apache.kafka.clients.admin.AlterConfigsOptions; @@ -49,6 +48,7 @@ import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.test.ClusterInstance; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.coordinator.group.GroupConfig; import org.apache.kafka.coordinator.group.modern.share.ShareGroupConfig; import org.apache.kafka.server.util.ServerTestUtils; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerCompressionTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerCompressionTest.java index b124f0e1695f6..b002dce38c1aa 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerCompressionTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerCompressionTest.java @@ -17,7 +17,6 @@ package org.apache.kafka.clients.producer; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.CloseOptions; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -30,6 +29,7 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import java.time.Duration; import java.util.ArrayList; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerIdExpirationTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerIdExpirationTest.java index 73b5caece1e3b..9a09bbe4238d7 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerIdExpirationTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerIdExpirationTest.java @@ -47,10 +47,10 @@ import java.util.concurrent.TimeUnit; import static kafka.utils.TestUtils.consumeRecords; -import static org.apache.kafka.common.test.base.TestUtils.DEFAULT_MAX_WAIT_MS; -import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; import static org.apache.kafka.clients.consumer.ConsumerConfig.ISOLATION_LEVEL_CONFIG; import static org.apache.kafka.clients.producer.ProducerConfig.ENABLE_IDEMPOTENCE_CONFIG; +import static org.apache.kafka.common.test.base.TestUtils.DEFAULT_MAX_WAIT_MS; +import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.GROUP_INITIAL_REBALANCE_DELAY_MS_CONFIG; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.OFFSETS_TOPIC_PARTITIONS_CONFIG; import static org.apache.kafka.coordinator.transaction.TransactionLogConfig.PRODUCER_ID_EXPIRATION_CHECK_INTERVAL_MS_CONFIG; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerIntegrationTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerIntegrationTest.java index c6e2f4442b4fe..178596e03d257 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerIntegrationTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.producer; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.admin.TransactionState; import org.apache.kafka.clients.consumer.Consumer; @@ -38,6 +37,7 @@ import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.ClusterTests; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; import org.apache.kafka.coordinator.transaction.TransactionLogConfig; import org.apache.kafka.server.IntegrationTestUtils; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerSendWhileDeletionTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerSendWhileDeletionTest.java index da4b56e92fac0..c1463ca007f07 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerSendWhileDeletionTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/producer/ProducerSendWhileDeletionTest.java @@ -18,7 +18,6 @@ import kafka.server.KafkaBroker; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewPartitionReassignment; import org.apache.kafka.clients.admin.NewTopic; @@ -34,6 +33,7 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.server.config.ServerLogConfigs; import org.apache.kafka.storage.internals.checkpoint.OffsetCheckpointFile; import org.apache.kafka.storage.internals.log.UnifiedLog; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/security/GroupAuthorizerIntegrationTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/security/GroupAuthorizerIntegrationTest.java index 81036cac6fff6..f4f4eddc06422 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/security/GroupAuthorizerIntegrationTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/security/GroupAuthorizerIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.security; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.NewTopic; @@ -48,6 +47,7 @@ import org.apache.kafka.common.test.api.ClusterConfigProperty; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; import org.apache.kafka.metadata.authorizer.StandardAuthorizer; import org.apache.kafka.server.authorizer.AuthorizableRequestContext; diff --git a/clients/clients-integration-tests/src/test/java/org/apache/kafka/server/quota/CustomQuotaCallbackTest.java b/clients/clients-integration-tests/src/test/java/org/apache/kafka/server/quota/CustomQuotaCallbackTest.java index 224483b0bdf9d..42ee69e82d331 100644 --- a/clients/clients-integration-tests/src/test/java/org/apache/kafka/server/quota/CustomQuotaCallbackTest.java +++ b/clients/clients-integration-tests/src/test/java/org/apache/kafka/server/quota/CustomQuotaCallbackTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.server.quota; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.common.Cluster; @@ -30,6 +29,7 @@ import org.apache.kafka.common.test.api.ClusterConfigProperty; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.server.config.QuotaConfig; import java.util.HashMap; diff --git a/clients/src/test/java/org/apache/kafka/clients/InFlightRequestsTest.java b/clients/src/test/java/org/apache/kafka/clients/InFlightRequestsTest.java index f51320a3c4293..aafb72bcc10a4 100644 --- a/clients/src/test/java/org/apache/kafka/clients/InFlightRequestsTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/InFlightRequestsTest.java @@ -17,9 +17,9 @@ package org.apache.kafka.clients; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.requests.RequestHeader; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; diff --git a/clients/src/test/java/org/apache/kafka/clients/MockClient.java b/clients/src/test/java/org/apache/kafka/clients/MockClient.java index 76682e4c3737d..e97472fadab70 100644 --- a/clients/src/test/java/org/apache/kafka/clients/MockClient.java +++ b/clients/src/test/java/org/apache/kafka/clients/MockClient.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Node; import org.apache.kafka.common.errors.AuthenticationException; import org.apache.kafka.common.errors.InterruptException; @@ -26,6 +25,7 @@ import org.apache.kafka.common.requests.AbstractResponse; import org.apache.kafka.common.requests.MetadataRequest; import org.apache.kafka.common.requests.MetadataResponse; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import java.util.ArrayList; diff --git a/clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java b/clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java index ef5be7a52814b..af43f31a26eec 100644 --- a/clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java @@ -16,8 +16,6 @@ */ package org.apache.kafka.clients; -import org.apache.kafka.common.test.base.TestReflectionUtils; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Cluster; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.Node; @@ -52,6 +50,8 @@ import org.apache.kafka.common.requests.RequestTestUtils; import org.apache.kafka.common.security.authenticator.SaslClientAuthenticator; import org.apache.kafka.common.telemetry.internals.ClientTelemetrySender; +import org.apache.kafka.common.test.base.TestReflectionUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.test.DelayedReceive; diff --git a/clients/src/test/java/org/apache/kafka/clients/NodeApiVersionsTest.java b/clients/src/test/java/org/apache/kafka/clients/NodeApiVersionsTest.java index f4b0ea3fee445..f9dface1a2915 100644 --- a/clients/src/test/java/org/apache/kafka/clients/NodeApiVersionsTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/NodeApiVersionsTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.feature.SupportedVersionRange; import org.apache.kafka.common.message.ApiMessageType; @@ -25,6 +24,7 @@ import org.apache.kafka.common.message.ApiVersionsResponseData.ApiVersionCollection; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.requests.ApiVersionsResponse; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsResultTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsResultTest.java index 50f3239b2281b..bb19a5c54e6cd 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsResultTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsResultTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.clients.admin; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.GroupAuthorizationException; import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; import org.apache.kafka.common.internals.KafkaFutureImpl; import org.apache.kafka.common.protocol.Errors; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java index 560c3281f7abc..12e405d4ae7db 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.admin; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientDnsLookup; import org.apache.kafka.clients.ClientRequest; import org.apache.kafka.clients.ClientUtils; @@ -256,6 +255,7 @@ import org.apache.kafka.common.resource.ResourceType; import org.apache.kafka.common.telemetry.internals.ClientTelemetryReporter; import org.apache.kafka.common.telemetry.internals.ClientTelemetrySender; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/RemoveMembersFromConsumerGroupResultTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/RemoveMembersFromConsumerGroupResultTest.java index e12d9fda3af20..a7246f987623e 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/RemoveMembersFromConsumerGroupResultTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/RemoveMembersFromConsumerGroupResultTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.clients.admin; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.errors.FencedInstanceIdException; import org.apache.kafka.common.errors.GroupAuthorizationException; import org.apache.kafka.common.internals.KafkaFutureImpl; import org.apache.kafka.common.message.LeaveGroupRequestData.MemberIdentity; import org.apache.kafka.common.protocol.Errors; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyIntegrationTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyIntegrationTest.java index ddfcd72dd92f4..b17ef0276739c 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyIntegrationTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.admin.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Node; import org.apache.kafka.common.errors.DisconnectException; import org.apache.kafka.common.errors.UnknownServerException; @@ -28,6 +27,7 @@ import org.apache.kafka.common.requests.AbstractResponse; import org.apache.kafka.common.requests.MetadataRequest; import org.apache.kafka.common.requests.MetadataResponse; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.internals.LogContext; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategyIntegrationTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategyIntegrationTest.java index 009fd5d7cea86..ddc543ac23458 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategyIntegrationTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategyIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.admin.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Node; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.DisconnectException; @@ -34,6 +33,7 @@ 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.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.internals.LogContext; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java index 437026be6a828..b0b4670f87969 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.consumer; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientRequest; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.KafkaClient; @@ -102,6 +101,7 @@ import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.telemetry.internals.ClientTelemetryReporter; import org.apache.kafka.common.telemetry.internals.ClientTelemetrySender; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinatorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinatorTest.java index 0e20ad11ba4a9..45e5f00870fac 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinatorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinatorTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.GroupRebalanceConfig; import org.apache.kafka.clients.MockClient; @@ -53,6 +52,7 @@ import org.apache.kafka.common.requests.RequestTestUtils; import org.apache.kafka.common.requests.SyncGroupRequest; import org.apache.kafka.common.requests.SyncGroupResponse; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AcknowledgementCommitCallbackHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AcknowledgementCommitCallbackHandlerTest.java index 7027f27b38ed8..b197bbf4b4973 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AcknowledgementCommitCallbackHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AcknowledgementCommitCallbackHandlerTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.AcknowledgeType; import org.apache.kafka.clients.consumer.AcknowledgementCommitCallback; import org.apache.kafka.common.TopicIdPartition; @@ -25,6 +24,7 @@ import org.apache.kafka.common.errors.InvalidRecordStateException; import org.apache.kafka.common.errors.TopicAuthorizationException; import org.apache.kafka.common.protocol.Errors; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumerTest.java index 642bddf349718..f42bf77db0ba5 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumerTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.Metadata.LeaderAndEpoch; import org.apache.kafka.clients.MockClient; import org.apache.kafka.clients.NodeApiVersions; @@ -87,6 +86,7 @@ import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.requests.RequestTestUtils; import org.apache.kafka.common.serialization.StringDeserializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; @@ -135,13 +135,13 @@ import static java.util.Arrays.asList; import static java.util.Collections.singleton; import static java.util.Collections.singletonList; -import static org.apache.kafka.common.test.base.TestUtils.requiredConsumerConfig; import static org.apache.kafka.clients.consumer.internals.AbstractMembershipManager.TOPIC_PARTITION_COMPARATOR; import static org.apache.kafka.clients.consumer.internals.ConsumerRebalanceListenerMethodName.ON_PARTITIONS_ASSIGNED; import static org.apache.kafka.clients.consumer.internals.ConsumerRebalanceListenerMethodName.ON_PARTITIONS_LOST; import static org.apache.kafka.clients.consumer.internals.ConsumerRebalanceListenerMethodName.ON_PARTITIONS_REVOKED; import static org.apache.kafka.clients.consumer.internals.ConsumerUtils.CONSUMER_METRIC_GROUP; import static org.apache.kafka.clients.consumer.internals.ConsumerUtils.THROW_ON_FETCH_STABLE_OFFSET_UNSUPPORTED; +import static org.apache.kafka.common.test.base.TestUtils.requiredConsumerConfig; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java index 8a739c564bcee..3a82c96732ea0 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientResponse; import org.apache.kafka.clients.consumer.CommitFailedException; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -49,6 +48,7 @@ import org.apache.kafka.common.requests.OffsetFetchResponse; import org.apache.kafka.common.requests.RequestHeader; import org.apache.kafka.common.serialization.StringDeserializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.internals.LogContext; @@ -75,12 +75,12 @@ import java.util.stream.Stream; import static java.util.Collections.singleton; -import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; import static org.apache.kafka.clients.consumer.ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG; import static org.apache.kafka.clients.consumer.ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG; import static org.apache.kafka.clients.consumer.ConsumerConfig.GROUP_ID_CONFIG; import static org.apache.kafka.clients.consumer.ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG; import static org.apache.kafka.clients.consumer.ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG; +import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinatorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinatorTest.java index 0b7a8b8648ee2..9fdfc9eb1cfbc 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinatorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinatorTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientResponse; import org.apache.kafka.clients.GroupRebalanceConfig; import org.apache.kafka.clients.MockClient; @@ -78,6 +77,7 @@ import org.apache.kafka.common.requests.RequestTestUtils; import org.apache.kafka.common.requests.SyncGroupRequest; import org.apache.kafka.common.requests.SyncGroupResponse; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClientTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClientTest.java index 1e199064085d3..911d5521673a5 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClientTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClientTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientResponse; import org.apache.kafka.clients.Metadata; import org.apache.kafka.clients.MockClient; @@ -38,6 +37,7 @@ import org.apache.kafka.common.requests.HeartbeatResponse; import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.requests.RequestTestUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.internals.LogContext; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThreadTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThreadTest.java index 1fb5851ba6e68..041208a27c510 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThreadTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThreadTest.java @@ -16,8 +16,6 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.common.test.base.TestCondition; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.internals.events.ApplicationEvent; import org.apache.kafka.clients.consumer.internals.events.ApplicationEventProcessor; import org.apache.kafka.clients.consumer.internals.events.AsyncPollEvent; @@ -25,6 +23,8 @@ import org.apache.kafka.clients.consumer.internals.metrics.AsyncConsumerMetrics; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.metrics.Metrics; +import org.apache.kafka.common.test.base.TestCondition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.internals.LogContext; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java index bda96274a6ae2..93945189ba5b9 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.ClientRequest; import org.apache.kafka.clients.CommonClientConfigs; @@ -79,6 +78,7 @@ import org.apache.kafka.common.serialization.BytesDeserializer; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.StringDeserializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.ByteBufferOutputStream; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; @@ -131,11 +131,11 @@ import static java.util.Collections.singleton; import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; -import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; -import static org.apache.kafka.common.test.base.TestUtils.assertOptional; import static org.apache.kafka.clients.consumer.ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG; import static org.apache.kafka.clients.consumer.ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG; import static org.apache.kafka.common.requests.FetchMetadata.INVALID_SESSION_ID; +import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; +import static org.apache.kafka.common.test.base.TestUtils.assertOptional; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java index 3599ee5d766f6..768bf1c4e0214 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.ClientRequest; import org.apache.kafka.clients.CommonClientConfigs; @@ -78,6 +77,7 @@ import org.apache.kafka.common.serialization.BytesDeserializer; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.StringDeserializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.ByteBufferOutputStream; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Timer; @@ -128,8 +128,8 @@ import static java.util.Collections.singleton; import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; -import static org.apache.kafka.common.test.base.TestUtils.assertOptional; import static org.apache.kafka.common.requests.FetchMetadata.INVALID_SESSION_ID; +import static org.apache.kafka.common.test.base.TestUtils.assertOptional; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegateTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegateTest.java index cf161504d059c..2a9746777f747 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegateTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegateTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientResponse; import org.apache.kafka.clients.Metadata; import org.apache.kafka.clients.MockClient; @@ -36,6 +35,7 @@ import org.apache.kafka.common.requests.FindCoordinatorRequest; import org.apache.kafka.common.requests.FindCoordinatorResponse; import org.apache.kafka.common.serialization.StringDeserializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.internals.LogContext; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherTest.java index e497290f221c9..94d7285bf15ce 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherTest.java @@ -82,9 +82,9 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.singleton; import static java.util.Collections.singletonMap; -import static org.apache.kafka.common.test.base.TestUtils.assertOptional; import static org.apache.kafka.common.requests.OffsetsForLeaderEpochResponse.UNDEFINED_EPOCH; import static org.apache.kafka.common.requests.OffsetsForLeaderEpochResponse.UNDEFINED_EPOCH_OFFSET; +import static org.apache.kafka.common.test.base.TestUtils.assertOptional; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertInstanceOf; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/SubscriptionStateTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/SubscriptionStateTest.java index a62f5b9de1de5..f1e3d17c0c9b2 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/SubscriptionStateTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/SubscriptionStateTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.Metadata; import org.apache.kafka.clients.NodeApiVersions; @@ -30,6 +29,7 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.message.OffsetForLeaderEpochResponseData.EpochEndOffset; import org.apache.kafka.common.protocol.ApiKeys; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.internals.LogContext; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessorTest.java index 41c30301cddfd..a9ff405a66358 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessorTest.java @@ -65,8 +65,8 @@ import java.util.regex.Pattern; import java.util.stream.Stream; -import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; import static org.apache.kafka.clients.consumer.internals.events.CompletableEvent.calculateDeadlineMs; +import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java index 1877a8f6732c1..3d8cf0afcb0f9 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.producer; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.KafkaClient; @@ -92,6 +91,7 @@ import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.common.telemetry.internals.ClientTelemetryReporter; import org.apache.kafka.common.telemetry.internals.ClientTelemetrySender; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.ProducerIdAndEpoch; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/BufferPoolTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/BufferPoolTest.java index 9237bf7bb61df..877a0955024bf 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/BufferPoolTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/BufferPoolTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.clients.producer.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.producer.BufferExhaustedException; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.metrics.Metrics; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerBatchTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerBatchTest.java index 3e99baaae4043..93390c9dd2896 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerBatchTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerBatchTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.producer.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.producer.Callback; import org.apache.kafka.clients.producer.RecordMetadata; import org.apache.kafka.common.KafkaException; @@ -30,6 +29,7 @@ import org.apache.kafka.common.record.internal.MemoryRecordsBuilder; import org.apache.kafka.common.record.internal.Record; import org.apache.kafka.common.record.internal.RecordBatch; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/RecordAccumulatorTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/RecordAccumulatorTest.java index 62c6f1223fa3f..a7ec0686d46bd 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/RecordAccumulatorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/RecordAccumulatorTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.producer.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.MetadataSnapshot; @@ -44,6 +43,7 @@ import org.apache.kafka.common.record.internal.RecordBatch; import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.requests.MetadataResponse.PartitionMetadata; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.ProducerIdAndEpoch; import org.apache.kafka.common.utils.Time; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java index 5897aad9fc1ea..1f826fe0b916c 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.producer.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.ClientRequest; import org.apache.kafka.clients.ClientResponse; @@ -85,6 +84,7 @@ import org.apache.kafka.common.requests.ProduceResponse; import org.apache.kafka.common.requests.RequestTestUtils; import org.apache.kafka.common.requests.TransactionResult; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.ProducerIdAndEpoch; import org.apache.kafka.common.utils.Time; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/TransactionManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/TransactionManagerTest.java index 121ec8d3032ca..57e8830902bbe 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/TransactionManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/TransactionManagerTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.producer.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.MetadataSnapshot; import org.apache.kafka.clients.MockClient; @@ -80,6 +79,7 @@ import org.apache.kafka.common.requests.TransactionResult; import org.apache.kafka.common.requests.TxnOffsetCommitRequest; import org.apache.kafka.common.requests.TxnOffsetCommitResponse; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.ProducerIdAndEpoch; import org.apache.kafka.common.utils.internals.LogContext; diff --git a/clients/src/test/java/org/apache/kafka/common/internals/TopicTest.java b/clients/src/test/java/org/apache/kafka/common/internals/TopicTest.java index 9f98238afb2a3..fd548a5199335 100644 --- a/clients/src/test/java/org/apache/kafka/common/internals/TopicTest.java +++ b/clients/src/test/java/org/apache/kafka/common/internals/TopicTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.common.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.errors.InvalidTopicException; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/network/CertStores.java b/clients/src/test/java/org/apache/kafka/common/network/CertStores.java index c7a589ce0f7c0..884582880c5e7 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/CertStores.java +++ b/clients/src/test/java/org/apache/kafka/common/network/CertStores.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.common.network; +import org.apache.kafka.common.config.SslConfigs; import org.apache.kafka.common.test.base.TestSslUtils; import org.apache.kafka.common.test.base.TestUtils; -import org.apache.kafka.common.config.SslConfigs; import java.io.File; import java.net.InetAddress; diff --git a/clients/src/test/java/org/apache/kafka/common/network/KafkaChannelTest.java b/clients/src/test/java/org/apache/kafka/common/network/KafkaChannelTest.java index 7573de9258a80..11e4852a1e747 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/KafkaChannelTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/KafkaChannelTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.common.network; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.memory.MemoryPool; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; diff --git a/clients/src/test/java/org/apache/kafka/common/network/NetworkTestUtils.java b/clients/src/test/java/org/apache/kafka/common/network/NetworkTestUtils.java index 5dbcf2d76e535..a4a717d428130 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/NetworkTestUtils.java +++ b/clients/src/test/java/org/apache/kafka/common/network/NetworkTestUtils.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.common.network; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.config.AbstractConfig; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.common.security.authenticator.CredentialCache; import org.apache.kafka.common.security.token.delegation.internals.DelegationTokenCache; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.LogContext; diff --git a/clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java b/clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java index f9f3ae87bff8f..14319f950f73e 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java +++ b/clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.common.network; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.config.AbstractConfig; import org.apache.kafka.common.message.ApiMessageType; @@ -28,6 +27,7 @@ import org.apache.kafka.common.security.scram.ScramCredential; import org.apache.kafka.common.security.scram.internals.ScramMechanism; import org.apache.kafka.common.security.token.delegation.internals.DelegationTokenCache; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SaslChannelBuilderTest.java b/clients/src/test/java/org/apache/kafka/common/network/SaslChannelBuilderTest.java index 6e6ea959f4e65..1e11d4df2c63c 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SaslChannelBuilderTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SaslChannelBuilderTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.common.network; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.SaslConfigs; @@ -32,6 +31,7 @@ import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; import org.apache.kafka.common.security.plain.PlainLoginModule; import org.apache.kafka.common.security.scram.ScramLoginModule; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.internals.LogContext; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java b/clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java index 752ee074b8c09..7ca34050aee1b 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java @@ -16,14 +16,14 @@ */ package org.apache.kafka.common.network; -import org.apache.kafka.common.test.base.TestReflectionUtils; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.memory.MemoryPool; import org.apache.kafka.common.memory.SimpleMemoryPool; import org.apache.kafka.common.metrics.KafkaMetric; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.security.auth.SecurityProtocol; +import org.apache.kafka.common.test.base.TestReflectionUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SslSelectorTest.java b/clients/src/test/java/org/apache/kafka/common/network/SslSelectorTest.java index a6ca6e5d6f21e..f060dc7ca60eb 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SslSelectorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SslSelectorTest.java @@ -16,8 +16,6 @@ */ package org.apache.kafka.common.network; -import org.apache.kafka.common.test.base.TestSslUtils; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.config.SecurityConfig; import org.apache.kafka.common.memory.MemoryPool; import org.apache.kafka.common.memory.SimpleMemoryPool; @@ -27,6 +25,8 @@ import org.apache.kafka.common.security.ssl.mock.TestKeyManagerFactory; import org.apache.kafka.common.security.ssl.mock.TestProviderCreator; import org.apache.kafka.common.security.ssl.mock.TestTrustManagerFactory; +import org.apache.kafka.common.test.base.TestSslUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.internals.LogContext; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SslTransportLayerTest.java b/clients/src/test/java/org/apache/kafka/common/network/SslTransportLayerTest.java index 78a32aca495a1..84bc1e12daa39 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SslTransportLayerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SslTransportLayerTest.java @@ -16,8 +16,6 @@ */ package org.apache.kafka.common.network; -import org.apache.kafka.common.test.base.TestSslUtils; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.config.SslConfigs; import org.apache.kafka.common.config.internals.BrokerSecurityConfigs; @@ -31,6 +29,8 @@ import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.common.security.ssl.DefaultSslEngineFactory; import org.apache.kafka.common.security.ssl.SslFactory; +import org.apache.kafka.common.test.base.TestSslUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.LogContext; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SslVersionsTransportLayerTest.java b/clients/src/test/java/org/apache/kafka/common/network/SslVersionsTransportLayerTest.java index a59c515149ae3..ba90f3f2a40e6 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SslVersionsTransportLayerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SslVersionsTransportLayerTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.common.network; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.config.SslConfigs; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.security.TestSecurityConfig; import org.apache.kafka.common.security.auth.SecurityProtocol; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.internals.LogContext; diff --git a/clients/src/test/java/org/apache/kafka/common/network/Tls12SelectorTest.java b/clients/src/test/java/org/apache/kafka/common/network/Tls12SelectorTest.java index b30e2c61489ec..4bd959349e9e6 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/Tls12SelectorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/Tls12SelectorTest.java @@ -17,8 +17,8 @@ package org.apache.kafka.common.network; -import org.apache.kafka.common.test.base.TestSslUtils; import org.apache.kafka.common.config.SslConfigs; +import org.apache.kafka.common.test.base.TestSslUtils; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/network/Tls13SelectorTest.java b/clients/src/test/java/org/apache/kafka/common/network/Tls13SelectorTest.java index 87b227f76dd1d..dead2032b027f 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/Tls13SelectorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/Tls13SelectorTest.java @@ -17,10 +17,10 @@ package org.apache.kafka.common.network; -import org.apache.kafka.common.test.base.TestSslUtils; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.config.SslConfigs; import org.apache.kafka.common.test.api.Flaky; +import org.apache.kafka.common.test.base.TestSslUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/record/internal/DefaultRecordBatchTest.java b/clients/src/test/java/org/apache/kafka/common/record/internal/DefaultRecordBatchTest.java index 6e108a70800c2..e5b33b8ca16e9 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/internal/DefaultRecordBatchTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/internal/DefaultRecordBatchTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.common.record.internal; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.InvalidRecordException; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.compress.ZstdCompression; @@ -24,6 +23,7 @@ import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.internals.RecordHeader; import org.apache.kafka.common.record.TimestampType; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.BufferSupplier; import org.apache.kafka.common.utils.internals.ChunkedBytesStream; diff --git a/clients/src/test/java/org/apache/kafka/common/record/internal/FileLogInputStreamTest.java b/clients/src/test/java/org/apache/kafka/common/record/internal/FileLogInputStreamTest.java index cacc216756309..a6dbe6ed9d364 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/internal/FileLogInputStreamTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/internal/FileLogInputStreamTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.common.record.internal; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.record.internal.FileLogInputStream.FileChannelRecordBatch; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.junit.jupiter.api.Test; @@ -35,13 +35,13 @@ import java.util.stream.Stream; import static java.util.Arrays.asList; -import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.apache.kafka.common.record.TimestampType.CREATE_TIME; import static org.apache.kafka.common.record.TimestampType.NO_TIMESTAMP_TYPE; import static org.apache.kafka.common.record.internal.RecordBatch.MAGIC_VALUE_V0; import static org.apache.kafka.common.record.internal.RecordBatch.MAGIC_VALUE_V1; import static org.apache.kafka.common.record.internal.RecordBatch.MAGIC_VALUE_V2; import static org.apache.kafka.common.record.internal.RecordBatch.NO_TIMESTAMP; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/clients/src/test/java/org/apache/kafka/common/record/internal/FileRecordsTest.java b/clients/src/test/java/org/apache/kafka/common/record/internal/FileRecordsTest.java index 394b2d619180e..ce7b76cf14430 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/internal/FileRecordsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/internal/FileRecordsTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.common.record.internal; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.internals.RecordHeader; import org.apache.kafka.common.network.TransferableChannel; import org.apache.kafka.common.record.TimestampType; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsBuilderTest.java b/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsBuilderTest.java index b63f390324eee..bd439c1c19faa 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsBuilderTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsBuilderTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.common.record.internal; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.message.LeaderChangeMessage; import org.apache.kafka.common.message.LeaderChangeMessage.Voter; import org.apache.kafka.common.record.TimestampType; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.ByteBufferOutputStream; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.BufferSupplier; diff --git a/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsTest.java b/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsTest.java index b64485b75f056..cd01f95a3b6ac 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.common.record.internal; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.errors.CorruptRecordException; import org.apache.kafka.common.header.internals.RecordHeaders; @@ -25,6 +24,7 @@ import org.apache.kafka.common.record.TimestampType; import org.apache.kafka.common.record.internal.MemoryRecords.RecordFilter; import org.apache.kafka.common.record.internal.MemoryRecords.RecordFilter.BatchRetention; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.BufferSupplier; import org.apache.kafka.common.utils.internals.CloseableIterator; diff --git a/clients/src/test/java/org/apache/kafka/common/record/internal/MultiRecordsSendTest.java b/clients/src/test/java/org/apache/kafka/common/record/internal/MultiRecordsSendTest.java index 11bbe7696ab8e..7af90fe3790b7 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/internal/MultiRecordsSendTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/internal/MultiRecordsSendTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.common.record.internal; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.network.ByteBufferSend; import org.apache.kafka.common.network.Send; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/record/internal/RemoteLogInputStreamTest.java b/clients/src/test/java/org/apache/kafka/common/record/internal/RemoteLogInputStreamTest.java index b70434ca79786..505860c31b5f8 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/internal/RemoteLogInputStreamTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/internal/RemoteLogInputStreamTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.common.record.internal; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.internals.RecordHeader; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.params.ParameterizedTest; @@ -36,13 +36,13 @@ import java.util.stream.Stream; import static java.util.Arrays.asList; -import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.apache.kafka.common.record.TimestampType.CREATE_TIME; import static org.apache.kafka.common.record.TimestampType.NO_TIMESTAMP_TYPE; import static org.apache.kafka.common.record.internal.RecordBatch.MAGIC_VALUE_V0; import static org.apache.kafka.common.record.internal.RecordBatch.MAGIC_VALUE_V1; import static org.apache.kafka.common.record.internal.RecordBatch.MAGIC_VALUE_V2; import static org.apache.kafka.common.record.internal.RecordBatch.NO_TIMESTAMP; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/ApiVersionsResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/ApiVersionsResponseTest.java index 5da9af12de2a5..340a763e37da8 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/ApiVersionsResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/ApiVersionsResponseTest.java @@ -17,7 +17,6 @@ package org.apache.kafka.common.requests; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.feature.Features; import org.apache.kafka.common.feature.SupportedVersionRange; import org.apache.kafka.common.message.ApiMessageType; @@ -26,6 +25,7 @@ import org.apache.kafka.common.message.ApiVersionsResponseData.ApiVersionCollection; import org.apache.kafka.common.message.ApiVersionsResponseData.SupportedFeatureKey; import org.apache.kafka.common.protocol.ApiKeys; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/JoinGroupRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/JoinGroupRequestTest.java index 64f6a709c26d7..36f7e657ad23a 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/JoinGroupRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/JoinGroupRequestTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.common.requests; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.errors.InvalidConfigurationException; import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.message.JoinGroupRequestData; import org.apache.kafka.common.protocol.MessageUtil; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java index a2b31c1350c2a..4ff6bc35a1cee 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.common.requests; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.ElectionType; import org.apache.kafka.common.GroupState; import org.apache.kafka.common.IsolationLevel; @@ -274,6 +273,7 @@ import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.common.security.token.delegation.DelegationToken; import org.apache.kafka.common.security.token.delegation.TokenInformation; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.internals.SecurityUtils; import org.junit.jupiter.api.Assertions; diff --git a/clients/src/test/java/org/apache/kafka/common/security/JaasContextTest.java b/clients/src/test/java/org/apache/kafka/common/security/JaasContextTest.java index 24110bb7d7a13..95d5d467bf309 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/JaasContextTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/JaasContextTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.common.security; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.config.SaslConfigs; import org.apache.kafka.common.config.types.Password; import org.apache.kafka.common.network.ListenerName; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/clients/src/test/java/org/apache/kafka/common/security/authenticator/ClientAuthenticationFailureTest.java b/clients/src/test/java/org/apache/kafka/common/security/authenticator/ClientAuthenticationFailureTest.java index 030908e81b80b..d76ad849aca7e 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/authenticator/ClientAuthenticationFailureTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/authenticator/ClientAuthenticationFailureTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.common.security.authenticator; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.TopicDescription; @@ -38,6 +37,7 @@ import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.junit.jupiter.api.AfterEach; diff --git a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorFailureDelayTest.java b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorFailureDelayTest.java index a3265b96dc376..c123c85eeb34f 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorFailureDelayTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorFailureDelayTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.common.security.authenticator; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.config.SaslConfigs; import org.apache.kafka.common.config.internals.BrokerSecurityConfigs; import org.apache.kafka.common.errors.SaslAuthenticationException; @@ -31,6 +30,7 @@ import org.apache.kafka.common.security.JaasContext; import org.apache.kafka.common.security.TestSecurityConfig; import org.apache.kafka.common.security.auth.SecurityProtocol; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.internals.LogContext; diff --git a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java index 5201a55259eea..339068e197e0d 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java @@ -16,8 +16,6 @@ */ package org.apache.kafka.common.security.authenticator; -import org.apache.kafka.common.test.base.TestReflectionUtils; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.NetworkClient; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.config.SaslConfigs; @@ -95,6 +93,8 @@ import org.apache.kafka.common.security.scram.internals.ScramMechanism; import org.apache.kafka.common.security.token.delegation.TokenInformation; import org.apache.kafka.common.security.token.delegation.internals.DelegationTokenCache; +import org.apache.kafka.common.test.base.TestReflectionUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; diff --git a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticatorTest.java b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticatorTest.java index 85223661ecdbf..a63b239d5071f 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticatorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticatorTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.common.security.authenticator; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.config.internals.BrokerSecurityConfigs; import org.apache.kafka.common.errors.InvalidRequestException; import org.apache.kafka.common.errors.SaslAuthenticationException; @@ -49,6 +48,7 @@ import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; import org.apache.kafka.common.security.plain.PlainLoginModule; import org.apache.kafka.common.security.ssl.SslPrincipalMapper; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.internals.AppInfoParser; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/DefaultJwtRetrieverTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/DefaultJwtRetrieverTest.java index ae43ec08333d6..8d63d5d6694c8 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/DefaultJwtRetrieverTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/DefaultJwtRetrieverTest.java @@ -35,7 +35,6 @@ import java.util.Map; import java.util.stream.Stream; -import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.apache.kafka.common.config.SaslConfigs.DEFAULT_SASL_OAUTHBEARER_HEADER_URLENCODE; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_HEADER_URLENCODE; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_TOKEN_ENDPOINT_URL; @@ -43,6 +42,7 @@ import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginCallbackHandler.CLIENT_ID_CONFIG; import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginCallbackHandler.CLIENT_SECRET_CONFIG; import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule.OAUTHBEARER_MECHANISM; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/DefaultJwtValidatorTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/DefaultJwtValidatorTest.java index ab2603bb210b9..7e8d6cab6a40a 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/DefaultJwtValidatorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/DefaultJwtValidatorTest.java @@ -32,9 +32,9 @@ import java.util.Map; -import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.apache.kafka.common.config.internals.BrokerSecurityConfigs.ALLOWED_SASL_OAUTHBEARER_URLS_CONFIG; import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule.OAUTHBEARER_MECHANISM; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertInstanceOf; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/JwtBearerJwtRetrieverTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/JwtBearerJwtRetrieverTest.java index 4eedbdd22a67c..c28d358ed7814 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/JwtBearerJwtRetrieverTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/JwtBearerJwtRetrieverTest.java @@ -30,7 +30,6 @@ import javax.security.auth.login.AppConfigurationEntry; -import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.apache.kafka.common.config.SaslConfigs.DEFAULT_SASL_OAUTHBEARER_ASSERTION_ALGORITHM; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_ALGORITHM; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_FILE; @@ -39,6 +38,7 @@ import static org.apache.kafka.common.config.internals.BrokerSecurityConfigs.ALLOWED_SASL_OAUTHBEARER_FILES_CONFIG; import static org.apache.kafka.common.config.internals.BrokerSecurityConfigs.ALLOWED_SASL_OAUTHBEARER_URLS_CONFIG; import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule.OAUTHBEARER_MECHANISM; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginCallbackHandlerTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginCallbackHandlerTest.java index a27d37a057128..7adeab60723ed 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginCallbackHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginCallbackHandlerTest.java @@ -34,12 +34,12 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.UnsupportedCallbackException; -import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_TOKEN_ENDPOINT_URL; import static org.apache.kafka.common.config.internals.BrokerSecurityConfigs.ALLOWED_SASL_OAUTHBEARER_URLS_CONFIG; import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginCallbackHandler.CLIENT_ID_CONFIG; import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginCallbackHandler.CLIENT_SECRET_CONFIG; import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule.OAUTHBEARER_MECHANISM; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ClientCredentialsRequestFormatterFactoryTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ClientCredentialsRequestFormatterFactoryTest.java index 62dfcfd3eb067..a68774aed4815 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ClientCredentialsRequestFormatterFactoryTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ClientCredentialsRequestFormatterFactoryTest.java @@ -35,7 +35,6 @@ import java.util.Map; import java.util.stream.Stream; -import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.apache.kafka.common.config.SaslConfigs.DEFAULT_SASL_OAUTHBEARER_HEADER_URLENCODE; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_ALGORITHM; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_CLAIM_AUD; @@ -49,6 +48,7 @@ import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_PRIVATE_KEY_PASSPHRASE; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_HEADER_URLENCODE; import static org.apache.kafka.common.config.internals.BrokerSecurityConfigs.ALLOWED_SASL_OAUTHBEARER_FILES_CONFIG; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ConfigurationUtilsTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ConfigurationUtilsTest.java index 7927a9ca0b27c..c3fcfbe9896a7 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ConfigurationUtilsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ConfigurationUtilsTest.java @@ -17,8 +17,8 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.config.ConfigException; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/VerificationKeyResolverFactoryTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/VerificationKeyResolverFactoryTest.java index 5301613d98db5..dd8db34ea0a3b 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/VerificationKeyResolverFactoryTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/VerificationKeyResolverFactoryTest.java @@ -26,10 +26,10 @@ import java.util.Collections; import java.util.Map; -import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_URL; import static org.apache.kafka.common.config.internals.BrokerSecurityConfigs.ALLOWED_SASL_OAUTHBEARER_URLS_CONFIG; import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule.OAUTHBEARER_MECHANISM; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; public class VerificationKeyResolverFactoryTest extends OAuthBearerTest { diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/AssertionSupplierFactoryTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/AssertionSupplierFactoryTest.java index 97a58c05da113..1958dbe8ef71d 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/AssertionSupplierFactoryTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/assertion/AssertionSupplierFactoryTest.java @@ -31,7 +31,6 @@ import java.io.IOException; import java.security.KeyPair; -import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_ALGORITHM; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_CLAIM_AUD; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_CLAIM_EXP_SECONDS; @@ -43,6 +42,7 @@ import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_PRIVATE_KEY_FILE; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_PRIVATE_KEY_PASSPHRASE; import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_ASSERTION_TEMPLATE_FILE; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; diff --git a/clients/src/test/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapperTest.java b/clients/src/test/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapperTest.java index 96c92189eec13..723d3dbefd6e9 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapperTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapperTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.common.security.ssl; -import org.apache.kafka.common.test.base.TestSslUtils; import org.apache.kafka.common.security.ssl.CommonNameLoggingTrustManagerFactoryWrapper.CommonNameLoggingTrustManager; import org.apache.kafka.common.security.ssl.CommonNameLoggingTrustManagerFactoryWrapper.NeverExpiringX509Certificate; +import org.apache.kafka.common.test.base.TestSslUtils; import org.apache.kafka.common.utils.LogCaptureAppender; import org.junit.jupiter.api.BeforeAll; diff --git a/clients/src/test/java/org/apache/kafka/common/security/ssl/DefaultSslEngineFactoryTest.java b/clients/src/test/java/org/apache/kafka/common/security/ssl/DefaultSslEngineFactoryTest.java index e740fa5886bb5..40d2c240bb594 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/ssl/DefaultSslEngineFactoryTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/ssl/DefaultSslEngineFactoryTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.common.security.ssl; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.config.SslConfigs; import org.apache.kafka.common.config.types.Password; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/security/ssl/SslFactoryTest.java b/clients/src/test/java/org/apache/kafka/common/security/ssl/SslFactoryTest.java index 95662266e45c2..7e7b261926dd8 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/ssl/SslFactoryTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/ssl/SslFactoryTest.java @@ -16,8 +16,6 @@ */ package org.apache.kafka.common.security.ssl; -import org.apache.kafka.common.test.base.TestSslUtils; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.config.ConfigException; import org.apache.kafka.common.config.SecurityConfig; @@ -32,6 +30,8 @@ import org.apache.kafka.common.security.ssl.mock.TestKeyManagerFactory; import org.apache.kafka.common.security.ssl.mock.TestProviderCreator; import org.apache.kafka.common.security.ssl.mock.TestTrustManagerFactory; +import org.apache.kafka.common.test.base.TestSslUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestKeyManagerFactory.java b/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestKeyManagerFactory.java index 2b1f84ff8cbc7..31ebdc4b1e36b 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestKeyManagerFactory.java +++ b/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestKeyManagerFactory.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.common.security.ssl.mock; +import org.apache.kafka.common.config.types.Password; import org.apache.kafka.common.test.base.TestSslUtils; import org.apache.kafka.common.test.base.TestSslUtils.CertificateBuilder; import org.apache.kafka.common.test.base.TestUtils; -import org.apache.kafka.common.config.types.Password; import java.io.File; import java.io.IOException; diff --git a/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java b/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java index e5b1d5710d5f6..57d25f3f5d126 100755 --- a/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.common.utils; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.config.ConfigException; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/connect/basic-auth-extension/src/test/java/org/apache/kafka/connect/rest/basic/auth/extension/JaasBasicAuthFilterTest.java b/connect/basic-auth-extension/src/test/java/org/apache/kafka/connect/rest/basic/auth/extension/JaasBasicAuthFilterTest.java index 645bd559f5f29..04d5feb8e291d 100644 --- a/connect/basic-auth-extension/src/test/java/org/apache/kafka/connect/rest/basic/auth/extension/JaasBasicAuthFilterTest.java +++ b/connect/basic-auth-extension/src/test/java/org/apache/kafka/connect/rest/basic/auth/extension/JaasBasicAuthFilterTest.java @@ -17,8 +17,8 @@ package org.apache.kafka.connect.rest.basic.auth.extension; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.security.authenticator.TestJaasConfig; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.connect.errors.ConnectException; import org.junit.jupiter.api.Test; diff --git a/connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSinkConnectorIntegrationTest.java b/connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSinkConnectorIntegrationTest.java index fb6811a7445f2..254531526461f 100644 --- a/connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSinkConnectorIntegrationTest.java +++ b/connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSinkConnectorIntegrationTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.connect.file.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.connect.file.FileStreamSinkConnector; import org.apache.kafka.connect.util.clusters.EmbeddedConnectCluster; diff --git a/connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSourceConnectorIntegrationTest.java b/connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSourceConnectorIntegrationTest.java index 2855fcd218bd9..bdd389040231a 100644 --- a/connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSourceConnectorIntegrationTest.java +++ b/connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSourceConnectorIntegrationTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.connect.file.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.connect.file.FileStreamSourceConnector; import org.apache.kafka.connect.util.clusters.EmbeddedConnectCluster; diff --git a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/DedicatedMirrorIntegrationTest.java b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/DedicatedMirrorIntegrationTest.java index e7bf25c050525..f9cdfa47feb7f 100644 --- a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/DedicatedMirrorIntegrationTest.java +++ b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/DedicatedMirrorIntegrationTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.connect.mirror.integration; -import org.apache.kafka.common.test.base.NoRetryException; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.TopicDescription; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerRecords; +import org.apache.kafka.common.test.base.NoRetryException; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.connect.errors.NotFoundException; import org.apache.kafka.connect.mirror.MirrorHeartbeatConnector; @@ -57,8 +57,8 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Predicate; -import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.clients.consumer.ConsumerConfig.AUTO_OFFSET_RESET_CONFIG; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.connect.mirror.MirrorMaker.CONNECTOR_CLASSES; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationBaseTest.java b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationBaseTest.java index ac333c7f271ef..b990377332446 100644 --- a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationBaseTest.java +++ b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationBaseTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.connect.mirror.integration; -import org.apache.kafka.common.test.base.TestCondition; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; @@ -42,6 +41,7 @@ import org.apache.kafka.common.config.ConfigResource; import org.apache.kafka.common.config.TopicConfig; import org.apache.kafka.common.metrics.KafkaMetric; +import org.apache.kafka.common.test.base.TestCondition; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.Utils; @@ -95,8 +95,8 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.clients.consumer.ConsumerConfig.AUTO_OFFSET_RESET_CONFIG; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.connect.mirror.MirrorConnectorConfig.METRIC_NAMES_LEGACY; import static org.apache.kafka.connect.mirror.MirrorConnectorConfig.METRIC_NAMES_NEW; import static org.apache.kafka.connect.mirror.MirrorConnectorConfig.OFFSET_SYNCS_CLIENT_ROLE_PREFIX; diff --git a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationSSLTest.java b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationSSLTest.java index f0229f98b67b1..35bc5364ab840 100644 --- a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationSSLTest.java +++ b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsIntegrationSSLTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.connect.mirror.integration; -import org.apache.kafka.common.test.base.TestSslUtils; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.common.config.SslConfigs; import org.apache.kafka.common.config.types.Password; import org.apache.kafka.common.network.ConnectionMode; +import org.apache.kafka.common.test.base.TestSslUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.network.SocketServerConfigs; import org.junit.jupiter.api.BeforeEach; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ConnectWorkerIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ConnectWorkerIntegrationTest.java index fbb754fb2c56a..39311f74af26b 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ConnectWorkerIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ConnectWorkerIntegrationTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.connect.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.MetadataRecoveryStrategy; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.provider.FileConfigProvider; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.connect.connector.Task; import org.apache.kafka.connect.data.Struct; @@ -72,12 +72,12 @@ import jakarta.ws.rs.core.Response; import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; -import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.clients.CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG; import static org.apache.kafka.clients.CommonClientConfigs.METADATA_RECOVERY_STRATEGY_CONFIG; import static org.apache.kafka.common.config.AbstractConfig.CONFIG_PROVIDERS_CONFIG; import static org.apache.kafka.common.config.TopicConfig.DELETE_RETENTION_MS_CONFIG; import static org.apache.kafka.common.config.TopicConfig.SEGMENT_MS_CONFIG; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.connect.integration.BlockingConnectorTest.TASK_STOP; import static org.apache.kafka.connect.integration.TestableSourceConnector.TOPIC_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLASS_CONFIG; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ExactlyOnceSourceIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ExactlyOnceSourceIntegrationTest.java index c66dff203610c..233465f086755 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ExactlyOnceSourceIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ExactlyOnceSourceIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.connect.integration; -import org.apache.kafka.common.test.base.NoRetryException; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -35,6 +34,7 @@ import org.apache.kafka.common.resource.PatternType; import org.apache.kafka.common.resource.ResourcePattern; import org.apache.kafka.common.resource.ResourceType; +import org.apache.kafka.common.test.base.NoRetryException; import org.apache.kafka.connect.connector.Task; import org.apache.kafka.connect.errors.ConnectException; import org.apache.kafka.connect.json.JsonConverter; @@ -79,11 +79,11 @@ import java.util.stream.IntStream; import java.util.stream.LongStream; -import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.clients.producer.ProducerConfig.BOOTSTRAP_SERVERS_CONFIG; import static org.apache.kafka.clients.producer.ProducerConfig.CLIENT_ID_CONFIG; import static org.apache.kafka.clients.producer.ProducerConfig.ENABLE_IDEMPOTENCE_CONFIG; import static org.apache.kafka.clients.producer.ProducerConfig.TRANSACTIONAL_ID_CONFIG; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.connect.integration.TestableSourceConnector.CUSTOM_EXACTLY_ONCE_SUPPORT_CONFIG; import static org.apache.kafka.connect.integration.TestableSourceConnector.CUSTOM_TRANSACTION_BOUNDARIES_CONFIG; import static org.apache.kafka.connect.integration.TestableSourceConnector.MAX_MESSAGES_PER_SECOND_CONFIG; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/OffsetsApiIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/OffsetsApiIntegrationTest.java index 93d89118e74aa..89dd75346e210 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/OffsetsApiIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/OffsetsApiIntegrationTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.connect.integration; -import org.apache.kafka.common.test.base.NoRetryException; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.GroupListing; import org.apache.kafka.clients.admin.ListGroupsOptions; import org.apache.kafka.common.test.api.Flaky; +import org.apache.kafka.common.test.base.NoRetryException; import org.apache.kafka.connect.runtime.ConnectorConfig; import org.apache.kafka.connect.runtime.SourceConnectorConfig; import org.apache.kafka.connect.runtime.distributed.DistributedConfig; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RestForwardingIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RestForwardingIntegrationTest.java index 4378597e954c3..6b80bae5adb37 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RestForwardingIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/RestForwardingIntegrationTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.connect.integration; -import org.apache.kafka.common.test.base.TestSslUtils; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.common.config.types.Password; import org.apache.kafka.common.network.ConnectionMode; +import org.apache.kafka.common.test.base.TestSslUtils; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.connect.runtime.Herder; import org.apache.kafka.connect.runtime.MockConnectMetrics; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/SinkConnectorsIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/SinkConnectorsIntegrationTest.java index 29449f78f0838..b602f7ca9f887 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/SinkConnectorsIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/SinkConnectorsIntegrationTest.java @@ -38,9 +38,9 @@ import java.util.Set; import java.util.function.Consumer; -import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.clients.consumer.ConsumerConfig.DEFAULT_API_TIMEOUT_MS_CONFIG; import static org.apache.kafka.clients.consumer.ConsumerConfig.PARTITION_ASSIGNMENT_STRATEGY_CONFIG; +import static org.apache.kafka.common.test.base.TestUtils.waitForCondition; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLASS_CONFIG; import static org.apache.kafka.connect.runtime.ConnectorConfig.CONNECTOR_CLIENT_CONSUMER_OVERRIDES_PREFIX; import static org.apache.kafka.connect.runtime.ConnectorConfig.TASKS_MAX_CONFIG; diff --git a/core/src/test/java/kafka/security/JaasTestUtils.java b/core/src/test/java/kafka/security/JaasTestUtils.java index e5430c4e11a05..44e797416ae61 100644 --- a/core/src/test/java/kafka/security/JaasTestUtils.java +++ b/core/src/test/java/kafka/security/JaasTestUtils.java @@ -18,12 +18,12 @@ import kafka.utils.TestUtils; -import org.apache.kafka.common.test.base.TestSslUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.ScramMechanism; import org.apache.kafka.common.config.SaslConfigs; import org.apache.kafka.common.network.ConnectionMode; import org.apache.kafka.common.security.auth.SecurityProtocol; +import org.apache.kafka.common.test.base.TestSslUtils; import org.apache.kafka.common.utils.internals.Java; import java.io.BufferedWriter; diff --git a/core/src/test/java/kafka/server/share/ShareFetchUtilsTest.java b/core/src/test/java/kafka/server/share/ShareFetchUtilsTest.java index ce93414c8ad1b..49b35925e0e77 100644 --- a/core/src/test/java/kafka/server/share/ShareFetchUtilsTest.java +++ b/core/src/test/java/kafka/server/share/ShareFetchUtilsTest.java @@ -18,7 +18,6 @@ import kafka.server.ReplicaManager; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.internals.ShareAcquireMode; import org.apache.kafka.common.TopicIdPartition; import org.apache.kafka.common.TopicPartition; @@ -35,6 +34,7 @@ import org.apache.kafka.common.record.internal.Records; import org.apache.kafka.common.record.internal.SimpleRecord; import org.apache.kafka.common.requests.FetchRequest; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.server.share.SharePartitionKey; import org.apache.kafka.server.share.fetch.ShareAcquiredRecords; import org.apache.kafka.server.share.fetch.ShareFetch; diff --git a/core/src/test/java/kafka/server/share/SharePartitionManagerTest.java b/core/src/test/java/kafka/server/share/SharePartitionManagerTest.java index a4c4c5bc39197..15611a382c447 100644 --- a/core/src/test/java/kafka/server/share/SharePartitionManagerTest.java +++ b/core/src/test/java/kafka/server/share/SharePartitionManagerTest.java @@ -20,7 +20,6 @@ import kafka.server.ReplicaManager; import kafka.server.share.SharePartitionManager.SharePartitionListener; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.AcknowledgeType; import org.apache.kafka.clients.consumer.internals.ShareAcquireMode; import org.apache.kafka.common.TopicIdPartition; @@ -50,6 +49,7 @@ import org.apache.kafka.common.requests.FetchRequest; import org.apache.kafka.common.requests.ShareFetchResponse; import org.apache.kafka.common.requests.ShareRequestMetadata; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.internals.ImplicitLinkedHashCollection; import org.apache.kafka.coordinator.group.GroupConfigManager; diff --git a/core/src/test/java/kafka/server/share/SharePartitionTest.java b/core/src/test/java/kafka/server/share/SharePartitionTest.java index d17e17622ded6..17b874d0c5559 100644 --- a/core/src/test/java/kafka/server/share/SharePartitionTest.java +++ b/core/src/test/java/kafka/server/share/SharePartitionTest.java @@ -21,7 +21,6 @@ import kafka.server.share.SharePartition.SharePartitionState; import kafka.server.share.SharePartitionManager.SharePartitionListener; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.AcknowledgeType; import org.apache.kafka.clients.consumer.internals.ShareAcquireMode; import org.apache.kafka.common.TopicIdPartition; @@ -50,6 +49,7 @@ import org.apache.kafka.common.record.internal.Records; import org.apache.kafka.common.record.internal.SimpleRecord; import org.apache.kafka.common.requests.ListOffsetsRequest; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.coordinator.group.GroupConfig; diff --git a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorServiceTest.java b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorServiceTest.java index 3c12a80b9fe15..6a25ff6ef8980 100644 --- a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorServiceTest.java +++ b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorServiceTest.java @@ -142,9 +142,9 @@ import java.util.concurrent.TimeoutException; import java.util.stream.Stream; -import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; import static org.apache.kafka.common.requests.ConsumerGroupHeartbeatRequest.LEAVE_GROUP_STATIC_MEMBER_EPOCH; import static org.apache.kafka.common.requests.JoinGroupRequest.UNKNOWN_MEMBER_ID; +import static org.apache.kafka.common.test.base.TestUtils.assertFutureThrows; import static org.apache.kafka.coordinator.common.runtime.TestUtil.requestContext; import static org.apache.kafka.coordinator.group.GroupConfigManagerTest.createConfigManager; import static org.apache.kafka.server.share.persister.DeleteShareGroupStateParameters.EMPTY_PARAMS; diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/log/StressTestLog.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/log/StressTestLog.java index ca21983d75f3e..2a35dd9378d69 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/log/StressTestLog.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/log/StressTestLog.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.jmh.log; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.OffsetOutOfRangeException; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.config.TopicConfig; @@ -26,6 +25,7 @@ import org.apache.kafka.common.record.internal.RecordBatch; import org.apache.kafka.common.record.internal.Records; import org.apache.kafka.common.record.internal.SimpleRecord; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.Exit; import org.apache.kafka.server.common.RequestLocal; diff --git a/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTest.java b/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTest.java index 3386b153dafa1..c0862c215cfcf 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTest.java @@ -17,8 +17,8 @@ package org.apache.kafka.controller; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.metadata.RegisterBrokerRecord; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.raft.LeaderAndEpoch; import org.apache.kafka.server.common.ApiMessageAndVersion; diff --git a/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTestEnv.java b/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTestEnv.java index 71740db4fd532..fc26929eeacb6 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTestEnv.java +++ b/metadata/src/test/java/org/apache/kafka/controller/MockRaftClientTestEnv.java @@ -17,8 +17,8 @@ package org.apache.kafka.controller; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Uuid; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.controller.MockRaftClient.LeaderChangeBatch; diff --git a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerMetricsIntegrationTest.java b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerMetricsIntegrationTest.java index 985d9105c058f..e06e2cc1f4d4a 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerMetricsIntegrationTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerMetricsIntegrationTest.java @@ -17,11 +17,11 @@ package org.apache.kafka.controller; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.message.BrokerHeartbeatRequestData; import org.apache.kafka.common.message.RequestHeaderData; import org.apache.kafka.common.security.auth.KafkaPrincipal; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import org.apache.kafka.controller.metrics.QuorumControllerMetrics; import org.apache.kafka.metadata.BrokerHeartbeatReply; diff --git a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java index 3836c01f67661..d4ca23f5afcc1 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java @@ -17,7 +17,6 @@ package org.apache.kafka.controller; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.config.ConfigResource; import org.apache.kafka.common.config.TopicConfig; @@ -68,6 +67,7 @@ import org.apache.kafka.common.security.auth.KafkaPrincipal; import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.common.test.api.Flaky; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.LogContext; diff --git a/metadata/src/test/java/org/apache/kafka/image/loader/MetadataLoaderTest.java b/metadata/src/test/java/org/apache/kafka/image/loader/MetadataLoaderTest.java index a36dcd89cbf31..62f0f8c6e41f6 100644 --- a/metadata/src/test/java/org/apache/kafka/image/loader/MetadataLoaderTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/loader/MetadataLoaderTest.java @@ -17,7 +17,6 @@ package org.apache.kafka.image.loader; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.config.ConfigResource; import org.apache.kafka.common.message.KRaftVersionRecord; @@ -30,6 +29,7 @@ import org.apache.kafka.common.metadata.PartitionRecord; import org.apache.kafka.common.metadata.RemoveTopicRecord; import org.apache.kafka.common.metadata.TopicRecord; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.image.MetadataDelta; import org.apache.kafka.image.MetadataImage; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapDirectoryTest.java b/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapDirectoryTest.java index bc5d47a143733..9433da5da2821 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapDirectoryTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapDirectoryTest.java @@ -17,9 +17,9 @@ package org.apache.kafka.metadata.bootstrap; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.metadata.FeatureLevelRecord; import org.apache.kafka.common.metadata.NoOpRecord; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.server.common.MetadataVersion; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/storage/FormatterTest.java b/metadata/src/test/java/org/apache/kafka/metadata/storage/FormatterTest.java index b578be1bd5d7c..3aea3652d9214 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/storage/FormatterTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/storage/FormatterTest.java @@ -17,12 +17,12 @@ package org.apache.kafka.metadata.storage; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.metadata.FeatureLevelRecord; import org.apache.kafka.common.metadata.UserScramCredentialRecord; import org.apache.kafka.common.security.scram.internals.ScramFormatter; import org.apache.kafka.common.security.scram.internals.ScramMechanism; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.metadata.bootstrap.BootstrapDirectory; import org.apache.kafka.metadata.bootstrap.BootstrapMetadata; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/storage/ScramParserTest.java b/metadata/src/test/java/org/apache/kafka/metadata/storage/ScramParserTest.java index cb4eb6f4112ba..7f956bef343d7 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/storage/ScramParserTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/storage/ScramParserTest.java @@ -17,10 +17,10 @@ package org.apache.kafka.metadata.storage; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.metadata.UserScramCredentialRecord; import org.apache.kafka.common.security.scram.internals.ScramFormatter; import org.apache.kafka.common.security.scram.internals.ScramMechanism; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.metadata.storage.ScramParser.PerMechanismData; import org.junit.jupiter.api.Test; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/util/BatchFileWriterReaderTest.java b/metadata/src/test/java/org/apache/kafka/metadata/util/BatchFileWriterReaderTest.java index 05a40b4c68524..aea2efa394b1b 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/util/BatchFileWriterReaderTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/util/BatchFileWriterReaderTest.java @@ -17,11 +17,11 @@ package org.apache.kafka.metadata.util; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.message.SnapshotFooterRecord; import org.apache.kafka.common.message.SnapshotHeaderRecord; import org.apache.kafka.common.metadata.TopicRecord; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.metadata.util.BatchFileReader.BatchAndType; import org.apache.kafka.raft.Batch; import org.apache.kafka.server.common.ApiMessageAndVersion; diff --git a/raft/src/test/java/org/apache/kafka/raft/FileQuorumStateStoreTest.java b/raft/src/test/java/org/apache/kafka/raft/FileQuorumStateStoreTest.java index 28dd68ba1a31b..3c9767892bcc4 100644 --- a/raft/src/test/java/org/apache/kafka/raft/FileQuorumStateStoreTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/FileQuorumStateStoreTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.raft; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.protocol.types.TaggedFields; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.raft.generated.QuorumStateData; import org.apache.kafka.server.common.KRaftVersion; diff --git a/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientTest.java b/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientTest.java index cc5a2bdd55f91..068128714672c 100644 --- a/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.raft; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.errors.RecordBatchTooLargeException; import org.apache.kafka.common.memory.MemoryPool; @@ -37,6 +36,7 @@ import org.apache.kafka.common.record.internal.RecordBatch; import org.apache.kafka.common.record.internal.Records; import org.apache.kafka.common.requests.FetchRequest; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.raft.errors.BufferAllocationException; import org.apache.kafka.raft.errors.NotLeaderException; diff --git a/raft/src/test/java/org/apache/kafka/raft/MockExpirationServiceTest.java b/raft/src/test/java/org/apache/kafka/raft/MockExpirationServiceTest.java index 95a00b38642a7..be37db40a8e4d 100644 --- a/raft/src/test/java/org/apache/kafka/raft/MockExpirationServiceTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/MockExpirationServiceTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.raft; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.errors.TimeoutException; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.junit.jupiter.api.Test; diff --git a/raft/src/test/java/org/apache/kafka/raft/RaftClientTestContext.java b/raft/src/test/java/org/apache/kafka/raft/RaftClientTestContext.java index 7e08b269f2cd4..e40f8a378c742 100644 --- a/raft/src/test/java/org/apache/kafka/raft/RaftClientTestContext.java +++ b/raft/src/test/java/org/apache/kafka/raft/RaftClientTestContext.java @@ -16,8 +16,6 @@ */ package org.apache.kafka.raft; -import org.apache.kafka.common.test.base.TestCondition; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Node; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; @@ -62,6 +60,8 @@ import org.apache.kafka.common.record.internal.Records; import org.apache.kafka.common.requests.DescribeQuorumResponse; import org.apache.kafka.common.requests.FetchSnapshotResponse; +import org.apache.kafka.common.test.base.TestCondition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.LogContext; diff --git a/raft/src/test/java/org/apache/kafka/raft/internals/KafkaRaftLogTest.java b/raft/src/test/java/org/apache/kafka/raft/internals/KafkaRaftLogTest.java index b01983726a992..f0a125fe61ec3 100644 --- a/raft/src/test/java/org/apache/kafka/raft/internals/KafkaRaftLogTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/internals/KafkaRaftLogTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.raft.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.config.AbstractConfig; @@ -32,6 +31,7 @@ import org.apache.kafka.common.record.internal.Record; import org.apache.kafka.common.record.internal.Records; import org.apache.kafka.common.record.internal.SimpleRecord; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.raft.Isolation; import org.apache.kafka.raft.KRaftConfigs; diff --git a/raft/src/test/java/org/apache/kafka/raft/internals/RecordsIteratorTest.java b/raft/src/test/java/org/apache/kafka/raft/internals/RecordsIteratorTest.java index fc1d99047c758..1c914d7680cd2 100644 --- a/raft/src/test/java/org/apache/kafka/raft/internals/RecordsIteratorTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/internals/RecordsIteratorTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.raft.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.errors.CorruptRecordException; import org.apache.kafka.common.message.KRaftVersionRecord; @@ -37,6 +36,7 @@ import org.apache.kafka.common.record.internal.MemoryRecordsBuilder; import org.apache.kafka.common.record.internal.RecordBatch; import org.apache.kafka.common.record.internal.Records; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.internals.BufferSupplier; import org.apache.kafka.common.utils.internals.LogContext; diff --git a/raft/src/test/java/org/apache/kafka/snapshot/FileRawSnapshotTest.java b/raft/src/test/java/org/apache/kafka/snapshot/FileRawSnapshotTest.java index a1033c75a4d29..03991cba302b6 100644 --- a/raft/src/test/java/org/apache/kafka/snapshot/FileRawSnapshotTest.java +++ b/raft/src/test/java/org/apache/kafka/snapshot/FileRawSnapshotTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.snapshot; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.record.internal.MemoryRecords; import org.apache.kafka.common.record.internal.Record; @@ -25,6 +24,7 @@ import org.apache.kafka.common.record.internal.UnalignedFileRecords; import org.apache.kafka.common.record.internal.UnalignedMemoryRecords; import org.apache.kafka.common.requests.ByteBufferChannel; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.BufferSupplier.GrowableBufferSupplier; import org.apache.kafka.server.common.OffsetAndEpoch; diff --git a/server-common/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesEnsembleTest.java b/server-common/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesEnsembleTest.java index 35cb0fd812a1c..9d2b736609acc 100644 --- a/server-common/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesEnsembleTest.java +++ b/server-common/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesEnsembleTest.java @@ -17,8 +17,8 @@ package org.apache.kafka.metadata.properties; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Uuid; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.Test; diff --git a/server-common/src/test/java/org/apache/kafka/queue/KafkaEventQueueTest.java b/server-common/src/test/java/org/apache/kafka/queue/KafkaEventQueueTest.java index e59599fa27edf..b22c812a26ac7 100644 --- a/server-common/src/test/java/org/apache/kafka/queue/KafkaEventQueueTest.java +++ b/server-common/src/test/java/org/apache/kafka/queue/KafkaEventQueueTest.java @@ -17,8 +17,8 @@ package org.apache.kafka.queue; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.errors.TimeoutException; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.internals.LogContext; diff --git a/server-common/src/test/java/org/apache/kafka/server/share/persister/PersisterStateManagerTest.java b/server-common/src/test/java/org/apache/kafka/server/share/persister/PersisterStateManagerTest.java index 0c4eddf581b73..7d7e23296e253 100644 --- a/server-common/src/test/java/org/apache/kafka/server/share/persister/PersisterStateManagerTest.java +++ b/server-common/src/test/java/org/apache/kafka/server/share/persister/PersisterStateManagerTest.java @@ -17,7 +17,6 @@ package org.apache.kafka.server.share.persister; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientResponse; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.KafkaClient; @@ -46,6 +45,7 @@ import org.apache.kafka.common.requests.ReadShareGroupStateSummaryResponse; import org.apache.kafka.common.requests.WriteShareGroupStateRequest; import org.apache.kafka.common.requests.WriteShareGroupStateResponse; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.server.share.SharePartitionKey; diff --git a/server-common/src/test/java/org/apache/kafka/server/util/ShutdownableThreadTest.java b/server-common/src/test/java/org/apache/kafka/server/util/ShutdownableThreadTest.java index 9df7ce3511086..593ce8f8a3f9e 100644 --- a/server-common/src/test/java/org/apache/kafka/server/util/ShutdownableThreadTest.java +++ b/server-common/src/test/java/org/apache/kafka/server/util/ShutdownableThreadTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.server.util; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.internals.FatalExitError; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.Exit; diff --git a/server-common/src/test/java/org/apache/kafka/server/util/timer/SystemTimerReaperTest.java b/server-common/src/test/java/org/apache/kafka/server/util/timer/SystemTimerReaperTest.java index 20bd705269f16..ef1401be335a3 100644 --- a/server-common/src/test/java/org/apache/kafka/server/util/timer/SystemTimerReaperTest.java +++ b/server-common/src/test/java/org/apache/kafka/server/util/timer/SystemTimerReaperTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.server.util.timer; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.errors.TimeoutException; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/server/src/test/java/org/apache/kafka/api/EndToEndClusterIdTest.java b/server/src/test/java/org/apache/kafka/api/EndToEndClusterIdTest.java index eee237a806901..a143d9a6e5d4c 100644 --- a/server/src/test/java/org/apache/kafka/api/EndToEndClusterIdTest.java +++ b/server/src/test/java/org/apache/kafka/api/EndToEndClusterIdTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.api; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; @@ -31,6 +30,7 @@ import org.apache.kafka.common.test.api.ClusterConfigProperty; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.server.config.ServerConfigs; import org.apache.kafka.server.metrics.MetricConfigs; import org.apache.kafka.test.MockConsumerInterceptor; diff --git a/server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java b/server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java index d1283090b1e39..20d81a5d2ff4e 100644 --- a/server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java +++ b/server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.server; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientResponse; import org.apache.kafka.clients.NodeApiVersions; import org.apache.kafka.common.Uuid; @@ -34,6 +33,7 @@ import org.apache.kafka.common.requests.ApiVersionsResponse; import org.apache.kafka.common.requests.AssignReplicasToDirsRequest; import org.apache.kafka.common.requests.AssignReplicasToDirsResponse; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.internals.ExponentialBackoff; import org.apache.kafka.image.MetadataDelta; diff --git a/server/src/test/java/org/apache/kafka/server/BootstrapControllersIntegrationTest.java b/server/src/test/java/org/apache/kafka/server/BootstrapControllersIntegrationTest.java index 6042ebab4d05d..8c7bcc309e6ac 100644 --- a/server/src/test/java/org/apache/kafka/server/BootstrapControllersIntegrationTest.java +++ b/server/src/test/java/org/apache/kafka/server/BootstrapControllersIntegrationTest.java @@ -17,7 +17,6 @@ package org.apache.kafka.server; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterConfigOp; import org.apache.kafka.clients.admin.Config; @@ -59,6 +58,7 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.metadata.authorizer.StandardAuthorizer; import org.apache.kafka.network.SocketServerConfigs; import org.apache.kafka.server.common.MetadataVersion; diff --git a/server/src/test/java/org/apache/kafka/server/ClientMetricsManagerTest.java b/server/src/test/java/org/apache/kafka/server/ClientMetricsManagerTest.java index a96b05ce4b9d2..65480b1f0f235 100644 --- a/server/src/test/java/org/apache/kafka/server/ClientMetricsManagerTest.java +++ b/server/src/test/java/org/apache/kafka/server/ClientMetricsManagerTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.server; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.errors.InvalidRequestException; @@ -31,6 +30,7 @@ import org.apache.kafka.common.requests.PushTelemetryRequest; import org.apache.kafka.common.requests.PushTelemetryRequest.Builder; import org.apache.kafka.common.requests.PushTelemetryResponse; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.server.metrics.ClientMetricsConfigs; import org.apache.kafka.server.metrics.ClientMetricsInstance; diff --git a/server/src/test/java/org/apache/kafka/server/CordonedLogDirsIntegrationTest.java b/server/src/test/java/org/apache/kafka/server/CordonedLogDirsIntegrationTest.java index 71d1a8b821638..becaf63c8a5e1 100644 --- a/server/src/test/java/org/apache/kafka/server/CordonedLogDirsIntegrationTest.java +++ b/server/src/test/java/org/apache/kafka/server/CordonedLogDirsIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.server; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterConfigOp; import org.apache.kafka.clients.admin.Config; @@ -40,6 +39,7 @@ import org.apache.kafka.common.test.api.ClusterConfigProperty; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.server.common.MetadataVersion; import org.junit.jupiter.api.BeforeEach; diff --git a/server/src/test/java/org/apache/kafka/server/EligibleLeaderReplicasIntegrationTest.java b/server/src/test/java/org/apache/kafka/server/EligibleLeaderReplicasIntegrationTest.java index 61ec753930461..d7392d09e597c 100644 --- a/server/src/test/java/org/apache/kafka/server/EligibleLeaderReplicasIntegrationTest.java +++ b/server/src/test/java/org/apache/kafka/server/EligibleLeaderReplicasIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.server; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterConfigOp; import org.apache.kafka.clients.admin.ConfigEntry; @@ -40,6 +39,7 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.server.common.EligibleLeaderReplicasVersion; import org.apache.kafka.server.common.MetadataVersion; import org.apache.kafka.server.config.ReplicationConfigs; diff --git a/server/src/test/java/org/apache/kafka/server/KRaftClusterTest.java b/server/src/test/java/org/apache/kafka/server/KRaftClusterTest.java index 51ee343661de4..fcc09377453cd 100644 --- a/server/src/test/java/org/apache/kafka/server/KRaftClusterTest.java +++ b/server/src/test/java/org/apache/kafka/server/KRaftClusterTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.server; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.AlterClientQuotasResult; @@ -63,6 +62,7 @@ import org.apache.kafka.common.security.auth.KafkaPrincipal; import org.apache.kafka.common.test.KafkaClusterTestKit; import org.apache.kafka.common.test.TestKitNodes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.controller.QuorumController; import org.apache.kafka.image.ClusterImage; import org.apache.kafka.metadata.BrokerRegistration; diff --git a/server/src/test/java/org/apache/kafka/server/LogManagerIntegrationTest.java b/server/src/test/java/org/apache/kafka/server/LogManagerIntegrationTest.java index 8c3fdede9da96..6742d2124cefa 100644 --- a/server/src/test/java/org/apache/kafka/server/LogManagerIntegrationTest.java +++ b/server/src/test/java/org/apache/kafka/server/LogManagerIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.server; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.consumer.Consumer; @@ -35,6 +34,7 @@ import org.apache.kafka.common.test.ClusterInstance; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.storage.internals.checkpoint.CleanShutdownFileHandler; import org.apache.kafka.storage.internals.checkpoint.PartitionMetadataFile; diff --git a/server/src/test/java/org/apache/kafka/server/MetadataRequestTest.java b/server/src/test/java/org/apache/kafka/server/MetadataRequestTest.java index a104b6dbd347b..1b09a7dd158dd 100644 --- a/server/src/test/java/org/apache/kafka/server/MetadataRequestTest.java +++ b/server/src/test/java/org/apache/kafka/server/MetadataRequestTest.java @@ -19,7 +19,6 @@ import kafka.network.SocketServer; import kafka.server.KafkaBroker; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Cluster; import org.apache.kafka.common.Node; import org.apache.kafka.common.PartitionInfo; @@ -36,6 +35,7 @@ import org.apache.kafka.common.test.api.ClusterConfigProperty; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; import org.apache.kafka.metadata.BrokerState; import org.apache.kafka.metadata.LeaderAndIsr; diff --git a/server/src/test/java/org/apache/kafka/server/config/DynamicConfigTest.java b/server/src/test/java/org/apache/kafka/server/config/DynamicConfigTest.java index 6c5b243340af3..25093d76e4bec 100644 --- a/server/src/test/java/org/apache/kafka/server/config/DynamicConfigTest.java +++ b/server/src/test/java/org/apache/kafka/server/config/DynamicConfigTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.server.config; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterConfigOp; import org.apache.kafka.clients.admin.ConfigEntry; @@ -24,6 +23,7 @@ import org.apache.kafka.common.config.ConfigResource; import org.apache.kafka.common.test.ClusterInstance; import org.apache.kafka.common.test.api.ClusterTest; +import org.apache.kafka.common.test.base.TestUtils; import java.util.List; import java.util.Map; diff --git a/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsTestUtils.java b/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsTestUtils.java index 91361c64a1a85..027aae573981b 100644 --- a/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsTestUtils.java +++ b/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsTestUtils.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.server.metrics; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.network.ClientInformation; import org.apache.kafka.common.network.ListenerName; import org.apache.kafka.common.protocol.ApiKeys; @@ -24,6 +23,7 @@ import org.apache.kafka.common.requests.RequestHeader; import org.apache.kafka.common.security.auth.KafkaPrincipal; import org.apache.kafka.common.security.auth.SecurityProtocol; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.server.authorizer.AuthorizableRequestContext; import org.apache.kafka.server.telemetry.ClientTelemetry; import org.apache.kafka.server.telemetry.ClientTelemetryContext; diff --git a/server/src/test/java/org/apache/kafka/server/purgatory/DelayedFutureTest.java b/server/src/test/java/org/apache/kafka/server/purgatory/DelayedFutureTest.java index 8bd760b642f8e..7cd54a6a6e140 100644 --- a/server/src/test/java/org/apache/kafka/server/purgatory/DelayedFutureTest.java +++ b/server/src/test/java/org/apache/kafka/server/purgatory/DelayedFutureTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.server.purgatory; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.errors.TimeoutException; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import org.junit.jupiter.api.Test; diff --git a/server/src/test/java/org/apache/kafka/server/quota/ClientQuotasRequestTest.java b/server/src/test/java/org/apache/kafka/server/quota/ClientQuotasRequestTest.java index fa6c52992b61e..1d708e079ea2e 100644 --- a/server/src/test/java/org/apache/kafka/server/quota/ClientQuotasRequestTest.java +++ b/server/src/test/java/org/apache/kafka/server/quota/ClientQuotasRequestTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.server.quota; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterClientQuotasOptions; import org.apache.kafka.clients.admin.AlterUserScramCredentialsResult; @@ -32,6 +31,7 @@ import org.apache.kafka.common.quota.ClientQuotaFilterComponent; import org.apache.kafka.common.test.ClusterInstance; import org.apache.kafka.common.test.api.ClusterTest; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.server.config.QuotaConfig; import java.net.InetAddress; diff --git a/server/src/test/java/org/apache/kafka/server/share/fetch/ShareFetchTestUtils.java b/server/src/test/java/org/apache/kafka/server/share/fetch/ShareFetchTestUtils.java index 36db75521ae07..c1a950e5abb2f 100644 --- a/server/src/test/java/org/apache/kafka/server/share/fetch/ShareFetchTestUtils.java +++ b/server/src/test/java/org/apache/kafka/server/share/fetch/ShareFetchTestUtils.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.server.share.fetch; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicIdPartition; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.message.ShareFetchResponseData.AcquiredRecords; @@ -24,6 +23,7 @@ import org.apache.kafka.common.record.internal.FileRecords; import org.apache.kafka.common.record.internal.MemoryRecords; import org.apache.kafka.common.record.internal.MemoryRecordsBuilder; +import org.apache.kafka.common.test.base.TestUtils; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/server/src/test/java/org/apache/kafka/server/share/session/ShareSessionCacheTest.java b/server/src/test/java/org/apache/kafka/server/share/session/ShareSessionCacheTest.java index c50252d80bf75..611088b483e98 100644 --- a/server/src/test/java/org/apache/kafka/server/share/session/ShareSessionCacheTest.java +++ b/server/src/test/java/org/apache/kafka/server/share/session/ShareSessionCacheTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.server.share.session; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Uuid; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.internals.ImplicitLinkedHashCollection; import org.apache.kafka.server.share.CachedSharePartition; import org.apache.kafka.server.share.ShareGroupListener; diff --git a/server/src/test/java/org/apache/kafka/server/util/SchedulerTest.java b/server/src/test/java/org/apache/kafka/server/util/SchedulerTest.java index 8d7344f79e613..17a53f7f8c73f 100644 --- a/server/src/test/java/org/apache/kafka/server/util/SchedulerTest.java +++ b/server/src/test/java/org/apache/kafka/server/util/SchedulerTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.server.util; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.coordinator.transaction.TransactionLogConfig; import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache; import org.apache.kafka.storage.internals.log.LoadedLogOffsets; diff --git a/storage/src/test/java/org/apache/kafka/admin/RemoteTopicCrudTest.java b/storage/src/test/java/org/apache/kafka/admin/RemoteTopicCrudTest.java index 844e750ba6d89..68bdc87996977 100644 --- a/storage/src/test/java/org/apache/kafka/admin/RemoteTopicCrudTest.java +++ b/storage/src/test/java/org/apache/kafka/admin/RemoteTopicCrudTest.java @@ -17,8 +17,6 @@ package org.apache.kafka.admin; -import org.apache.kafka.common.test.base.TestCondition; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.AlterConfigOp; import org.apache.kafka.clients.admin.ConfigEntry; import org.apache.kafka.clients.admin.NewTopic; @@ -35,6 +33,8 @@ import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.ClusterTests; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestCondition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.server.log.remote.storage.NoOpRemoteLogMetadataManager; import org.apache.kafka.server.log.remote.storage.NoOpRemoteStorageManager; diff --git a/storage/src/test/java/org/apache/kafka/server/log/LogAppendTimeTest.java b/storage/src/test/java/org/apache/kafka/server/log/LogAppendTimeTest.java index ce9346d5c48e5..7440c67fdbcfa 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/LogAppendTimeTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/LogAppendTimeTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.server.log; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.consumer.Consumer; @@ -33,6 +32,7 @@ import org.apache.kafka.common.test.api.ClusterConfigProperty; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import java.time.Duration; import java.util.ArrayList; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogMetadataManagerTestUtils.java b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogMetadataManagerTestUtils.java index 9a92276791a85..655d5411ae0b7 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogMetadataManagerTestUtils.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogMetadataManagerTestUtils.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.server.log.remote.metadata.storage; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; +import org.apache.kafka.common.test.base.TestUtils; import java.util.HashMap; import java.util.Map; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogSegmentLifecycleTest.java b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogSegmentLifecycleTest.java index fdef8703e4b44..ef32599f7b4db 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogSegmentLifecycleTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogSegmentLifecycleTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.server.log.remote.metadata.storage; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicIdPartition; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.test.ClusterInstance; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import org.apache.kafka.server.log.remote.storage.RemoteLogMetadataManager; import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentId; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerConfigTest.java b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerConfigTest.java index f7728461b7e2d..2b6ae7adc56a6 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerConfigTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerConfigTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.server.log.remote.metadata.storage; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.config.SaslConfigs; import org.apache.kafka.common.config.SslConfigs; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.Test; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerRestartTest.java b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerRestartTest.java index f9d54804b2c05..cb6c6cd644da3 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerRestartTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerRestartTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.server.log.remote.metadata.storage; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.common.TopicIdPartition; @@ -24,6 +23,7 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.test.ClusterInstance; import org.apache.kafka.common.test.api.ClusterTest; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentId; import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentMetadata; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerTest.java b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerTest.java index 7390299468b8f..c32806ecd0c0a 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.server.log.remote.metadata.storage; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.Config; import org.apache.kafka.clients.admin.ConfigEntry; @@ -33,6 +32,7 @@ import org.apache.kafka.common.test.ClusterInstance; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.internals.Exit; import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentId; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorage.java b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorage.java index efea8eefe4437..c7f82cc882ea5 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorage.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorage.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.server.log.remote.storage; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicIdPartition; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.errors.InvalidConfigurationException; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.server.log.remote.storage.LocalTieredStorageListener.LocalTieredStorageListeners; import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentMetadata.CustomMetadata; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogManagerTest.java b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogManagerTest.java index 6a77c2ef092c4..cc31650b03b01 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogManagerTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogManagerTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.server.log.remote.storage; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Endpoint; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.TopicIdPartition; @@ -36,6 +35,7 @@ import org.apache.kafka.common.record.internal.SimpleRecord; import org.apache.kafka.common.requests.FetchRequest; import org.apache.kafka.common.security.auth.SecurityProtocol; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.server.common.OffsetAndEpoch; @@ -118,8 +118,8 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.apache.kafka.common.record.TimestampType.CREATE_TIME; +import static org.apache.kafka.common.test.base.TestUtils.tempFile; import static org.apache.kafka.server.log.remote.metadata.storage.TopicBasedRemoteLogMetadataManagerConfig.REMOTE_LOG_METADATA_COMMON_CLIENT_PREFIX; import static org.apache.kafka.server.log.remote.metadata.storage.TopicBasedRemoteLogMetadataManagerConfig.REMOTE_LOG_METADATA_CONSUMER_PREFIX; import static org.apache.kafka.server.log.remote.metadata.storage.TopicBasedRemoteLogMetadataManagerConfig.REMOTE_LOG_METADATA_PRODUCER_PREFIX; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogOffsetReaderTest.java b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogOffsetReaderTest.java index a129eb2d2ff15..2809a29c06b26 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogOffsetReaderTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogOffsetReaderTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.server.log.remote.storage; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.config.AbstractConfig; import org.apache.kafka.common.metrics.Metrics; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.server.util.MockTime; import org.apache.kafka.storage.internals.checkpoint.LeaderEpochCheckpointFile; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/OffsetCheckpointFileWithFailureHandlerTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/OffsetCheckpointFileWithFailureHandlerTest.java index e365cd025b0f5..8f1aa77d58d59 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/OffsetCheckpointFileWithFailureHandlerTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/OffsetCheckpointFileWithFailureHandlerTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.storage.internals.checkpoint; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.KafkaStorageException; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.storage.internals.log.EpochEntry; import org.apache.kafka.storage.internals.log.LogDirFailureChannel; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/PartitionMetadataFileTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/PartitionMetadataFileTest.java index 9b218c1f4398d..67daadf5e78b9 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/PartitionMetadataFileTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/PartitionMetadataFileTest.java @@ -17,9 +17,9 @@ package org.apache.kafka.storage.internals.checkpoint; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.errors.InconsistentTopicIdException; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.storage.internals.log.LogDirFailureChannel; import org.junit.jupiter.api.Test; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/BrokerCompressionTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/BrokerCompressionTest.java index 0c81f4c62287c..ccf3e9ef5039b 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/BrokerCompressionTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/BrokerCompressionTest.java @@ -17,13 +17,13 @@ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.config.TopicConfig; import org.apache.kafka.common.record.internal.CompressionType; import org.apache.kafka.common.record.internal.MemoryRecords; import org.apache.kafka.common.record.internal.RecordBatch; import org.apache.kafka.common.record.internal.SimpleRecord; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.coordinator.transaction.TransactionLogConfig; import org.apache.kafka.server.record.BrokerCompressionType; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/LocalLogTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/LocalLogTest.java index 8c85d6d80903c..47768ec54fa32 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/LocalLogTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/LocalLogTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.compress.Compression; @@ -25,6 +24,7 @@ import org.apache.kafka.common.record.internal.MemoryRecords; import org.apache.kafka.common.record.internal.Record; import org.apache.kafka.common.record.internal.SimpleRecord; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.server.util.MockTime; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogCleanerIntegrationTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogCleanerIntegrationTest.java index b5fe57bdc612d..c6bb59b7b477b 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogCleanerIntegrationTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogCleanerIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.config.AbstractConfig; @@ -29,6 +28,7 @@ import org.apache.kafka.common.record.internal.RecordBatch; import org.apache.kafka.common.record.internal.RecordVersion; import org.apache.kafka.common.record.internal.SimpleRecord; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.coordinator.transaction.TransactionLogConfig; import org.apache.kafka.server.config.ServerConfigs; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogCleanerManagerTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogCleanerManagerTest.java index bd410bb140bd8..c9e6cae77dc2a 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogCleanerManagerTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogCleanerManagerTest.java @@ -17,7 +17,6 @@ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.compress.Compression; @@ -26,6 +25,7 @@ import org.apache.kafka.common.record.internal.EndTransactionMarker; import org.apache.kafka.common.record.internal.MemoryRecords; import org.apache.kafka.common.record.internal.SimpleRecord; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.coordinator.transaction.TransactionLogConfig; import org.apache.kafka.server.common.RequestLocal; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogConcurrencyTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogConcurrencyTest.java index 6460fcc61ba02..135d5d7ffbb6f 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogConcurrencyTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogConcurrencyTest.java @@ -17,11 +17,11 @@ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.record.internal.MemoryRecords; import org.apache.kafka.common.record.internal.RecordBatch; import org.apache.kafka.common.record.internal.SimpleRecord; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.coordinator.transaction.TransactionLogConfig; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogSegmentTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogSegmentTest.java index 2cc93117173a5..9a57d4b852462 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogSegmentTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogSegmentTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.config.TopicConfig; @@ -32,6 +31,7 @@ import org.apache.kafka.common.record.internal.RecordBatch; import org.apache.kafka.common.record.internal.Records; import org.apache.kafka.common.record.internal.SimpleRecord; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogSegmentsTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogSegmentsTest.java index eb240607ebe33..2c7df35f646e9 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogSegmentsTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogSegmentsTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogValidatorTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogValidatorTest.java index b75f0ae2fc26d..b4bd4e6420537 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/LogValidatorTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/LogValidatorTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.InvalidRecordException; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.compress.Compression; @@ -35,6 +34,7 @@ import org.apache.kafka.common.record.internal.RecordBatch; import org.apache.kafka.common.record.internal.RecordVersion; import org.apache.kafka.common.record.internal.SimpleRecord; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.internals.PrimitiveRef; import org.apache.kafka.server.common.RequestLocal; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/OffsetIndexTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/OffsetIndexTest.java index 491a944be1b3d..922103bd3fed3 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/OffsetIndexTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/OffsetIndexTest.java @@ -17,8 +17,8 @@ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.errors.InvalidOffsetException; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/ProducerStateManagerTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/ProducerStateManagerTest.java index 1feb786185345..16c1ef7e056d6 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/ProducerStateManagerTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/ProducerStateManagerTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.InvalidProducerEpochException; import org.apache.kafka.common.errors.InvalidTxnStateException; @@ -26,6 +25,7 @@ import org.apache.kafka.common.record.internal.ControlRecordType; import org.apache.kafka.common.record.internal.EndTransactionMarker; import org.apache.kafka.common.record.internal.RecordBatch; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.server.util.MockTime; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/RemoteIndexCacheTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/RemoteIndexCacheTest.java index f189516fd7fec..07b926bf6a347 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/RemoteIndexCacheTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/RemoteIndexCacheTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicIdPartition; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.message.AbortedTxn; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentId; import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentMetadata; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/TimeIndexTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/TimeIndexTest.java index ca86b883120e3..5977f8c152b45 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/TimeIndexTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/TimeIndexTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.errors.InvalidOffsetException; import org.apache.kafka.common.record.internal.RecordBatch; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/TransactionIndexTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/TransactionIndexTest.java index f0a4a86fb5e9d..b59d97123b0b0 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/TransactionIndexTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/TransactionIndexTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.message.AbortedTxn; import org.apache.kafka.common.protocol.MessageUtil; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/log/UnifiedLogTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/log/UnifiedLogTest.java index b3d5d45672a7d..0f21379e40042 100644 --- a/storage/src/test/java/org/apache/kafka/storage/internals/log/UnifiedLogTest.java +++ b/storage/src/test/java/org/apache/kafka/storage/internals/log/UnifiedLogTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.storage.internals.log; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.InvalidRecordException; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; @@ -54,6 +53,7 @@ import org.apache.kafka.common.record.internal.SimpleRecord; import org.apache.kafka.common.requests.ListOffsetsRequest; import org.apache.kafka.common.requests.ListOffsetsResponse; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.BufferSupplier; import org.apache.kafka.coordinator.transaction.TransactionLogConfig; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestHarness.java b/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestHarness.java index 3f125356e23b0..8e1bf4e301342 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestHarness.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestHarness.java @@ -19,8 +19,8 @@ import kafka.api.IntegrationTestHarness; import kafka.server.KafkaBroker; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.replica.ReplicaSelector; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.server.config.ReplicationConfigs; import org.apache.kafka.server.log.remote.metadata.storage.TopicBasedRemoteLogMetadataManager; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/AlterLogDirAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/AlterLogDirAction.java index 0dfcf380c1bec..2d14065030e7e 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/AlterLogDirAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/AlterLogDirAction.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.tiered.storage.actions; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.AlterReplicaLogDirsResult; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.TopicPartitionReplica; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.tiered.storage.TieredStorageTestAction; import org.apache.kafka.tiered.storage.TieredStorageTestContext; import org.apache.kafka.tiered.storage.utils.BrokerLocalStorage; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectBrokerInISRAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectBrokerInISRAction.java index 5f679e77753d7..fec1a2bdb8a5f 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectBrokerInISRAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectBrokerInISRAction.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.tiered.storage.actions; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.TopicDescription; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.TopicPartitionInfo; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.tiered.storage.TieredStorageTestAction; import org.apache.kafka.tiered.storage.TieredStorageTestContext; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectEmptyRemoteStorageAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectEmptyRemoteStorageAction.java index 4ae4b56d1097e..28e99018e2033 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectEmptyRemoteStorageAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectEmptyRemoteStorageAction.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.tiered.storage.actions; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.server.log.remote.storage.LocalTieredStorageSnapshot; import org.apache.kafka.tiered.storage.TieredStorageTestAction; import org.apache.kafka.tiered.storage.TieredStorageTestContext; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderAction.java index c534c6f869c2b..bf7a1dd79afa2 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderAction.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.tiered.storage.actions; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.AlterPartitionReassignmentsResult; import org.apache.kafka.clients.admin.NewPartitionReassignment; import org.apache.kafka.clients.admin.TopicDescription; @@ -25,6 +24,7 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.TopicPartitionInfo; import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.tiered.storage.TieredStorageTestAction; import org.apache.kafka.tiered.storage.TieredStorageTestContext; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderEpochCheckpointAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderEpochCheckpointAction.java index b02cba0d53700..d30e30900027a 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderEpochCheckpointAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderEpochCheckpointAction.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.tiered.storage.actions; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache; import org.apache.kafka.storage.internals.log.EpochEntry; import org.apache.kafka.storage.internals.log.UnifiedLog; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ReassignReplicaAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ReassignReplicaAction.java index b9595cd2a4524..c367e0950a8c3 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ReassignReplicaAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ReassignReplicaAction.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.tiered.storage.actions; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.NewPartitionReassignment; import org.apache.kafka.clients.admin.TopicDescription; import org.apache.kafka.common.Node; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.tiered.storage.TieredStorageTestAction; import org.apache.kafka.tiered.storage.TieredStorageTestContext; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ShrinkReplicaAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ShrinkReplicaAction.java index d1a4ace4a7572..1b204d6dee8c7 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ShrinkReplicaAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ShrinkReplicaAction.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.tiered.storage.actions; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.NewPartitionReassignment; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.TopicPartitionInfo; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.tiered.storage.TieredStorageTestAction; import org.apache.kafka.tiered.storage.TieredStorageTestContext; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/integration/TransactionsWithTieredStoreTest.java b/storage/src/test/java/org/apache/kafka/tiered/storage/integration/TransactionsWithTieredStoreTest.java index 9b76f41916ce3..319aa8c17cd28 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/integration/TransactionsWithTieredStoreTest.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/integration/TransactionsWithTieredStoreTest.java @@ -19,8 +19,8 @@ import kafka.api.TransactionsTest; import kafka.server.KafkaBroker; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.server.HostedPartition; import org.apache.kafka.tiered.storage.utils.BrokerLocalStorage; diff --git a/streams/examples/src/test/java/org/apache/kafka/streams/examples/wordcount/WordCountDemoTest.java b/streams/examples/src/test/java/org/apache/kafka/streams/examples/wordcount/WordCountDemoTest.java index f5507c13b902a..852ec114780a0 100644 --- a/streams/examples/src/test/java/org/apache/kafka/streams/examples/wordcount/WordCountDemoTest.java +++ b/streams/examples/src/test/java/org/apache/kafka/streams/examples/wordcount/WordCountDemoTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.streams.examples.wordcount; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.common.serialization.LongDeserializer; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsBuilder; import org.apache.kafka.streams.TestInputTopic; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AbstractJoinIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AbstractJoinIntegrationTest.java index 59111c6a7f53e..2b90ed7285890 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AbstractJoinIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AbstractJoinIntegrationTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.LongDeserializer; import org.apache.kafka.common.serialization.LongSerializer; 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.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AdjustStreamThreadCountTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AdjustStreamThreadCountTest.java index c99c24f53aa78..9f0c2ff296f67 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AdjustStreamThreadCountTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AdjustStreamThreadCountTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.StreamsBuilder; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AtLeastOnceDeliveryMessageLossIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AtLeastOnceDeliveryMessageLossIntegrationTest.java index 17de11dea4f71..fab3370b476aa 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AtLeastOnceDeliveryMessageLossIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/AtLeastOnceDeliveryMessageLossIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.producer.ProducerConfig; @@ -25,6 +24,7 @@ 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.test.base.TestUtils; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/ConsistencyVectorIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/ConsistencyVectorIntegrationTest.java index 6e02e88122c18..a020611a275b4 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/ConsistencyVectorIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/ConsistencyVectorIntegrationTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.KafkaStreams; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/DeadLetterQueueIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/DeadLetterQueueIntegrationTest.java index 09fa46389804e..47bad633b677a 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/DeadLetterQueueIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/DeadLetterQueueIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.serialization.ByteArrayDeserializer; @@ -25,6 +24,7 @@ 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.test.base.TestUtils; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsBuilder; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EOSUncleanShutdownIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EOSUncleanShutdownIntegrationTest.java index abc3be8ab7e5c..569c05232945a 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EOSUncleanShutdownIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EOSUncleanShutdownIntegrationTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KafkaStreams.State; import org.apache.kafka.streams.KeyValueTimestamp; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EmitOnChangeIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EmitOnChangeIntegrationTest.java index 3c6e756625733..399e9534523c4 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EmitOnChangeIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EmitOnChangeIntegrationTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.IntegerDeserializer; import org.apache.kafka.common.serialization.IntegerSerializer; 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.test.base.TestUtils; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsBuilder; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EosIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EosIntegrationTest.java index 2a8891404704c..8fe6e82d6aac6 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EosIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/EosIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.Consumer; @@ -36,6 +35,7 @@ import org.apache.kafka.common.serialization.LongDeserializer; import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/FineGrainedAutoResetIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/FineGrainedAutoResetIntegrationTest.java index ef3f4e6527b11..d696294790b26 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/FineGrainedAutoResetIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/FineGrainedAutoResetIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.clients.consumer.OffsetAndMetadata; @@ -25,6 +24,7 @@ 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.test.base.TestUtils; import org.apache.kafka.server.util.MockTime; import org.apache.kafka.streams.AutoOffsetReset; import org.apache.kafka.streams.KafkaStreams; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalKTableEOSIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalKTableEOSIntegrationTest.java index 8b252cbeebbc9..6f15a46700b00 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalKTableEOSIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalKTableEOSIntegrationTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.server.util.MockTime; import org.apache.kafka.streams.KafkaStreams; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalKTableIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalKTableIntegrationTest.java index 91661d39598f8..1e625e17a0df6 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalKTableIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalKTableIntegrationTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.server.util.MockTime; import org.apache.kafka.streams.KafkaStreams; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalStateReprocessTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalStateReprocessTest.java index 351458a49b4eb..dbd95c5cc3bbb 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalStateReprocessTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalStateReprocessTest.java @@ -17,11 +17,11 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalThreadShutDownOrderTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalThreadShutDownOrderTest.java index f81722e881ead..6747650e125e0 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalThreadShutDownOrderTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/GlobalThreadShutDownOrderTest.java @@ -17,11 +17,11 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.KafkaStreams; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HandlingSourceTopicDeletionIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HandlingSourceTopicDeletionIntegrationTest.java index d0166b59e5419..147894386db4b 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HandlingSourceTopicDeletionIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HandlingSourceTopicDeletionIntegrationTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KafkaStreams.State; import org.apache.kafka.streams.StreamsBuilder; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HeadersStoreUpgradeIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HeadersStoreUpgradeIntegrationTest.java index 12c5798127432..48ca17c6aceac 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HeadersStoreUpgradeIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HeadersStoreUpgradeIntegrationTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsBuilder; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HighAvailabilityTaskAssignorIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HighAvailabilityTaskAssignorIntegrationTest.java index cb6d0e5f86bef..d036c716ce9bc 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HighAvailabilityTaskAssignorIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/HighAvailabilityTaskAssignorIntegrationTest.java @@ -16,8 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.NoRetryException; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -30,6 +28,8 @@ 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.test.base.NoRetryException; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.server.config.ServerConfigs; import org.apache.kafka.streams.KafkaStreams; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2EndpointToPartitionsIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2EndpointToPartitionsIntegrationTest.java index 384d783a99c25..f5a184c20bed5 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2EndpointToPartitionsIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2EndpointToPartitionsIntegrationTest.java @@ -17,10 +17,10 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.StreamsBuilder; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2IntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2IntegrationTest.java index 2ad6634e3ea49..9b76cac105298 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2IntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2IntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.Producer; @@ -26,6 +25,7 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.Time; import org.apache.kafka.streams.KafkaStreams; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2StoreIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2StoreIntegrationTest.java index 95886a1433de0..b7436a685653c 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2StoreIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/IQv2StoreIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.Producer; @@ -25,6 +24,7 @@ import org.apache.kafka.clients.producer.RecordMetadata; import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.Time; import org.apache.kafka.streams.KafkaStreams; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/InternalTopicIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/InternalTopicIntegrationTest.java index 281e8f03506df..bb46c39eea1e1 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/InternalTopicIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/InternalTopicIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.Config; @@ -27,6 +26,7 @@ import org.apache.kafka.common.config.TopicConfig; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.server.util.MockTime; import org.apache.kafka.streams.GroupProtocol; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinGracePeriodDurabilityIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinGracePeriodDurabilityIntegrationTest.java index f28ad3cacabdd..dc360df167e09 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinGracePeriodDurabilityIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinGracePeriodDurabilityIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.Deserializer; @@ -25,6 +24,7 @@ import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValueTimestamp; import org.apache.kafka.streams.StreamsBuilder; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinStoreIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinStoreIntegrationTest.java index 14b708c2f2ee0..321ad3274a134 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinStoreIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinStoreIntegrationTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.config.ConfigResource; import org.apache.kafka.common.config.ConfigResource.Type; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.StreamsBuilder; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinWithIncompleteMetadataIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinWithIncompleteMetadataIntegrationTest.java index 7a366c05ba591..166a691aed2c0 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinWithIncompleteMetadataIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/JoinWithIncompleteMetadataIntegrationTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.streams.GroupProtocol; import org.apache.kafka.streams.StreamsBuilder; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamAggregationDedupIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamAggregationDedupIntegrationTest.java index cbdf77aa731c2..ddd3b020e943a 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamAggregationDedupIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamAggregationDedupIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.IntegerSerializer; @@ -24,6 +23,7 @@ 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.test.base.TestUtils; import org.apache.kafka.server.util.MockTime; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamAggregationIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamAggregationIntegrationTest.java index 81820f548696c..933284de8a499 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamAggregationIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamAggregationIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeader; @@ -29,6 +28,7 @@ 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.test.base.TestUtils; import org.apache.kafka.server.util.MockTime; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamKStreamIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamKStreamIntegrationTest.java index 8fb2522c599c5..986857500f11d 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamKStreamIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamKStreamIntegrationTest.java @@ -17,12 +17,12 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; 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.test.base.TestUtils; import org.apache.kafka.server.util.MockTime; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamRepartitionIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamRepartitionIntegrationTest.java index 1efc568bcc9e6..7998cfabfb672 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamRepartitionIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KStreamRepartitionIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.TopicDescription; @@ -28,6 +27,7 @@ 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.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.GroupProtocol; import org.apache.kafka.streams.KafkaStreams; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableEfficientRangeQueryTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableEfficientRangeQueryTest.java index c17b68f6c64bb..55f61b021746c 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableEfficientRangeQueryTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableEfficientRangeQueryTest.java @@ -17,9 +17,9 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.KeyValue; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinCustomPartitionerIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinCustomPartitionerIntegrationTest.java index 9fbe833b6d63d..edc603bee16ca 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinCustomPartitionerIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinCustomPartitionerIntegrationTest.java @@ -17,12 +17,12 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; 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.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.server.util.MockTime; import org.apache.kafka.streams.KafkaStreams; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java index 32fbf3bc89d37..9d74db7530740 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.FloatSerializer; @@ -26,6 +25,7 @@ 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.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.server.util.MockTime; import org.apache.kafka.streams.KafkaStreams; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinDistributedTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinDistributedTest.java index 23f8ec693fb92..444c50f0b763b 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinDistributedTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinDistributedTest.java @@ -17,12 +17,12 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; 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.test.base.TestUtils; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsBuilder; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinIntegrationTest.java index c53087210a5e8..f0f5b6383a380 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinIntegrationTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; 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.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.KeyValue; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinMaterializationIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinMaterializationIntegrationTest.java index c5e285eadd2f1..95607b57b995a 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinMaterializationIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyJoinMaterializationIntegrationTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; 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.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.StreamsBuilder; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableSourceTopicRestartIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableSourceTopicRestartIntegrationTest.java index 60ee1d3086fb0..b2e20fd053efd 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableSourceTopicRestartIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KTableSourceTopicRestartIntegrationTest.java @@ -17,12 +17,12 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsCloseOptionsIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsCloseOptionsIntegrationTest.java index 6992bfefa1fb7..dbdf827c60eb4 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsCloseOptionsIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsCloseOptionsIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -26,6 +25,7 @@ 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.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsTelemetryIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsTelemetryIntegrationTest.java index 622dd3720ad43..91fe0eb6173ea 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsTelemetryIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/KafkaStreamsTelemetryIntegrationTest.java @@ -17,7 +17,6 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.Consumer; @@ -36,6 +35,7 @@ import org.apache.kafka.common.serialization.ByteArraySerializer; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.server.telemetry.ClientTelemetryExporter; import org.apache.kafka.server.telemetry.ClientTelemetryExporterProvider; import org.apache.kafka.shaded.io.opentelemetry.proto.metrics.v1.MetricsData; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/LagFetchIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/LagFetchIntegrationTest.java index 2828983b7be72..24a77c546eeb3 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/LagFetchIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/LagFetchIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.serialization.LongDeserializer; @@ -24,6 +23,7 @@ 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.test.base.TestUtils; import org.apache.kafka.server.util.MockTime; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/MetricsIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/MetricsIntegrationTest.java index abeda18212e98..6bbc133e32266 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/MetricsIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/MetricsIntegrationTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Metric; import org.apache.kafka.common.metrics.Sensor; import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.GroupProtocol; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/NamedTopologyIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/NamedTopologyIntegrationTest.java index 1a674fd885258..02be8554086d7 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/NamedTopologyIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/NamedTopologyIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.serialization.LongDeserializer; @@ -24,6 +23,7 @@ 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.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.KafkaClientSupplier; import org.apache.kafka.streams.KafkaStreams.State; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/OptimizedKTableIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/OptimizedKTableIntegrationTest.java index 7d2e823f60a3f..f209e43fb35dc 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/OptimizedKTableIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/OptimizedKTableIntegrationTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.NoRetryException; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.NoRetryException; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.KafkaStreams; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/OuterJoinListValueStoreRestorationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/OuterJoinListValueStoreRestorationTest.java index ca7d4deed5a49..3260acf2fee2b 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/OuterJoinListValueStoreRestorationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/OuterJoinListValueStoreRestorationTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; 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.test.base.TestUtils; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsBuilder; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PauseResumeIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PauseResumeIntegrationTest.java index 0617474b63001..30e01e0c111dc 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PauseResumeIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PauseResumeIntegrationTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.LongDeserializer; import org.apache.kafka.common.serialization.LongSerializer; 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.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KafkaStreams.State; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PositionRestartIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PositionRestartIntegrationTest.java index 5fbcf5cf81307..8741ebbf90e64 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PositionRestartIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PositionRestartIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.Producer; @@ -25,6 +24,7 @@ import org.apache.kafka.clients.producer.RecordMetadata; import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.Time; import org.apache.kafka.streams.KafkaStreams; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PurgeRepartitionTopicIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PurgeRepartitionTopicIntegrationTest.java index c9cecb5737d15..7917b141835b9 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PurgeRepartitionTopicIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/PurgeRepartitionTopicIntegrationTest.java @@ -16,8 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestCondition; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.Config; import org.apache.kafka.clients.admin.LogDirDescription; @@ -28,6 +26,8 @@ import org.apache.kafka.common.config.TopicConfig; import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestCondition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.storage.internals.log.LogConfig; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/QueryableStateIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/QueryableStateIntegrationTest.java index e93ef081f722a..30a94ea5a9ade 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/QueryableStateIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/QueryableStateIntegrationTest.java @@ -16,8 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.NoRetryException; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerConfig; @@ -28,6 +26,8 @@ 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.test.base.NoRetryException; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.server.util.MockTime; import org.apache.kafka.streams.KafkaStreams; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RangeQueryIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RangeQueryIntegrationTest.java index d014a140e585c..cfdea0a5dca9f 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RangeQueryIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RangeQueryIntegrationTest.java @@ -17,10 +17,10 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.KafkaStreams; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceIntegrationTest.java index 10879a59173bb..f1bb92a2ac00d 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceIntegrationTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.LongDeserializer; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceProtocolMigrationIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceProtocolMigrationIntegrationTest.java index 54cfd0c9504d2..d10de9c787bb5 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceProtocolMigrationIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceProtocolMigrationIntegrationTest.java @@ -17,13 +17,13 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.ConsumerConfig; 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.test.base.TestUtils; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; import org.apache.kafka.streams.GroupProtocol; import org.apache.kafka.streams.KafkaStreams; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceTaskClosureIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceTaskClosureIntegrationTest.java index beeae3f637961..a6d52539db90c 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceTaskClosureIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RebalanceTaskClosureIntegrationTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.CloseOptions; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RegexSourceIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RegexSourceIntegrationTest.java index b31b3da822d6d..62d8679289479 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RegexSourceIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RegexSourceIntegrationTest.java @@ -16,8 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestCondition; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRebalanceListener; @@ -28,6 +26,8 @@ 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.test.base.TestCondition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.server.util.MockTime; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/ResetPartitionTimeIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/ResetPartitionTimeIntegrationTest.java index 928a49f78514a..78481d76035b3 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/ResetPartitionTimeIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/ResetPartitionTimeIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.producer.ProducerConfig; @@ -26,6 +25,7 @@ import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValueTimestamp; import org.apache.kafka.streams.StreamsBuilder; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RestoreIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RestoreIntegrationTest.java index 9b8e75d6bf29c..917f5072aa716 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RestoreIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RestoreIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.ListOffsetsResult; @@ -35,6 +34,7 @@ import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringDeserializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Utils; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RocksDBMetricsIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RocksDBMetricsIntegrationTest.java index e1257d2bb3756..89429d192d4da 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RocksDBMetricsIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/RocksDBMetricsIntegrationTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Metric; import org.apache.kafka.common.metrics.Sensor; import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.GroupProtocol; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfJoinUpgradeIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfJoinUpgradeIntegrationTest.java index e442f81de24dc..39af2021c5a49 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfJoinUpgradeIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfJoinUpgradeIntegrationTest.java @@ -17,11 +17,11 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; 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.test.base.TestUtils; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.KeyValueTimestamp; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfManagedOffsetLifecycleIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfManagedOffsetLifecycleIntegrationTest.java index a82bf5f0a5a33..27ae2f6092f68 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfManagedOffsetLifecycleIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfManagedOffsetLifecycleIntegrationTest.java @@ -17,7 +17,6 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.TopicPartition; @@ -25,6 +24,7 @@ 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.test.base.TestUtils; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfManagedOffsetRecoveryIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfManagedOffsetRecoveryIntegrationTest.java index c16bc5432da9b..6b10087f4db15 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfManagedOffsetRecoveryIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SelfManagedOffsetRecoveryIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.TopicPartition; @@ -24,6 +23,7 @@ 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.test.base.TestUtils; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsBuilder; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SessionsStoreWithHeadersTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SessionsStoreWithHeadersTest.java index 6a48339d65026..6a93c7273d940 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SessionsStoreWithHeadersTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SessionsStoreWithHeadersTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; @@ -24,6 +23,7 @@ import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsBuilder; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SlidingWindowedKStreamIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SlidingWindowedKStreamIntegrationTest.java index 623087bdad4aa..7f3a7066f062f 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SlidingWindowedKStreamIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SlidingWindowedKStreamIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Serde; @@ -24,6 +23,7 @@ import org.apache.kafka.common.serialization.Serdes.StringSerde; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValueTimestamp; import org.apache.kafka.streams.StreamsBuilder; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskCreationIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskCreationIntegrationTest.java index 71f0b63e8b5e7..a0f81ef97ed05 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskCreationIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskCreationIntegrationTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.streams.GroupProtocol; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KafkaStreams.State; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSIntegrationTest.java index 690139b7306cb..b69ce16692fbd 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSIntegrationTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.serialization.IntegerDeserializer; import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSMultiRebalanceIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSMultiRebalanceIntegrationTest.java index 24d4a9142786b..78c486a72b7a5 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSMultiRebalanceIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSMultiRebalanceIntegrationTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.IntegerDeserializer; import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StateDirectoryIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StateDirectoryIntegrationTest.java index 0b6ae55dca6b5..cbb6f7374a158 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StateDirectoryIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StateDirectoryIntegrationTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.StreamsBuilder; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StateUpdaterFailureIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StateUpdaterFailureIntegrationTest.java index 60d4a84f73978..b11e98866c6bf 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StateUpdaterFailureIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StateUpdaterFailureIntegrationTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StoreQueryIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StoreQueryIntegrationTest.java index 4bd208957cd52..a765236257a19 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StoreQueryIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StoreQueryIntegrationTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestCondition; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestCondition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.KafkaStreams; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamTableJoinTopologyOptimizationIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamTableJoinTopologyOptimizationIntegrationTest.java index 1fbf6d6a3582f..ada1fe683beb5 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamTableJoinTopologyOptimizationIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamTableJoinTopologyOptimizationIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.TopicDescription; @@ -27,6 +26,7 @@ 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.test.base.TestUtils; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsBuilder; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamsUncaughtExceptionHandlerIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamsUncaughtExceptionHandlerIntegrationTest.java index e65e77d19da58..91fa40785eb47 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamsUncaughtExceptionHandlerIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/StreamsUncaughtExceptionHandlerIntegrationTest.java @@ -17,13 +17,13 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.IntegerDeserializer; import org.apache.kafka.common.serialization.IntegerSerializer; 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.test.base.TestUtils; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.GroupProtocol; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionDurabilityIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionDurabilityIntegrationTest.java index 1c081e3921293..f25920b4e9d71 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionDurabilityIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionDurabilityIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.Deserializer; @@ -26,6 +25,7 @@ import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValueTimestamp; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionIntegrationTest.java index ab099928479a0..63e7c38acd9ea 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SuppressionIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecords; @@ -28,6 +27,7 @@ import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SwallowUnknownTopicErrorIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SwallowUnknownTopicErrorIntegrationTest.java index bd8c3af551502..f524b6d775d82 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SwallowUnknownTopicErrorIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/SwallowUnknownTopicErrorIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; @@ -25,6 +24,7 @@ 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.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KafkaStreams.State; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TaskAssignorIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TaskAssignorIntegrationTest.java index 077252dfceea0..efd6eaf496ba4 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TaskAssignorIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TaskAssignorIntegrationTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerPartitionAssignor; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.clients.consumer.internals.ClassicKafkaConsumer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.StreamsBuilder; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TaskMetadataIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TaskMetadataIntegrationTest.java index f01e1d0ed48f1..3e74867c20cb7 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TaskMetadataIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TaskMetadataIntegrationTest.java @@ -17,10 +17,10 @@ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsBuilder; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimeWindowedKStreamIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimeWindowedKStreamIntegrationTest.java index 72011ef3071f3..91d489f798c4c 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimeWindowedKStreamIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimeWindowedKStreamIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Serde; @@ -24,6 +23,7 @@ import org.apache.kafka.common.serialization.Serdes.StringSerde; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValueTimestamp; import org.apache.kafka.streams.StreamsBuilder; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedKeyValueStoreWithHeadersTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedKeyValueStoreWithHeadersTest.java index a506843977ac6..6fbc4180f540c 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedKeyValueStoreWithHeadersTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedKeyValueStoreWithHeadersTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; @@ -24,6 +23,7 @@ import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsBuilder; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedStoreUpgradeIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedStoreUpgradeIntegrationTest.java index 09993a9be710d..da7ccfc69c2dd 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedStoreUpgradeIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedStoreUpgradeIntegrationTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsBuilder; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedWindowStoreWithHeadersTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedWindowStoreWithHeadersTest.java index 26eeead5e7645..1a3093bf0cce5 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedWindowStoreWithHeadersTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/TimestampedWindowStoreWithHeadersTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; @@ -24,6 +23,7 @@ import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsBuilder; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/VersionedKeyValueStoreIntegrationTest.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/VersionedKeyValueStoreIntegrationTest.java index 7744e283346e0..5338e178a190e 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/VersionedKeyValueStoreIntegrationTest.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/VersionedKeyValueStoreIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.integration; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.config.TopicConfig; @@ -24,6 +23,7 @@ import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.KeyValue; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/utils/EmbeddedKafkaCluster.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/utils/EmbeddedKafkaCluster.java index 711b856d3e032..7f85a3284c3c9 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/utils/EmbeddedKafkaCluster.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/utils/EmbeddedKafkaCluster.java @@ -16,8 +16,6 @@ */ package org.apache.kafka.streams.integration.utils; -import org.apache.kafka.common.test.base.TestCondition; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterConfigOp; @@ -43,6 +41,8 @@ import org.apache.kafka.common.serialization.ByteArraySerializer; import org.apache.kafka.common.test.KafkaClusterTestKit; import org.apache.kafka.common.test.TestKitNodes; +import org.apache.kafka.common.test.base.TestCondition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.coordinator.group.GroupConfig; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; diff --git a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/utils/IntegrationTestUtils.java b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/utils/IntegrationTestUtils.java index c181548d60196..b3601c49ecc1f 100644 --- a/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/utils/IntegrationTestUtils.java +++ b/streams/integration-tests/src/test/java/org/apache/kafka/streams/integration/utils/IntegrationTestUtils.java @@ -16,8 +16,6 @@ */ package org.apache.kafka.streams.integration.utils; -import org.apache.kafka.common.test.base.TestCondition; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.ConsumerGroupDescription; import org.apache.kafka.clients.consumer.Consumer; @@ -35,6 +33,8 @@ import org.apache.kafka.common.errors.GroupIdNotFoundException; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.header.Headers; +import org.apache.kafka.common.test.base.TestCondition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.KafkaStreams; diff --git a/streams/src/test/java/org/apache/kafka/streams/KafkaStreamsTest.java b/streams/src/test/java/org/apache/kafka/streams/KafkaStreamsTest.java index 44ca2a923b6ff..97b1cac94b402 100644 --- a/streams/src/test/java/org/apache/kafka/streams/KafkaStreamsTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/KafkaStreamsTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.ListOffsetsResult.ListOffsetsResultInfo; import org.apache.kafka.clients.admin.MockAdminClient; @@ -33,6 +32,7 @@ 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.test.base.TestUtils; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamSessionWindowAggregateProcessorTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamSessionWindowAggregateProcessorTest.java index ea5235c39a509..0f8f9298334de 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamSessionWindowAggregateProcessorTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamSessionWindowAggregateProcessorTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.streams.kstream.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.LogCaptureAppender.Event; import org.apache.kafka.common.utils.MockTime; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregateTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregateTest.java index 8440821aac1c1..496f11acf4f6b 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregateTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregateTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.streams.kstream.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.MetricName; 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.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.Utils; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableAggregateTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableAggregateTest.java index c37d2cd1eb733..66dd4e42c9687 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableAggregateTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableAggregateTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.kstream.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeader; import org.apache.kafka.common.header.internals.RecordHeaders; @@ -27,6 +26,7 @@ import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.KeyValueTimestamp; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableKTableForeignKeyJoinScenarioTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableKTableForeignKeyJoinScenarioTest.java index 515ecb0b6a85c..a43eb8ff431a4 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableKTableForeignKeyJoinScenarioTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableKTableForeignKeyJoinScenarioTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.streams.kstream.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.IntegerDeserializer; import org.apache.kafka.common.serialization.IntegerSerializer; 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.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.StreamsBuilder; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableTransformValuesTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableTransformValuesTest.java index f3ed232253530..9ab159e1d8859 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableTransformValuesTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableTransformValuesTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.streams.kstream.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.KeyValueTimestamp; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/SuppressScenarioTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/SuppressScenarioTest.java index 1b6603fad5101..e8e11983c9ae6 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/SuppressScenarioTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/SuppressScenarioTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.streams.kstream.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Deserializer; 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.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.KeyValue; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/ForeignTableJoinProcessorSupplierTests.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/ForeignTableJoinProcessorSupplierTests.java index 6dd6ea757e747..6f4667827fe1e 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/ForeignTableJoinProcessorSupplierTests.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/ForeignTableJoinProcessorSupplierTests.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.streams.kstream.internals.foreignkeyjoin; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.kstream.internals.Change; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/SubscriptionReceiveProcessorSupplierTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/SubscriptionReceiveProcessorSupplierTest.java index 857d6c67a6406..fac0182d4c5a6 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/SubscriptionReceiveProcessorSupplierTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/SubscriptionReceiveProcessorSupplierTest.java @@ -17,11 +17,11 @@ package org.apache.kafka.streams.kstream.internals.foreignkeyjoin; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.kstream.internals.Change; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/suppress/KTableSuppressProcessorMetricsTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/suppress/KTableSuppressProcessorMetricsTest.java index efd23251f4431..f770c13961c2c 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/suppress/KTableSuppressProcessorMetricsTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/suppress/KTableSuppressProcessorMetricsTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.streams.kstream.internals.suppress; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.kstream.Suppressed; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImplTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImplTest.java index e0ce52892c8cb..022e816843abc 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImplTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImplTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.processor.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.MockConsumer; @@ -25,6 +24,7 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.serialization.Deserializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.internals.LogContext; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateTaskTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateTaskTest.java index 34f20f6719f61..0f9563a150a4a 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateTaskTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStateTaskTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.processor.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.header.internals.RecordHeaders; @@ -25,6 +24,7 @@ import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.StringDeserializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.errors.ErrorHandlerContext; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStreamThreadTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStreamThreadTest.java index 12b81d03bbdd6..8d7caab1ac4b6 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStreamThreadTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStreamThreadTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.processor.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.InvalidOffsetException; import org.apache.kafka.clients.consumer.MockConsumer; import org.apache.kafka.clients.consumer.internals.AutoOffsetResetStrategy; @@ -28,6 +27,7 @@ import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/NamedTopologyTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/NamedTopologyTest.java index ad17cc8463e5f..9346a33723d13 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/NamedTopologyTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/NamedTopologyTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.processor.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.errors.TopologyException; import org.apache.kafka.streams.errors.UnknownStateStoreException; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorStateManagerTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorStateManagerTest.java index f749d4a6b5fa4..52efcea77f684 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorStateManagerTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorStateManagerTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.streams.processor.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Utils; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorTopologyTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorTopologyTest.java index 56bcf71a82c9e..37865917b9849 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorTopologyTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorTopologyTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.processor.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.Headers; @@ -28,6 +27,7 @@ import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.TestInputTopic; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StandbyTaskTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StandbyTaskTest.java index 7897d0cdf64d0..b16b10bd1ed10 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StandbyTaskTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StandbyTaskTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.processor.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.Node; import org.apache.kafka.common.PartitionInfo; @@ -28,6 +27,7 @@ import org.apache.kafka.common.metrics.Sensor; import org.apache.kafka.common.metrics.stats.CumulativeSum; import org.apache.kafka.common.serialization.IntegerSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.LogContext; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateDirectoryTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateDirectoryTest.java index 9b5692c57bbdf..b986768278a25 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateDirectoryTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateDirectoryTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.processor.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Utils; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamTaskTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamTaskTest.java index 3609bb06a60e8..7386a90dce530 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamTaskTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamTaskTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.processor.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.InvalidOffsetException; @@ -42,6 +41,7 @@ import org.apache.kafka.common.serialization.IntegerDeserializer; import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.Serializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Utils; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamThreadTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamThreadTest.java index 0713167cea2dd..c82434f244199 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamThreadTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamThreadTest.java @@ -16,8 +16,6 @@ */ package org.apache.kafka.streams.processor.internals; -import org.apache.kafka.common.test.base.TestCondition; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.MockAdminClient; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerGroupMetadata; @@ -58,6 +56,8 @@ import org.apache.kafka.common.record.TimestampType; import org.apache.kafka.common.requests.StreamsGroupHeartbeatResponse; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestCondition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutorTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutorTest.java index 42094251a5acf..9ddebf1d8a5cd 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutorTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutorTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.streams.processor.internals.tasks; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.KafkaFuture; import org.apache.kafka.common.errors.TimeoutException; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.streams.errors.StreamsException; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/KeyValueStoreTestDriver.java b/streams/src/test/java/org/apache/kafka/streams/state/KeyValueStoreTestDriver.java index eb0a50728eb93..4287b86e4eb83 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/KeyValueStoreTestDriver.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/KeyValueStoreTestDriver.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.state; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.producer.MockProducer; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; @@ -24,6 +23,7 @@ import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.Serializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractDualSchemaRocksDBSegmentedBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractDualSchemaRocksDBSegmentedBytesStoreTest.java index 40323c397db3d..d2ccacb33851e 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractDualSchemaRocksDBSegmentedBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractDualSchemaRocksDBSegmentedBytesStoreTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; @@ -28,6 +27,7 @@ import org.apache.kafka.common.record.internal.RecordBatch; import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractRocksDBSegmentedBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractRocksDBSegmentedBytesStoreTest.java index 0bfdaa684adb0..ca0c0ee1fdbb5 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractRocksDBSegmentedBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractRocksDBSegmentedBytesStoreTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; @@ -32,6 +31,7 @@ import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSegmentsTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSegmentsTest.java index f82de6b01f2a5..a21c1683fad6f 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSegmentsTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSegmentsTest.java @@ -17,12 +17,12 @@ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.errors.TaskCorruptedException; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSessionBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSessionBytesStoreTest.java index ae9d2b905b33d..f83e08a226e41 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSessionBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractSessionBytesStoreTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; @@ -26,6 +25,7 @@ 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.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.Time; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractWindowBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractWindowBytesStoreTest.java index 23801dc279217..9daffdf29c41b 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractWindowBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractWindowBytesStoreTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; @@ -24,6 +23,7 @@ import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.Time; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemoryKeyValueStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemoryKeyValueStoreTest.java index 280f0660b8b3e..81b47113ce1c1 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemoryKeyValueStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemoryKeyValueStoreTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemorySessionStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemorySessionStoreTest.java index 51dfc0ceb96fa..5f1e80b0ba60b 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemorySessionStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemorySessionStoreTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.StringDeserializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.internals.LogContext; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentSessionStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentSessionStoreTest.java index 58bcf55222447..35035b7e0c4f6 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentSessionStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentSessionStoreTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.StringDeserializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.internals.LogContext; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentWindowStoreTest.java index c913631974aae..c26779c5cab58 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentWindowStoreTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; @@ -24,6 +23,7 @@ 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.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.internals.LogContext; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStoreTest.java index d5841503a67c1..ec752fc1770a7 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStoreTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreTest.java index 06c5c925c7857..2672db5713d80 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreWithHeadersTest.java index fb2edd5e8b32f..d9e977b081bb7 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreWithHeadersTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreWithHeadersTest.java index 0ee2d51fdaab5..7fa01238cc783 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreWithHeadersTest.java @@ -17,13 +17,13 @@ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeader; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.ByteArraySerializer; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingVersionedKeyValueBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingVersionedKeyValueBytesStoreTest.java index 60c1b151b188f..03ce315829490 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingVersionedKeyValueBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingVersionedKeyValueBytesStoreTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryWindowStoreTest.java index fbabd5c8f7f17..7252f54fbf6bb 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryWindowStoreTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/KeyValueSegmentTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/KeyValueSegmentTest.java index 421c5ef5890b4..b39feb25e2364 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/KeyValueSegmentTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/KeyValueSegmentTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.metrics.Metrics; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.processor.TaskId; import org.apache.kafka.streams.processor.internals.metrics.StreamsMetricsImpl; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/LegacyCheckpointingStateStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/LegacyCheckpointingStateStoreTest.java index d5c196c70f653..8e30b6655b2ea 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/LegacyCheckpointingStateStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/LegacyCheckpointingStateStoreTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Utils; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ListValueStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ListValueStoreTest.java index 64c562777662d..97ba6cc799723 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ListValueStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ListValueStoreTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/LogicalKeyValueSegmentTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/LogicalKeyValueSegmentTest.java index cb48dd42e20e2..40056b4736bfd 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/LogicalKeyValueSegmentTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/LogicalKeyValueSegmentTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.KeyValue; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStoreTest.java index 1e7bcbdb349c7..3edb9ff05977a 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStoreTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.Headers; @@ -32,6 +31,7 @@ import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredSessionStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredSessionStoreTest.java index aaefc2f386f17..11af67796d1ee 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredSessionStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredSessionStoreTest.java @@ -17,7 +17,6 @@ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.Headers; @@ -32,6 +31,7 @@ import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.Serializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreTest.java index 354d193c24c52..b63f0e44294d2 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.MetricConfig; import org.apache.kafka.common.metrics.Metrics; @@ -25,6 +24,7 @@ import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.Serializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreWithHeadersTest.java index 3c05dd2111c01..b29a279b9aa2b 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreWithHeadersTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.MetricConfig; import org.apache.kafka.common.metrics.Metrics; @@ -26,6 +25,7 @@ import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredWindowStoreTest.java index d066d159b8400..cd8a69fc4bed5 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredWindowStoreTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.Headers; @@ -32,6 +31,7 @@ import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.Serializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/OffsetCheckpointTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/OffsetCheckpointTest.java index 2728f23883bf1..6dd8ea7e2e95a 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/OffsetCheckpointTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/OffsetCheckpointTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.Test; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/PlainToHeadersWindowStoreAdapterTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/PlainToHeadersWindowStoreAdapterTest.java index d0abbfdac3973..217efcd66a804 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/PlainToHeadersWindowStoreAdapterTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/PlainToHeadersWindowStoreAdapterTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBSessionStoreWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBSessionStoreWithHeadersTest.java index 65cdbbc004c29..4182d02e0ac14 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBSessionStoreWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBSessionStoreWithHeadersTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.kstream.Windowed; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBStoreTest.java index 08b897399f427..c4c9c9af7fb0f 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBStoreTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; @@ -37,6 +36,7 @@ import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.common.serialization.UUIDSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBufferTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBufferTest.java index 57e795c403677..3b87af749c063 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBufferTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBufferTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.metrics.Sensor; import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.processor.TaskId; import org.apache.kafka.streams.processor.api.Record; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBytesStoreTest.java index cae8e1aeed15c..1c9d7e711d1c5 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBytesStoreTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.processor.internals.MockStreamsMetrics; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedSessionStoreWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedSessionStoreWithHeadersTest.java index ccfb49a497b1b..e2deb189f5084 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedSessionStoreWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedSessionStoreWithHeadersTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.kstream.Windowed; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedWindowStoreWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedWindowStoreWithHeadersTest.java index 04a46fc6822e8..667321df04ceb 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedWindowStoreWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedWindowStoreWithHeadersTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.query.FailureReason; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimestampedWindowStoreWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimestampedWindowStoreWithHeadersTest.java index 90d6c0bc353ec..14b845b6f0e25 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimestampedWindowStoreWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimestampedWindowStoreWithHeadersTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.query.FailureReason; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBVersionedStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBVersionedStoreTest.java index 4604a5dd25eda..1d413624e68e8 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBVersionedStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBVersionedStoreTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; @@ -27,6 +26,7 @@ import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.query.Position; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/SegmentIteratorTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/SegmentIteratorTest.java index 95be8bb3a609b..54e8bd1cec04d 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/SegmentIteratorTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/SegmentIteratorTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.internals.LogContext; import org.apache.kafka.streams.KeyValue; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionSegmentWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionSegmentWithHeadersTest.java index 3bc7b4b404247..942d6753d903c 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionSegmentWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionSegmentWithHeadersTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.metrics.Metrics; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.processor.TaskId; import org.apache.kafka.streams.processor.internals.metrics.StreamsMetricsImpl; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionStoreFetchTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionStoreFetchTest.java index 8ab6e75e2085b..58c406a083b66 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionStoreFetchTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionStoreFetchTest.java @@ -17,9 +17,9 @@ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.KeyValue; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/StreamThreadStateStoreProviderTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/StreamThreadStateStoreProviderTest.java index 82e5611cf9a0a..984ba6037f7a8 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/StreamThreadStateStoreProviderTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/StreamThreadStateStoreProviderTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.MockAdminClient; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -28,6 +27,7 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedCachingPersistentWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedCachingPersistentWindowStoreTest.java index 84d4775225f44..ea1541b81e0f0 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedCachingPersistentWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedCachingPersistentWindowStoreTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; @@ -24,6 +23,7 @@ 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.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.internals.LogContext; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedKeyValueBufferTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedKeyValueBufferTest.java index 2c7d0475fbd33..cf93a595283d6 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedKeyValueBufferTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedKeyValueBufferTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.header.Header; @@ -26,6 +25,7 @@ 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.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedSessionStoreUpgradeTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedSessionStoreUpgradeTest.java index 67eaaaca8b4c7..ba6e2e1bac301 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedSessionStoreUpgradeTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedSessionStoreUpgradeTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.internals.ByteUtils; import org.apache.kafka.streams.DslStoreFormat; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreTest.java index 7270c12a56cf9..fb5a0fba18888 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.metrics.Metrics; @@ -24,6 +23,7 @@ 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.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.internals.LogContext; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreUpgradeTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreUpgradeTest.java index cc85778629ee5..a281591097c16 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreUpgradeTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreUpgradeTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.internals.ByteUtils; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedKeyValueStoreBuilderWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedKeyValueStoreBuilderWithHeadersTest.java index 37035b8b2633a..9df39f92d85c4 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedKeyValueStoreBuilderWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedKeyValueStoreBuilderWithHeadersTest.java @@ -17,10 +17,10 @@ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentTest.java index 67edea869ccbb..f7adaeaabbbc8 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.metrics.Metrics; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.processor.TaskId; import org.apache.kafka.streams.processor.internals.metrics.StreamsMetricsImpl; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentWithHeadersTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentWithHeadersTest.java index e951038769ee2..b2db1cad22694 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentWithHeadersTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentWithHeadersTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.metrics.Metrics; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.streams.processor.TaskId; import org.apache.kafka.streams.processor.internals.metrics.StreamsMetricsImpl; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedToHeadersWindowStoreAdapterTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedToHeadersWindowStoreAdapterTest.java index b48011cc3a39e..cb9dfbbf377bf 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedToHeadersWindowStoreAdapterTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedToHeadersWindowStoreAdapterTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedWindowStoreWithHeadersSerializerSideEffectTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedWindowStoreWithHeadersSerializerSideEffectTest.java index 986e2359f6703..ae1d5f4f2ffcb 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedWindowStoreWithHeadersSerializerSideEffectTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedWindowStoreWithHeadersSerializerSideEffectTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.Serializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.streams.StreamsBuilder; import org.apache.kafka.streams.TestInputTopic; import org.apache.kafka.streams.TestOutputTopic; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/WindowStoreFetchTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/WindowStoreFetchTest.java index 549e7abd7d87c..665a173ff1bd6 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/WindowStoreFetchTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/WindowStoreFetchTest.java @@ -17,9 +17,9 @@ package org.apache.kafka.streams.state.internals; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.KeyValue; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBBlockCacheMetricsTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBBlockCacheMetricsTest.java index 9ed14f64dab4e..497db9b148574 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBBlockCacheMetricsTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBBlockCacheMetricsTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.streams.state.internals.metrics; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.metrics.KafkaMetric; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.processor.StateStoreContext; import org.apache.kafka.streams.processor.TaskId; diff --git a/streams/src/test/java/org/apache/kafka/streams/tests/RelationalSmokeTestTest.java b/streams/src/test/java/org/apache/kafka/streams/tests/RelationalSmokeTestTest.java index fec0709a1a0f9..bad19de9f3970 100644 --- a/streams/src/test/java/org/apache/kafka/streams/tests/RelationalSmokeTestTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/tests/RelationalSmokeTestTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.streams.tests; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.IntegerDeserializer; import org.apache.kafka.common.serialization.IntegerSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.TestInputTopic; import org.apache.kafka.streams.TestOutputTopic; diff --git a/streams/src/test/java/org/apache/kafka/streams/tests/SmokeTestClient.java b/streams/src/test/java/org/apache/kafka/streams/tests/SmokeTestClient.java index 0fa06cded97b2..a9701186494b2 100644 --- a/streams/src/test/java/org/apache/kafka/streams/tests/SmokeTestClient.java +++ b/streams/src/test/java/org/apache/kafka/streams/tests/SmokeTestClient.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.tests; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.common.utils.internals.KafkaThread; import org.apache.kafka.streams.KafkaStreams; diff --git a/streams/src/test/java/org/apache/kafka/test/StreamsTestUtils.java b/streams/src/test/java/org/apache/kafka/test/StreamsTestUtils.java index 443842e6a49d7..b9f1f311ad540 100644 --- a/streams/src/test/java/org/apache/kafka/test/StreamsTestUtils.java +++ b/streams/src/test/java/org/apache/kafka/test/StreamsTestUtils.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.test; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.serialization.Serde; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Bytes; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.StreamsConfig; diff --git a/streams/test-utils/src/test/java/org/apache/kafka/streams/TopologyTestDriverTest.java b/streams/test-utils/src/test/java/org/apache/kafka/streams/TopologyTestDriverTest.java index 7a654a71c01c3..73a500449ab77 100644 --- a/streams/test-utils/src/test/java/org/apache/kafka/streams/TopologyTestDriverTest.java +++ b/streams/test-utils/src/test/java/org/apache/kafka/streams/TopologyTestDriverTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.streams; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.Headers; @@ -35,6 +34,7 @@ import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import org.apache.kafka.streams.errors.TopologyException; import org.apache.kafka.streams.kstream.Consumed; diff --git a/streams/test-utils/src/test/java/org/apache/kafka/streams/test/MockProcessorContextStateStoreTest.java b/streams/test-utils/src/test/java/org/apache/kafka/streams/test/MockProcessorContextStateStoreTest.java index 13fc871c0ab09..3878db6dffcec 100644 --- a/streams/test-utils/src/test/java/org/apache/kafka/streams/test/MockProcessorContextStateStoreTest.java +++ b/streams/test-utils/src/test/java/org/apache/kafka/streams/test/MockProcessorContextStateStoreTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.test; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.processor.StateStore; diff --git a/streams/test-utils/src/test/java/org/apache/kafka/streams/test/wordcount/WindowedWordCountProcessorTest.java b/streams/test-utils/src/test/java/org/apache/kafka/streams/test/wordcount/WindowedWordCountProcessorTest.java index 29437bce6b643..49656944641cf 100644 --- a/streams/test-utils/src/test/java/org/apache/kafka/streams/test/wordcount/WindowedWordCountProcessorTest.java +++ b/streams/test-utils/src/test/java/org/apache/kafka/streams/test/wordcount/WindowedWordCountProcessorTest.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.streams.test.wordcount; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.processor.StateStore; import org.apache.kafka.streams.processor.TaskId; diff --git a/tools/src/test/java/org/apache/kafka/tools/AbstractResetIntegrationTest.java b/tools/src/test/java/org/apache/kafka/tools/AbstractResetIntegrationTest.java index 4042f8a8b13ec..f4d4a07655f4c 100644 --- a/tools/src/test/java/org/apache/kafka/tools/AbstractResetIntegrationTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/AbstractResetIntegrationTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.tools; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -30,6 +29,7 @@ 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.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.streams.KafkaStreams; diff --git a/tools/src/test/java/org/apache/kafka/tools/AclCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/AclCommandTest.java index ec2eda70d1397..e7b035600651e 100644 --- a/tools/src/test/java/org/apache/kafka/tools/AclCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/AclCommandTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.tools; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.acl.AccessControlEntry; import org.apache.kafka.common.acl.AclBinding; import org.apache.kafka.common.acl.AclBindingFilter; @@ -32,6 +31,7 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.LogCaptureAppender; import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.common.utils.internals.Exit; diff --git a/tools/src/test/java/org/apache/kafka/tools/ClusterToolTest.java b/tools/src/test/java/org/apache/kafka/tools/ClusterToolTest.java index 1f94c299e6532..93a200a863d95 100644 --- a/tools/src/test/java/org/apache/kafka/tools/ClusterToolTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/ClusterToolTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.tools; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.MockAdminClient; import org.apache.kafka.common.test.ClusterInstance; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import net.sourceforge.argparse4j.inf.ArgumentParserException; diff --git a/tools/src/test/java/org/apache/kafka/tools/ConfigCommandIntegrationTest.java b/tools/src/test/java/org/apache/kafka/tools/ConfigCommandIntegrationTest.java index 9b88bfe433ce8..fa6f6f8786a90 100644 --- a/tools/src/test/java/org/apache/kafka/tools/ConfigCommandIntegrationTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/ConfigCommandIntegrationTest.java @@ -18,7 +18,6 @@ import kafka.server.KafkaBroker; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientTestUtils; import org.apache.kafka.clients.admin.AlterConfigsOptions; @@ -33,6 +32,7 @@ import org.apache.kafka.common.test.api.ClusterConfigProperty; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.internals.Exit; import org.apache.kafka.server.common.MetadataVersion; diff --git a/tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java index 21ab799ca65a3..d8b44e06979c2 100644 --- a/tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.tools; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterClientQuotasOptions; import org.apache.kafka.clients.admin.AlterClientQuotasResult; @@ -45,6 +44,7 @@ import org.apache.kafka.common.quota.ClientQuotaEntity; import org.apache.kafka.common.quota.ClientQuotaFilter; import org.apache.kafka.common.quota.ClientQuotaFilterComponent; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.internals.Exit; import org.apache.kafka.server.config.ConfigType; diff --git a/tools/src/test/java/org/apache/kafka/tools/GetOffsetShellTest.java b/tools/src/test/java/org/apache/kafka/tools/GetOffsetShellTest.java index 9537569fb3542..c29130d0e0e14 100644 --- a/tools/src/test/java/org/apache/kafka/tools/GetOffsetShellTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/GetOffsetShellTest.java @@ -17,7 +17,6 @@ package org.apache.kafka.tools; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewTopic; @@ -35,6 +34,7 @@ import org.apache.kafka.common.test.api.ClusterTemplate; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.common.utils.internals.Exit; import org.apache.kafka.server.config.ServerLogConfigs; diff --git a/tools/src/test/java/org/apache/kafka/tools/GroupsCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/GroupsCommandTest.java index ff159eea21ec3..0db6163ae44c6 100644 --- a/tools/src/test/java/org/apache/kafka/tools/GroupsCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/GroupsCommandTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.tools; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.AdminClientTestUtils; @@ -37,6 +36,7 @@ import org.apache.kafka.common.test.ClusterInstance; import org.apache.kafka.common.test.api.ClusterConfigProperty; import org.apache.kafka.common.test.api.ClusterTest; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.internals.Exit; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; import org.apache.kafka.streams.KafkaStreams; diff --git a/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java index 1cb6f8fa0f51a..b90d3a463c007 100644 --- a/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.tools; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.CreateTopicsResult; @@ -29,6 +28,7 @@ import org.apache.kafka.common.test.api.ClusterConfigProperty; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.internals.Exit; import org.mockito.ArgumentCaptor; diff --git a/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java index 15cebc65aa1d3..953fc3a4f3f75 100644 --- a/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.tools; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.common.test.ClusterInstance; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTests; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.Test; diff --git a/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandUnitTest.java b/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandUnitTest.java index fcb93e3af5411..cab7c09427aaa 100644 --- a/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandUnitTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandUnitTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.tools; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.RaftVoterEndpoint; import org.apache.kafka.common.Uuid; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.metadata.properties.MetaProperties; import org.apache.kafka.metadata.properties.MetaPropertiesEnsemble; diff --git a/tools/src/test/java/org/apache/kafka/tools/ResetIntegrationTest.java b/tools/src/test/java/org/apache/kafka/tools/ResetIntegrationTest.java index 6031424ddee17..65bc712a99e98 100644 --- a/tools/src/test/java/org/apache/kafka/tools/ResetIntegrationTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/ResetIntegrationTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.tools; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.GroupProtocol; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.internals.Exit; import org.apache.kafka.network.SocketServerConfigs; import org.apache.kafka.streams.KafkaStreams; diff --git a/tools/src/test/java/org/apache/kafka/tools/ResetIntegrationWithSslTest.java b/tools/src/test/java/org/apache/kafka/tools/ResetIntegrationWithSslTest.java index 1a77723b8c496..8bbde16426f55 100644 --- a/tools/src/test/java/org/apache/kafka/tools/ResetIntegrationWithSslTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/ResetIntegrationWithSslTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.tools; +import org.apache.kafka.common.network.ConnectionMode; import org.apache.kafka.common.test.base.TestSslUtils; import org.apache.kafka.common.test.base.TestUtils; -import org.apache.kafka.common.network.ConnectionMode; import org.apache.kafka.network.SocketServerConfigs; import org.apache.kafka.streams.integration.utils.EmbeddedKafkaCluster; diff --git a/tools/src/test/java/org/apache/kafka/tools/TopicCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/TopicCommandTest.java index b8c338367ec6e..d8915e4ab13eb 100644 --- a/tools/src/test/java/org/apache/kafka/tools/TopicCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/TopicCommandTest.java @@ -17,7 +17,6 @@ package org.apache.kafka.tools; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientTestUtils; import org.apache.kafka.clients.admin.Config; @@ -56,6 +55,7 @@ import org.apache.kafka.common.test.api.ClusterTemplate; import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.internals.Exit; import org.apache.kafka.metadata.LeaderAndIsr; import org.apache.kafka.storage.internals.log.LogConfig; diff --git a/tools/src/test/java/org/apache/kafka/tools/UserScramCredentialsCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/UserScramCredentialsCommandTest.java index 97156290dc9cb..70a540bf80ceb 100644 --- a/tools/src/test/java/org/apache/kafka/tools/UserScramCredentialsCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/UserScramCredentialsCommandTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.tools; -import org.apache.kafka.common.test.base.NoRetryException; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.test.ClusterInstance; import org.apache.kafka.common.test.api.ClusterTest; +import org.apache.kafka.common.test.base.NoRetryException; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.internals.Exit; import java.util.ArrayList; diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/DeleteConsumerGroupsTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/DeleteConsumerGroupsTest.java index 6ceb65470dc02..697618788c171 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/DeleteConsumerGroupsTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/DeleteConsumerGroupsTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.tools.consumer.group; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.GroupProtocol; import org.apache.kafka.clients.consumer.KafkaConsumer; @@ -31,6 +30,7 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.tools.ToolsTestUtils; import org.junit.jupiter.api.Test; diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/DescribeConsumerGroupTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/DescribeConsumerGroupTest.java index bf49c5dcdea6e..eaf6a6adde890 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/DescribeConsumerGroupTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/DescribeConsumerGroupTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.tools.consumer.group; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; @@ -41,6 +40,7 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.internals.AppInfoParser; import org.apache.kafka.common.utils.internals.Exit; import org.apache.kafka.tools.ToolsTestUtils; diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ListConsumerGroupTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ListConsumerGroupTest.java index 1dde9105e0e17..da39778532d6c 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ListConsumerGroupTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ListConsumerGroupTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.tools.consumer.group; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; @@ -35,6 +34,7 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.tools.ToolsTestUtils; import org.junit.jupiter.api.Assertions; diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ResetConsumerGroupOffsetTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ResetConsumerGroupOffsetTest.java index e664d5420e36b..8eacccc07569b 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ResetConsumerGroupOffsetTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ResetConsumerGroupOffsetTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.tools.consumer.group; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.consumer.GroupProtocol; @@ -37,6 +36,7 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import java.io.BufferedWriter; import java.io.File; @@ -62,7 +62,6 @@ import static java.time.LocalDateTime.now; import static java.util.stream.Collectors.toMap; -import static org.apache.kafka.common.test.base.TestUtils.DEFAULT_MAX_WAIT_MS; import static org.apache.kafka.clients.CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG; import static org.apache.kafka.clients.admin.AdminClientConfig.RETRIES_CONFIG; import static org.apache.kafka.clients.consumer.ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG; @@ -74,6 +73,7 @@ import static org.apache.kafka.clients.producer.ProducerConfig.ACKS_CONFIG; import static org.apache.kafka.clients.producer.ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG; import static org.apache.kafka.clients.producer.ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG; +import static org.apache.kafka.common.test.base.TestUtils.DEFAULT_MAX_WAIT_MS; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.CONSUMER_GROUP_HEARTBEAT_INTERVAL_MS_CONFIG; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.CONSUMER_GROUP_MIN_HEARTBEAT_INTERVAL_MS_CONFIG; import static org.apache.kafka.coordinator.group.GroupCoordinatorConfig.GROUP_INITIAL_REBALANCE_DELAY_MS_CONFIG; diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/SaslClientsWithInvalidCredentialsTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/SaslClientsWithInvalidCredentialsTest.java index 3da2062206707..eb84d1329226a 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/SaslClientsWithInvalidCredentialsTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/SaslClientsWithInvalidCredentialsTest.java @@ -19,7 +19,6 @@ import kafka.api.AbstractSaslTest; import kafka.security.JaasTestUtils; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.consumer.Consumer; @@ -27,6 +26,7 @@ import org.apache.kafka.common.errors.SaslAuthenticationException; import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.common.serialization.ByteArrayDeserializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.metadata.storage.Formatter; import org.junit.jupiter.api.AfterEach; diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandTest.java index 6a8516e71b534..974beb0ac9b81 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.tools.consumer.group; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientTestUtils; import org.apache.kafka.clients.admin.AlterShareGroupOffsetsOptions; @@ -53,6 +52,7 @@ import org.apache.kafka.common.errors.GroupIdNotFoundException; import org.apache.kafka.common.internals.KafkaFutureImpl; import org.apache.kafka.common.protocol.Errors; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.internals.Exit; import org.apache.kafka.tools.ToolsTestUtils; import org.apache.kafka.tools.consumer.group.ShareGroupCommand.ShareGroupService; diff --git a/tools/src/test/java/org/apache/kafka/tools/reassign/ReassignPartitionsCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/reassign/ReassignPartitionsCommandTest.java index 21584f95fb075..1d4219fe9a7c2 100644 --- a/tools/src/test/java/org/apache/kafka/tools/reassign/ReassignPartitionsCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/reassign/ReassignPartitionsCommandTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.tools.reassign; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; @@ -46,6 +45,7 @@ import org.apache.kafka.common.test.api.ClusterTest; import org.apache.kafka.common.test.api.ClusterTestDefaults; import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Time; import org.apache.kafka.server.config.QuotaConfig; import org.apache.kafka.tools.TerseException; diff --git a/tools/src/test/java/org/apache/kafka/tools/streams/DeleteStreamsGroupOffsetTest.java b/tools/src/test/java/org/apache/kafka/tools/streams/DeleteStreamsGroupOffsetTest.java index ad2ac43e3c8d7..7ba2ab5ded03d 100644 --- a/tools/src/test/java/org/apache/kafka/tools/streams/DeleteStreamsGroupOffsetTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/streams/DeleteStreamsGroupOffsetTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.tools.streams; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.GroupListing; import org.apache.kafka.clients.admin.ListGroupsOptions; @@ -27,6 +26,7 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.internals.Exit; import org.apache.kafka.streams.CloseOptions; import org.apache.kafka.streams.GroupProtocol; diff --git a/tools/src/test/java/org/apache/kafka/tools/streams/DeleteStreamsGroupTest.java b/tools/src/test/java/org/apache/kafka/tools/streams/DeleteStreamsGroupTest.java index fbd007cfb3f2b..99f18eb9059fd 100644 --- a/tools/src/test/java/org/apache/kafka/tools/streams/DeleteStreamsGroupTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/streams/DeleteStreamsGroupTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.tools.streams; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.FeatureUpdate; @@ -29,6 +28,7 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.internals.Exit; import org.apache.kafka.streams.CloseOptions; diff --git a/tools/src/test/java/org/apache/kafka/tools/streams/DescribeStreamsGroupTest.java b/tools/src/test/java/org/apache/kafka/tools/streams/DescribeStreamsGroupTest.java index 5346137496150..582aad8694d05 100644 --- a/tools/src/test/java/org/apache/kafka/tools/streams/DescribeStreamsGroupTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/streams/DescribeStreamsGroupTest.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.tools.streams; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.internals.Exit; import org.apache.kafka.streams.GroupProtocol; import org.apache.kafka.streams.KafkaStreams; diff --git a/tools/src/test/java/org/apache/kafka/tools/streams/ListStreamsGroupTest.java b/tools/src/test/java/org/apache/kafka/tools/streams/ListStreamsGroupTest.java index 37261f687c523..c30be5650cd3b 100644 --- a/tools/src/test/java/org/apache/kafka/tools/streams/ListStreamsGroupTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/streams/ListStreamsGroupTest.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.tools.streams; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.GroupListing; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.GroupState; import org.apache.kafka.common.GroupType; import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.streams.GroupProtocol; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.StreamsBuilder; diff --git a/tools/src/test/java/org/apache/kafka/tools/streams/ResetStreamsGroupOffsetTest.java b/tools/src/test/java/org/apache/kafka/tools/streams/ResetStreamsGroupOffsetTest.java index e74481b0af753..dd0d9609714f5 100644 --- a/tools/src/test/java/org/apache/kafka/tools/streams/ResetStreamsGroupOffsetTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/streams/ResetStreamsGroupOffsetTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.tools.streams; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.GroupListing; @@ -27,6 +26,7 @@ import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.serialization.StringSerializer; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.internals.Exit; import org.apache.kafka.streams.GroupProtocol; import org.apache.kafka.streams.KafkaStreams; diff --git a/tools/src/test/java/org/apache/kafka/tools/streams/StreamsGroupCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/streams/StreamsGroupCommandTest.java index 2f5edcdddeabf..9a50ac529ce41 100644 --- a/tools/src/test/java/org/apache/kafka/tools/streams/StreamsGroupCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/streams/StreamsGroupCommandTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.tools.streams; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.DeleteStreamsGroupsOptions; import org.apache.kafka.clients.admin.DeleteStreamsGroupsResult; @@ -48,6 +47,7 @@ import org.apache.kafka.common.TopicPartitionInfo; import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; import org.apache.kafka.common.internals.KafkaFutureImpl; +import org.apache.kafka.common.test.base.TestUtils; import org.junit.jupiter.api.Test; import org.mockito.MockedStatic; diff --git a/transaction-coordinator/src/test/java/org/apache/kafka/coordinator/transaction/ProducerIdManagerTest.java b/transaction-coordinator/src/test/java/org/apache/kafka/coordinator/transaction/ProducerIdManagerTest.java index 9e573dfa0d4a9..cf158c1683e34 100644 --- a/transaction-coordinator/src/test/java/org/apache/kafka/coordinator/transaction/ProducerIdManagerTest.java +++ b/transaction-coordinator/src/test/java/org/apache/kafka/coordinator/transaction/ProducerIdManagerTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.coordinator.transaction; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.clients.ClientResponse; import org.apache.kafka.common.errors.AuthenticationException; import org.apache.kafka.common.errors.CoordinatorLoadInProgressException; @@ -24,6 +23,7 @@ import org.apache.kafka.common.message.AllocateProducerIdsResponseData; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.AllocateProducerIdsResponse; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.server.common.NodeToControllerChannelManager; diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/workload/ExternalCommandWorkerTest.java b/trogdor/src/test/java/org/apache/kafka/trogdor/workload/ExternalCommandWorkerTest.java index da9e3039f81b2..60a01ef939dc0 100644 --- a/trogdor/src/test/java/org/apache/kafka/trogdor/workload/ExternalCommandWorkerTest.java +++ b/trogdor/src/test/java/org/apache/kafka/trogdor/workload/ExternalCommandWorkerTest.java @@ -17,8 +17,8 @@ package org.apache.kafka.trogdor.workload; -import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.internals.KafkaFutureImpl; +import org.apache.kafka.common.test.base.TestUtils; import org.apache.kafka.common.utils.internals.OperatingSystem; import org.apache.kafka.trogdor.task.AgentWorkerStatusTracker; import org.apache.kafka.trogdor.task.WorkerStatusTracker; From 66adc6a111075e7cf93169f1157288a1cc06f291 Mon Sep 17 00:00:00 2001 From: Igor Soarez Date: Sun, 3 May 2026 16:49:17 +0100 Subject: [PATCH 09/10] fix broken tests --- .../java/org/apache/kafka/common/test/base/TestUtils.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/TestUtils.java b/test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/TestUtils.java index eb6812587d784..2bd9fe8b208da 100644 --- a/test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/TestUtils.java +++ b/test-common/test-common-base/src/main/java/org/apache/kafka/common/test/base/TestUtils.java @@ -525,12 +525,15 @@ public static void isValidClusterId(String clusterId) { assertEquals(16, decodedUuid.length); //Check if it can be converted back to a UUID. + UUID uuid = null; try { ByteBuffer uuidBuffer = ByteBuffer.wrap(decodedUuid); - assertEquals(originalClusterId, new UUID(uuidBuffer.getLong(), uuidBuffer.getLong()).toString()); + uuid = new UUID(uuidBuffer.getLong(), uuidBuffer.getLong()); } catch (Exception e) { fail(clusterId + " cannot be converted back to UUID."); + return; } + assertNotNull(uuid); } /** From 2bbdd9eeb65ddd0ff5646088cd2919173182e5a4 Mon Sep 17 00:00:00 2001 From: Igor Soarez Date: Mon, 4 May 2026 00:41:14 +0100 Subject: [PATCH 10/10] fix circular dependency --- build.gradle | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2d01926fc1124..d5c503f1b50d9 100644 --- a/build.gradle +++ b/build.gradle @@ -1588,7 +1588,11 @@ project(':test-common:test-common-base') { } dependencies { - implementation project(':clients') + // `client` tests depend on this module so `implementation project(':clients')` would cause a circular dependency + // and trigger `createVersionFile`, breaking AppInfoParserTest's expectations. + // The tradeoff is that transitive dependencies from `clients` are dropped. + implementation project(':clients').sourceSets.main.output + implementation libs.bcpkix implementation libs.junitJupiter implementation testLog4j2Libs