More code cleanups

jeroenvandisseldorp · Jun 27, 2024 · 6912d44 · 6912d44
1 parent c88019b
commit 6912d44
Show file tree

Hide file tree

Showing 24 changed files with 1,088 additions and 428 deletions.
diff --git a/docs/specification.md b/docs/specification.md
diff --git a/ksml-data-avro/src/main/java/io/axual/ksml/data/notation/avro/MockAvroNotation.java b/ksml-data-avro/src/main/java/io/axual/ksml/data/notation/avro/MockAvroNotation.java
@@ -20,17 +20,6 @@
  * =========================LICENSE_END==================================
  */
 
-import org.apache.avro.Schema;
-import org.apache.kafka.common.serialization.Deserializer;
-import org.apache.kafka.common.serialization.Serde;
-import org.apache.kafka.common.serialization.Serializer;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import io.axual.ksml.data.exception.DataException;
 import io.axual.ksml.data.exception.ExecutionException;
 import io.axual.ksml.data.mapper.NativeDataObjectMapper;
@@ -45,6 +34,16 @@
 import io.confluent.kafka.serializers.KafkaAvroDeserializerConfig;
 import io.confluent.kafka.serializers.KafkaAvroSerializer;
 import lombok.Getter;
+import org.apache.avro.Schema;
+import org.apache.kafka.common.serialization.Deserializer;
+import org.apache.kafka.common.serialization.Serde;
+import org.apache.kafka.common.serialization.Serializer;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * An AVRO {@link Notation} which does not need a running schema registry.

diff --git a/...ata-avro/src/main/java/io/axual/ksml/data/notation/avro/SyncMockSchemaRegistryClient.java b/...ata-avro/src/main/java/io/axual/ksml/data/notation/avro/SyncMockSchemaRegistryClient.java
@@ -20,12 +20,6 @@
  * =========================LICENSE_END==================================
  */
 
-import java.io.IOException;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
 import io.confluent.kafka.schemaregistry.ParsedSchema;
 import io.confluent.kafka.schemaregistry.client.MockSchemaRegistryClient;
 import io.confluent.kafka.schemaregistry.client.SchemaMetadata;
