Merge pull request #77 from entur/gbfs-3.0-release

Gbfs 3.0 release

Author: testower

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>org.entur.gbfs</groupId>
     <artifactId>gbfs-validator-java</artifactId>
-    <version>1.0.27-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
 
     <name>gbfs-validator-java</name>
     <description>Validate GBFS feeds</description>
@@ -46,8 +46,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jdk.version>17</jdk.version>
 
-        <gbfsGithubUrl>https://github.com/entur/gbfs-json-schema/archive/refs/tags/v3.0-RC8.zip</gbfsGithubUrl>
-        <schemaVersion>3.0-RC8</schemaVersion>
+        <gbfsGithubUrl>https://github.com/entur/gbfs-json-schema/archive/refs/tags/v3.0.zip</gbfsGithubUrl>
+        <schemaVersion>3.0</schemaVersion>
 
         <everit-json-schema.version>1.14.4</everit-json-schema.version>
         <slf4j.version>1.7.36</slf4j.version>

…ion/validator/versions/Version30_RC.java …dation/validator/versions/Version30.javasrc/main/java/org/entur/gbfs/validation/validator/versions/Version30_RC.java renamed to src/main/java/org/entur/gbfs/validation/validator/versions/Version30.java src/main/java/org/entur/gbfs/validation/validator/versions/Version30_RC.java renamed to src/main/java/org/entur/gbfs/validation/validator/versions/Version30.java

@@ -30,8 +30,8 @@
 import java.util.List;
 import java.util.Map;
 
