happy checkstyle

transferwise · Aug 6, 2024 · 3684259 · 3684259
1 parent e6d5a6d
commit 3684259
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 34 deletions.
diff --git a/...ms-starter/src/main/java/com/transferwise/kafka/tkms/TransactionalKafkaMessageSender.java b/...ms-starter/src/main/java/com/transferwise/kafka/tkms/TransactionalKafkaMessageSender.java
@@ -147,10 +147,10 @@ protected void checkActiveTransaction(int shard, boolean transactionActive, bool
 
   @Override
   public SendMessagesResult sendMessages(SendMessagesRequest request) {
-    var transactionActive = TransactionSynchronizationManager.isActualTransactionActive();
     request.getTkmsMessages().forEach(message -> messageDecorators.forEach(message::accept));
     validateMessages(request);
 
+    var transactionActive = TransactionSynchronizationManager.isActualTransactionActive();
     var validatedTopics = new HashSet<String>();
 
     int seq = 0;

diff --git a/tw-tkms-starter/src/main/java/com/transferwise/kafka/tkms/api/ITkmsMessageDecorator.java b/tw-tkms-starter/src/main/java/com/transferwise/kafka/tkms/api/ITkmsMessageDecorator.java
@@ -2,10 +2,10 @@
 
 import com.transferwise.kafka.tkms.api.TkmsMessage.Header;
 import java.util.List;
-import java.util.Map;
 
 public interface ITkmsMessageDecorator {
-  default List<Header> getHeaders(TkmsMessage message){
+
+  default List<Header> getHeaders(TkmsMessage message) {
     return List.of();
   }
 }
diff --git a/tw-tkms-starter/src/main/java/com/transferwise/kafka/tkms/api/TkmsMessage.java b/tw-tkms-starter/src/main/java/com/transferwise/kafka/tkms/api/TkmsMessage.java
@@ -79,9 +79,9 @@ public TkmsMessage addHeader(Header header) {
     return this;
   }
 
-  public TkmsMessage accept(ITkmsMessageDecorator decorator){
+  public TkmsMessage accept(ITkmsMessageDecorator decorator) {
     var headers = decorator.getHeaders(this);
-    if(headers != null){
+    if (headers != null) {
       headers.forEach(this::addHeader);
     }
     return this;

diff --git a/tw-tkms-starter/src/main/java/com/transferwise/kafka/tkms/config/TkmsAutoConfiguration.java b/tw-tkms-starter/src/main/java/com/transferwise/kafka/tkms/config/TkmsAutoConfiguration.java
@@ -8,6 +8,8 @@
 import com.transferwise.common.baseutils.transactionsmanagement.TransactionsHelper;
 import com.transferwise.kafka.tkms.api.ITkmsMessageDecorator;
 import io.micrometer.core.instrument.MeterRegistry;
+import java.util.Collections;
+import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -16,8 +18,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import java.util.Collections;
-import java.util.List;
 
 @Configuration
 @AutoConfigureAfter({FlywayAutoConfiguration.class, ValidationAutoConfiguration.class})
@@ -42,7 +42,7 @@ public IMeterCache twDefaultMeterCache(MeterRegistry meterRegistry) {
   public TransactionsHelper twTransactionsHelper() {
     return new TransactionsHelper();
   }
-
+  
   @Bean
   @ConditionalOnMissingBean(ITkmsMessageDecorator.class)
   public List<ITkmsMessageDecorator> messageDecorators() {

diff --git a/tw-tkms-starter/src/test/java/com/transferwise/kafka/tkms/MessageDecorationTest.java b/tw-tkms-starter/src/test/java/com/transferwise/kafka/tkms/MessageDecorationTest.java
@@ -1,28 +1,22 @@
 package com.transferwise.kafka.tkms;
 
+import static org.awaitility.Awaitility.await;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import com.transferwise.common.baseutils.transactionsmanagement.ITransactionsHelper;
-import com.transferwise.kafka.tkms.api.ITkmsMessageInterceptor.MessageInterceptionDecision;
 import com.transferwise.kafka.tkms.api.ITransactionalKafkaMessageSender.SendMessagesRequest;
 import com.transferwise.kafka.tkms.api.TkmsMessage;
 import com.transferwise.kafka.tkms.test.BaseIntTest;
 import com.transferwise.kafka.tkms.test.ITkmsSentMessagesCollector.SentMessage;
 import com.transferwise.kafka.tkms.test.TestMessagesInterceptor;
 import com.transferwise.kafka.tkms.test.TestProperties;
+import java.nio.charset.StandardCharsets;
+import java.util.stream.StreamSupport;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.awaitility.Awaitility.await;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @Slf4j
 class MessageDecorationTest extends BaseIntTest {
@@ -49,22 +43,22 @@ void messagesAreDecorateWithJambi() {
 
     transactionsHelper.withTransaction().run(() ->
         transactionalKafkaMessageSender.sendMessages(new SendMessagesRequest()
-            .addTkmsMessage(new TkmsMessage().setTopic(topic).setKey("A").setValue(someValue))
-            .addTkmsMessage(new TkmsMessage().setTopic(topic).setKey("B").setValue(someValue))
+            .addTkmsMessage(new TkmsMessage().setTopic(topic).setKey("adam-jones").setValue(someValue))
+            .addTkmsMessage(new TkmsMessage().setTopic(topic).setKey("danny-carey").setValue(someValue))
         ));
 
     await().until(() -> tkmsSentMessagesCollector.getSentMessages(topic).size() == 2);
-
     var messages = tkmsSentMessagesCollector.getSentMessages(topic);
-    assertThat(messages.size()).isEqualTo(2);
-    checkForHeader(messages.get(0) , "adam-jones" , "jambi");
-    checkForHeader(messages.get(1) , "danny-carey" , "the-grudge");
+
+    assertEquals(2, messages.size());
+    checkForHeader(messages.get(0), "tool", "jambi");
+    checkForHeader(messages.get(1), "tool", "jambi");
   }
 
   private void checkForHeader(SentMessage sentMessage, String key, String value) {
     assertTrue(
-        StreamSupport.stream(sentMessage.getProducerRecord().headers().spliterator() , false)
-        .anyMatch(h -> h.key().equals(key) && value.equals(new String(h.value())))
+        StreamSupport.stream(sentMessage.getProducerRecord().headers().spliterator(), false)
+            .anyMatch(h -> h.key().equals(key) && value.equals(new String(h.value())))
     );
   }
 }
diff --git a/tw-tkms-starter/src/test/java/com/transferwise/kafka/tkms/test/TestMessageDecorator.java b/tw-tkms-starter/src/test/java/com/transferwise/kafka/tkms/test/TestMessageDecorator.java
@@ -3,19 +3,19 @@
 import com.transferwise.kafka.tkms.api.ITkmsMessageDecorator;
 import com.transferwise.kafka.tkms.api.TkmsMessage;
 import com.transferwise.kafka.tkms.api.TkmsMessage.Header;
-import org.springframework.stereotype.Component;
 import java.util.List;
+import org.springframework.stereotype.Component;
 
 @Component
 public class TestMessageDecorator implements ITkmsMessageDecorator {
 
   @Override
-  public List<Header> getHeaders(TkmsMessage message){
-    var h1 = new Header().setKey("adam-jones").setValue("jambi".getBytes());
-    if (message.getValue() != null && new String(message.getValue()).startsWith("Here from the king")) {
-      return List.of(h1);
+  public List<Header> getHeaders(TkmsMessage message) {
+    var h1 = new Header().setKey("tool").setValue("jambi".getBytes());
+    if (message.getKey() == null) {
+      return List.of();
     }
-    return List.of();
+    return List.of(h1);
   }
 
 }