@@ -37,6 +31,12 @@
 import io.confluent.kafka.schemaregistry.client.rest.entities.requests.RegisterSchemaResponse;
 import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException;
 
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
 public class SyncMockSchemaRegistryClient implements SchemaRegistryClient {
     @Override
     public synchronized Optional<ParsedSchema> parseSchema(String schemaType, String schemaString, List<SchemaReference> references) {

diff --git a/ksml-data/src/main/java/io/axual/ksml/data/parser/MapWithSchemaParser.java b/ksml-data/src/main/java/io/axual/ksml/data/parser/MapWithSchemaParser.java
@@ -25,7 +25,6 @@
 import io.axual.ksml.data.schema.UnionSchema;
 import lombok.Getter;
 
-import java.util.List;
 import java.util.Map;
 
 @Getter

diff --git a/ksml-data/src/main/java/io/axual/ksml/data/parser/ParserWithSchemas.java b/ksml-data/src/main/java/io/axual/ksml/data/parser/ParserWithSchemas.java
@@ -20,10 +20,7 @@
  * =========================LICENSE_END==================================
  */
 
-import io.axual.ksml.data.notation.UserType;
 import io.axual.ksml.data.schema.DataSchema;
-import io.axual.ksml.data.schema.StructSchema;
-import io.axual.ksml.data.schema.UnionSchema;
 
 import java.util.List;
 import java.util.function.Function;

diff --git a/ksml-data/src/main/java/io/axual/ksml/data/serde/DataObjectSerializer.java b/ksml-data/src/main/java/io/axual/ksml/data/serde/DataObjectSerializer.java
@@ -20,10 +20,6 @@
  * =========================LICENSE_END==================================
  */
 
-import org.apache.kafka.common.serialization.Serializer;
-
-import java.util.List;
-
 import io.axual.ksml.data.exception.ExecutionException;
 import io.axual.ksml.data.mapper.DataSchemaMapper;
 import io.axual.ksml.data.object.DataNull;
@@ -33,6 +29,9 @@
 import io.axual.ksml.data.schema.StructSchema;
 import io.axual.ksml.data.type.DataType;
 import lombok.Getter;
+import org.apache.kafka.common.serialization.Serializer;
+
+import java.util.List;
 
 import static io.axual.ksml.data.parser.schema.DataSchemaDSL.DATA_OBJECT_TYPE_NAME;
 import static io.axual.ksml.data.parser.schema.DataSchemaDSL.DATA_SCHEMA_NAMESPACE;

diff --git a/ksml-data/src/main/java/io/axual/ksml/data/serde/UnionSerde.java b/ksml-data/src/main/java/io/axual/ksml/data/serde/UnionSerde.java
@@ -20,6 +20,11 @@
  * =========================LICENSE_END==================================
  */
 
+import io.axual.ksml.data.exception.ExecutionException;
+import io.axual.ksml.data.object.DataNull;
+import io.axual.ksml.data.object.DataObject;
+import io.axual.ksml.data.type.DataType;
+import io.axual.ksml.data.type.UnionType;
 import org.apache.kafka.common.serialization.Deserializer;
 import org.apache.kafka.common.serialization.Serde;
 import org.apache.kafka.common.serialization.Serializer;
@@ -28,12 +33,6 @@
 import java.util.List;
 import java.util.Map;
 
-import io.axual.ksml.data.exception.ExecutionException;
-import io.axual.ksml.data.object.DataNull;
-import io.axual.ksml.data.object.DataObject;
-import io.axual.ksml.data.type.DataType;
-import io.axual.ksml.data.type.UnionType;
-
 public class UnionSerde implements Serde<Object> {
     private record PossibleType(DataType type, Serializer<Object> serializer,
                                 Deserializer<Object> deserializer) {

diff --git a/ksml-data/src/main/java/io/axual/ksml/data/tag/ContextTags.java b/ksml-data/src/main/java/io/axual/ksml/data/tag/ContextTags.java
@@ -21,10 +21,8 @@
  */
 
 import lombok.EqualsAndHashCode;
-import org.apache.kafka.common.utils.Utils;
 
 import java.util.ArrayList;
-import java.util.List;
 
 @EqualsAndHashCode
 public class ContextTags extends ArrayList<ContextTag> {

diff --git a/ksml-runner/src/main/java/io/axual/ksml/runner/KSMLRunner.java b/ksml-runner/src/main/java/io/axual/ksml/runner/KSMLRunner.java
@@ -23,21 +23,6 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-
-import org.apache.kafka.common.serialization.Serdes;
-import org.apache.kafka.common.utils.Utils;
-import org.apache.kafka.streams.state.HostInfo;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
 import io.axual.ksml.client.serde.ResolvingDeserializer;
 import io.axual.ksml.client.serde.ResolvingSerializer;
 import io.axual.ksml.data.mapper.DataTypeSchemaMapper;
@@ -76,6 +61,19 @@
 import io.axual.ksml.runner.exception.ConfigException;
 import io.axual.ksml.runner.prometheus.PrometheusExport;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.common.serialization.Serdes;
+import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.streams.state.HostInfo;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 @Slf4j
 public class KSMLRunner {

diff --git a/ksml-runner/src/main/java/io/axual/ksml/runner/KsmlInfo.java b/ksml-runner/src/main/java/io/axual/ksml/runner/KsmlInfo.java
@@ -20,20 +20,15 @@
  * =========================LICENSE_END==================================
  */
 
+import io.axual.ksml.metric.KSMLMetrics;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.management.*;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.management.ManagementFactory;
 import java.util.Properties;
 
-import javax.management.InstanceAlreadyExistsException;
-import javax.management.MBeanRegistrationException;
-import javax.management.MalformedObjectNameException;
-import javax.management.NotCompliantMBeanException;
-import javax.management.ObjectName;
-
-import io.axual.ksml.metric.KSMLMetrics;
-import lombok.extern.slf4j.Slf4j;
-
 @Slf4j
 public class KsmlInfo {
 

diff --git a/ksml-runner/src/main/java/io/axual/ksml/runner/backend/ExecutableProducer.java b/ksml-runner/src/main/java/io/axual/ksml/runner/backend/ExecutableProducer.java
@@ -20,14 +20,6 @@
  * =========================LICENSE_END==================================
  */
 
-import org.apache.kafka.clients.producer.Producer;
-import org.apache.kafka.clients.producer.ProducerRecord;
-import org.apache.kafka.common.serialization.Serializer;
-
-import java.time.Duration;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-
 import io.axual.ksml.client.serde.ResolvingSerializer;
 import io.axual.ksml.data.mapper.DataObjectConverter;
 import io.axual.ksml.data.mapper.NativeDataObjectMapper;
@@ -46,6 +38,13 @@
 import io.axual.ksml.user.UserPredicate;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.producer.Producer;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.serialization.Serializer;
+
+import java.time.Duration;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
 
 import static io.axual.ksml.data.notation.UserType.DEFAULT_NOTATION;
 

diff --git a/ksml-runner/src/main/java/io/axual/ksml/runner/backend/KafkaProducerRunner.java b/ksml-runner/src/main/java/io/axual/ksml/runner/backend/KafkaProducerRunner.java
@@ -20,6 +20,11 @@
  * =========================LICENSE_END==================================
  */
 
+import io.axual.ksml.client.producer.ResolvingProducer;
+import io.axual.ksml.generator.TopologyDefinition;
+import io.axual.ksml.python.PythonContext;
+import io.axual.ksml.python.PythonFunction;
+import lombok.Builder;
 import org.apache.kafka.clients.producer.Producer;
 import org.apache.kafka.common.serialization.ByteArraySerializer;
 import org.slf4j.Logger;
@@ -29,16 +34,8 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import io.axual.ksml.client.producer.ResolvingProducer;
-import io.axual.ksml.generator.TopologyDefinition;
-import io.axual.ksml.python.PythonContext;
-import io.axual.ksml.python.PythonFunction;
-import lombok.Builder;
-
-import static org.apache.kafka.clients.producer.ProducerConfig.CLIENT_ID_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.streams.StreamsConfig.APPLICATION_ID_CONFIG;
 
 public class KafkaProducerRunner implements Runner {
     private static final Logger log = LoggerFactory.getLogger(KafkaProducerRunner.class);

diff --git a/ksml-runner/src/main/java/io/axual/ksml/runner/backend/KafkaStreamsRunner.java b/ksml-runner/src/main/java/io/axual/ksml/runner/backend/KafkaStreamsRunner.java
@@ -21,22 +21,6 @@
  */
 
 
-import org.apache.kafka.common.serialization.Serializer;
-import org.apache.kafka.common.utils.Utils;
-import org.apache.kafka.streams.KafkaStreams;
-import org.apache.kafka.streams.KeyQueryMetadata;
-import org.apache.kafka.streams.StoreQueryParameters;
-import org.apache.kafka.streams.StreamsBuilder;
-import org.apache.kafka.streams.StreamsConfig;
-import org.apache.kafka.streams.StreamsMetadata;
-import org.apache.kafka.streams.TopologyConfig;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import io.axual.ksml.TopologyGenerator;
 import io.axual.ksml.client.generic.ResolvingClientConfig;
 import io.axual.ksml.client.producer.ResolvingProducerConfig;
@@ -48,8 +32,15 @@
 import io.axual.ksml.runner.streams.KSMLClientSupplier;
 import lombok.Builder;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.common.serialization.Serializer;
+import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.streams.*;
 
-import static org.apache.kafka.clients.producer.ProducerConfig.CLIENT_ID_CONFIG;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 @Slf4j
 public class KafkaStreamsRunner implements Runner {

diff --git a/ksml-runner/src/main/java/io/axual/ksml/runner/config/ApplicationServerConfig.java b/ksml-runner/src/main/java/io/axual/ksml/runner/config/ApplicationServerConfig.java
@@ -22,7 +22,6 @@
 
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
 import lombok.Builder;
 import lombok.Data;
 import lombok.extern.jackson.Jacksonized;

diff --git a/ksml-runner/src/main/java/io/axual/ksml/runner/config/KSMLConfig.java b/ksml-runner/src/main/java/io/axual/ksml/runner/config/KSMLConfig.java
@@ -24,13 +24,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.HashMap;
-import java.util.Map;
-
 import io.axual.ksml.data.notation.binary.JsonNodeNativeMapper;
 import io.axual.ksml.generator.YAMLObjectMapper;
 import io.axual.ksml.runner.exception.ConfigException;
@@ -39,6 +32,12 @@
 import lombok.extern.jackson.Jacksonized;
 import lombok.extern.slf4j.Slf4j;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
+
 @Slf4j
 @JsonIgnoreProperties(ignoreUnknown = true)
 @Builder

diff --git a/ksml-runner/src/main/java/io/axual/ksml/runner/config/KSMLErrorHandlingConfig.java b/ksml-runner/src/main/java/io/axual/ksml/runner/config/KSMLErrorHandlingConfig.java
@@ -22,7 +22,6 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;

diff --git a/ksml-runner/src/main/java/io/axual/ksml/runner/config/KSMLRunnerConfig.java b/ksml-runner/src/main/java/io/axual/ksml/runner/config/KSMLRunnerConfig.java
@@ -21,23 +21,17 @@
  */
 
 
-import com.fasterxml.jackson.annotation.JsonAlias;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-
-import java.util.HashMap;
-import java.util.Map;
-
 import lombok.Builder;
 import lombok.Data;
 import lombok.extern.jackson.Jacksonized;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @Slf4j
 @Data
 @JsonIgnoreProperties(ignoreUnknown = true)

diff --git a/ksml-runner/src/main/java/io/axual/ksml/runner/config/PrometheusConfig.java b/ksml-runner/src/main/java/io/axual/ksml/runner/config/PrometheusConfig.java
@@ -22,18 +22,16 @@
 
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
+import lombok.Builder;
+import lombok.Data;
+import lombok.extern.jackson.Jacksonized;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 
-import lombok.Builder;
-import lombok.Data;
-import lombok.extern.jackson.Jacksonized;
-import lombok.extern.slf4j.Slf4j;
-
 @Slf4j
 @JsonIgnoreProperties(ignoreUnknown = true)
 @Data