Merge pull request #167 from mobidata-bw/issues/430_missing_gbfs_feed

Fix: return discovery feed
entur · Apr 20, 2024 · 0eb855e · 0eb855e
2 parents 1321e9e + 505104a
commit 0eb855e
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/src/main/java/org/entur/gbfs/loader/BaseGbfsLoader.java b/src/main/java/org/entur/gbfs/loader/BaseGbfsLoader.java
@@ -145,10 +145,16 @@ public <R> R getFeed(Class<R> feed) {
   }
 
   public Optional<byte[]> getRawFeed(S feedName) {
+    if (feedName == getDiscoveryFeedName()) {
+      return discoveryFileUpdater.getRawData();
+    }
+
     GBFSFeedUpdater<?> updater = feedUpdaters.get(feedName);
     if (updater == null) {
       return Optional.empty();
     }
     return updater.getRawData();
   }
+
+  protected abstract S getDiscoveryFeedName();
 }
diff --git a/src/main/java/org/entur/gbfs/loader/v2/GbfsV2Loader.java b/src/main/java/org/entur/gbfs/loader/v2/GbfsV2Loader.java
@@ -125,4 +125,9 @@ public GbfsV2Loader(
       )
       .collect(Collectors.toList());
   }
+
+  @Override
+  protected GBFSFeedName getDiscoveryFeedName() {
+    return GBFSFeedName.GBFS;
+  }
 }
diff --git a/src/main/java/org/entur/gbfs/loader/v3/GbfsV3Loader.java b/src/main/java/org/entur/gbfs/loader/v3/GbfsV3Loader.java
@@ -93,4 +93,9 @@ public GbfsV3Loader(
       )
       .collect(Collectors.toList());
   }
+
+  @Override
+  protected GBFSFeed.Name getDiscoveryFeedName() {
+    return GBFSFeed.Name.GBFS;
+  }
 }
diff --git a/src/test/java/org/entur/gbfs/loader/v2/GbfsV2LoaderTest.java b/src/test/java/org/entur/gbfs/loader/v2/GbfsV2LoaderTest.java
@@ -153,6 +153,8 @@ private void validateV22Feed(GbfsV2Loader loader) {
     );
     assertEquals(0, validationResult.getErrorsCount());
 
+    assertFalse(loader.getRawFeed(GBFSFeedName.GBFS).isEmpty());
+
     GBFSSystemInformation systemInformation = loader.getFeed(GBFSSystemInformation.class);
     assertNotNull(systemInformation);
     assertEquals("lillestrombysykkel", systemInformation.getData().getSystemId());

diff --git a/src/test/java/org/entur/gbfs/loader/v3/GbfsV3LoaderTest.java b/src/test/java/org/entur/gbfs/loader/v3/GbfsV3LoaderTest.java
@@ -1,10 +1,6 @@
 package org.entur.gbfs.loader.v3;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.ByteArrayInputStream;
 import java.util.List;
@@ -52,6 +48,8 @@ private void validateV3Feed(GbfsV3Loader loader) {
     );
     assertEquals(0, validationResult.getErrorsCount());
 
+    assertFalse(loader.getRawFeed(GBFSFeed.Name.GBFS).isEmpty());
+
     GBFSSystemInformation systemInformation = loader.getFeed(GBFSSystemInformation.class);
     assertNotNull(systemInformation);
     assertEquals("getaround_stavanger", systemInformation.getData().getSystemId());