Merge pull request Azure#4 from moarychan/moary/fix-coverage-not-met-…

…error Fix pipeline failures and comments
moarychan · Jan 10, 2022 · 47b8259 · 47b8259
2 parents 78066e6 + 0720ea5
commit 47b8259
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 25 deletions.
diff --git a/...in/java/com/azure/spring/cloud/stream/binder/eventhubs/EventHubsMessageChannelBinder.java b/...in/java/com/azure/spring/cloud/stream/binder/eventhubs/EventHubsMessageChannelBinder.java
@@ -16,7 +16,7 @@
 import com.azure.spring.eventhubs.core.properties.ProcessorProperties;
 import com.azure.spring.eventhubs.core.properties.ProducerProperties;
 import com.azure.spring.integration.eventhubs.inbound.EventHubsInboundChannelAdapter;
-import com.azure.spring.integration.eventhubs.inbound.health.EventHusProcessorInstrumentation;
+import com.azure.spring.integration.eventhubs.inbound.health.EventHubsProcessorInstrumentation;
 import com.azure.spring.integration.handler.DefaultMessageHandler;
 import com.azure.spring.integration.instrumentation.DefaultInstrumentation;
 import com.azure.spring.integration.instrumentation.DefaultInstrumentationManager;
@@ -222,7 +222,7 @@ private EventHubsProcessorContainer getProcessorContainer() {
                 this.checkpointStore, this.namespaceProperties, getProcessorPropertiesSupplier());
             factory.addListener((name, consumerGroup, processorClient) -> {
                 String instrumentationName = name + "/" + consumerGroup;
-                Instrumentation instrumentation = new EventHusProcessorInstrumentation(instrumentationName, CONSUMER, Duration.ofMinutes(2));
+                Instrumentation instrumentation = new EventHubsProcessorInstrumentation(instrumentationName, CONSUMER, Duration.ofMinutes(2));
                 instrumentation.markUp();
                 instrumentationManager.addHealthInstrumentation(instrumentation.getId(), instrumentation);
             });

diff --git a/...st/java/com/azure/spring/cloud/stream/binder/eventhubs/EventHubsHealthIndicatorTests.java b/...st/java/com/azure/spring/cloud/stream/binder/eventhubs/EventHubsHealthIndicatorTests.java
@@ -15,7 +15,7 @@
 import com.azure.spring.eventhubs.core.EventHubsProcessorContainer;
 import com.azure.spring.eventhubs.core.EventHubsTemplate;
 import com.azure.spring.eventhubs.core.producer.DefaultEventHubsNamespaceProducerFactory;
-import com.azure.spring.integration.eventhubs.inbound.health.EventHusProcessorInstrumentation;
+import com.azure.spring.integration.eventhubs.inbound.health.EventHubsProcessorInstrumentation;
 import com.azure.spring.integration.instrumentation.Instrumentation;
 import com.azure.spring.integration.instrumentation.InstrumentationManager;
 import com.azure.spring.messaging.checkpoint.CheckpointConfig;
