Intern flight number string (#447)

* Intern flight number string

* Ensure output directories are present

Author: vpaturet

README.md

@@ -46,9 +46,9 @@ Main parameters:
 | avinor.timetable.period.back        |       Time window for which past flight data are imported       |
 
 ## Workflow overview
-- For each whitelisted airport, Extime sends a query to the Avinor REST API and retrieves all departure for passenger flights over a given time period.
+- For each whitelisted airport, Extime sends a query to the Avinor REST API and retrieves all departures for passenger flights over a given time period.
 - The API returns a list of _Flight_ objects that represent a single departure.
-- The _Flight_ objects are successively mapped to _FlightEvent_  and _FlightLeg_ object.
+- The _Flight_ objects are successively mapped to _FlightEvent_  and _FlightLeg_ objects.
 - A heuristic searches among all _FlightLegs_ those that are part of a multi-leg flight:
   - they share the same airline and flight number,
   - a given leg arrives at the same airport as the one the next leg departs from,

src/main/java/no/rutebanken/extime/model/FlightEvent.java

@@ -11,8 +11,8 @@
  * @param departureAirport the departure airport IATA code.
  * @param arrivalAirport the arrival airport IATA code.
  * @param dateOfOperation the scheduled date of operation.
- * @param departureTime the departure time in the time zone of the operation day.
- * @param arrivalTime the arrival time in the time zone of the operation day.
+ * @param departureTime the departure time in the time zone of the date of operation.
+ * @param arrivalTime the arrival time in the time zone of the date of operation.
  */
 public record FlightEvent(
         long flightId,

src/main/java/no/rutebanken/extime/model/FlightEventMapper.java

@@ -41,9 +41,10 @@ public List<FlightEvent> mapToFlightEvent(Flights flightsInAirport) {
 
     private static FlightEvent toFlightEvent(Flight flight) {
         AirlineIATA airline = AirlineIATA.valueOf(flight.getAirlineDesignator());
+        String flightNumber = (airline.name() + flight.getFlightNumber()).intern();
         return new FlightEvent(
                 flight.getId().longValue(),
-                airline.name() + flight.getFlightNumber(),
+                flightNumber,
                 airline,
                         AirportIATA.valueOf(flight.getDepartureStation()),
                         AirportIATA.valueOf(flight.getArrivalStation()),

src/main/java/no/rutebanken/extime/util/AvinorTimetableUtils.java

@@ -32,7 +32,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Predicate;
 import java.util.stream.Stream;
 
 @Component
@@ -146,23 +145,22 @@ private static String convertToAsciiChar(char ch) {
     }
 
     public void compressNetexFiles(Exchange exchange, @Header(Exchange.FILE_NAME) String compressedFileName) {
-        Path netexOutputPath = Paths.get(generatedOutputPath);
-        Path zipOutputPath = Paths.get(compressedOutputPath);
-        Path zipOutputFilePath = Paths.get(zipOutputPath.toString(), compressedFileName);
-        PathMatcher matcher = netexOutputPath.getFileSystem().getPathMatcher(XML_GLOB);
-        Predicate<Path> isRegularFile = path -> Files.isRegularFile(path, LinkOption.NOFOLLOW_LINKS);
-
-        if (!Files.exists(zipOutputPath)) {
-            try {
-                Files.createDirectory(zipOutputPath);
-            } catch (IOException e) {
-                throw new ExtimeException("Error while compressing NeTEx files", e);
-            }
+        Path netexOutputDirPath = Paths.get(generatedOutputPath);
+        Path zipOutputDirPath = Paths.get(compressedOutputPath);
+        try {
+            Files.createDirectories(netexOutputDirPath);
+            Files.createDirectories(zipOutputDirPath);
+        } catch (IOException e) {
+            throw new ExtimeException("Error while compressing NeTEx files", e);
         }
 
-        try (Stream<Path> stream = Files.list(netexOutputPath)) {
+        Path zipOutputFilePath = zipOutputDirPath.resolve(compressedFileName);
+        PathMatcher matcher = netexOutputDirPath.getFileSystem().getPathMatcher(XML_GLOB);
+
+        try (Stream<Path> stream = Files.list(netexOutputDirPath)) {
             File[] files = stream
-                    .filter(isRegularFile.and(path -> matcher.matches(path.getFileName())))
+                    .filter(path -> Files.isRegularFile(path, LinkOption.NOFOLLOW_LINKS))
+                    .filter(path -> matcher.matches(path.getFileName()))
                     .map(Path::toFile)
                     .toArray(File[]::new);
             ZipUtil.packEntries(files, zipOutputFilePath.toFile());