Remove version from REST uri fragment if exists (0.104) (#8250)

Remove version from REST uri fragment if exists (#8246) This PR fixes the issue exposed in acceptance tests * Remove version from REST uri fragment if exists --------- Signed-off-by: Xin Li <[email protected]> Signed-off-by: Steven Sheehy <[email protected]> Co-authored-by: Xin Li <[email protected]>
hashgraph · May 7, 2024 · af0ea9d · af0ea9d
1 parent 85af2a9
commit af0ea9d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/...ror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/client/MirrorNodeClient.java b/...ror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/client/MirrorNodeClient.java
@@ -16,6 +16,7 @@
 
 package com.hedera.mirror.test.e2e.acceptance.client;
 
+import static com.hedera.mirror.test.e2e.acceptance.config.RestProperties.URL_PREFIX;
 import static org.awaitility.Awaitility.await;
 
 import com.google.common.base.Stopwatch;
@@ -372,21 +373,31 @@ public void unSubscribeFromTopic(SubscriptionHandle subscription) {
     }
 
     private <T> T callRestEndpoint(String uri, Class<T> classType, Object... uriVariables) {
-        return retryTemplate.execute(
-                x -> restClient.get().uri(uri, uriVariables).retrieve().body(classType));
+        String normalizedUri = normalizeUri(uri);
+        return retryTemplate.execute(x ->
+                restClient.get().uri(normalizedUri, uriVariables).retrieve().body(classType));
     }
 
     private <T> T callRestJavaEndpoint(String uri, Class<T> classType, Object... uriVariables) {
-        return retryTemplate.execute(
-                x -> restJavaClient.get().uri(uri, uriVariables).retrieve().body(classType));
+        String normalizedUri = normalizeUri(uri);
+        return retryTemplate.execute(x ->
+                restJavaClient.get().uri(normalizedUri, uriVariables).retrieve().body(classType));
     }
 
     private <T> T callRestEndpointNoRetry(String uri, Class<T> classType, Object... uriVariables) {
-        return restClient.get().uri(uri, uriVariables).retrieve().body(classType);
+        return restClient.get().uri(normalizeUri(uri), uriVariables).retrieve().body(classType);
     }
 
     private <T, R> T callPostRestEndpoint(String uri, Class<T> classType, R request) {
         return retryTemplate.execute(
                 x -> web3Client.post().uri(uri).body(request).retrieve().body(classType));
     }
+
+    private String normalizeUri(String uri) {
+        if (uri == null || !uri.startsWith(URL_PREFIX)) {
+            return uri;
+        }
+
+        return uri.substring(URL_PREFIX.length());
+    }
 }
diff --git a/...r-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/config/RestJavaProperties.java b/...r-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/config/RestJavaProperties.java
@@ -16,7 +16,7 @@
 
 package com.hedera.mirror.test.e2e.acceptance.config;
 
-import static com.hedera.mirror.test.e2e.acceptance.config.RestProperties.URL_SUFFIX;
+import static com.hedera.mirror.test.e2e.acceptance.config.RestProperties.URL_PREFIX;
 
 import jakarta.inject.Named;
 import lombok.Data;
@@ -36,8 +36,8 @@ public class RestJavaProperties {
     private boolean enabled = false;
 
     public String getBaseUrl() {
-        if (baseUrl != null && !baseUrl.endsWith(URL_SUFFIX)) {
-            return baseUrl + URL_SUFFIX;
+        if (baseUrl != null && !baseUrl.endsWith(URL_PREFIX)) {
+            return baseUrl + URL_PREFIX;
         }
         return baseUrl;
     }

diff --git a/...irror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/config/RestProperties.java b/...irror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/config/RestProperties.java
@@ -36,7 +36,7 @@
 @Validated
 public class RestProperties {
 
-    public static final String URL_SUFFIX = "/api/v1";
+    public static final String URL_PREFIX = "/api/v1";
 
     @NotBlank
     private String baseUrl;
@@ -59,8 +59,8 @@ public boolean shouldRetry(Throwable t) {
     }
 
     public String getBaseUrl() {
-        if (baseUrl != null && !baseUrl.endsWith(URL_SUFFIX)) {
-            return baseUrl + URL_SUFFIX;
+        if (baseUrl != null && !baseUrl.endsWith(URL_PREFIX)) {
+            return baseUrl + URL_PREFIX;
         }
         return baseUrl;
     }

diff --git a/...irror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/config/Web3Properties.java b/...irror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/config/Web3Properties.java
@@ -16,7 +16,7 @@
 
 package com.hedera.mirror.test.e2e.acceptance.config;
 
-import static com.hedera.mirror.test.e2e.acceptance.config.RestProperties.URL_SUFFIX;
+import static com.hedera.mirror.test.e2e.acceptance.config.RestProperties.URL_PREFIX;
 
 import jakarta.inject.Named;
 import lombok.Data;
@@ -36,8 +36,8 @@ public class Web3Properties {
     private boolean enabled = false;
 
     public String getBaseUrl() {
-        if (baseUrl != null && !baseUrl.endsWith(URL_SUFFIX)) {
-            return baseUrl + URL_SUFFIX;
+        if (baseUrl != null && !baseUrl.endsWith(URL_PREFIX)) {
+            return baseUrl + URL_PREFIX;
         }
         return baseUrl;
     }