Fix tests after observability integration

Author: acogoluegnes

src/main/java/com/rabbitmq/stream/codec/QpidProtonCodec.java

@@ -32,7 +32,7 @@
 import org.apache.qpid.proton.codec.WritableBuffer;
 
 public class QpidProtonCodec implements Codec {
-  private static final MessageBuilderListener NO_OP_MESSAGE_BUILDER_LISTENER = (s, mb) -> null;
+  static final MessageBuilderListener NO_OP_MESSAGE_BUILDER_LISTENER = (s, mb) -> null;
   private static final Function<String, String> MESSAGE_ANNOTATIONS_STRING_KEY_EXTRACTOR = k -> k;
   private static final Function<Symbol, String> MESSAGE_ANNOTATIONS_SYMBOL_KEY_EXTRACTOR =
       Symbol::toString;

src/main/java/com/rabbitmq/stream/codec/SimpleCodec.java

@@ -39,12 +39,12 @@ public MessageBuilder messageBuilder() {
 
   @Override
   public MessageBuilder messageBuilder(String stream) {
-    return null;
+    return new SimpleMessageBuilder();
   }
 
   @Override
   public Codec messageBuilderListener(MessageBuilderListener listener) {
-    return null;
+    return new SimpleCodec();
   }
 
   @Override

src/test/java/com/rabbitmq/stream/codec/CodecsTest.java

@@ -13,6 +13,7 @@
 // [email protected].
 package com.rabbitmq.stream.codec;
 
+import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
@@ -32,7 +33,6 @@
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
@@ -53,7 +53,7 @@ public class CodecsTest {
   static UUID TEST_UUID = UUID.randomUUID();
 
   static Iterable<CodecCouple> codecsCouples() {
-    List<Codec> codecs = Arrays.asList(new QpidProtonCodec(), new SwiftMqCodec());
+    List<Codec> codecs = asList(new QpidProtonCodec(), new SwiftMqCodec());
     List<CodecCouple> couples = new ArrayList<>();
     for (Codec serializer : codecs) {
       for (Codec deserializer : codecs) {
@@ -65,14 +65,14 @@ static Iterable<CodecCouple> codecsCouples() {
   }
 
   static Iterable<Supplier<MessageBuilder>> messageBuilderSuppliers() {
-    return Arrays.asList(
-        new MessageBuilderCreator(QpidProtonMessageBuilder.class),
-        new MessageBuilderCreator(SwiftMqMessageBuilder.class),
-        new MessageBuilderCreator(WrapperMessageBuilder.class));
+    return asList(
+        () -> new QpidProtonMessageBuilder("", (stream, builder) -> null),
+        SwiftMqMessageBuilder::new,
+        WrapperMessageBuilder::new);
   }
 
   static Iterable<Codec> readCreatedMessage() {
-    return Arrays.asList(
+    return asList(
         when(mock(Codec.class).messageBuilder()).thenReturn(new WrapperMessageBuilder()).getMock(),
         new QpidProtonCodec(),
         new SwiftMqCodec());
@@ -598,29 +598,4 @@ public String toString() {
           + messageBuilderSupplier.get().getClass().getSimpleName();
     }
   }
-
-  static class MessageBuilderCreator implements Supplier<MessageBuilder> {
-
-    final Supplier<MessageBuilder> supplier;
-
-    MessageBuilderCreator(Class<? extends MessageBuilder> clazz) {
-      supplier =
-          () -> {
-            try {
-              return clazz.getDeclaredConstructor().newInstance();
-            } catch (Exception e) {
-              throw new RuntimeException(e);
-            }
-          };
-    }
-
-    public MessageBuilder get() {
-      return supplier.get();
-    }
-
-    @Override
-    public String toString() {
-      return get().getClass().getSimpleName();
-    }
-  }
 }

src/test/java/com/rabbitmq/stream/impl/StreamProducerUnitTest.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2022 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2021-2023 VMware, Inc. or its affiliates.  All rights reserved.
 //
 // This software, the RabbitMQ Stream Java client library, is dual-licensed under the
 // Mozilla Public License 2.0 ("MPL"), and the Apache License version 2 ("ASL").
@@ -22,6 +22,7 @@
 
 import com.rabbitmq.stream.ConfirmationHandler;
 import com.rabbitmq.stream.Constants;
+import com.rabbitmq.stream.ObservationCollector;
 import com.rabbitmq.stream.StreamException;
 import com.rabbitmq.stream.codec.SimpleCodec;
 import com.rabbitmq.stream.compression.Compression;
@@ -112,6 +113,7 @@ void init() {
     when(env.locatorOperation(any())).thenCallRealMethod();
     when(env.clock()).thenReturn(clock);
     when(env.codec()).thenReturn(new SimpleCodec());
+    when(env.observationCollector()).thenReturn(ObservationCollector.NO_OP);
     doAnswer(
             (Answer<Runnable>)
                 invocationOnMock -> {