diff --git a/ksqldb-common/pom.xml b/ksqldb-common/pom.xml index c2d9021b072e..57ff60ca6584 100644 --- a/ksqldb-common/pom.xml +++ b/ksqldb-common/pom.xml @@ -29,6 +29,12 @@ + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.2 + + com.google.code.findbugs jsr305 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 index 60b96bede49c..25b6bc0f2907 100644 --- 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 index cf33233f88b5..cd586674307a 100644 --- 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 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>> 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 index 656859b9f69d..8e7c3431808a 100644 --- 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> 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 index 285519669df1..111a91d6ef50 100644 --- 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> 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 index cb5354f933c7..16c881e92d32 100644 --- a/ksqldb-rest-app/pom.xml +++ b/ksqldb-rest-app/pom.xml @@ -97,12 +97,6 @@ ${jackson.version} - - org.apache.kafka - kafka-log4j-appender - ${kafka.version} - - io.confluent confluent-log4j-extensions @@ -203,12 +197,12 @@ - - + + - one.duckling + io.yokota mbknor-jackson-jsonschema-java8 - 1.0.39.1 + 1.0.39.2 test diff --git a/ksqldb-rest-app/src/test/java/io/confluent/ksql/rest/integration/RestIntegrationTestUtil.java b/ksqldb-rest-app/src/test/java/io/confluent/ksql/rest/integration/RestIntegrationTestUtil.java index 4b2d518dac6c..73ffd68178d0 100644 --- a/ksqldb-rest-app/src/test/java/io/confluent/ksql/rest/integration/RestIntegrationTestUtil.java +++ b/ksqldb-rest-app/src/test/java/io/confluent/ksql/rest/integration/RestIntegrationTestUtil.java @@ -569,7 +569,7 @@ public static List 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 index 6e4c4417fa4b..9c0b82233c1c 100644 --- 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 index ea369d7daf83..63b6fb339153 100644 --- a/pom.xml +++ b/pom.xml @@ -417,12 +417,6 @@ ${io.confluent.schema-registry.version} - - org.apache.kafka - kafka-log4j-appender - ${kafka.version} - - io.confluent common-utils