Skip to content

feat: java language bindings 3.1-rc3 #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Alessandro100 merged 1 commit into from
May 26, 2026
Merged

feat: java language bindings 3.1-rc3 #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion models/java/gbfs-java-model/bin/schema-to-subfolders.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.1-RC2" "v3.0" "v2.3" "v2.2" "v2.1" "v2.0" "v1.1" "v1.0")
versions=("v3.1-RC3" "v3.0" "v2.3" "v2.2" "v2.1" "v2.0" "v1.1" "v1.0")

echo "Start Schema to Subfolders Script"

Expand Down
8 changes: 4 additions & 4 deletions models/java/gbfs-java-model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.mobilitydata</groupId>
<artifactId>gbfs-java-model</artifactId>
<version>1.0.12</version>
<version>1.0.13</version>

<name>gbfs-java-model</name>

Expand Down Expand Up @@ -257,7 +257,7 @@
</configuration>
</execution>
<execution>
<id>generate-v3.1-RC2-sources</id>
<id>generate-v3.1-RC3-sources</id>
<goals>
<goal>generate</goal>
</goals>
Expand All @@ -270,8 +270,8 @@
<serializable>true</serializable>
<initializeCollections>false</initializeCollections>
<generateBuilders>true</generateBuilders>
<sourceDirectory>${basedir}/resources/v3.1-RC2</sourceDirectory>
<targetPackage>org.mobilitydata.gbfs.v3_1_RC2</targetPackage>
<sourceDirectory>${basedir}/resources/v3.1-RC3</sourceDirectory>
<targetPackage>org.mobilitydata.gbfs.v3_1_RC3</targetPackage>
<customRuleFactory>org.mobilitydata.gbfs.GeofencingRuleFactory</customRuleFactory>
</configuration>
</execution>
Expand Down
24 changes: 12 additions & 12 deletions ...data/gbfs/v3_1_RC2/gbfs/GBFSFeedName.java → ...data/gbfs/v3_1_RC3/gbfs/GBFSFeedName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
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;
package org.mobilitydata.gbfs.v3_1_RC3.gbfs;

import org.mobilitydata.gbfs.v3_1_RC3.gbfs_versions.GBFSGbfsVersions;
import org.mobilitydata.gbfs.v3_1_RC3.geofencing_zones.GBFSGeofencingZones;
import org.mobilitydata.gbfs.v3_1_RC3.station_information.GBFSStationInformation;
import org.mobilitydata.gbfs.v3_1_RC3.station_status.GBFSStationStatus;
import org.mobilitydata.gbfs.v3_1_RC3.system_alerts.GBFSSystemAlerts;
import org.mobilitydata.gbfs.v3_1_RC3.system_information.GBFSSystemInformation;
import org.mobilitydata.gbfs.v3_1_RC3.system_pricing_plans.GBFSSystemPricingPlans;
import org.mobilitydata.gbfs.v3_1_RC3.system_regions.GBFSSystemRegions;
import org.mobilitydata.gbfs.v3_1_RC3.vehicle_status.GBFSVehicleStatus;
import org.mobilitydata.gbfs.v3_1_RC3.vehicle_types.GBFSVehicleTypes;

import java.util.EnumMap;
import java.util.Map;
Expand Down
10 changes: 5 additions & 5 deletions .../gbfs/v3_1_RC2/gbfs/GBFSFeedNameTest.java → .../gbfs/v3_1_RC3/gbfs/GBFSFeedNameTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.mobilitydata.gbfs.v3_1_RC2.gbfs;
package org.mobilitydata.gbfs.v3_1_RC3.gbfs;

import org.mobilitydata.gbfs.v3_1_RC2.station_information.GBFSStationInformation;
import org.mobilitydata.gbfs.v3_1_RC3.station_information.GBFSStationInformation;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

