From e5dec7973c2509d5c65ce4420ee9d56d60f02bcf Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Thu, 8 Feb 2024 17:22:08 -0500 Subject: [PATCH] fixes #199 add pre-commit hook and apply it (#200) --- .gitignore | 2 +- .pre-commit-config.yaml | 14 ++++++++++++++ .../networknt/kafka/common/AvroSchemaUtils.java | 2 +- .../networknt/kafka/common/CircularFifoQueue.java | 2 +- .../java/com/networknt/kafka/common/EventId.java | 10 ---------- .../networknt/kafka/common/JsonPOJOSerializer.java | 2 +- .../kafka/common/CircularFifoQueueTest.java | 2 +- .../src/test/resources/config/kafka-consumer.yml | 1 - .../src/test/resources/config/kafka-ksqldb.yml | 2 +- .../kafka/consumer/ConsumerInstanceId.java | 1 - .../kafka/consumer/KafkaConsumerState.java | 1 - .../kafka/entity/KsqlDbPullQueryRequest.java | 10 +++++----- .../networknt/kafka/entity/StateStoreValue.java | 3 --- .../com/networknt/kafka/entity/TopicPartition.java | 2 +- .../src/test/resources/config/kafka-producer.yml | 2 +- .../src/test/resources/config/kafka-streams.yml | 2 +- .../kafka/producer/CompletableFutures.java | 1 - 17 files changed, 28 insertions(+), 31 deletions(-) create mode 100644 .pre-commit-config.yaml diff --git a/.gitignore b/.gitignore index 077e2c9..8a5d2ba 100644 --- a/.gitignore +++ b/.gitignore @@ -31,4 +31,4 @@ exec-develop-build/bin/ exec-regex-replace/bin/ exec-release-docker/bin/ exec-release-maven/bin/ -exec-version-upgrade/bin/ \ No newline at end of file +exec-version-upgrade/bin/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..bbb4368 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,14 @@ +repos: +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v3.2.0 + hooks: + - id: trailing-whitespace + - id: end-of-file-fixer + - id: check-yaml + - id: check-added-large-files +- repo: https://github.com/networknt/pre-commit-hook-keyword + rev: f17c4de14fc24420f6768c19cad06ba03af06d86 + hooks: + - id: keywordscan + args: ["--keywords=c3VubGlmZQ==,Y2liYw==,c3VuIGxpZmU="] + types: ["text"] diff --git a/kafka-common/src/main/java/com/networknt/kafka/common/AvroSchemaUtils.java b/kafka-common/src/main/java/com/networknt/kafka/common/AvroSchemaUtils.java index 8be8caf..e920772 100644 --- a/kafka-common/src/main/java/com/networknt/kafka/common/AvroSchemaUtils.java +++ b/kafka-common/src/main/java/com/networknt/kafka/common/AvroSchemaUtils.java @@ -78,4 +78,4 @@ public static Schema getSchema(Object object) { + "Float, Double, String, byte[] and IndexedRecord"); } } -} \ No newline at end of file +} diff --git a/kafka-common/src/main/java/com/networknt/kafka/common/CircularFifoQueue.java b/kafka-common/src/main/java/com/networknt/kafka/common/CircularFifoQueue.java index 7ab86d7..11e9b57 100644 --- a/kafka-common/src/main/java/com/networknt/kafka/common/CircularFifoQueue.java +++ b/kafka-common/src/main/java/com/networknt/kafka/common/CircularFifoQueue.java @@ -403,4 +403,4 @@ public void remove() { }; } -} \ No newline at end of file +} diff --git a/kafka-common/src/main/java/com/networknt/kafka/common/EventId.java b/kafka-common/src/main/java/com/networknt/kafka/common/EventId.java index b9193de..77faa55 100644 --- a/kafka-common/src/main/java/com/networknt/kafka/common/EventId.java +++ b/kafka-common/src/main/java/com/networknt/kafka/common/EventId.java @@ -478,13 +478,3 @@ public EventId build() { } } } - - - - - - - - - - diff --git a/kafka-common/src/main/java/com/networknt/kafka/common/JsonPOJOSerializer.java b/kafka-common/src/main/java/com/networknt/kafka/common/JsonPOJOSerializer.java index 72a81e4..aeeac9e 100644 --- a/kafka-common/src/main/java/com/networknt/kafka/common/JsonPOJOSerializer.java +++ b/kafka-common/src/main/java/com/networknt/kafka/common/JsonPOJOSerializer.java @@ -34,4 +34,4 @@ public byte[] serialize(String topic, T data) { public void close() { } -} \ No newline at end of file +} diff --git a/kafka-common/src/test/java/com/networknt/kafka/common/CircularFifoQueueTest.java b/kafka-common/src/test/java/com/networknt/kafka/common/CircularFifoQueueTest.java index 027d39a..10c14de 100644 --- a/kafka-common/src/test/java/com/networknt/kafka/common/CircularFifoQueueTest.java +++ b/kafka-common/src/test/java/com/networknt/kafka/common/CircularFifoQueueTest.java @@ -289,4 +289,4 @@ public void testRepeatedSerialization() throws Exception { assertEquals(true, b3.contains("c")); } -} \ No newline at end of file +} diff --git a/kafka-common/src/test/resources/config/kafka-consumer.yml b/kafka-common/src/test/resources/config/kafka-consumer.yml index 6687cf4..2ca8444 100644 --- a/kafka-common/src/test/resources/config/kafka-consumer.yml +++ b/kafka-common/src/test/resources/config/kafka-consumer.yml @@ -99,4 +99,3 @@ iteratorBackoffMs: ${kafka-consumer.iteratorBackoffMs:50} #keep alive time out occurs and sidecar consumer does not move forward. Hence we are adding this property so that we can explicitly close the connection #when we receive the response and not wait for FinAck. backendConnectionReset: ${kafka-consumer.backendConnectionReset:false} - diff --git a/kafka-common/src/test/resources/config/kafka-ksqldb.yml b/kafka-common/src/test/resources/config/kafka-ksqldb.yml index 3dc5f43..f53f6c9 100644 --- a/kafka-common/src/test/resources/config/kafka-ksqldb.yml +++ b/kafka-common/src/test/resources/config/kafka-ksqldb.yml @@ -27,4 +27,4 @@ properties: # Backend API host backendUrl: ${kafka-ksqldb.backendUrl:https://localhost:8080} # Backend API path -backendPath: ${kafka-ksqldb.backendPath:/kafka/ksqldb} \ No newline at end of file +backendPath: ${kafka-ksqldb.backendPath:/kafka/ksqldb} diff --git a/kafka-consumer/src/main/java/com/networknt/kafka/consumer/ConsumerInstanceId.java b/kafka-consumer/src/main/java/com/networknt/kafka/consumer/ConsumerInstanceId.java index 7ed31d5..2118df2 100644 --- a/kafka-consumer/src/main/java/com/networknt/kafka/consumer/ConsumerInstanceId.java +++ b/kafka-consumer/src/main/java/com/networknt/kafka/consumer/ConsumerInstanceId.java @@ -56,4 +56,3 @@ public String toString() { + '}'; } } - diff --git a/kafka-consumer/src/main/java/com/networknt/kafka/consumer/KafkaConsumerState.java b/kafka-consumer/src/main/java/com/networknt/kafka/consumer/KafkaConsumerState.java index a9b8767..d469546 100644 --- a/kafka-consumer/src/main/java/com/networknt/kafka/consumer/KafkaConsumerState.java +++ b/kafka-consumer/src/main/java/com/networknt/kafka/consumer/KafkaConsumerState.java @@ -597,4 +597,3 @@ protected Map convertHeaders(Headers headers) { return headerMap; } } - diff --git a/kafka-entity/src/main/java/com/networknt/kafka/entity/KsqlDbPullQueryRequest.java b/kafka-entity/src/main/java/com/networknt/kafka/entity/KsqlDbPullQueryRequest.java index 024e47e..e50d7b5 100644 --- a/kafka-entity/src/main/java/com/networknt/kafka/entity/KsqlDbPullQueryRequest.java +++ b/kafka-entity/src/main/java/com/networknt/kafka/entity/KsqlDbPullQueryRequest.java @@ -8,14 +8,14 @@ public class KsqlDbPullQueryRequest { - - + + public enum OffsetEnum { - + EARLIEST ("earliest"), - + LATEST ("latest"); - + private final String value; diff --git a/kafka-entity/src/main/java/com/networknt/kafka/entity/StateStoreValue.java b/kafka-entity/src/main/java/com/networknt/kafka/entity/StateStoreValue.java index 928076e..ccfef0b 100644 --- a/kafka-entity/src/main/java/com/networknt/kafka/entity/StateStoreValue.java +++ b/kafka-entity/src/main/java/com/networknt/kafka/entity/StateStoreValue.java @@ -49,6 +49,3 @@ default Headers getHeaders() { return headers; } } - - - diff --git a/kafka-entity/src/main/java/com/networknt/kafka/entity/TopicPartition.java b/kafka-entity/src/main/java/com/networknt/kafka/entity/TopicPartition.java index 425ef7e..645e5bd 100644 --- a/kafka-entity/src/main/java/com/networknt/kafka/entity/TopicPartition.java +++ b/kafka-entity/src/main/java/com/networknt/kafka/entity/TopicPartition.java @@ -25,7 +25,7 @@ public final class TopicPartition { private final String topic; private final Integer partition; - + public TopicPartition( @JsonProperty("topic") String topic, @JsonProperty("partition") Integer partition diff --git a/kafka-entity/src/test/resources/config/kafka-producer.yml b/kafka-entity/src/test/resources/config/kafka-producer.yml index 8e3d6e2..8ee664d 100644 --- a/kafka-entity/src/test/resources/config/kafka-producer.yml +++ b/kafka-entity/src/test/resources/config/kafka-producer.yml @@ -52,4 +52,4 @@ retries: ${kafka-producer.retries:0} # The maximum number of unacknowledged requests the client will send on a single connection before blocking. Note that if # this setting is set to be greater than 1 and there are failed sends, there is a risk of message re-ordering due to retries # (i.e., if retries are enabled). -maxInFlightRequestsPerConnection: ${kafka-producer.maxInFlightRequestsPerConnection:5} \ No newline at end of file +maxInFlightRequestsPerConnection: ${kafka-producer.maxInFlightRequestsPerConnection:5} diff --git a/kafka-entity/src/test/resources/config/kafka-streams.yml b/kafka-entity/src/test/resources/config/kafka-streams.yml index 9a8f769..f40479c 100644 --- a/kafka-entity/src/test/resources/config/kafka-streams.yml +++ b/kafka-entity/src/test/resources/config/kafka-streams.yml @@ -4,4 +4,4 @@ bootstrapServers: localhost:9092 processingGuarantee: exactly_once replicationFactor: 3 # Only set to true right after the streams reset. -cleanUp: false \ No newline at end of file +cleanUp: false diff --git a/kafka-producer/src/main/java/com/networknt/kafka/producer/CompletableFutures.java b/kafka-producer/src/main/java/com/networknt/kafka/producer/CompletableFutures.java index cf7e45c..f8c9ce3 100644 --- a/kafka-producer/src/main/java/com/networknt/kafka/producer/CompletableFutures.java +++ b/kafka-producer/src/main/java/com/networknt/kafka/producer/CompletableFutures.java @@ -88,4 +88,3 @@ public static CompletableFuture catchingCompose( .thenCompose(wrapped -> wrapped); } } -