From aa834b9974f14ffec4c97bc4945a875537d4d2ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez=20Pi=C3=B1eiro?=
 <53467003+DavidGonzalezPineiro@users.noreply.github.com>
Date: Thu, 15 May 2025 14:11:52 +0200
Subject: [PATCH 1/2] Fixing SunsetAirFlightData reference and test

---
 .../flightimporter/FlightImporterJob.java     |  4 ++--
 .../java/models/SunsetAirFlightDataTest.java  | 19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/solutions/16-merging-streams/src/main/java/flightimporter/FlightImporterJob.java b/solutions/16-merging-streams/src/main/java/flightimporter/FlightImporterJob.java
index dd35324..079820c 100644
--- a/solutions/16-merging-streams/src/main/java/flightimporter/FlightImporterJob.java
+++ b/solutions/16-merging-streams/src/main/java/flightimporter/FlightImporterJob.java
@@ -41,7 +41,7 @@ public static void main(String[] args) throws Exception {
             .setValueOnlyDeserializer(new JsonDeserializationSchema(SkyOneAirlinesFlightData.class))
             .build();
 
-        KafkaSource<SunsetAirFlightData> sunsetSource = KafkaSource.<SkyOneAirlinesFlightData>builder()
+        KafkaSource<SunsetAirFlightData> sunsetSource = KafkaSource.<SunsetAirFlightData>builder()
             .setProperties(consumerConfig)
             .setTopics("sunset")
             .setStartingOffsets(OffsetsInitializer.latest())
@@ -87,4 +87,4 @@ public static DataStream<FlightData> defineWorkflow(DataStream<SkyOneAirlinesFli
 
         return skyOneFlightStream.union(sunsetFlightStream);
     }
-}
\ No newline at end of file
+}
diff --git a/staging/16-merging-streams/src/test/java/models/SunsetAirFlightDataTest.java b/staging/16-merging-streams/src/test/java/models/SunsetAirFlightDataTest.java
index c5b26f4..4ad0db6 100644
--- a/staging/16-merging-streams/src/test/java/models/SunsetAirFlightDataTest.java
+++ b/staging/16-merging-streams/src/test/java/models/SunsetAirFlightDataTest.java
@@ -7,6 +7,9 @@
 import static org.apache.flink.types.PojoTestUtils.assertSerializedAsPojo;
 import static org.junit.jupiter.api.Assertions.*;
 
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+
 class SunsetAirFlightDataTest {
 
     ObjectMapper mapper = new ObjectMapper().registerModule(new JavaTimeModule());
@@ -93,10 +96,20 @@ public void serializer_shouldSerializeAndDeserializeTheCorrectObject() throws Ex
 
     @Test
     public void serializer_shouldHandleUnknownFields() throws Exception {
-        String json = "{\"emailAddress\":\"LJNZGYPIER@email.com\",\"flightDepartureTime\":\"2023-10-16T22:25:00.000Z\",\"iataDepartureCode\":\"LAS\",\"flightArrivalTime\":\"2023-10-17T09:38:00.000Z\",\"iataArrivalCode\":\"BOS\",\"flightNumber\":\"SKY1522\",\"confirmation\":\"SKY1OUJUUK\",\"unknownField\":\"ignore\"}";
-
+        String json = "{\"customerEmailAddress\":\"LJNZGYPIER@email.com\",\"departureTime\":\"2023-10-16T22:25:00.000Z\",\"departureAirport\":\"LAS\",\"arrivalTime\":\"2023-10-17T09:38:00.000Z\",\"arrivalAirport\":\"BOS\",\"flightId\":\"SKY1522\",\"referenceNumber\":\"SKY1OUJUUK\",\"unknownField\":\"ignore\"}";
+        
         SunsetAirFlightData object = mapper.readValue(json, SunsetAirFlightData.class);
+ 
+        SunsetAirFlightData expected = new SunsetAirFlightData();
+        expected.setCustomerEmailAddress("LJNZGYPIER@email.com");
+        expected.setDepartureTime(ZonedDateTime.parse("2023-10-16T22:25:00.000Z").withZoneSameInstant(ZoneId.of("UTC")));
+        expected.setDepartureAirport("LAS");
+        expected.setArrivalTime(ZonedDateTime.parse("2023-10-17T09:38:00.000Z").withZoneSameInstant(ZoneId.of("UTC")));
+        expected.setArrivalAirport("BOS");
+        expected.setFlightId("SKY1522");
+        expected.setReferenceNumber("SKY1OUJUUK");
 
         assertInstanceOf(SunsetAirFlightData.class, object);
+        assertEquals(expected, object);
     }
-}
\ No newline at end of file
+}

From f993d26364c5ebd708e52a130de3d2c6b7c0ba0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez=20Pi=C3=B1eiro?=
 <53467003+DavidGonzalezPineiro@users.noreply.github.com>
Date: Fri, 16 May 2025 09:42:14 +0200
Subject: [PATCH 2/2] Trigger CLA check