Generify OsrmService into RoutingService

src/main/java/no/entur/uttu/export/netex/producer/common/ServiceLinkProducer.java

@@ -10,8 +10,8 @@
 import no.entur.uttu.export.netex.producer.NetexIdProducer;
 import no.entur.uttu.export.netex.producer.NetexObjectFactory;
 import no.entur.uttu.model.Ref;
-import no.entur.uttu.osrm.OsrmService;
-import no.entur.uttu.osrm.RouteGeometry;
+import no.entur.uttu.routing.RouteGeometry;
+import no.entur.uttu.routing.RoutingService;
 import no.entur.uttu.stopplace.spi.StopPlaceRegistry;
 import org.rutebanken.netex.model.LinkSequenceProjection;
 import org.rutebanken.netex.model.Projections_RelStructure;
@@ -26,16 +26,16 @@ public class ServiceLinkProducer {
 
   private final NetexObjectFactory objectFactory;
   private final StopPlaceRegistry stopPlaceRegistry;
-  private final OsrmService osrmService;
+  private final RoutingService routingService;
 
   public ServiceLinkProducer(
     NetexObjectFactory objectFactory,
     StopPlaceRegistry stopPlaceRegistry,
-    OsrmService osrmService
+    RoutingService routingService
   ) {
     this.objectFactory = objectFactory;
     this.stopPlaceRegistry = stopPlaceRegistry;
-    this.osrmService = osrmService;
+    this.routingService = routingService;
   }
 
   public List<ServiceLink> produce(NetexExportContext context) {
@@ -47,7 +47,7 @@ public List<ServiceLink> produce(NetexExportContext context) {
         String quayRefTo = extractQuayRefTo(serviceLinkRef, context);
         Quay quayTo = getQuay(quayRefTo);
 
-        RouteGeometry routeGeometry = osrmService.getRouteGeometry(
+        RouteGeometry routeGeometry = routingService.getRouteGeometry(
           quayFrom.getCentroid().getLocation().getLongitude(),
           quayFrom.getCentroid().getLocation().getLatitude(),
           quayTo.getCentroid().getLocation().getLongitude(),

src/main/java/no/entur/uttu/export/netex/producer/line/JourneyPatternProducer.java

@@ -31,7 +31,7 @@
 import no.entur.uttu.model.Ref;
 import no.entur.uttu.model.StopPointInJourneyPattern;
 import no.entur.uttu.model.job.SeverityEnumeration;
-import no.entur.uttu.osrm.OsrmService;
+import no.entur.uttu.routing.RoutingService;
 import no.entur.uttu.stopplace.spi.StopPlaceRegistry;
 import org.rutebanken.netex.model.BookingAccessEnumeration;
 import org.rutebanken.netex.model.BookingArrangementsStructure;
@@ -57,18 +57,18 @@ public class JourneyPatternProducer {
   private final NetexObjectFactory objectFactory;
   private final ContactStructureProducer contactStructureProducer;
   private final StopPlaceRegistry stopPlaceRegistry;
-  private final OsrmService osrmService;
+  private final RoutingService routingService;
 
   public JourneyPatternProducer(
     NetexObjectFactory objectFactory,
     ContactStructureProducer contactStructureProducer,
     StopPlaceRegistry stopPlaceRegistry,
-    OsrmService osrmService
+    RoutingService routingService
   ) {
     this.objectFactory = objectFactory;
     this.contactStructureProducer = contactStructureProducer;
     this.stopPlaceRegistry = stopPlaceRegistry;
-    this.osrmService = osrmService;
+    this.routingService = routingService;
   }
 
   public org.rutebanken.netex.model.JourneyPattern produce(
@@ -99,7 +99,7 @@ public org.rutebanken.netex.model.JourneyPattern produce(
     context.notices.addAll(local.getNotices());
 
     List<LinkInLinkSequence_VersionedChildStructure> linksInSequence;
-    if (osrmService != null && osrmService.isEnabled()) {
+    if (routingService != null && routingService.isEnabled()) {
       linksInSequence =
         local
           .getPointsInSequence()

src/main/java/no/entur/uttu/routing/DefaultRoutingService.java

@@ -0,0 +1,25 @@
+package no.entur.uttu.routing;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import org.springframework.stereotype.Component;
+
+/**
+ * Fallback implementation in case routing profile not specified
+ */
+@Component
+public class DefaultRoutingService implements RoutingService {
+
+  public RouteGeometry getRouteGeometry(
+    BigDecimal longitudeFrom,
+    BigDecimal latitudeFrom,
+    BigDecimal longitudeTo,
+    BigDecimal latitudeTo
+  ) {
+    return new RouteGeometry(new ArrayList<>(), BigDecimal.ZERO);
+  }
+
+  public boolean isEnabled() {
+    return false;
+  }
+}

src/main/java/no/entur/uttu/osrm/RouteGeometry.java → src/main/java/no/entur/uttu/routing/RouteGeometry.java

@@ -1,4 +1,4 @@
-package no.entur.uttu.osrm;
+package no.entur.uttu.routing;
 
 import java.math.BigDecimal;
 import java.util.List;

src/main/java/no/entur/uttu/routing/RoutingService.java

@@ -0,0 +1,16 @@
+package no.entur.uttu.routing;
+
+import java.math.BigDecimal;
+
+/**
+ * For getting the road geometry - resulting in service links and links in sequence in a journey pattern
+ */
+public interface RoutingService {
+  RouteGeometry getRouteGeometry(
+    BigDecimal longitudeFrom,
+    BigDecimal latitudeFrom,
+    BigDecimal longitudeTo,
+    BigDecimal latitudeTo
+  );
+  boolean isEnabled();
+}

src/main/java/no/entur/uttu/routing/osrm/OsrmConfiguration.java

@@ -0,0 +1,16 @@
+package no.entur.uttu.routing.osrm;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+@Configuration
+@Profile("routing")
+public class OsrmConfiguration {
+
+  @Bean
+  OsrmService osrmService(@Value("${uttu.routing.osrm-api}") String osrmApi) {
+    return new OsrmService(osrmApi);
+  }
+}

src/main/java/no/entur/uttu/osrm/OsrmService.java → src/main/java/no/entur/uttu/routing/osrm/OsrmService.java

@@ -1,4 +1,4 @@
-package no.entur.uttu.osrm;
+package no.entur.uttu.routing.osrm;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -15,25 +15,21 @@
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
+import no.entur.uttu.routing.RouteGeometry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Profile;
-import org.springframework.stereotype.Component;
 
-@Component
-@Profile("routing")
-public class OsrmService {
+public class OsrmService implements no.entur.uttu.routing.RoutingService {
 
   private static final Logger logger = LoggerFactory.getLogger(OsrmService.class);
 
-  @Value("${uttu.routing.osrm-api}")
-  private String osrmApi;
+  private final String osrmApi;
 
   private final Methanol httpClient;
   private final ObjectMapper objectMapper;
 
-  public OsrmService() {
+  public OsrmService(String osrmApi) {
+    this.osrmApi = osrmApi;
     this.objectMapper = initializeObjectMapper();
     this.httpClient = initializeHttpClient();
   }