Replaced org.entur with org.mobilitydata in package names.

Author: jcpitre

gbfs-validator-java-api/pom.xml

@@ -308,9 +308,9 @@
                             <inputSpec>${project.basedir}/src/main/resources/public/openapi.yaml</inputSpec>
                             <generatorName>spring</generatorName>
                             <output>${project.build.directory}/generated-sources/openapi</output>
-                            <apiPackage>org.entur.gbfs.validator.api.gen</apiPackage>
-                            <modelPackage>org.entur.gbfs.validator.api.model</modelPackage>
-                            <invokerPackage>org.entur.gbfs.validator.api.handler</invokerPackage>
+                            <apiPackage>org.mobilitydata.gbfs.validator.api.gen</apiPackage>
+                            <modelPackage>org.mobilitydata.gbfs.validator.api.model</modelPackage>
+                            <invokerPackage>org.mobilitydata.gbfs.validator.api.handler</invokerPackage>
                             <generateApiTests>false</generateApiTests>
                             <generateModelTests>false</generateModelTests>
                             <ignoreFileOverride>${project.basedir}/.openapi-generator-ignore</ignoreFileOverride>

…tor/api/handler/LoaderConfiguration.java …tor/api/handler/LoaderConfiguration.javagbfs-validator-java-api/src/main/java/org/entur/gbfs/validator/api/handler/LoaderConfiguration.java renamed to gbfs-validator-java-api/src/main/java/org/mobilitydata/gbfs/validator/api/handler/LoaderConfiguration.java gbfs-validator-java-api/src/main/java/org/entur/gbfs/validator/api/handler/LoaderConfiguration.java renamed to gbfs-validator-java-api/src/main/java/org/mobilitydata/gbfs/validator/api/handler/LoaderConfiguration.java

@@ -18,9 +18,9 @@
  *
  */
 
-package org.entur.gbfs.validator.api.handler;
+package org.mobilitydata.gbfs.validator.api.handler;
 
-import org.entur.gbfs.validator.loader.Loader;
+import org.mobilitydata.gbfs.validator.loader.Loader;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

…idator/api/handler/LoaderProperties.java …idator/api/handler/LoaderProperties.javagbfs-validator-java-api/src/main/java/org/entur/gbfs/validator/api/handler/LoaderProperties.java renamed to gbfs-validator-java-api/src/main/java/org/mobilitydata/gbfs/validator/api/handler/LoaderProperties.java gbfs-validator-java-api/src/main/java/org/entur/gbfs/validator/api/handler/LoaderProperties.java renamed to gbfs-validator-java-api/src/main/java/org/mobilitydata/gbfs/validator/api/handler/LoaderProperties.java

@@ -18,7 +18,7 @@
  *
  */
 
-package org.entur.gbfs.validator.api.handler;
+package org.mobilitydata.gbfs.validator.api.handler;
 
 import java.util.HashMap;
 import java.util.Map;

…alidator/api/handler/SecurityConfig.java …alidator/api/handler/SecurityConfig.javagbfs-validator-java-api/src/main/java/org/entur/gbfs/validator/api/handler/SecurityConfig.java renamed to gbfs-validator-java-api/src/main/java/org/mobilitydata/gbfs/validator/api/handler/SecurityConfig.java gbfs-validator-java-api/src/main/java/org/entur/gbfs/validator/api/handler/SecurityConfig.java renamed to gbfs-validator-java-api/src/main/java/org/mobilitydata/gbfs/validator/api/handler/SecurityConfig.java

@@ -18,7 +18,7 @@
  *
  */
 
-package org.entur.gbfs.validator.api.handler;
+package org.mobilitydata.gbfs.validator.api.handler;
 
 import java.util.Arrays;
 import java.util.List;

