You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cs...@apache.org on 2019/07/04 15:18:45 UTC

[sling-org-apache-sling-distribution-journal-kafka] branch master updated: SLING-8554 - Fix some sonar issues

This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal-kafka.git


The following commit(s) were added to refs/heads/master by this push:
     new 374fc46  SLING-8554 - Fix some sonar issues
374fc46 is described below

commit 374fc468537274c8fb770cbabd86eadfb79a4525
Author: Christian Schneider <cs...@adobe.com>
AuthorDate: Thu Jul 4 17:17:39 2019 +0200

    SLING-8554 - Fix some sonar issues
---
 .../sling/distribution/journal/kafka/KafkaJsonMessageSender.java    | 2 +-
 .../apache/sling/distribution/journal/kafka/KafkaMessageSender.java | 2 +-
 .../org/apache/sling/distribution/journal/kafka/KafkaPoller.java    | 6 ++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/apache/sling/distribution/journal/kafka/KafkaJsonMessageSender.java b/src/main/java/org/apache/sling/distribution/journal/kafka/KafkaJsonMessageSender.java
index 83fb495..9951a79 100644
--- a/src/main/java/org/apache/sling/distribution/journal/kafka/KafkaJsonMessageSender.java
+++ b/src/main/java/org/apache/sling/distribution/journal/kafka/KafkaJsonMessageSender.java
@@ -59,7 +59,7 @@ public class KafkaJsonMessageSender<T> implements JsonMessageSender<T> {
             String payloadSt = writer.writeValueAsString(payload);
             ProducerRecord<String, String> record = new ProducerRecord<>(topic, PARTITION, null, payloadSt);
             RecordMetadata metadata = producer.send(record).get();
-            LOG.info(format("Sent JSON to %s", metadata));
+            LOG.info("Sent JSON to {}", metadata);
         } catch (Exception e) {
             eventSender.send(e);
             throw new MessagingException(format("Failed to send JSON message on topic %s", topic), e);
diff --git a/src/main/java/org/apache/sling/distribution/journal/kafka/KafkaMessageSender.java b/src/main/java/org/apache/sling/distribution/journal/kafka/KafkaMessageSender.java
index 870f444..69defdc 100644
--- a/src/main/java/org/apache/sling/distribution/journal/kafka/KafkaMessageSender.java
+++ b/src/main/java/org/apache/sling/distribution/journal/kafka/KafkaMessageSender.java
@@ -64,7 +64,7 @@ public class KafkaMessageSender<T extends GeneratedMessage> implements MessageSe
         ProducerRecord<String, byte[]> record = new ProducerRecord<>(topic, PARTITION, null, null, payload.toByteArray(), toHeaders(type, version));
         try {
             RecordMetadata metadata = producer.send(record).get();
-            LOG.info(format("Sent to %s", metadata));
+            LOG.info("Sent to {}", metadata);
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
             handleException(topic, e);
diff --git a/src/main/java/org/apache/sling/distribution/journal/kafka/KafkaPoller.java b/src/main/java/org/apache/sling/distribution/journal/kafka/KafkaPoller.java
index 671fa28..e4d20c4 100644
--- a/src/main/java/org/apache/sling/distribution/journal/kafka/KafkaPoller.java
+++ b/src/main/java/org/apache/sling/distribution/journal/kafka/KafkaPoller.java
@@ -60,13 +60,11 @@ public class KafkaPoller<T> implements Closeable {
     }
     
     public static Closeable createProtobufPoller(KafkaConsumer<String, byte[]> consumer, ExceptionEventSender eventSender, HandlerAdapter<?>... adapters) {
-        Consumer<ConsumerRecord<String, byte[]>> handler = new ProtobufRecordHandler(adapters);
-        return new KafkaPoller<byte[]>(consumer, eventSender, handler);
+        return new KafkaPoller<>(consumer, eventSender, new ProtobufRecordHandler(adapters));
     }
     
     public static <T>  Closeable createJsonPoller(KafkaConsumer<String, String> consumer, ExceptionEventSender eventSender, MessageHandler<T> handler, Class<T> clazz) {
-        Consumer<ConsumerRecord<String, String>> recordHandler = new JsonRecordHandler<T>(handler, clazz);
-        return new KafkaPoller<String>(consumer, eventSender, recordHandler);
+        return new KafkaPoller<>(consumer, eventSender, new JsonRecordHandler<T>(handler, clazz));
     }
 
     @Override