Fix NPE (#37382)

airbytehq · Apr 17, 2024 · a49f205 · a49f205
1 parent f519eb1
commit a49f205
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/airbyte-integrations/connectors/destination-e2e-test/metadata.yaml b/airbyte-integrations/connectors/destination-e2e-test/metadata.yaml
@@ -2,7 +2,7 @@ data:
   connectorSubtype: unknown
   connectorType: destination
   definitionId: 2eb65e87-983a-4fd7-b3e3-9d9dc6eb8537
-  dockerImageTag: 0.3.3
+  dockerImageTag: 0.3.4
   dockerRepository: airbyte/destination-e2e-test
   githubIssueLabel: destination-e2e-test
   icon: airbyte.svg

diff --git a/...t/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/LoggingConsumer.java b/...t/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/LoggingConsumer.java
@@ -52,24 +52,21 @@ public void accept(final AirbyteMessage message) {
     if (message.getType() == Type.STATE) {
       LOGGER.info("Emitting state: {}", message);
       outputRecordCollector.accept(message);
-      return;
     } else if (message.getType() == Type.TRACE) {
       LOGGER.info("Received a trace: {}", message);
-    } else if (message.getType() != Type.RECORD) {
-      return;
-    }
+    } else if (message.getType() == Type.RECORD) {
+      final AirbyteRecordMessage recordMessage = message.getRecord();
+      final AirbyteStreamNameNamespacePair pair = AirbyteStreamNameNamespacePair.fromRecordMessage(recordMessage);
 
-    final AirbyteRecordMessage recordMessage = message.getRecord();
-    final AirbyteStreamNameNamespacePair pair = AirbyteStreamNameNamespacePair.fromRecordMessage(recordMessage);
+      if (!loggers.containsKey(pair)) {
+        throw new IllegalArgumentException(
+            String.format(
+                "Message contained record from a stream that was not in the catalog.\n  Catalog: %s\n  Message: %s",
+                Jsons.serialize(configuredCatalog), Jsons.serialize(recordMessage)));
+      }
 
-    if (!loggers.containsKey(pair)) {
-      throw new IllegalArgumentException(
-          String.format(
-              "Message contained record from a stream that was not in the catalog.\n  Catalog: %s\n  Message: %s",
-              Jsons.serialize(configuredCatalog), Jsons.serialize(recordMessage)));
+      loggers.get(pair).log(recordMessage);
     }
-
-    loggers.get(pair).log(recordMessage);
   }
 
   @Override

diff --git a/docs/integrations/destinations/e2e-test.md b/docs/integrations/destinations/e2e-test.md
@@ -46,6 +46,7 @@ The OSS and Cloud variants have the same version number starting from version `0
 
 | Version | Date       | Pull Request                                             | Subject                                                   |
 |:--------|:-----------| :------------------------------------------------------- |:----------------------------------------------------------|
+| 0.3.4   | 2024-04-16 | [37366](https://github.com/airbytehq/airbyte/pull/37366) | Fix NPE                                                   |
 | 0.3.3   | 2024-04-16 | [37366](https://github.com/airbytehq/airbyte/pull/37366) | Fix Log trace messages                                    |
 | 0.3.2   | 2024-02-14 | [36812](https://github.com/airbytehq/airbyte/pull/36812) | Log trace messages                                        |
 | 0.3.1   | 2024-02-14 | [35278](https://github.com/airbytehq/airbyte/pull/35278) | Adopt CDK 0.20.6                                          |