Expand All @@ -10,17 +10,17 @@ class GBFSFeedNameTest {

@Test
void value() {
Assertions.assertEquals("station_information", org.mobilitydata.gbfs.v3_1_RC2.gbfs.GBFSFeed.Name.STATION_INFORMATION.value());
Assertions.assertEquals("station_information", org.mobilitydata.gbfs.v3_1_RC3.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));
assertEquals(GBFSStationInformation.class, org.mobilitydata.gbfs.v3_1_RC3.gbfs.GBFSFeedName.implementingClass(org.mobilitydata.gbfs.v3_1_RC3.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"));
assertEquals(org.mobilitydata.gbfs.v3_1_RC3.gbfs.GBFSFeed.Name.STATION_INFORMATION, org.mobilitydata.gbfs.v3_1_RC3.gbfs.GBFSFeed.Name.fromValue("station_information"));
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions ...litydata/gbfs/v3_1_RC2/gbfs/GBFSTest.java → ...litydata/gbfs/v3_1_RC3/gbfs/GBFSTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.mobilitydata.gbfs.v3_1_RC2.gbfs;
package org.mobilitydata.gbfs.v3_1_RC3.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);
assertUnmarshalDoesNotThrow("v3_1_RC3/gbfs.json", GBFSGbfs.class);
}
}
4 changes: 2 additions & 2 deletions ...1_RC2/gbfs_versions/GBFSVersionsTest.java → ...1_RC3/gbfs_versions/GBFSVersionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mobilitydata.gbfs.v3_1_RC2.gbfs_versions;
package org.mobilitydata.gbfs.v3_1_RC3.gbfs_versions;

import org.mobilitydata.gbfs.TestBase;

Expand All @@ -7,6 +7,6 @@
class GBFSVersionsTest extends TestBase {
@Test
void testUnmarshal() {
assertUnmarshalDoesNotThrow("v3_1_RC2/gbfs_versions.json", GBFSGbfsVersions.class);
assertUnmarshalDoesNotThrow("v3_1_RC3/gbfs_versions.json", GBFSGbfsVersions.class);
}
}
4 changes: 2 additions & 2 deletions ...geofencing_zones/GeofencingZonesTest.java → ...geofencing_zones/GeofencingZonesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mobilitydata.gbfs.v3_1_RC2.geofencing_zones;
package org.mobilitydata.gbfs.v3_1_RC3.geofencing_zones;

import org.mobilitydata.gbfs.TestBase;

Expand All @@ -10,7 +10,7 @@
class GeofencingZonesTest extends TestBase {
@Test
void testUnmarshal() {
GBFSGeofencingZones zones = assertUnmarshalDoesNotThrow("v3_1_RC2/geofencing_zones.json", GBFSGeofencingZones.class);
GBFSGeofencingZones zones = assertUnmarshalDoesNotThrow("v3_1_RC3/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);
Expand Down
4 changes: 2 additions & 2 deletions .../gbfs/v3_1_RC2/manifest/ManifestTest.java → .../gbfs/v3_1_RC3/manifest/ManifestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mobilitydata.gbfs.v3_1_RC2.manifest;
package org.mobilitydata.gbfs.v3_1_RC3.manifest;

import org.mobilitydata.gbfs.TestBase;

Expand All @@ -7,6 +7,6 @@
class ManifestTest extends TestBase {
@Test
void testUnmarshal() {
assertUnmarshalDoesNotThrow("v3_1_RC2/manifest.json", GBFSManifest.class);
assertUnmarshalDoesNotThrow("v3_1_RC3/manifest.json", GBFSManifest.class);
}
}
4 changes: 2 additions & 2 deletions ...n_information/StationInformationTest.java → ...n_information/StationInformationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.mobilitydata.gbfs.v3_1_RC2.station_information;
package org.mobilitydata.gbfs.v3_1_RC3.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);
assertUnmarshalDoesNotThrow("v3_1_RC3/station_information.json", GBFSStationInformation.class);
}
}
4 changes: 2 additions & 2 deletions ...RC2/station_status/StationStatusTest.java → ...RC3/station_status/StationStatusTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.mobilitydata.gbfs.v3_1_RC2.station_status;
package org.mobilitydata.gbfs.v3_1_RC3.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);
assertUnmarshalDoesNotThrow("v3_1_RC3/station_status.json", GBFSStationStatus.class);
}
}
4 changes: 2 additions & 2 deletions ...1_RC2/system_alerts/SystemAlertsTest.java → ...1_RC3/system_alerts/SystemAlertsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.mobilitydata.gbfs.v3_1_RC2.system_alerts;
package org.mobilitydata.gbfs.v3_1_RC3.system_alerts;

import org.mobilitydata.gbfs.TestBase;
import org.junit.jupiter.api.Test;