@@ -247,8 +247,8 @@ default void updateInstrumentation(ErrorContext errorContext,
                                            String instrumentationId) {
             Instrumentation instrumentation = instrumentationManager.getHealthInstrumentation(instrumentationId);
             if (instrumentation != null) {
-                if (instrumentation instanceof EventHusProcessorInstrumentation) {
-                    ((EventHusProcessorInstrumentation) instrumentation).markError(errorContext);
+                if (instrumentation instanceof EventHubsProcessorInstrumentation) {
+                    ((EventHubsProcessorInstrumentation) instrumentation).markError(errorContext);
                 } else {
                     instrumentation.markDown(errorContext.getThrowable());
                 }

diff --git a/...n/java/com/azure/spring/integration/eventhubs/inbound/EventHubsInboundChannelAdapter.java b/...n/java/com/azure/spring/integration/eventhubs/inbound/EventHubsInboundChannelAdapter.java
@@ -14,7 +14,7 @@
 import com.azure.spring.eventhubs.support.EventHubsHeaders;
 import com.azure.spring.eventhubs.support.converter.EventHubBatchMessageConverter;
 import com.azure.spring.eventhubs.support.converter.EventHubsMessageConverter;
-import com.azure.spring.integration.eventhubs.inbound.health.EventHusProcessorInstrumentation;
+import com.azure.spring.integration.eventhubs.inbound.health.EventHubsProcessorInstrumentation;
 import com.azure.spring.integration.instrumentation.Instrumentation;
 import com.azure.spring.integration.instrumentation.InstrumentationManager;
 import com.azure.spring.messaging.AzureHeaders;
@@ -223,8 +223,8 @@ default void updateInstrumentation(ErrorContext errorContext,
 
             Instrumentation instrumentation = instrumentationManager.getHealthInstrumentation(instrumentationId);
             if (instrumentation != null) {
-                if (instrumentation instanceof EventHusProcessorInstrumentation) {
-                    ((EventHusProcessorInstrumentation) instrumentation).markError(errorContext);
+                if (instrumentation instanceof EventHubsProcessorInstrumentation) {
+                    ((EventHubsProcessorInstrumentation) instrumentation).markError(errorContext);
                 } else {
                     instrumentation.markDown(errorContext.getThrowable());
                 }

diff --git a/...lth/EventHusProcessorInstrumentation.java → ...th/EventHubsProcessorInstrumentation.java b/...lth/EventHusProcessorInstrumentation.java → ...th/EventHubsProcessorInstrumentation.java
@@ -9,18 +9,18 @@
 import java.time.Duration;
 
 /**
- * EventHus health details entity class.
+ * EventHubs health details entity class.
  */
-public class EventHusProcessorInstrumentation extends AbstractProcessorInstrumentation<ErrorContext> {
+public class EventHubsProcessorInstrumentation extends AbstractProcessorInstrumentation<ErrorContext> {
 
     /**
-     * Construct a {@link EventHusProcessorInstrumentation} with the specified name, {@link Type} and the period of a none error window.
+     * Construct a {@link EventHubsProcessorInstrumentation} with the specified name, {@link Type} and the period of a none error window.
      *
      * @param name the name
      * @param type the type
      * @param noneErrorWindow the period of a none error window
      */
-    public EventHusProcessorInstrumentation(String name, Type type, Duration noneErrorWindow) {
+    public EventHubsProcessorInstrumentation(String name, Type type, Duration noneErrorWindow) {
         super(name, type, noneErrorWindow);
     }
 

diff --git a/...a/com/azure/spring/integration/eventhubs/inbound/EventHubsInboundChannelAdapterTests.java b/...a/com/azure/spring/integration/eventhubs/inbound/EventHubsInboundChannelAdapterTests.java
@@ -9,6 +9,7 @@
 import com.azure.spring.integration.instrumentation.DefaultInstrumentationManager;
 import com.azure.spring.messaging.checkpoint.CheckpointConfig;
 import com.azure.spring.messaging.converter.AbstractAzureMessageConverter;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -37,13 +38,10 @@ class EventHubsInboundChannelAdapterTests {
     private final List<Message<?>> messages = Arrays.stream(payloads)
                                                     .map(p -> MessageBuilder.withPayload(p).build())
                                                     .collect(Collectors.toList());
-    private EventHubsProcessorContainer processorsContainer;
-
     @BeforeEach
     void setUp() {
-        processorsContainer = mock(EventHubsProcessorContainer.class);
-        this.adapter = new TestEventHubsInboundChannelAdapter(processorsContainer, this.eventHub, this.consumerGroup,
-            new CheckpointConfig());
+        this.adapter = new TestEventHubsInboundChannelAdapter(mock(EventHubsProcessorContainer.class),
+            this.eventHub, this.consumerGroup, new CheckpointConfig());
     }
 
     @Test
@@ -132,6 +130,11 @@ public void sendMessage(Message<?> messageArg) {
     static class TestAzureMessageConverter extends AbstractAzureMessageConverter<EventData, EventData> {
 
 
+        @Override
+        protected ObjectMapper getObjectMapper() {
+            return null;
+        }
+
         @Override
         protected Object getPayload(EventData azureMessage) {
             return azureMessage.getBody();
@@ -151,6 +154,11 @@ protected EventData fromByte(byte[] payload) {
     static class TestBatchAzureMessageConverter extends AbstractAzureMessageConverter<EventBatchContext, EventData> {
 
 
+        @Override
+        protected ObjectMapper getObjectMapper() {
+            return null;
+        }
+
         @Override
         protected Object getPayload(EventBatchContext azureMessage) {
             return azureMessage.getEvents().stream().map(EventData::getBody).collect(Collectors.toList());

diff --git a/...re/spring/integration/eventhubs/inbound/health/EventHusProcessorInstrumentationTests.java b/...re/spring/integration/eventhubs/inbound/health/EventHusProcessorInstrumentationTests.java
@@ -23,6 +23,6 @@ public ErrorContext getErrorContext(RuntimeException exception) {
     @Override
     public AbstractProcessorInstrumentation<ErrorContext> getProcessorInstrumentation(Instrumentation.Type type,
                                                                                       Duration window) {
-        return new EventHusProcessorInstrumentation("test", type, window);
+        return new EventHubsProcessorInstrumentation("test", type, window);
     }
 }
diff --git a/...com/azure/spring/integration/servicebus/inbound/ServiceBusInboundChannelAdapterTests.java b/...com/azure/spring/integration/servicebus/inbound/ServiceBusInboundChannelAdapterTests.java
@@ -13,6 +13,7 @@
 import com.azure.spring.messaging.checkpoint.CheckpointMode;
 import com.azure.spring.messaging.converter.AbstractAzureMessageConverter;
 import com.azure.spring.servicebus.core.ServiceBusProcessorContainer;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -47,21 +48,19 @@ class ServiceBusInboundChannelAdapterTests {
                                               .collect(Collectors.toList());
 
     private AutoCloseable closeable;
-    private ServiceBusProcessorContainer processorsContainer;
 
     @BeforeEach
     public void setUp() {
-        processorsContainer = mock(ServiceBusProcessorContainer.class);
         this.closeable = MockitoAnnotations.openMocks(this);
-        this.adapter = new TestServiceBusInboundChannelAdapter(processorsContainer, destination, subscription,
-            new CheckpointConfig(CheckpointMode.RECORD));
+        this.adapter = new TestServiceBusInboundChannelAdapter(mock(ServiceBusProcessorContainer.class),
+            destination, subscription, new CheckpointConfig(CheckpointMode.RECORD));
     }
 
     @Test
-    void subscriptionCannotEmptyWhenEntityTypeIsTopic() {
+    void destinationCannotEmptyWhenEntityTypeIsTopic() {
         assertThrows(IllegalArgumentException.class,
-            () -> new TestServiceBusInboundChannelAdapter(processorsContainer, destination, null,
-                new CheckpointConfig(CheckpointMode.RECORD)));
+            () -> new TestServiceBusInboundChannelAdapter(mock(ServiceBusProcessorContainer.class),
+                null, null, new CheckpointConfig(CheckpointMode.RECORD)));
     }
 
     @Test
@@ -153,6 +152,11 @@ public void sendMessage(Message<?> messageArg) {
 
     static class TestServiceBusMessageConverter extends AbstractAzureMessageConverter<ServiceBusReceivedMessage, ServiceBusMessage> {
 
+        @Override
+        protected ObjectMapper getObjectMapper() {
+            return null;
+        }
+
         @Override
         protected Object getPayload(ServiceBusReceivedMessage azureMessage) {
             final BinaryData body = azureMessage.getBody();