-public class Version30_RC extends AbstractVersion {
-    public static final String VERSION = "3.0-RC";
+public class Version30 extends AbstractVersion {
+    public static final String VERSION = "3.0";
 
     private static final List<String> feeds = Arrays.asList(
             "gbfs",
@@ -65,7 +65,7 @@ public class Version30_RC extends AbstractVersion {
             )
     );
 
-    protected Version30_RC() {
+    protected Version30() {
         super(VERSION, feeds, customRules);
     }
 

src/main/java/org/entur/gbfs/validation/validator/versions/Version30_RC2.java

@@ -35,11 +35,8 @@ public static Version createVersion(String version) {
                 return new Version22();
             case "2.3":
                 return new Version23();
-            case "3.0-RC":
-                return new Version30_RC();
             case "3.0":
-            case "3.0-RC2":
-                return new Version30_RC2();
+                return new Version30();
             default:
                 throw new UnsupportedOperationException("Version not implemented");
         }

src/main/java/org/entur/gbfs/validation/validator/versions/VersionFactory.java

@@ -167,54 +167,28 @@ void testSuccessfulV2_3Validation() {
     }
 
     @Test
-    void testSuccessfulV3_0_RCValidation() {
+    void testSuccessfulV3_0Validation() {
         GbfsJsonValidator validator = new GbfsJsonValidator();
 
         Map<String, InputStream> deliveryMap = new HashMap<>();
-        deliveryMap.put("gbfs", getFixture("fixtures/v3.0-RC/gbfs.json"));
-        deliveryMap.put("gbfs_versions", getFixture("fixtures/v3.0-RC/gbfs_versions.json"));
-        deliveryMap.put("system_information", getFixture("fixtures/v3.0-RC/system_information.json"));
-        deliveryMap.put("vehicle_types", getFixture("fixtures/v3.0-RC/vehicle_types.json"));
-        deliveryMap.put("station_information", getFixture("fixtures/v3.0-RC/station_information.json"));
-        deliveryMap.put("station_status", getFixture("fixtures/v3.0-RC/station_status.json"));
-        deliveryMap.put("vehicle_status", getFixture("fixtures/v3.0-RC/vehicle_status.json"));
-        deliveryMap.put("manifest", getFixture("fixtures/v3.0-RC/manifest.json"));
-        deliveryMap.put("system_regions", getFixture("fixtures/v3.0-RC/system_regions.json"));
-        deliveryMap.put("system_pricing_plans", getFixture("fixtures/v3.0-RC/system_pricing_plans.json"));
-        deliveryMap.put("system_alerts", getFixture("fixtures/v3.0-RC/system_alerts.json"));
-        deliveryMap.put("geofencing_zones", getFixture("fixtures/v3.0-RC/geofencing_zones.json"));
+        deliveryMap.put("gbfs", getFixture("fixtures/v3.0/gbfs.json"));
+        deliveryMap.put("gbfs_versions", getFixture("fixtures/v3.0/gbfs_versions.json"));
+        deliveryMap.put("system_information", getFixture("fixtures/v3.0/system_information.json"));
+        deliveryMap.put("vehicle_types", getFixture("fixtures/v3.0/vehicle_types.json"));
+        deliveryMap.put("station_information", getFixture("fixtures/v3.0/station_information.json"));
+        deliveryMap.put("station_status", getFixture("fixtures/v3.0/station_status.json"));
+        deliveryMap.put("vehicle_status", getFixture("fixtures/v3.0/vehicle_status.json"));
+        deliveryMap.put("manifest", getFixture("fixtures/v3.0/manifest.json"));
+        deliveryMap.put("system_regions", getFixture("fixtures/v3.0/system_regions.json"));
+        deliveryMap.put("system_pricing_plans", getFixture("fixtures/v3.0/system_pricing_plans.json"));
+        deliveryMap.put("system_alerts", getFixture("fixtures/v3.0/system_alerts.json"));
+        deliveryMap.put("geofencing_zones", getFixture("fixtures/v3.0/geofencing_zones.json"));
 
         ValidationResult result = validator.validate(deliveryMap);
 
-        printErrors("3.0-RC", result);
+        printErrors("3.0", result);
 
-        Assertions.assertEquals("3.0-RC", result.getSummary().getVersion());
-        Assertions.assertEquals(0, result.getSummary().getErrorsCount());
-    }
-
-    @Test
-    void testSuccessfulV3_0_RC2Validation() {
-        GbfsJsonValidator validator = new GbfsJsonValidator();
-
-        Map<String, InputStream> deliveryMap = new HashMap<>();
-        deliveryMap.put("gbfs", getFixture("fixtures/v3.0-RC2/gbfs.json"));
-        deliveryMap.put("gbfs_versions", getFixture("fixtures/v3.0-RC2/gbfs_versions.json"));
-        deliveryMap.put("system_information", getFixture("fixtures/v3.0-RC2/system_information.json"));
-        deliveryMap.put("vehicle_types", getFixture("fixtures/v3.0-RC2/vehicle_types.json"));
-        deliveryMap.put("station_information", getFixture("fixtures/v3.0-RC2/station_information.json"));
-        deliveryMap.put("station_status", getFixture("fixtures/v3.0-RC2/station_status.json"));
-        deliveryMap.put("vehicle_status", getFixture("fixtures/v3.0-RC2/vehicle_status.json"));
-        deliveryMap.put("manifest", getFixture("fixtures/v3.0-RC2/manifest.json"));
-        deliveryMap.put("system_regions", getFixture("fixtures/v3.0-RC2/system_regions.json"));
-        deliveryMap.put("system_pricing_plans", getFixture("fixtures/v3.0-RC2/system_pricing_plans.json"));
-        deliveryMap.put("system_alerts", getFixture("fixtures/v3.0-RC2/system_alerts.json"));
-        deliveryMap.put("geofencing_zones", getFixture("fixtures/v3.0-RC2/geofencing_zones.json"));
-
-        ValidationResult result = validator.validate(deliveryMap);
-
-        printErrors("3.0-RC2", result);
-
-        Assertions.assertEquals("3.0-RC2", result.getSummary().getVersion());
+        Assertions.assertEquals("3.0", result.getSummary().getVersion());
         Assertions.assertEquals(0, result.getSummary().getErrorsCount());
     }