Fix compilation errors

Author: testower

gbfs-validator-java-api/pom.xml

@@ -96,6 +96,11 @@
             <artifactId>gbfs-validator-java</artifactId>
             <version>2.0.30-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>32.1.3-jre</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

gbfs-validator-java-api/src/main/java/org/entur/gbfs/validator/api/handler/ValidateApiDelegateHandler.java

@@ -39,7 +39,6 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -105,7 +104,7 @@ private org.entur.gbfs.validator.api.model.ValidationResult mergeValidationResul
         return mergedResult;
     }
 
-    private org.entur.gbfs.validator.api.model.ValidationResult mapValidationResult(ValidationResult validationResult, Map<String, String> urlMap, @Nullable String language) {
+    private org.entur.gbfs.validator.api.model.ValidationResult mapValidationResult(ValidationResult validationResult, Map<String, String> urlMap, String language) {
         ValidationResultSummary validationResultSummary = new ValidationResultSummary();
         validationResultSummary.setValidatorVersion("2.0.30-SNAPSHOT"); // TODO inject this value
         validationResultSummary.setFiles(mapFiles(validationResult.files(), urlMap, language));
@@ -114,15 +113,15 @@ private org.entur.gbfs.validator.api.model.ValidationResult mapValidationResult(
         return validationResultOption1;
     }
 
-    private List<GbfsFile> mapFiles(Map<String, FileValidationResult> files, Map<String, String> urlMap, @Nullable String language) {
+    private List<GbfsFile> mapFiles(Map<String, FileValidationResult> files, Map<String, String> urlMap, String language) {
         return files.entrySet().stream().map(entry -> {
             String fileName = entry.getKey();
             FileValidationResult fileValidationResult = entry.getValue();
 
             GbfsFile file = new GbfsFile();
             file.setName(fileName);
             file.setUrl(urlMap.get(fileName));
-            file.setSchema(fileValidationResult.schema());
+            //file.setSchema(fileValidationResult.schema());
             file.setVersion(fileValidationResult.version());
 
             // The discovery file itself has no language, and is listed once per system

gbfs-validator-java-loader/pom.xml

@@ -12,8 +12,8 @@
     <artifactId>gbfs-validator-java-loader</artifactId>
 
     <properties>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

gbfs-validator-java-loader/src/main/java/org/entur/gbfs/validator/loader/LoadedFile.java

@@ -20,14 +20,13 @@
 
 package org.entur.gbfs.validator.loader;
 
-import javax.annotation.Nullable;
 import java.io.InputStream;
 
 public record LoadedFile(
         String fileName,
         String url,
         InputStream fileContents,
-        @Nullable String language
+        String language
 ) {
     public LoadedFile(String fileName, String url, InputStream fileContents) {
         this(fileName, url, fileContents, null);