…/handler/ValidateApiDelegateHandler.java …/handler/ValidateApiDelegateHandler.javagbfs-validator-java-api/src/main/java/org/entur/gbfs/validator/api/handler/ValidateApiDelegateHandler.java renamed to gbfs-validator-java-api/src/main/java/org/mobilitydata/gbfs/validator/api/handler/ValidateApiDelegateHandler.java gbfs-validator-java-api/src/main/java/org/entur/gbfs/validator/api/handler/ValidateApiDelegateHandler.java renamed to gbfs-validator-java-api/src/main/java/org/mobilitydata/gbfs/validator/api/handler/ValidateApiDelegateHandler.java

@@ -18,7 +18,7 @@
  *
  */
 
-package org.entur.gbfs.validator.api.handler;
+package org.mobilitydata.gbfs.validator.api.handler;
 
 import com.google.common.collect.Multimap;
 import com.google.common.collect.MultimapBuilder;
@@ -29,23 +29,23 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.entur.gbfs.validation.GbfsValidator;
-import org.entur.gbfs.validation.GbfsValidatorFactory;
-import org.entur.gbfs.validation.model.FileValidationError;
-import org.entur.gbfs.validation.model.FileValidationResult;
-import org.entur.gbfs.validation.model.ValidationResult;
-import org.entur.gbfs.validation.model.ValidatorError;
-import org.entur.gbfs.validator.api.gen.ValidateApiDelegate;
-import org.entur.gbfs.validator.api.model.FileError;
-import org.entur.gbfs.validator.api.model.GbfsFile;
-import org.entur.gbfs.validator.api.model.SystemError;
-import org.entur.gbfs.validator.api.model.ValidatePostRequest;
-import org.entur.gbfs.validator.api.model.ValidatePostRequestAuth;
-import org.entur.gbfs.validator.api.model.ValidationResultSummary;
-import org.entur.gbfs.validator.loader.LoadedFile;
-import org.entur.gbfs.validator.loader.Loader;
-import org.entur.gbfs.validator.loader.LoaderError;
-import org.entur.gbfs.validator.loader.auth.Authentication;
+import org.mobilitydata.gbfs.validation.GbfsValidator;
+import org.mobilitydata.gbfs.validation.GbfsValidatorFactory;
+import org.mobilitydata.gbfs.validation.model.FileValidationError;
+import org.mobilitydata.gbfs.validation.model.FileValidationResult;
+import org.mobilitydata.gbfs.validation.model.ValidationResult;
+import org.mobilitydata.gbfs.validation.model.ValidatorError;
+import org.mobilitydata.gbfs.validator.api.gen.ValidateApiDelegate;
+import org.mobilitydata.gbfs.validator.api.model.FileError;
+import org.mobilitydata.gbfs.validator.api.model.GbfsFile;
+import org.mobilitydata.gbfs.validator.api.model.SystemError;
+import org.mobilitydata.gbfs.validator.api.model.ValidatePostRequest;
+import org.mobilitydata.gbfs.validator.api.model.ValidatePostRequestAuth;
+import org.mobilitydata.gbfs.validator.api.model.ValidationResultSummary;
+import org.mobilitydata.gbfs.validator.loader.LoadedFile;
+import org.mobilitydata.gbfs.validator.loader.Loader;
+import org.mobilitydata.gbfs.validator.loader.LoaderError;
+import org.mobilitydata.gbfs.validator.loader.auth.Authentication;
 import org.openapitools.jackson.nullable.JsonNullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -102,7 +102,7 @@ public void destroy() {
    * @return validation results with file-level errors and system errors
    */
   @Override
-  public ResponseEntity<org.entur.gbfs.validator.api.model.ValidationResult> validatePost(
+  public ResponseEntity<org.mobilitydata.gbfs.validator.api.model.ValidationResult> validatePost(
     ValidatePostRequest validatePostRequest
   ) {
     logger.debug(
@@ -131,7 +131,7 @@ public ResponseEntity<org.entur.gbfs.validator.api.model.ValidationResult> valid
       }
 
       GbfsValidator validator = GbfsValidatorFactory.getGbfsJsonValidator();
-      List<org.entur.gbfs.validator.api.model.ValidationResult> resultsPerLanguage =
+      List<org.mobilitydata.gbfs.validator.api.model.ValidationResult> resultsPerLanguage =
         new ArrayList<>();
 
       filesByLanguage
@@ -185,15 +185,15 @@ private static Authentication getAuthentication(
       if ("basicAuth".equals(authType)) {
         if (apiAuth.getUsername() != null && apiAuth.getPassword() != null) {
           loaderAuth =
-            new org.entur.gbfs.validator.loader.auth.BasicAuth(
+            new org.mobilitydata.gbfs.validator.loader.auth.BasicAuth(
               apiAuth.getUsername(),
               apiAuth.getPassword()
             );
         }
       } else if ("bearerToken".equals(authType)) {
         if (apiAuth.getToken() != null) {
           loaderAuth =
-            new org.entur.gbfs.validator.loader.auth.BearerTokenAuth(
+            new org.mobilitydata.gbfs.validator.loader.auth.BearerTokenAuth(
               apiAuth.getToken()
             );
         }
@@ -204,7 +204,7 @@ private static Authentication getAuthentication(
           apiAuth.getTokenUrl() != null
         ) {
           loaderAuth =
-            new org.entur.gbfs.validator.loader.auth.OAuthClientCredentialsGrantAuth(
+            new org.mobilitydata.gbfs.validator.loader.auth.OAuthClientCredentialsGrantAuth(
               apiAuth.getClientId(),
               apiAuth.getClientSecret(),
               apiAuth.getTokenUrl()
@@ -215,21 +215,21 @@ private static Authentication getAuthentication(
     return loaderAuth;
   }
 
-  private org.entur.gbfs.validator.api.model.ValidationResult mergeValidationResults(
-    List<org.entur.gbfs.validator.api.model.ValidationResult> results
+  private org.mobilitydata.gbfs.validator.api.model.ValidationResult mergeValidationResults(
+    List<org.mobilitydata.gbfs.validator.api.model.ValidationResult> results
   ) {
     if (results.isEmpty()) {
-      org.entur.gbfs.validator.api.model.ValidationResult emptyApiResult =
-        new org.entur.gbfs.validator.api.model.ValidationResult();
+      org.mobilitydata.gbfs.validator.api.model.ValidationResult emptyApiResult =
+        new org.mobilitydata.gbfs.validator.api.model.ValidationResult();
       ValidationResultSummary emptySummary = new ValidationResultSummary();
       emptySummary.setValidatorVersion(versionProvider.getVersion());
       emptySummary.setFiles(new ArrayList<>());
       emptyApiResult.setSummary(emptySummary);
       return emptyApiResult;
     }
 
-    org.entur.gbfs.validator.api.model.ValidationResult mergedResult =
-      new org.entur.gbfs.validator.api.model.ValidationResult();
+    org.mobilitydata.gbfs.validator.api.model.ValidationResult mergedResult =
+      new org.mobilitydata.gbfs.validator.api.model.ValidationResult();
     ValidationResultSummary summary = new ValidationResultSummary();
     summary.setValidatorVersion(
       results.get(0).getSummary().getValidatorVersion()
@@ -249,7 +249,7 @@ private org.entur.gbfs.validator.api.model.ValidationResult mergeValidationResul
     return mergedResult;
   }
 
-  private org.entur.gbfs.validator.api.model.ValidationResult mapValidationResult(
+  private org.mobilitydata.gbfs.validator.api.model.ValidationResult mapValidationResult(
     ValidationResult internalValidationResult,
     List<LoadedFile> loadedFilesForLanguage,
     String language
@@ -266,8 +266,8 @@ private org.entur.gbfs.validator.api.model.ValidationResult mapValidationResult(
       )
     );
 
-    org.entur.gbfs.validator.api.model.ValidationResult apiResult =
-      new org.entur.gbfs.validator.api.model.ValidationResult();
+    org.mobilitydata.gbfs.validator.api.model.ValidationResult apiResult =
+      new org.mobilitydata.gbfs.validator.api.model.ValidationResult();
     apiResult.setSummary(validationResultSummary);
     return apiResult;
   }

…lidator/api/handler/VersionProvider.java …lidator/api/handler/VersionProvider.javagbfs-validator-java-api/src/main/java/org/entur/gbfs/validator/api/handler/VersionProvider.java renamed to gbfs-validator-java-api/src/main/java/org/mobilitydata/gbfs/validator/api/handler/VersionProvider.java gbfs-validator-java-api/src/main/java/org/entur/gbfs/validator/api/handler/VersionProvider.java renamed to gbfs-validator-java-api/src/main/java/org/mobilitydata/gbfs/validator/api/handler/VersionProvider.java

@@ -18,7 +18,7 @@
  *
  */
 
-package org.entur.gbfs.validator.api.handler;
+package org.mobilitydata.gbfs.validator.api.handler;
 
 import org.springframework.boot.info.BuildProperties;
 import org.springframework.stereotype.Component;

gbfs-validator-java-api/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 spring.application.name=gbfs-validator-java-api
 
-logging.level.org.entur.gbfs.validator.api.handler.ValidateApiDelegateHandler=DEBUG
+logging.level.org.mobilitydata.gbfs.validator.api.handler.ValidateApiDelegateHandler=DEBUG
 server.compression.enabled=true
 server.compression.min-response-size=1024
 

…lidator/api/ValidateIntegrationTest.java …lidator/api/ValidateIntegrationTest.javagbfs-validator-java-api/src/test/java/org/entur/gbfs/validator/api/ValidateIntegrationTest.java renamed to gbfs-validator-java-api/src/test/java/org/mobilitydata/gbfs/validator/api/ValidateIntegrationTest.java gbfs-validator-java-api/src/test/java/org/entur/gbfs/validator/api/ValidateIntegrationTest.java renamed to gbfs-validator-java-api/src/test/java/org/mobilitydata/gbfs/validator/api/ValidateIntegrationTest.java

@@ -1,4 +1,4 @@
-package org.entur.gbfs.validator.api;
+package org.mobilitydata.gbfs.validator.api;
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
@@ -7,8 +7,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import org.entur.gbfs.validator.api.handler.OpenApiGeneratorApplication;
-import org.entur.gbfs.validator.api.model.*;
+import org.mobilitydata.gbfs.validator.api.handler.OpenApiGeneratorApplication;
+import org.mobilitydata.gbfs.validator.api.model.*;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;

gbfs-validator-java-cli/pom.xml

@@ -133,7 +133,7 @@
                             <createDependencyReducedPom>false</createDependencyReducedPom>
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.entur.gbfs.validator.cli.GbfsValidatorCli</mainClass>
+                                    <mainClass>org.mobilitydata.gbfs.validator.cli.GbfsValidatorCli</mainClass>
                                 </transformer>
                             </transformers>
                             <finalName>gbfs-validator-cli</finalName>

…ntur/gbfs/validator/cli/AuthOptions.java …data/gbfs/validator/cli/AuthOptions.javagbfs-validator-java-cli/src/main/java/org/entur/gbfs/validator/cli/AuthOptions.java renamed to gbfs-validator-java-cli/src/main/java/org/mobilitydata/gbfs/validator/cli/AuthOptions.java gbfs-validator-java-cli/src/main/java/org/entur/gbfs/validator/cli/AuthOptions.java renamed to gbfs-validator-java-cli/src/main/java/org/mobilitydata/gbfs/validator/cli/AuthOptions.java

@@ -1,4 +1,4 @@
-package org.entur.gbfs.validator.cli;
+package org.mobilitydata.gbfs.validator.cli;
 
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Option;