[KSQL-12787] Fix master build (#10596)

* Fix build * Use DatatypeConverter from jakarta * Use assertEquals instead * Fix assert statement * Fix asser equals * Fix tests * Fixes a test * Revert test updates * Use set default for KafkaMetric * Encode the test url * Revert url encoding * Update dependency version * Fix version * Remove kafka-log4j-appender dependency * Fix typos
confluentinc · Dec 23, 2024 · d021108 · d021108
1 parent 85526be
commit d021108
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 22 deletions.
diff --git a/ksqldb-common/pom.xml b/ksqldb-common/pom.xml
@@ -29,6 +29,12 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>4.0.2</version>
+        </dependency>
+
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>

diff --git a/ksqldb-common/src/main/java/io/confluent/ksql/util/BytesUtils.java b/ksqldb-common/src/main/java/io/confluent/ksql/util/BytesUtils.java
@@ -16,6 +16,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.vertx.core.buffer.Buffer;
+import jakarta.xml.bind.DatatypeConverter;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.charset.StandardCharsets;
@@ -25,7 +26,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
-import javax.xml.bind.DatatypeConverter;
 
 public final class BytesUtils {
   public enum Encoding {

diff --git a/ksqldb-engine/src/main/java/io/confluent/ksql/internal/ThroughputMetricsReporter.java b/ksqldb-engine/src/main/java/io/confluent/ksql/internal/ThroughputMetricsReporter.java
@@ -21,7 +21,6 @@
 import static io.confluent.ksql.internal.MetricsTagUtils.SHARED_RUNTIME_THREAD_PATTERN;
 import static io.confluent.ksql.internal.MetricsTagUtils.UNSHARED_RUNTIME_THREAD_PATTERN;
 import static java.util.Objects.requireNonNull;
-import static org.apache.kafka.common.utils.Utils.mkSet;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
@@ -52,7 +51,7 @@ public class ThroughputMetricsReporter implements MetricsReporter {
   private static final String RECORDS_PRODUCED = "records-produced-total";
   private static final String BYTES_PRODUCED = "bytes-produced-total";
   private static final Set<String> THROUGHPUT_METRIC_NAMES =
-      mkSet(RECORDS_CONSUMED, BYTES_CONSUMED, RECORDS_PRODUCED, BYTES_PRODUCED);
+      Set.of(RECORDS_CONSUMED, BYTES_CONSUMED, RECORDS_PRODUCED, BYTES_PRODUCED);
 
   private static final Map<String, Map<String, Map<MetricName, ThroughputTotalMetric>>> metrics =
       new HashMap<>();

diff --git a/ksqldb-engine/src/test/java/io/confluent/ksql/services/SandboxedAdminClientTest.java b/ksqldb-engine/src/test/java/io/confluent/ksql/services/SandboxedAdminClientTest.java
@@ -24,6 +24,8 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.kafka.clients.admin.Admin;
 import org.apache.kafka.clients.admin.ElectLeadersOptions;
+import org.apache.kafka.common.metrics.KafkaMetric;
+import org.apache.kafka.common.metrics.Measurable;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.runners.Enclosed;
@@ -47,6 +49,12 @@ public static Collection<TestCase<Admin>> getMethodsToTest() {
           .ignoreUnchecked("close", long.class, TimeUnit.class)
           .setDefault(ElectLeadersOptions.class, new ElectLeadersOptions())
           .setDefault(Optional.class, Optional.empty())
+          .setDefault(KafkaMetric.class, new KafkaMetric(
+              null,
+              null,
+              (Measurable) (config, now) -> 0,
+              null,
+              null))
           .build();
     }
 

diff --git a/ksqldb-engine/src/test/java/io/confluent/ksql/services/SandboxedConsumerTest.java b/ksqldb-engine/src/test/java/io/confluent/ksql/services/SandboxedConsumerTest.java
@@ -23,6 +23,8 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.common.TopicPartition;
+import org.apache.kafka.common.metrics.KafkaMetric;
+import org.apache.kafka.common.metrics.Measurable;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.runners.Enclosed;
@@ -48,6 +50,12 @@ public static Collection<TestCase<Consumer>> getMethodsToTest() {
           .ignore("wakeup")
           .ignore("groupMetadata")
           .setDefault(TopicPartition.class, new TopicPartition("t", 1))
+          .setDefault(KafkaMetric.class, new KafkaMetric(
+              null,
+              null,
+              (Measurable) (config, now) -> 0,
+              null,
+              null))
           .build();
     }
 

diff --git a/ksqldb-rest-app/pom.xml b/ksqldb-rest-app/pom.xml
@@ -97,12 +97,6 @@
             <version>${jackson.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.kafka</groupId>
-            <artifactId>kafka-log4j-appender</artifactId>
-            <version>${kafka.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>io.confluent</groupId>
             <artifactId>confluent-log4j-extensions</artifactId>
@@ -203,12 +197,12 @@
         </dependency>
 
         <dependency>
-            <!-- one.ducking is a fork of com.kjetland -->
-            <!-- schema-registry is dependent on one.duckling:mbknor-jackson-jsonschema-java8 -->
+            <!-- io.yokota is a fork of com.kjetland -->
+            <!-- schema-registry is dependent on io.yokota:mbknor-jackson-jsonschema-java8 -->
             <!-- hence all the downstream projects had to use that one only -->
-            <groupId>one.duckling</groupId>
+            <groupId>io.yokota</groupId>
             <artifactId>mbknor-jackson-jsonschema-java8</artifactId>
-            <version>1.0.39.1</version>
+            <version>1.0.39.2</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>

diff --git a/...db-rest-app/src/test/java/io/confluent/ksql/rest/integration/RestIntegrationTestUtil.java b/...db-rest-app/src/test/java/io/confluent/ksql/rest/integration/RestIntegrationTestUtil.java
@@ -569,7 +569,7 @@ public static List<String> makeWsRequest(
 
       final String uri = baseUri.toString() + "/ws/query?request="
           + buildStreamingRequest(sql, overrides, requestProperties)
-          + "&access_token=" + credentials.get().getAuthHeader();
+          + "&access_token=" + credentials.get().getAuthHeader().replace(" ", "%20");
 
       final MultiMap headers = MultiMap.caseInsensitiveMultiMap();
 

diff --git a/ksqldb-serde/src/test/java/io/confluent/ksql/serde/avro/KsqlAvroDeserializerTest.java b/ksqldb-serde/src/test/java/io/confluent/ksql/serde/avro/KsqlAvroDeserializerTest.java
@@ -39,7 +39,6 @@
 import io.confluent.ksql.util.DecimalUtil;
 import io.confluent.ksql.util.KsqlConfig;
 import io.confluent.ksql.util.KsqlException;
-import io.confluent.ksql.util.KsqlPreconditions;
 import java.math.BigDecimal;
 import java.nio.ByteBuffer;
 import java.time.LocalDate;
@@ -53,7 +52,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Optional;
 import java.util.stream.Collectors;
 import org.apache.avro.Conversions.DecimalConversion;
 import org.apache.avro.LogicalTypes;

diff --git a/pom.xml b/pom.xml
@@ -417,12 +417,6 @@
                 <version>${io.confluent.schema-registry.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.kafka</groupId>
-                <artifactId>kafka-log4j-appender</artifactId>
-                <version>${kafka.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>io.confluent</groupId>
                 <artifactId>common-utils</artifactId>