class SystemAlertsTest extends TestBase {
@Test
void testUnmarshal() {
assertUnmarshalDoesNotThrow("v3_1_RC2/system_alerts.json", GBFSSystemAlerts.class);
assertUnmarshalDoesNotThrow("v3_1_RC3/system_alerts.json", GBFSSystemAlerts.class);
}
}
4 changes: 2 additions & 2 deletions ...em_information/SystemInformationTest.java → ...em_information/SystemInformationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.mobilitydata.gbfs.v3_1_RC2.system_information;
package org.mobilitydata.gbfs.v3_1_RC3.system_information;

import org.mobilitydata.gbfs.TestBase;
import org.junit.jupiter.api.Test;

class SystemInformationTest extends TestBase {
@Test
void testUnmarshal() {
assertUnmarshalDoesNotThrow("v3_1_RC2/system_information.json", GBFSSystemInformation.class);
assertUnmarshalDoesNotThrow("v3_1_RC3/system_information.json", GBFSSystemInformation.class);
}
}
4 changes: 2 additions & 2 deletions ...pricing_plans/SystemPricingPlansTest.java → ...pricing_plans/SystemPricingPlansTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.mobilitydata.gbfs.v3_1_RC2.system_pricing_plans;
package org.mobilitydata.gbfs.v3_1_RC3.system_pricing_plans;

import org.mobilitydata.gbfs.TestBase;
import org.junit.jupiter.api.Test;

class SystemPricingPlansTest extends TestBase {
@Test
void testUnmarshal() {
assertUnmarshalDoesNotThrow("v3_1_RC2/system_pricing_plans.json", GBFSSystemPricingPlans.class);
assertUnmarshalDoesNotThrow("v3_1_RC3/system_pricing_plans.json", GBFSSystemPricingPlans.class);
}
}
4 changes: 2 additions & 2 deletions ...RC2/system_regions/SystemRegionsTest.java → ...RC3/system_regions/SystemRegionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.mobilitydata.gbfs.v3_1_RC2.system_regions;
package org.mobilitydata.gbfs.v3_1_RC3.system_regions;

import org.mobilitydata.gbfs.TestBase;
import org.junit.jupiter.api.Test;

class SystemRegionsTest extends TestBase {
@Test
void testUnmarshal() {
assertUnmarshalDoesNotThrow("v3_1_RC2/system_regions.json", GBFSSystemRegions.class);
assertUnmarshalDoesNotThrow("v3_1_RC3/system_regions.json", GBFSSystemRegions.class);
}
}
4 changes: 2 additions & 2 deletions ...availability/VehicleAvailabilityTest.java → ...availability/VehicleAvailabilityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.mobilitydata.gbfs.v3_1_RC2.vehicle_availability;
package org.mobilitydata.gbfs.v3_1_RC3.vehicle_availability;

import org.mobilitydata.gbfs.TestBase;
import org.junit.jupiter.api.Test;

class VehicleAvailabilityTest extends TestBase {
@Test
void testUnmarshal() {
assertUnmarshalDoesNotThrow("v3_1_RC2/vehicle_availability.json", GBFSVehicleAvailability.class);
assertUnmarshalDoesNotThrow("v3_1_RC3/vehicle_availability.json", GBFSVehicleAvailability.class);
}
}
4 changes: 2 additions & 2 deletions ...RC2/vehicle_status/VehicleStatusTest.java → ...RC3/vehicle_status/VehicleStatusTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.mobilitydata.gbfs.v3_1_RC2.vehicle_status;
package org.mobilitydata.gbfs.v3_1_RC3.vehicle_status;

import org.mobilitydata.gbfs.TestBase;
import org.junit.jupiter.api.Test;

class VehicleStatusTest extends TestBase {
@Test
void testUnmarshal() {
assertUnmarshalDoesNotThrow("v3_1_RC2/vehicle_status.json", GBFSVehicleStatus.class);
assertUnmarshalDoesNotThrow("v3_1_RC3/vehicle_status.json", GBFSVehicleStatus.class);
}
}
4 changes: 2 additions & 2 deletions ...1_RC2/vehicle_types/VehicleTypesTest.java → ...1_RC3/vehicle_types/VehicleTypesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.mobilitydata.gbfs.v3_1_RC2.vehicle_types;
package org.mobilitydata.gbfs.v3_1_RC3.vehicle_types;

import org.mobilitydata.gbfs.TestBase;
import org.junit.jupiter.api.Test;

