Rename notification-server into study-notification-server (#71)

Signed-off-by: Florent MILLOT <[email protected]>

Author: flomillot

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

@@ -30,8 +30,8 @@ public class ServiceURIsConfig {
     @Value("${backing-services.merge-orchestrator-server.base-uri:http://merge-orchestrator-server/}")
     String mergeOrchestratorServerBaseUri;
 
-    @Value("${backing-services.notification-server.base-uri:http://notification-server/}")
-    String notificationServerBaseUri;
+    @Value("${backing-services.study-notification-server.base-uri:http://study-notification-server/}")
+    String studyNotificationServerBaseUri;
 
     @Value("${backing-services.merge-notification-server.base-uri:http://merge-notification-server/}")
     String mergeNotificationServerBaseUri;

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

@@ -15,7 +15,7 @@
 @Component(value = StudyNotificationServer.ENDPOINT_NAME)
 public class StudyNotificationServer implements EndPointServer {
 
-    public static final String ENDPOINT_NAME = "notification";
+    public static final String ENDPOINT_NAME = "study-notification";
 
     private final ServiceURIsConfig servicesURIsConfig;
 
@@ -25,7 +25,7 @@ public StudyNotificationServer(ServiceURIsConfig servicesURIsConfig) {
 
     @Override
     public String getEndpointBaseUri() {
-        return servicesURIsConfig.getNotificationServerBaseUri();
+        return servicesURIsConfig.getStudyNotificationServerBaseUri();
     }
 
     @Override

src/main/resources/application-local.yml

@@ -8,7 +8,7 @@ backing-services:
     base-uri: http://localhost:5001
   merge-orchestrator-server:
     base-uri: http://localhost:5020
-  notification-server:
+  study-notification-server:
     base-uri: http://localhost:5009
   merge-notification-server:
     base-uri: http://localhost:5002

src/test/java/org/gridsuite/gateway/TokenValidationTest.java

@@ -58,7 +58,7 @@
         "backing-services.merge-notification-server.base-uri=http://localhost:${wiremock.server.port}",
         "backing-services.directory-notification-server.base-uri=http://localhost:${wiremock.server.port}",
         "backing-services.actions-server.base-uri=http://localhost:${wiremock.server.port}",
-        "backing-services.notification-server.base-uri=http://localhost:${wiremock.server.port}",
+        "backing-services.study-notification-server.base-uri=http://localhost:${wiremock.server.port}",
         "backing-services.config-server.base-uri=http://localhost:${wiremock.server.port}",
         "backing-services.config-notification-server.base-uri=http://localhost:${wiremock.server.port}",
         "backing-services.directory-server.base-uri=http://localhost:${wiremock.server.port}",
@@ -374,7 +374,7 @@ public void testWebsockets() {
                 .withStatus(101)
                 .withStatusMessage("Switching Protocols")));
 
-        testWebsocket("notification");
+        testWebsocket("study-notification");
         testWebsocket("config-notification");
         testWebsocket("merge-notification");
         testWebsocket("directory-notification");
@@ -534,7 +534,7 @@ public void invalidToken() {
         // test without a token
         WebSocketClient client = new StandardWebSocketClient();
         client.execute(URI.create("ws://localhost:" +
-                this.localServerPort + "/notification/notify"),
+                this.localServerPort + "/study-notification/notify"),
             ws -> ws.receive().then()).doOnSuccess(s -> Assert.fail("Should have thrown"));
     }