-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
renamed java language bindings to mobilitydata
- Loading branch information
1 parent
583914f
commit 353d869
Showing
58 changed files
with
222 additions
and
278 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <groupId>org.entur.gbfs</groupId> | ||
| <groupId>org.mobilitydata</groupId> | ||
| <artifactId>gbfs-java-model</artifactId> | ||
| <version>3.1.3-SNAPSHOT</version> | ||
|
|
||
| <name>gbfs-java-model</name> | ||
|
|
||
| <description>Generates Java model from GBFS JSON schema using jsonschema2pojo.</description> | ||
| <url>https://github.com/entur/gbfs-java-model</url> | ||
| <url>https://github.com/MobilityData/gbfs-json-schema</url> | ||
| <organization> | ||
| <name>Entur AS</name> | ||
| <url>http://www.entur.org/</url> | ||
| <name>MobilityData</name> | ||
| <url>https://mobilitydata.org/</url> | ||
| </organization> | ||
| <licenses> | ||
| <license> | ||
|
|
@@ -29,9 +29,9 @@ | |
| </developer> | ||
| </developers> | ||
| <scm> | ||
| <connection>scm:git:ssh://[email protected]/entur/gbfs-java-model.git</connection> | ||
| <developerConnection>scm:git:ssh://[email protected]/entur/gbfs-java-model.git</developerConnection> | ||
| <url>https://github.com/entur/gbfs-java-model/tree/master</url> | ||
| <connection>scm:git:ssh://[email protected]/MobilityData/gbfs-json-schema.git</connection> | ||
| <developerConnection>scm:git:ssh://[email protected]/MobilityData/gbfs-json-schema.git</developerConnection> | ||
| <url>https://github.com/MobilityData/gbfs-json-schema/tree/master</url> | ||
| <tag>HEAD</tag> | ||
| </scm> | ||
| <distributionManagement> | ||
|
|
@@ -163,35 +163,13 @@ | |
| </plugins> | ||
| </pluginManagement> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.codehaus.mojo</groupId> | ||
| <artifactId>exec-maven-plugin</artifactId> | ||
| <version>${maven-exec-plugin.version}</version> | ||
| <executions> | ||
| <execution> | ||
| <id>download-extract-current-version</id> | ||
| <phase>generate-sources</phase> | ||
| <goals> | ||
| <goal>exec</goal> | ||
| </goals> | ||
| <configuration> | ||
| <environmentVariables> | ||
| <GITHUB_URL>${gbfsGithubUrl}</GITHUB_URL> | ||
| <SCHEMA_VERSION>${schemaVersion}</SCHEMA_VERSION> | ||
| <DESTINATION_PATH>src/main/resources/schema</DESTINATION_PATH> | ||
| </environmentVariables> | ||
| <executable>./bin/gbfs-download-extract.sh</executable> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.jsonschema2pojo</groupId> | ||
| <artifactId>jsonschema2pojo-maven-plugin</artifactId> | ||
| <version>${jsonschema2pojo-maven-plugin.version}</version> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.entur.gbfs</groupId> | ||
| <groupId>org.mobilitydata</groupId> | ||
| <artifactId>rule-factory</artifactId> | ||
| <version>1.0.0</version> | ||
| </dependency> | ||
|
|
@@ -211,9 +189,9 @@ | |
| <serializable>true</serializable> | ||
| <initializeCollections>false</initializeCollections> | ||
| <generateBuilders>true</generateBuilders> | ||
| <sourceDirectory>${basedir}/src/main/resources/schema/v2.2</sourceDirectory> | ||
| <targetPackage>org.entur.gbfs.v2_2</targetPackage> | ||
| <customRuleFactory>org.entur.gbfs.GeofencingRuleFactory</customRuleFactory> | ||
| <sourceDirectory>${basedir}/../../../v2.2</sourceDirectory> | ||
| <targetPackage>org.mobilitydata.v2_2</targetPackage> | ||
| <customRuleFactory>org.mobilitydata.gbfs.GeofencingRuleFactory</customRuleFactory> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
|
|
@@ -230,9 +208,9 @@ | |
| <serializable>true</serializable> | ||
| <initializeCollections>false</initializeCollections> | ||
| <generateBuilders>true</generateBuilders> | ||
| <sourceDirectory>${basedir}/src/main/resources/schema/v2.3</sourceDirectory> | ||
| <targetPackage>org.entur.gbfs.v2_3</targetPackage> | ||
| <customRuleFactory>org.entur.gbfs.GeofencingRuleFactory</customRuleFactory> | ||
| <sourceDirectory>${basedir}/../../../v2.3</sourceDirectory> | ||
| <targetPackage>org.mobilitydata.v2_3</targetPackage> | ||
| <customRuleFactory>org.mobilitydata.gbfs.GeofencingRuleFactory</customRuleFactory> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
|
|
@@ -249,9 +227,9 @@ | |
| <serializable>true</serializable> | ||
| <initializeCollections>false</initializeCollections> | ||
| <generateBuilders>true</generateBuilders> | ||
| <sourceDirectory>${basedir}/src/main/resources/schema/v3.0</sourceDirectory> | ||
| <targetPackage>org.entur.gbfs.v3_0</targetPackage> | ||
| <customRuleFactory>org.entur.gbfs.GeofencingRuleFactory</customRuleFactory> | ||
| <sourceDirectory>${basedir}/../../../v3.0</sourceDirectory> | ||
| <targetPackage>org.mobilitydata.v3_0</targetPackage> | ||
| <customRuleFactory>org.mobilitydata.gbfs.GeofencingRuleFactory</customRuleFactory> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
|
|
||
3 changes: 2 additions & 1 deletion
3
...n/java/org/entur/gbfs/v2_3/gbfs/GBFS.java → ...org/mobilitydata/gbfs/v2_2/gbfs/GBFS.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...va/org/entur/gbfs/v2_2/gbfs/GBFSFeed.java → ...mobilitydata/gbfs/v2_2/gbfs/GBFSFeed.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 13 additions & 13 deletions
26
...rg/entur/gbfs/v2_2/gbfs/GBFSFeedName.java → ...litydata/gbfs/v2_2/gbfs/GBFSFeedName.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...a/org/entur/gbfs/v2_2/gbfs/GBFSFeeds.java → ...obilitydata/gbfs/v2_2/gbfs/GBFSFeeds.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
...n/java/org/entur/gbfs/v2_2/gbfs/GBFS.java → ...org/mobilitydata/gbfs/v2_3/gbfs/GBFS.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...va/org/entur/gbfs/v2_3/gbfs/GBFSFeed.java → ...mobilitydata/gbfs/v2_3/gbfs/GBFSFeed.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 15 additions & 14 deletions
29
...rg/entur/gbfs/v2_3/gbfs/GBFSFeedName.java → ...litydata/gbfs/v2_3/gbfs/GBFSFeedName.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...a/org/entur/gbfs/v2_3/gbfs/GBFSFeeds.java → ...obilitydata/gbfs/v2_3/gbfs/GBFSFeeds.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 14 additions & 12 deletions
26
...rg/entur/gbfs/v3_0/gbfs/GBFSFeedName.java → ...litydata/gbfs/v3_0/gbfs/GBFSFeedName.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 0 additions & 31 deletions
31
models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/gbfs/GBFSFeedNameTest.java
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
...rc/test/java/org/entur/gbfs/TestBase.java → .../java/org/mobilitydata/gbfs/TestBase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package org.entur.gbfs; | ||
| package org.mobilitydata.gbfs; | ||
|
|
||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
|
|
||
|
|
||
5 changes: 3 additions & 2 deletions
5
.../free_bike_status/FreeBikeStatusTest.java → .../free_bike_status/FreeBikeStatusTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...ntur/gbfs/v2_2/gbfs/GBFSFeedNameTest.java → ...data/gbfs/v2_2/gbfs/GBFSFeedNameTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...va/org/entur/gbfs/v2_3/gbfs/GBFSTest.java → ...mobilitydata/gbfs/v2_2/gbfs/GBFSTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.