class VehicleTypesTest extends TestBase {
@Test
void testUnmarshal() {
assertUnmarshalDoesNotThrow("v3_1_RC2/vehicle_types.json", GBFSVehicleTypes.class);
assertUnmarshalDoesNotThrow("v3_1_RC3/vehicle_types.json", GBFSVehicleTypes.class);
}
}
2 changes: 1 addition & 1 deletion ...del/src/test/resources/v3_1_RC2/gbfs.json → ...del/src/test/resources/v3_1_RC3/gbfs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"last_updated": "2023-07-17T13:34:13+02:00",
"ttl": 0,
"version": "3.1-RC2",
"version": "3.1-RC3",
"data": {
"feeds": [
{
Expand Down
6 changes: 3 additions & 3 deletions ...est/resources/v3_1_RC2/gbfs_versions.json → ...est/resources/v3_1_RC3/gbfs_versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"last_updated": "2023-07-17T13:34:13+02:00",
"ttl": 0,
"version": "3.1-RC2",
"version": "3.1-RC3",
"data": {
"versions": [
{
"version": "2.0",
"url": "https://www.example.com/gbfs/2/gbfs"
},
{
"version": "3.1-RC2",
"url": "https://www.example.com/gbfs/3.1-RC2/gbfs"
"version": "3.1-RC3",
"url": "https://www.example.com/gbfs/3.1-RC3/gbfs"
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion .../resources/v3_1_RC2/geofencing_zones.json → .../resources/v3_1_RC3/geofencing_zones.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"last_updated": "2023-07-17T13:34:13+02:00",
"ttl": 60,
"version": "3.1-RC2",
"version": "3.1-RC3",
"data": {
"geofencing_zones": {
"type": "FeatureCollection",
Expand Down
10 changes: 5 additions & 5 deletions ...src/test/resources/v3_1_RC2/manifest.json → ...src/test/resources/v3_1_RC3/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"last_updated": "2023-07-17T13:34:13+02:00",
"ttl":0,
"version": "3.1-RC2",
"version": "3.1-RC3",
"data":{
"datasets":[
{
Expand All @@ -12,8 +12,8 @@
"url":"https://berlin.example.com/gbfs/2/gbfs"
},
{
"version": "3.1-RC2",
"url":"https://berlin.example.com/gbfs/3.1-RC2/gbfs"
"version": "3.1-RC3",
"url":"https://berlin.example.com/gbfs/3.1-RC3/gbfs"
}
],
"area": {
Expand Down Expand Up @@ -63,8 +63,8 @@
"url":"https://paris.example.com/gbfs/2/gbfs"
},
{
"version": "3.1-RC2",
"url":"https://paris.example.com/gbfs/3.1-RC2/gbfs"
"version": "3.1-RC3",
"url":"https://paris.example.com/gbfs/3.1-RC3/gbfs"
}
],
"area": {
Expand Down
2 changes: 1 addition & 1 deletion ...sources/v3_1_RC2/station_information.json → ...sources/v3_1_RC3/station_information.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"last_updated": "2023-07-17T13:34:13+02:00",
"ttl": 0,
"version": "3.1-RC2",
"version": "3.1-RC3",
"data": {
"stations": [
{
Expand Down
2 changes: 1 addition & 1 deletion ...st/resources/v3_1_RC2/station_status.json → ...st/resources/v3_1_RC3/station_status.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"last_updated": "2023-07-17T13:34:13+02:00",
"ttl": 0,
"version": "3.1-RC2",
"version": "3.1-RC3",
"data": {
"stations": [
{
Expand Down
2 changes: 1 addition & 1 deletion ...est/resources/v3_1_RC2/system_alerts.json → ...est/resources/v3_1_RC3/system_alerts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"last_updated": "2023-07-17T13:34:13+02:00",
"ttl": 60,
"version": "3.1-RC2",
"version": "3.1-RC3",
"data": {
"alerts": [
{
Expand Down
2 changes: 1 addition & 1 deletion ...esources/v3_1_RC2/system_information.json → ...esources/v3_1_RC3/system_information.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"last_updated": "2023-07-17T13:34:13+02:00",
"ttl": 1800,
"version": "3.1-RC2",
"version": "3.1-RC3",
"data": {
"system_id": "example_cityname",
"languages": ["en"],
Expand Down
2 changes: 1 addition & 1 deletion ...ources/v3_1_RC2/system_pricing_plans.json → ...ources/v3_1_RC3/system_pricing_plans.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"last_updated": "2023-07-17T13:34:13+02:00",
"ttl": 0,
"version": "3.1-RC2",
"version": "3.1-RC3",
"data": {
"plans": [
{
Expand Down
Loading
Loading