Inject configurable properties

Author: testower

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

@@ -28,7 +28,13 @@
 public class LoaderConfiguration {
 
     @Bean
-    public Loader loader() {
-        return new Loader();
+    public Loader loader(LoaderProperties properties) {
+        return new Loader(
+            properties.getHttp().getMaxTotalConnections(),
+            properties.getHttp().getMaxConnectionsPerRoute(),
+            properties.getHttp().getConnectTimeoutSeconds(),
+            properties.getHttp().getResponseTimeoutSeconds(),
+            properties.getThreadPool().getSize()
+        );
     }
 }

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

@@ -0,0 +1,99 @@
+/*
+ *
+ *  *
+ *  *
+ *  *  * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by
+ *  *  * the European Commission - subsequent versions of the EUPL (the "Licence");
+ *  *  * You may not use this work except in compliance with the Licence.
+ *  *  * You may obtain a copy of the Licence at:
+ *  *  *
+ *  *  *   https://joinup.ec.europa.eu/software/page/eupl
+ *  *  *
+ *  *  * Unless required by applicable law or agreed to in writing, software
+ *  *  * distributed under the Licence is distributed on an "AS IS" basis,
+ *  *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  *  * See the Licence for the specific language governing permissions and
+ *  *  * limitations under the Licence.
+ *  *
+ *
+ */
+
+package org.entur.gbfs.validator.api.handler;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties(prefix = "loader")
+public class LoaderProperties {
+
+    private Http http = new Http();
+    private ThreadPool threadPool = new ThreadPool();
+
+    public Http getHttp() {
+        return http;
+    }
+
+    public void setHttp(Http http) {
+        this.http = http;
+    }
+
+    public ThreadPool getThreadPool() {
+        return threadPool;
+    }
+
+    public void setThreadPool(ThreadPool threadPool) {
+        this.threadPool = threadPool;
+    }
+
+    public static class Http {
+        private int maxTotalConnections = 50;
+        private int maxConnectionsPerRoute = 20;
+        private int connectTimeoutSeconds = 5;
+        private int responseTimeoutSeconds = 5;
+
+        public int getMaxTotalConnections() {
+            return maxTotalConnections;
+        }
+
+        public void setMaxTotalConnections(int maxTotalConnections) {
+            this.maxTotalConnections = maxTotalConnections;
+        }
+
+        public int getMaxConnectionsPerRoute() {
+            return maxConnectionsPerRoute;
+        }
+
+        public void setMaxConnectionsPerRoute(int maxConnectionsPerRoute) {
+            this.maxConnectionsPerRoute = maxConnectionsPerRoute;
+        }
+
+        public int getConnectTimeoutSeconds() {
+            return connectTimeoutSeconds;
+        }
+
+        public void setConnectTimeoutSeconds(int connectTimeoutSeconds) {
+            this.connectTimeoutSeconds = connectTimeoutSeconds;
+        }
+
+        public int getResponseTimeoutSeconds() {
+            return responseTimeoutSeconds;
+        }
+
+        public void setResponseTimeoutSeconds(int responseTimeoutSeconds) {
+            this.responseTimeoutSeconds = responseTimeoutSeconds;
+        }
+    }
+
+    public static class ThreadPool {
+        private int size = 20;
+
+        public int getSize() {
+            return size;
+        }
+
+        public void setSize(int size) {
+            this.size = size;
+        }
+    }
+}

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

@@ -62,7 +62,7 @@ public class ValidateApiDelegateHandler implements ValidateApiDelegate {
     private static final Logger logger = LoggerFactory.getLogger(ValidateApiDelegateHandler.class);
 
     private final Loader loader;
-    
+
     public ValidateApiDelegateHandler(Loader loader) {
         this.loader = loader;
     }

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

@@ -3,3 +3,12 @@ spring.application.name=gbfs-validator-java-api
 logging.level.org.entur.gbfs.validator.api.handler.ValidateApiDelegateHandler=DEBUG
 server.compression.enabled=true
 server.compression.min-response-size=1024
+
+# Loader HTTP client configuration
+loader.http.max-total-connections=50
+loader.http.max-connections-per-route=20
+loader.http.connect-timeout-seconds=5
+loader.http.response-timeout-seconds=5
+
+# Loader thread pool configuration
+loader.thread-pool.size=20

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

@@ -70,20 +70,23 @@ private String getFileName(URI uri) {
     }
 
     public Loader() {
+        this(50, 20, 5, 5, 20);
+    }
+
+    public Loader(int maxTotalConnections, int maxConnectionsPerRoute,
+                  int connectTimeoutSeconds, int responseTimeoutSeconds,
+                  int threadPoolSize) {
         // Create connection pool manager
         PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager();
         // Set the maximum number of total connections
-        // TODO configurable max total
-        connectionManager.setMaxTotal(50);
+        connectionManager.setMaxTotal(maxTotalConnections);
         // Set the maximum number of connections per route
-        // TODO configurable max per route
-        connectionManager.setDefaultMaxPerRoute(20);
+        connectionManager.setDefaultMaxPerRoute(maxConnectionsPerRoute);
 
         // Configure request timeouts
         RequestConfig requestConfig = RequestConfig.custom()
-                // TODO configurable timeouts
-                .setConnectTimeout(Timeout.of(5, TimeUnit.SECONDS))
-                .setResponseTimeout(Timeout.of(5, TimeUnit.SECONDS))
+                .setConnectTimeout(Timeout.of(connectTimeoutSeconds, TimeUnit.SECONDS))
+                .setResponseTimeout(Timeout.of(responseTimeoutSeconds, TimeUnit.SECONDS))
                 .build();
 
         // Build the HttpClient with connection pooling
@@ -93,8 +96,7 @@ public Loader() {
                 .build();
 
         // Create a thread pool for parallel execution
-        // TODO configurable pool size
-        executorService = Executors.newFixedThreadPool(20);
+        executorService = Executors.newFixedThreadPool(threadPoolSize);
     }
 
     public List<LoadedFile> load(String discoveryURIString) throws IOException {