odre-server and geo-data-server can now be requested through the gateway (#64)

* odre-server and geo-data-server can now be requested through the gateway
Signed-off-by: bendaamerahm <[email protected]>

Author: bendaamerahm

src/main/java/org/gridsuite/gateway/GatewayConfig.java

@@ -47,6 +47,8 @@ public RouteLocator myRoutes(RouteLocatorBuilder builder, ApplicationContext con
             .route(p -> context.getBean(ReportServer.class).getRoute(p))
             .route(p -> context.getBean(NetworkModificationServer.class).getRoute(p))
             .route(p -> context.getBean(NetworkConversionServer.class).getRoute(p))
+            .route(p -> context.getBean(OdreServer.class).getRoute(p))
+            .route(p -> context.getBean(GeoDataServer.class).getRoute(p))
             .build();
     }
 }

src/main/java/org/gridsuite/gateway/ServiceURIsConfig.java

@@ -71,4 +71,10 @@ public class ServiceURIsConfig {
 
     @Value("${backing-services.network-conversion-server.base-uri:http://network-conversion-server/}")
     String networkConversionServerBaseUri;
+
+    @Value("${backing-services.odre-server.base-uri:http://odre-server/}")
+    String odreServerBaseUri;
+
+    @Value("${backing-services.geo-data-server.base-uri:http://geo-data-server/}")
+    String geoDataServerBaseUri;
 }

src/main/java/org/gridsuite/gateway/endpoints/GeoDataServer.java

@@ -0,0 +1,35 @@
+/*
+  Copyright (c) 2022, RTE (http://www.rte-france.com)
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.gridsuite.gateway.endpoints;
+
+import org.gridsuite.gateway.ServiceURIsConfig;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author bendaamerahm <ahmed.bendaamer at rte-france.com>
+ */
+@Component(value = GeoDataServer.ENDPOINT_NAME)
+public class GeoDataServer implements EndPointServer {
+
+    public static final String ENDPOINT_NAME = "geo-data";
+
+    private final ServiceURIsConfig servicesURIsConfig;
+
+    public GeoDataServer(ServiceURIsConfig servicesURIsConfig) {
+        this.servicesURIsConfig = servicesURIsConfig;
+    }
+
+    @Override
+    public String getEndpointBaseUri() {
+        return servicesURIsConfig.getGeoDataServerBaseUri();
+    }
+
+    @Override
+    public String getEndpointName() {
+        return ENDPOINT_NAME;
+    }
+}

src/main/java/org/gridsuite/gateway/endpoints/OdreServer.java

@@ -0,0 +1,35 @@
+/*
+  Copyright (c) 2022, RTE (http://www.rte-france.com)
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.gridsuite.gateway.endpoints;
+
+import org.gridsuite.gateway.ServiceURIsConfig;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author bendaamerahm <ahmed.bendaamer at rte-france.com>
+ */
+@Component(value = OdreServer.ENDPOINT_NAME)
+public class OdreServer implements EndPointServer {
+
+    public static final String ENDPOINT_NAME = "odre";
+
+    private final ServiceURIsConfig servicesURIsConfig;
+
+    public OdreServer(ServiceURIsConfig servicesURIsConfig) {
+        this.servicesURIsConfig = servicesURIsConfig;
+    }
+
+    @Override
+    public String getEndpointBaseUri() {
+        return servicesURIsConfig.getOdreServerBaseUri();
+    }
+
+    @Override
+    public String getEndpointName() {
+        return ENDPOINT_NAME;
+    }
+}

src/main/resources/application-local.yml

@@ -36,4 +36,8 @@ backing-services:
     base-uri: http://localhost:5007
   network-conversion-server:
     base-uri: http://localhost:5003
+  odre-server:
+    base-uri: http://localhost:8090
+  geo-data-server:
+    base-uri: http://localhost:8087