From 13874dc2aaf0941cee24be9ab38c24d1fc871f37 Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Tue, 5 Nov 2024 16:28:12 -0500 Subject: [PATCH] Addressing checkstyle issues --- .../cloud/stream/binder/BinderHeaders.java | 3 +- .../stream/function/StandardBatchUtils.java | 58 +++++++++---------- .../function/StandardBatchUtilsTests.java | 27 ++++----- 3 files changed, 42 insertions(+), 46 deletions(-) diff --git a/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/BinderHeaders.java b/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/BinderHeaders.java index 091a19c2f..06226f339 100644 --- a/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/BinderHeaders.java +++ b/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/BinderHeaders.java @@ -39,8 +39,7 @@ public final class BinderHeaders { IntegrationMessageHeaderAccessor.SEQUENCE_NUMBER, MessageHeaders.CONTENT_TYPE}; private static final String PREFIX = "scst_"; - - + /** * Name of the Message header identifying structure for batch Message headers. */ diff --git a/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/StandardBatchUtils.java b/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/StandardBatchUtils.java index 3f23cb42a..7557e4bd7 100644 --- a/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/StandardBatchUtils.java +++ b/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/StandardBatchUtils.java @@ -34,59 +34,55 @@ import org.springframework.util.Assert; * @since 4.2 */ public final class StandardBatchUtils { - + private StandardBatchUtils() { - + } - + /** * Iterates over batch message structure returning {@link Iterable} of individual messages. - * + * * @param batchMessage instance of batch {@link Message} * @return instance of {@link Iterable} representing individual Messages in a batch {@link Message} as {@link Entry}. */ public static Iterable>> iterate(Message> batchMessage) { - return new Iterable>>() { + return () -> new Iterator<>() { + int index = 0; + @Override - public Iterator>> iterator() { - return new Iterator>>() { - int index = 0; - @Override - public Entry> next() { - return getMessageByIndex(batchMessage, index++); - } - - @Override - public boolean hasNext() { - return index < batchMessage.getPayload().size(); - } - }; + public Entry> next() { + return getMessageByIndex(batchMessage, index++); + } + + @Override + public boolean hasNext() { + return index < batchMessage.getPayload().size(); } }; } - + /** - * Extracts individual {@link Message} by index from batch {@link Message} + * Extracts individual {@link Message} by index from batch {@link Message}. * @param batchMessage instance of batch {@link Message} * @param index index of individual {@link Message} in a batch * @return individual {@link Message} in a batch {@link Message} */ public static Entry> getMessageByIndex(Message> batchMessage, int index) { - Assert.isTrue(index < batchMessage.getPayload().size(), "Index " + index + " is out of bounds as there are only " + Assert.isTrue(index < batchMessage.getPayload().size(), "Index " + index + " is out of bounds as there are only " + batchMessage.getPayload().size() + " messages in a batch."); - return new Entry>() { - + return new Entry<>() { + @Override public Map setValue(Map value) { throw new UnsupportedOperationException(); } - + @SuppressWarnings("unchecked") @Override public Map getValue() { return ((List>) batchMessage.getHeaders().get(BinderHeaders.BATCH_HEADERS)).get(index); } - + @Override public Object getKey() { return batchMessage.getPayload().get(index); @@ -95,24 +91,24 @@ public final class StandardBatchUtils { } public static class BatchMessageBuilder { - + private final List payloads = new ArrayList<>(); - + private final List> batchHeaders = new ArrayList<>(); - + private final Map headers = new HashMap<>(); - + public BatchMessageBuilder addMessage(Object payload, Map batchHeaders) { this.payloads.add(payload); this.batchHeaders.add(batchHeaders); return this; } - + public BatchMessageBuilder addRootHeader(String key, Object value) { this.headers.put(key, value); return this; } - + public Message> build() { this.headers.put(BinderHeaders.BATCH_HEADERS, this.batchHeaders); return MessageBuilder.createMessage(payloads, new MessageHeaders(headers)); diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/StandardBatchUtilsTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/StandardBatchUtilsTests.java index 936efd0a5..de0a7e8cc 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/StandardBatchUtilsTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/StandardBatchUtilsTests.java @@ -16,7 +16,6 @@ package org.springframework.cloud.stream.function; -import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; import java.util.Collections; @@ -25,13 +24,15 @@ import java.util.Map; import java.util.Map.Entry; import org.junit.jupiter.api.Test; + import org.springframework.cloud.stream.binder.BinderHeaders; import org.springframework.cloud.stream.function.StandardBatchUtils.BatchMessageBuilder; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; /** - * + * */ public class StandardBatchUtilsTests { @@ -43,24 +44,24 @@ public class StandardBatchUtilsTests { builder.addRootHeader("a", "a"); builder.addMessage("bar", Collections.singletonMap("barKey", "barValue")); builder.addMessage("baz", Collections.singletonMap("bazKey", "bazValue")); - + Message> batchMessage = builder.build(); - + List payloads = batchMessage.getPayload(); assertThat(payloads.size()).isEqualTo(3); - + List> batchHeaders = (List>) batchMessage.getHeaders().get(BinderHeaders.BATCH_HEADERS); assertThat(batchHeaders.size()).isEqualTo(3); - + assertThat(payloads.get(0)).isEqualTo("foo"); assertThat(batchHeaders.get(0).get("fooKey")).isEqualTo("fooValue"); - + assertThat(payloads.get(1)).isEqualTo("bar"); assertThat(batchHeaders.get(1).get("barKey")).isEqualTo("barValue"); - + assertThat(batchMessage.getHeaders().get("a")).isEqualTo("a"); } - + @Test public void testIterator() { BatchMessageBuilder builder = new BatchMessageBuilder(); @@ -68,9 +69,9 @@ public class StandardBatchUtilsTests { builder.addRootHeader("a", "a"); builder.addMessage("bar", Collections.singletonMap("barKey", "barValue")); builder.addMessage("baz", Collections.singletonMap("bazKey", "bazValue")); - + Message> batchMessage = builder.build(); - + List>> entries = new ArrayList<>(); StandardBatchUtils.iterate(batchMessage).forEach(entry -> { entries.add(entry); @@ -78,10 +79,10 @@ public class StandardBatchUtilsTests { assertThat(entries.size()).isEqualTo(3); assertThat(entries.get(0).getKey()).isEqualTo("foo"); assertThat(entries.get(0).getValue().get("fooKey")).isEqualTo("fooValue"); - + assertThat(entries.get(1).getKey()).isEqualTo("bar"); assertThat(entries.get(1).getValue().get("barKey")).isEqualTo("barValue"); - + assertThat(entries.get(2).getKey()).isEqualTo("baz"); assertThat(entries.get(2).getValue().get("bazKey")).isEqualTo("bazValue"); }