java models for 3.1-rc2

Author: Alessandro100

models/java/gbfs-java-model/bin/schema-to-subfolders.sh

@@ -13,7 +13,7 @@ rm -rf ./models/java/gbfs-java-model/resources
 output_path="./models/java/gbfs-java-model/resources/"
 path_to_schemas="."
 
-versions=("v3.0" "v2.3" "v2.2" "v2.1" "v2.0" "v1.1" "v1.0")
+versions=("v3.1-RC2" "v3.0" "v2.3" "v2.2" "v2.1" "v2.0" "v1.1" "v1.0")
 
 echo "Start Schema to Subfolders Script"
 

models/java/gbfs-java-model/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.mobilitydata</groupId>
     <artifactId>gbfs-java-model</artifactId>
-    <version>1.0.9</version>
+    <version>1.0.10</version>
 
     <name>gbfs-java-model</name>
 
@@ -256,6 +256,25 @@
                             <customRuleFactory>org.mobilitydata.gbfs.GeofencingRuleFactory</customRuleFactory>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>generate-v3.1-RC2-sources</id>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <classNamePrefix>GBFS</classNamePrefix>
+                            <formatTypeMapping>
+                                <uri>java.lang.String</uri>
+                            </formatTypeMapping>
+                            <removeOldOutput>false</removeOldOutput>
+                            <serializable>true</serializable>
+                            <initializeCollections>false</initializeCollections>
+                            <generateBuilders>true</generateBuilders>
+                            <sourceDirectory>${basedir}/resources/v3.1-RC2</sourceDirectory>
+                            <targetPackage>org.mobilitydata.gbfs.v3_1_RC2</targetPackage>
+                            <customRuleFactory>org.mobilitydata.gbfs.GeofencingRuleFactory</customRuleFactory>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>

models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v3_1_RC2/gbfs/GBFSFeedName.java

@@ -0,0 +1,48 @@
+package org.mobilitydata.gbfs.v3_1_RC2.gbfs;
+
+import org.mobilitydata.gbfs.v3_1_RC2.gbfs_versions.GBFSGbfsVersions;
+import org.mobilitydata.gbfs.v3_1_RC2.geofencing_zones.GBFSGeofencingZones;
+import org.mobilitydata.gbfs.v3_1_RC2.station_information.GBFSStationInformation;
+import org.mobilitydata.gbfs.v3_1_RC2.station_status.GBFSStationStatus;
+import org.mobilitydata.gbfs.v3_1_RC2.system_alerts.GBFSSystemAlerts;
+import org.mobilitydata.gbfs.v3_1_RC2.system_information.GBFSSystemInformation;
+import org.mobilitydata.gbfs.v3_1_RC2.system_pricing_plans.GBFSSystemPricingPlans;
+import org.mobilitydata.gbfs.v3_1_RC2.system_regions.GBFSSystemRegions;
+import org.mobilitydata.gbfs.v3_1_RC2.vehicle_status.GBFSVehicleStatus;
+import org.mobilitydata.gbfs.v3_1_RC2.vehicle_types.GBFSVehicleTypes;
+
+import java.util.EnumMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class GBFSFeedName {
+    private GBFSFeedName() {}
+
+
+    private static final Map<GBFSFeed.Name, Class<?>> feedNameMap = new EnumMap<>(GBFSFeed.Name.class);
+
+    private static final Map<Class<?>, GBFSFeed.Name> classMap;
+
+    static {
+        feedNameMap.put(GBFSFeed.Name.GBFS, GBFSGbfs.class);
+        feedNameMap.put(GBFSFeed.Name.GBFS_VERSIONS, GBFSGbfsVersions.class);
+        feedNameMap.put(GBFSFeed.Name.GEOFENCING_ZONES, GBFSGeofencingZones.class);
+        feedNameMap.put(GBFSFeed.Name.STATION_INFORMATION, GBFSStationInformation.class);
+        feedNameMap.put(GBFSFeed.Name.STATION_STATUS, GBFSStationStatus.class);
+        feedNameMap.put(GBFSFeed.Name.SYSTEM_ALERTS, GBFSSystemAlerts.class);
+        feedNameMap.put(GBFSFeed.Name.SYSTEM_INFORMATION, GBFSSystemInformation.class);
+        feedNameMap.put(GBFSFeed.Name.SYSTEM_PRICING_PLANS, GBFSSystemPricingPlans.class);
+        feedNameMap.put(GBFSFeed.Name.SYSTEM_REGIONS, GBFSSystemRegions.class);
+        feedNameMap.put(GBFSFeed.Name.VEHICLE_STATUS, GBFSVehicleStatus.class);
+        feedNameMap.put(GBFSFeed.Name.VEHICLE_TYPES, GBFSVehicleTypes.class);
+        classMap = feedNameMap.entrySet().stream().collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey));
+    }
+
+    public static Class<?> implementingClass(GBFSFeed.Name feedName) {
+        return feedNameMap.get(feedName);
+    }
+
+    public static GBFSFeed.Name fromClass(Class<?> clazz) {
+        return classMap.get(clazz);
+    }
+}

