Skip to content

Commit 2553b48

Browse files
committed
fixes
1 parent e8dbcb2 commit 2553b48

File tree

12 files changed

+18
-9
lines changed

12 files changed

+18
-9
lines changed

api/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ generateGrammarSource {
107107
}
108108

109109
tasks.withType(JavaCompile) {
110-
options.compilerArgs << "-Xlint:deprecation"
110+
options.compilerArgs << "-Xlint:deprecation" << "-Xlint:unchecked"
111111
}
112112

113113

api/src/main/java/io/kafbat/ui/serdes/builtin/sr/Serialize.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ static byte[] serializeProto(SchemaRegistryClient srClient,
9696

9797
@KafkaClientInternalsDependant("AbstractKafkaAvroSerializer::serializeImpl")
9898
@SneakyThrows
99+
@SuppressWarnings("unchecked")
99100
static byte[] serializeAvro(AvroSchema schema, int schemaId, String input) {
100101
var avroObject = JsonAvroConversion.convertJsonToAvro(input, schema.rawSchema());
101102
try (var out = new ByteArrayOutputStream()) {

api/src/main/java/io/kafbat/ui/service/ReactiveAdminClient.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,7 @@ public Mono<TopicDescription> describeTopic(String topic) {
377377
* This method converts input map into Mono[Map] ignoring keys for which KafkaFutures
378378
* finished with <code>classes</code> exceptions and empty Monos.
379379
*/
380+
@SuppressWarnings("unchecked")
380381
@SafeVarargs
381382
static <K, V> Mono<Map<K, V>> toMonoWithExceptionFilter(Map<K, KafkaFuture<V>> values,
382383
Class<? extends KafkaException>... classes) {

api/src/main/java/io/kafbat/ui/service/StatisticsService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public Mono<Statistics> updateCache(KafkaCluster c) {
3434
return getStatistics(c).doOnSuccess(m -> cache.replace(c, m));
3535
}
3636

37+
@SuppressWarnings("unchecked")
3738
private Mono<Statistics> getStatistics(KafkaCluster cluster) {
3839
return adminClientService.get(cluster).flatMap(ac ->
3940
ac.describeCluster().flatMap(description ->

api/src/main/java/io/kafbat/ui/util/jsonschema/JsonAvroConversion.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ private static Object convert(JsonNode node, Schema avroSchema) {
195195

196196
// converts output of KafkaAvroDeserializer (with AVRO_USE_LOGICAL_TYPE_CONVERTERS flat enabled!) into json.
197197
// Note: conversion should be compatible with AvroJsonSchemaConverter logic!
198+
@SuppressWarnings("unchecked")
198199
public static JsonNode convertAvroToJson(Object obj, Schema avroSchema) {
199200
if (obj == null) {
200201
return NullNode.getInstance();
@@ -213,7 +214,7 @@ public static JsonNode convertAvroToJson(Object obj, Schema avroSchema) {
213214
}
214215
case MAP -> {
215216
ObjectNode node = MAPPER.createObjectNode();
216-
((Map) obj).forEach((k, v) -> node.set(k.toString(), convertAvroToJson(v, avroSchema.getValueType())));
217+
((Map<?, ?>) obj).forEach((k, v) -> node.set(k.toString(), convertAvroToJson(v, avroSchema.getValueType())));
217218
yield node;
218219
}
219220
case ARRAY -> {

api/src/test/java/io/kafbat/ui/AbstractIntegrationTest.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,11 @@ public abstract class AbstractIntegrationTest {
4040

4141
private static final String CONFLUENT_PLATFORM_VERSION = "7.8.0";
4242

43-
public static final ConfluentKafkaContainer kafka = new ConfluentKafkaContainer(
44-
DockerImageName.parse("confluentinc/cp-kafka").withTag(CONFLUENT_PLATFORM_VERSION))
43+
public static final ConfluentKafkaContainer kafkaOriginal = new ConfluentKafkaContainer(
44+
DockerImageName.parse("confluentinc/cp-kafka").withTag(CONFLUENT_PLATFORM_VERSION));
45+
46+
public static final ConfluentKafkaContainer kafka = kafkaOriginal
47+
.withListener("0.0.0.0:9095", () -> kafkaOriginal.getNetworkAliases().getFirst() + ":9095")
4548
.withNetwork(Network.SHARED);
4649

4750
public static final SchemaRegistryContainer schemaRegistry =

api/src/test/java/io/kafbat/ui/container/KafkaConnectContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public KafkaConnectContainer(String version) {
1919

2020

2121
public KafkaConnectContainer withKafka(ConfluentKafkaContainer kafka) {
22-
String bootstrapServers = kafka.getNetworkAliases().getFirst() + ":9092";
22+
String bootstrapServers = kafka.getNetworkAliases().getFirst() + ":9095";
2323
return withKafka(kafka.getNetwork(), bootstrapServers);
2424
}
2525

api/src/test/java/io/kafbat/ui/container/KsqlDbContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public KsqlDbContainer(DockerImageName imageName) {
2222

2323
public KsqlDbContainer withKafka(ConfluentKafkaContainer kafka) {
2424
dependsOn(kafka);
25-
String bootstrapServers = kafka.getNetworkAliases().getFirst() + ":9092";
25+
String bootstrapServers = kafka.getNetworkAliases().getFirst() + ":9095";
2626
return withKafka(kafka.getNetwork(), bootstrapServers);
2727
}
2828

api/src/test/java/io/kafbat/ui/container/SchemaRegistryContainer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import io.confluent.kafka.schemaregistry.client.CachedSchemaRegistryClient;
44
import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
55
import org.testcontainers.containers.GenericContainer;
6-
import org.testcontainers.containers.KafkaContainer;
76
import org.testcontainers.containers.Network;
87
import org.testcontainers.kafka.ConfluentKafkaContainer;
98

@@ -16,7 +15,7 @@ public SchemaRegistryContainer(String version) {
1615
}
1716

1817
public SchemaRegistryContainer withKafka(ConfluentKafkaContainer kafka) {
19-
String bootstrapServers = kafka.getNetworkAliases().get(0) + ":9092";
18+
String bootstrapServers = kafka.getNetworkAliases().getFirst() + ":9095";
2019
return withKafka(kafka.getNetwork(), bootstrapServers);
2120
}
2221

api/src/test/java/io/kafbat/ui/service/audit/AuditServiceTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import reactor.core.publisher.Mono;
2727
import reactor.core.publisher.Signal;
2828

29+
@SuppressWarnings("unchecked")
2930
class AuditServiceTest {
3031

3132
@Test
@@ -59,6 +60,7 @@ void auditCallsWriterMethodDependingOnSignal() {
5960
verify(auditWriter).write(any(), any(), eq(th));
6061
}
6162

63+
@SuppressWarnings("unchecked")
6264
@Nested
6365
class CreateAuditWriter {
6466

api/src/test/java/io/kafbat/ui/service/audit/AuditWriterTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.mockito.Mockito;
2424
import org.slf4j.Logger;
2525

26+
@SuppressWarnings("unchecked")
2627
class AuditWriterTest {
2728

2829
final KafkaProducer<byte[], byte[]> producerMock = Mockito.mock(KafkaProducer.class);

contract/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def specDir = project.layout.projectDirectory.dir("src/main/resources/swagger/")
1010
def targetDir = project.layout.buildDirectory.dir("generated").get()
1111

1212
tasks.withType(JavaCompile).configureEach {
13-
options.compilerArgs << "-Xlint:deprecation"
13+
options.compilerArgs << "-Xlint:deprecation" << "-Xlint:unchecked"
1414
}
1515

1616
dependencies {

0 commit comments

Comments
 (0)