Rename spreadsheet-config-server into study-config-server (#125)

Signed-off-by: David BRAQUART <[email protected]>

Author: dbraquart

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

@@ -53,8 +53,7 @@ public RouteLocator myRoutes(RouteLocatorBuilder builder, ApplicationContext con
             .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(SpreadsheetConfigServer.class).getRoute(p))
-            .route(p -> context.getBean(SpreadsheetConfigCollection.class).getRoute(p))
+            .route(p -> context.getBean(StudyConfigServer.class).getRoute(p))
             .build();
     }
 }

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

@@ -111,8 +111,8 @@ public class ServiceURIsConfig {
     @Value("${gridsuite.services.state-estimation-orchestrator-server.base-uri:http://state-estimation-orchestrator-server/}")
     String stateEstimationOrchestratorServerBaseUri;
 
-    @Value("${gridsuite.services.spreadsheet-config-server.base-uri:http://spreadsheet-config-server/}")
-    String spreadsheetConfigServerBaseUri;
+    @Value("${gridsuite.services.study-config-server.base-uri:http://study-config-server/}")
+    String studyConfigServerBaseUri;
 
     @Value("${gridsuite.services.user-identity-server.base-uri:http://user-identity-server/}")
     String userIdentityServerBaseUri;

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

@@ -11,19 +11,19 @@
 import org.springframework.stereotype.Component;
 
 /**
- * @author Achour BERRAHMA <achour.berrahma at rte-france.com>
+ * @author David BRAQUART <david.braquart at rte-france.com>
  */
 @RequiredArgsConstructor
-@Component(value = SpreadsheetConfigServer.ENDPOINT_NAME)
-public class SpreadsheetConfigServer implements EndPointServer {
+@Component(value = StudyConfigServer.ENDPOINT_NAME)
+public class StudyConfigServer implements EndPointServer {
 
-    public static final String ENDPOINT_NAME = "spreadsheet-config";
+    public static final String ENDPOINT_NAME = "study-config";
 
     private final ServiceURIsConfig servicesURIsConfig;
 
     @Override
     public String getEndpointBaseUri() {
-        return servicesURIsConfig.getSpreadsheetConfigServerBaseUri();
+        return servicesURIsConfig.getStudyConfigServerBaseUri();
     }
 
     @Override

src/main/java/org/gridsuite/gateway/endpoints/SpreadsheetConfigServer.java renamed to src/main/java/org/gridsuite/gateway/endpoints/StudyConfigServer.java

@@ -63,10 +63,10 @@ gridsuite:
     shortcircuit-server:
       base-uri: http://localhost:5031
     state-estimation-server:
-      base-uri: http://localhost:5040
+      base-uri: http://localhost:6040
     state-estimation-orchestrator-server:
       base-uri: http://localhost:5041
-    spreadsheet-config-server:
+    study-config-server:
       base-uri: http://localhost:5035
     user-identity-server:
       base-uri: http://localhost:5034

src/main/resources/application-local.yml

@@ -47,7 +47,7 @@
         "gridsuite.services.filter-server.base-uri=http://localhost:${wiremock.server.port}",
         "gridsuite.services.user-admin-server.base-uri=http://localhost:${wiremock.server.port}",
         "gridsuite.services.sensitivity-analysis-server.base-uri=http://localhost:${wiremock.server.port}",
-        "gridsuite.services.spreadsheet-config-server.base-uri=http://localhost:${wiremock.server.port}",
+        "gridsuite.services.study-config-server.base-uri=http://localhost:${wiremock.server.port}",
     }
 )
 @AutoConfigureWireMock(port = 0)
@@ -211,37 +211,37 @@ void testGetElements() {
                 .willReturn(aResponse()));
 
         webClient
-                .get().uri(String.format("spreadsheet-config/v1/spreadsheet-configs/%s", uuid))
+                .get().uri(String.format("study-config/v1/spreadsheet-configs/%s", uuid))
                 .header("Authorization", "Bearer " + tokenUser1)
                 .exchange()
                 .expectStatus().isOk();
 
         webClient
-                .get().uri(String.format("spreadsheet-config/v1/spreadsheet-config-collections/%s", uuid))
+                .get().uri(String.format("study-config/v1/spreadsheet-config-collections/%s", uuid))
                 .header("Authorization", "Bearer " + tokenUser1)
                 .exchange()
                 .expectStatus().isOk();
 
         webClient
-                .get().uri(String.format("spreadsheet-config/v1/spreadsheet-configs/%s", uuid))
+                .get().uri(String.format("study-config/v1/spreadsheet-configs/%s", uuid))
                 .header("Authorization", "Bearer " + tokenUser2)
                 .exchange()
                 .expectStatus().isNotFound();
 
         webClient
-                .get().uri(String.format("spreadsheet-config/v1/spreadsheet-config-collections/%s", uuid))
+                .get().uri(String.format("study-config/v1/spreadsheet-config-collections/%s", uuid))
                 .header("Authorization", "Bearer " + tokenUser2)
                 .exchange()
                 .expectStatus().isNotFound();
 
         webClient
-                .get().uri("spreadsheet-config/v1/spreadsheet-configs/invalid-uuid")
+                .get().uri("study-config/v1/spreadsheet-configs/invalid-uuid")
                 .header("Authorization", "Bearer " + tokenUser1)
                 .exchange()
                 .expectStatus().isNotFound();
 
         webClient
-                .get().uri("spreadsheet-config/v1/spreadsheet-config-collections/invalid-uuid")
+                .get().uri("study-config/v1/spreadsheet-config-collections/invalid-uuid")
                 .header("Authorization", "Bearer " + tokenUser1)
                 .exchange()
                 .expectStatus().isNotFound();