diff --git a/src/main/java/org/gridsuite/gateway/GatewayConfig.java b/src/main/java/org/gridsuite/gateway/GatewayConfig.java index db5dd60..53dbd1a 100644 --- a/src/main/java/org/gridsuite/gateway/GatewayConfig.java +++ b/src/main/java/org/gridsuite/gateway/GatewayConfig.java @@ -54,7 +54,7 @@ public RouteLocator myRoutes(RouteLocatorBuilder builder, ApplicationContext con .route(p -> context.getBean(DynamicSecurityAnalysisServer.class).getRoute(p)) .route(p -> context.getBean(VoltageInitServer.class).getRoute(p)) .route(p -> context.getBean(ShortCircuitServer.class).getRoute(p)) - .route(p -> context.getBean(StateEstimationOrchestratorServer.class).getRoute(p)) + .route(p -> context.getBean(SnapshotRefinerServer.class).getRoute(p)) .route(p -> context.getBean(StudyConfigServer.class).getRoute(p)) .route(p -> context.getBean(GeoDataServer.class).getRoute(p)) .route(p -> context.getBean(PccMinServer.class).getRoute(p)) diff --git a/src/main/java/org/gridsuite/gateway/ServiceURIsConfig.java b/src/main/java/org/gridsuite/gateway/ServiceURIsConfig.java index 1cb43f1..f6cb00f 100644 --- a/src/main/java/org/gridsuite/gateway/ServiceURIsConfig.java +++ b/src/main/java/org/gridsuite/gateway/ServiceURIsConfig.java @@ -114,8 +114,8 @@ public class ServiceURIsConfig { @Value("${gridsuite.services.state-estimation-server.base-uri:http://state-estimation-server/}") String stateEstimationServerBaseUri; - @Value("${gridsuite.services.state-estimation-orchestrator-server.base-uri:http://state-estimation-orchestrator-server/}") - String stateEstimationOrchestratorServerBaseUri; + @Value("${gridsuite.services.snapshot-refiner-server.base-uri:http://snapshot-refiner-server/}") + String snapshotRefinerServerBaseUri; @Value("${gridsuite.services.study-config-server.base-uri:http://study-config-server/}") String studyConfigServerBaseUri; diff --git a/src/main/java/org/gridsuite/gateway/endpoints/StateEstimationOrchestratorServer.java b/src/main/java/org/gridsuite/gateway/endpoints/SnapshotRefinerServer.java similarity index 65% rename from src/main/java/org/gridsuite/gateway/endpoints/StateEstimationOrchestratorServer.java rename to src/main/java/org/gridsuite/gateway/endpoints/SnapshotRefinerServer.java index 681fc2a..256370c 100644 --- a/src/main/java/org/gridsuite/gateway/endpoints/StateEstimationOrchestratorServer.java +++ b/src/main/java/org/gridsuite/gateway/endpoints/SnapshotRefinerServer.java @@ -12,20 +12,20 @@ /** * @author Franck Lecuyer */ -@Component(value = StateEstimationOrchestratorServer.ENDPOINT_NAME) -public class StateEstimationOrchestratorServer implements EndPointServer { +@Component(value = SnapshotRefinerServer.ENDPOINT_NAME) +public class SnapshotRefinerServer implements EndPointServer { - public static final String ENDPOINT_NAME = "state-estimation-orchestrator"; + public static final String ENDPOINT_NAME = "snapshot-refiner"; private final ServiceURIsConfig servicesURIsConfig; - public StateEstimationOrchestratorServer(ServiceURIsConfig servicesURIsConfig) { + public SnapshotRefinerServer(ServiceURIsConfig servicesURIsConfig) { this.servicesURIsConfig = servicesURIsConfig; } @Override public String getEndpointBaseUri() { - return servicesURIsConfig.getStateEstimationOrchestratorServerBaseUri(); + return servicesURIsConfig.getSnapshotRefinerServerBaseUri(); } @Override diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index a45bd0d..dde9059 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -68,7 +68,7 @@ gridsuite: base-uri: http://localhost:5031 state-estimation-server: base-uri: http://localhost:6040 - state-estimation-orchestrator-server: + snapshot-refiner-server: base-uri: http://localhost:6041 study-config-server: base-uri: http://localhost:5035 @@ -79,4 +79,4 @@ gridsuite: # Note: The issuer configured in Docker Compose must match the one used here. Using localhost instead will not work. allowed-issuers: http://172.17.0.1:9090 -allowed-audiences: gridexplore-client, gridadmin-client, griddyna-client, gridstudy-client, gridexplore-local, gridadmin-local, griddyna-local, gridstudy-local \ No newline at end of file +allowed-audiences: gridexplore-client, gridadmin-client, griddyna-client, gridstudy-client, gridexplore-local, gridadmin-local, griddyna-local, gridstudy-local