Rename namespace qualifiers for exposed services (#896)

segabriel · web-flow · commit d2a032a6f229 · 2025-02-10T11:44:34.000+02:00
diff --git a/services-gateway/src/main/java/io/scalecube/services/gateway/http/HttpGatewayAcceptor.java b/services-gateway/src/main/java/io/scalecube/services/gateway/http/HttpGatewayAcceptor.java
@@ -186,7 +186,7 @@ private static ServiceReference matchFileRequest(List<ServiceReference> list) {
       return null;
     }
     final var sr = list.get(0);
-    if ("application/scalecube-file".equals(sr.tags().get("Content-Type"))) {
+    if ("application/file".equals(sr.tags().get("Content-Type"))) {
       return sr;
     } else {
       return null;
@@ -202,7 +202,7 @@ private Mono<Void> handleFileRequest(
             (signal, flux) -> {
               final var qualifier = message.qualifier();
               final var map =
-                  DynamicQualifier.from("v1/scalecube.endpoints/:endpointId/files/:name")
+                  DynamicQualifier.from("v1/endpoints/:endpointId/files/:name")
                       .matchQualifier(qualifier);
               if (map == null) {
                 throw new RuntimeException("Wrong qualifier: " + qualifier);
diff --git a/services-gateway/src/main/java/io/scalecube/services/gateway/websocket/HeartbeatService.java b/services-gateway/src/main/java/io/scalecube/services/gateway/websocket/HeartbeatService.java
@@ -11,7 +11,7 @@
 @Service(HeartbeatService.NAMESPACE)
 public interface HeartbeatService {
 
-  String NAMESPACE = "v1/scalecube.websocket";
+  String NAMESPACE = "v1/heartbeat";
 
   @ServiceMethod
   Mono<Long> ping(long value);
diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/files/FileDownloadTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/files/FileDownloadTest.java
@@ -129,7 +129,7 @@ void testExportReport() throws IOException {
             .block(TIMEOUT);
     assertNotNull(reportResponse, "reportResponse");
     assertNotNull(reportResponse.reportPath(), "reportResponse.reportPath");
-    assertTrue(reportResponse.reportPath().matches("^v1/scalecube.endpoints/.*/files/.*$"));
+    assertTrue(reportResponse.reportPath().matches("^v1/endpoints/.*/files/.*$"));
 
     final var file =
         downloadFile("http://localhost:" + httpAddress.port() + "/" + reportResponse.reportPath());
@@ -152,7 +152,7 @@ void testFileExpired() throws InterruptedException {
             .block(TIMEOUT);
     assertNotNull(reportResponse, "reportResponse");
     assertNotNull(reportResponse.reportPath(), "reportResponse.reportPath");
-    assertTrue(reportResponse.reportPath().matches("^v1/scalecube.endpoints/.*/files/.*$"));
+    assertTrue(reportResponse.reportPath().matches("^v1/endpoints/.*/files/.*$"));
 
     // Download file first time
 
@@ -198,7 +198,7 @@ void testFileNotFound() {
         serviceCall.api(ReportService.class).exportReport(new ExportReportRequest()).block(TIMEOUT);
     assertNotNull(reportResponse, "reportResponse");
     assertNotNull(reportResponse.reportPath(), "reportResponse.reportPath");
-    assertTrue(reportResponse.reportPath().matches("^v1/scalecube.endpoints/.*/files/.*$"));
+    assertTrue(reportResponse.reportPath().matches("^v1/endpoints/.*/files/.*$"));
 
     final var reportPath = reportResponse.reportPath();
     final var s = reportPath.substring(reportPath.lastIndexOf("/"));
@@ -226,7 +226,7 @@ void testWrongFileName() {
         serviceCall.api(ReportService.class).exportReport(new ExportReportRequest()).block(TIMEOUT);
     assertNotNull(reportResponse, "reportResponse");
     assertNotNull(reportResponse.reportPath(), "reportResponse.reportPath");
-    assertTrue(reportResponse.reportPath().matches("^v1/scalecube.endpoints/.*/files/.*$"));
+    assertTrue(reportResponse.reportPath().matches("^v1/endpoints/.*/files/.*$"));
 
     final var reportPath = reportResponse.reportPath();
     final var s = reportPath.substring(reportPath.lastIndexOf("/"));
@@ -253,7 +253,7 @@ void testYetAnotherWrongFileName() {
         serviceCall.api(ReportService.class).exportReport(new ExportReportRequest()).block(TIMEOUT);
     assertNotNull(reportResponse, "reportResponse");
     assertNotNull(reportResponse.reportPath(), "reportResponse.reportPath");
-    assertTrue(reportResponse.reportPath().matches("^v1/scalecube.endpoints/.*/files/.*$"));
+    assertTrue(reportResponse.reportPath().matches("^v1/endpoints/.*/files/.*$"));
 
     final var reportPath = reportResponse.reportPath();
     final var s = reportPath.substring(reportPath.lastIndexOf("/"));
diff --git a/services/src/main/java/io/scalecube/services/files/FileStreamer.java b/services/src/main/java/io/scalecube/services/files/FileStreamer.java
@@ -8,15 +8,15 @@
 
 /**
  * System service interface for streaming files after they have been added locally with {@link
- * FileService#addFile(AddFileRequest)}. NOTE: this is system service inerface, clients are not
+ * FileService#addFile(AddFileRequest)}. NOTE: this is system service interface, clients are not
  * supposed to inject it into their app services and call it directly.
  */
 @Service(FileStreamer.NAMESPACE)
 public interface FileStreamer {
 
-  String NAMESPACE = "v1/scalecube.endpoints";
+  String NAMESPACE = "v1/endpoints";
 
-  @Tag(key = "Content-Type", value = "application/scalecube-file")
+  @Tag(key = "Content-Type", value = "application/file")
   @RestMethod("GET")
   @ServiceMethod("${microservices:id}/files/:name")
   Flux<byte[]> streamFile();