models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_1_RC2/gbfs/GBFSFeedNameTest.java

@@ -0,0 +1,30 @@
+package org.mobilitydata.gbfs.v3_1_RC2.gbfs;
+
+import org.mobilitydata.gbfs.v3_1_RC2.station_information.GBFSStationInformation;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class GBFSFeedNameTest {
+
+    @Test
+    void value() {
+        Assertions.assertEquals("station_information", org.mobilitydata.gbfs.v3_1_RC2.gbfs.GBFSFeed.Name.STATION_INFORMATION.value());
+    }
+
+    @Test
+    void implementingClass() {
+        assertEquals(GBFSStationInformation.class, org.mobilitydata.gbfs.v3_1_RC2.gbfs.GBFSFeedName.implementingClass(org.mobilitydata.gbfs.v3_1_RC2.gbfs.GBFSFeed.Name.STATION_INFORMATION));
+    }
+
+    @Test
+    void fromValue() {
+        assertEquals(org.mobilitydata.gbfs.v3_1_RC2.gbfs.GBFSFeed.Name.STATION_INFORMATION, org.mobilitydata.gbfs.v3_1_RC2.gbfs.GBFSFeed.Name.fromValue("station_information"));
+    }
+
+    @Test
+    void fromClass() {
+        assertEquals(GBFSFeed.Name.STATION_INFORMATION, GBFSFeedName.fromClass(GBFSStationInformation.class));
+    }
+}

models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_1_RC2/gbfs/GBFSTest.java

@@ -0,0 +1,11 @@
+package org.mobilitydata.gbfs.v3_1_RC2.gbfs;
+
+import org.mobilitydata.gbfs.TestBase;
+import org.junit.jupiter.api.Test;
+
+class GBFSTest extends TestBase {
+    @Test
+    void testUnmarshal() {
+        assertUnmarshalDoesNotThrow("v3_1_RC2/gbfs.json", GBFSGbfs.class);
+    }
+}

models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_1_RC2/gbfs_versions/GBFSVersionsTest.java

@@ -0,0 +1,12 @@
+package org.mobilitydata.gbfs.v3_1_RC2.gbfs_versions;
+
+import org.mobilitydata.gbfs.TestBase;
+
+import org.junit.jupiter.api.Test;
+
+class GBFSVersionsTest extends TestBase {
+    @Test
+    void testUnmarshal() {
+        assertUnmarshalDoesNotThrow("v3_1_RC2/gbfs_versions.json", GBFSGbfsVersions.class);
+    }
+}

models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_1_RC2/geofencing_zones/GeofencingZonesTest.java

@@ -0,0 +1,19 @@
+package org.mobilitydata.gbfs.v3_1_RC2.geofencing_zones;
+
+import org.mobilitydata.gbfs.TestBase;
+
+import org.geojson.LngLatAlt;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class GeofencingZonesTest extends TestBase {
+    @Test
+    void testUnmarshal() {
+        GBFSGeofencingZones zones = assertUnmarshalDoesNotThrow("v3_1_RC2/geofencing_zones.json", GBFSGeofencingZones.class);
+        GBFSFeature feature = zones.getData().getGeofencingZones().getFeatures().get(0);
+        LngLatAlt coord = feature.getGeometry().getCoordinates().get(0).get(0).get(0);
+        assertEquals(45.562982, coord.getLatitude(), 0.01);
+        assertEquals(-122.578067, coord.getLongitude());
+    }
+}

models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_1_RC2/manifest/ManifestTest.java

@@ -0,0 +1,12 @@
+package org.mobilitydata.gbfs.v3_1_RC2.manifest;
+
+import org.mobilitydata.gbfs.TestBase;
+
+import org.junit.jupiter.api.Test;
+
+class ManifestTest extends TestBase {
+    @Test
+    void testUnmarshal() {
+        assertUnmarshalDoesNotThrow("v3_1_RC2/manifest.json", GBFSManifest.class);
+    }
+}

models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_1_RC2/station_information/StationInformationTest.java

@@ -0,0 +1,11 @@
+package org.mobilitydata.gbfs.v3_1_RC2.station_information;
+
+import org.mobilitydata.gbfs.TestBase;
+import org.junit.jupiter.api.Test;
+
+class StationInformationTest extends TestBase {
+    @Test
+    void testUnmarshal() {
+        assertUnmarshalDoesNotThrow("v3_1_RC2/station_information.json", GBFSStationInformation.class);
+    }
+}

models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_1_RC2/station_status/StationStatusTest.java

@@ -0,0 +1,11 @@
+package org.mobilitydata.gbfs.v3_1_RC2.station_status;
+
+import org.mobilitydata.gbfs.TestBase;
+import org.junit.jupiter.api.Test;
+
+class StationStatusTest extends TestBase {
+    @Test
+    void testUnmarshal() {
+        assertUnmarshalDoesNotThrow("v3_1_RC2/station_status.json", GBFSStationStatus.class);
+    }
+}