Merge pull request #501 from solita-sabinaf/more_osrm_logs

More logs for routing related services
entur · Dec 12, 2024 · 723263c · 723263c
2 parents 1315612 + 861f27f
commit 723263c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/src/main/java/no/entur/uttu/routing/DefaultRoutingService.java b/src/main/java/no/entur/uttu/routing/DefaultRoutingService.java
@@ -2,6 +2,8 @@
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.stereotype.Component;
 
@@ -15,6 +17,14 @@
 )
 public class DefaultRoutingService implements RoutingService {
 
+  private static final Logger logger = LoggerFactory.getLogger(
+    DefaultRoutingService.class
+  );
+
+  public DefaultRoutingService() {
+    logger.info("DefaultRoutingService got initialised");
+  }
+
   public RouteGeometry getRouteGeometry(
     BigDecimal longitudeFrom,
     BigDecimal latitudeFrom,

diff --git a/src/main/java/no/entur/uttu/routing/osrm/OsrmConfiguration.java b/src/main/java/no/entur/uttu/routing/osrm/OsrmConfiguration.java
@@ -11,7 +11,9 @@
 public class OsrmConfiguration {
 
   @Bean
-  RoutingService routingService(@Value("${uttu.routing.osrm-api}") String osrmApi) {
-    return new OsrmService(osrmApi);
+  RoutingService routingService(
+    @Value("${uttu.routing.osrm-api}") String osrmApiEndpoint
+  ) {
+    return new OsrmService(osrmApiEndpoint);
   }
 }
diff --git a/src/main/java/no/entur/uttu/routing/osrm/OsrmService.java b/src/main/java/no/entur/uttu/routing/osrm/OsrmService.java
@@ -23,15 +23,16 @@ public class OsrmService implements no.entur.uttu.routing.RoutingService {
 
   private static final Logger logger = LoggerFactory.getLogger(OsrmService.class);
 
-  private final String osrmApi;
+  private final String osrmApiEndpoint;
 
   private final Methanol httpClient;
   private final ObjectMapper objectMapper;
 
-  public OsrmService(String osrmApi) {
-    this.osrmApi = osrmApi;
+  public OsrmService(String osrmApiEndpoint) {
+    this.osrmApiEndpoint = osrmApiEndpoint;
     this.objectMapper = initializeObjectMapper();
     this.httpClient = initializeHttpClient();
+    logger.info("OsrmService got initialised, osrmApiEndpoint is: {}", osrmApiEndpoint);
   }
 
   private static ObjectMapper initializeObjectMapper() {
@@ -53,7 +54,7 @@ private static Methanol initializeHttpClient() {
   }
 
   public boolean isEnabled() {
-    return osrmApi != null && !osrmApi.isBlank();
+    return osrmApiEndpoint != null && !osrmApiEndpoint.isBlank();
   }
 
   public RouteGeometry getRouteGeometry(
@@ -65,7 +66,7 @@ public RouteGeometry getRouteGeometry(
     List<List<BigDecimal>> routeCoordinates = new ArrayList<>();
     MutableRequest request = MutableRequest
       .GET(
-        osrmApi +
+        osrmApiEndpoint +
         "/route/v1/driving/" +
         longitudeFrom +
         "," +