Merge pull request #66 from TheWorldAvatar/StackHost-blank-as-empty

gpeb2 · web-flow · commit eab35db06db5 · 2025-10-03T10:49:35.000+01:00
StackHost treat blank as empty
diff --git a/stack-clients/.vscode/tasks.json b/stack-clients/.vscode/tasks.json
@@ -14,9 +14,6 @@
                 "cwd": "${cwd}/../stack-manager",
                 "shell": {
                     "executable": "bash",
-                    "args": [
-                        "-c"
-                    ]
                 }
             },
             "group": {
@@ -35,9 +32,6 @@
                 "cwd": "${cwd}/../stack-data-uploader",
                 "shell": {
                     "executable": "bash",
-                    "args": [
-                        "-c"
-                    ]
                 }
             },
             "group": {
@@ -67,10 +61,7 @@
             ],
             "options": {
                 "shell": {
-                    "executable": "bash",
-                    "args": [
-                        "-c"
-                    ]
+                    "executable": "bash"
                 }
             },
             "group": {
diff --git a/stack-clients/docker-compose.yml b/stack-clients/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   stack-client:
-    image: ghcr.io/theworldavatar/stack-client${IMAGE_SUFFIX}:1.52.0
+    image: ghcr.io/theworldavatar/stack-client${IMAGE_SUFFIX}:1.53.0
     secrets:
       - blazegraph_password
       - postgis_password
diff --git a/stack-clients/pom.xml b/stack-clients/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>com.cmclinnovations</groupId>
     <artifactId>stack-clients</artifactId>
-    <version>1.52.0</version>
+    <version>1.53.0</version>
 
     <name>Stack Clients</name>
     <url>https://theworldavatar.io</url>
diff --git a/stack-clients/src/main/java/com/cmclinnovations/stack/clients/core/StackHost.java b/stack-clients/src/main/java/com/cmclinnovations/stack/clients/core/StackHost.java
@@ -23,19 +23,19 @@ public StackHost(String hostName) {
     }
 
     public Optional<String> getProto() {
-        return proto;
+        return proto.filter(p -> !p.isBlank());
     }
 
     public Optional<String> getName() {
-        return name;
+        return name.filter(n -> !n.isBlank());
     }
 
     public Optional<String> getPort() {
-        return port;
+        return port.filter(p -> !p.isBlank());
     }
 
     public Optional<String> getPath() {
-        return path;
+        return path.filter(p -> !p.isBlank());
     }
 
     public Builder getStringBuilder() {
@@ -52,42 +52,42 @@ public class Builder {
         private boolean finalSlash = false;
 
         public Builder withProto() {
-            proto.ifPresent(p -> protoOut = p);
+            getProto().ifPresent(p -> protoOut = p);
             return this;
         }
 
         public Builder withProto(String defaultProto) {
-            protoOut = proto.orElse(defaultProto);
+            protoOut = getProto().orElse(defaultProto);
             return this;
         }
 
         public Builder withName() {
-            name.ifPresent(n -> nameOut = n);
+            getName().ifPresent(n -> nameOut = n);
             return this;
         }
 
         public Builder withName(String defaultName) {
-            nameOut = name.orElse(defaultName);
+            nameOut = getName().orElse(defaultName);
             return this;
         }
 
         public Builder withPort() {
-            port.ifPresent(p -> portOut = p);
+            getPort().ifPresent(p -> portOut = p);
             return this;
         }
 
         public Builder withPort(String defaultPort) {
-            portOut = port.orElse(defaultPort);
+            portOut = getPort().orElse(defaultPort);
             return this;
         }
 
         public Builder withPath() {
-            path.ifPresent(p -> pathOut = p);
+            getPath().ifPresent(p -> pathOut = p);
             return this;
         }
 
         public Builder withPath(String defaultPath) {
-            pathOut = path.orElse(defaultPath);
+            pathOut = getPath().orElse(defaultPath);
             return this;
         }
 
diff --git a/stack-clients/src/main/java/com/cmclinnovations/stack/services/GrlcService.java b/stack-clients/src/main/java/com/cmclinnovations/stack/services/GrlcService.java
@@ -2,13 +2,15 @@
 
 import com.cmclinnovations.stack.clients.core.EndpointNames;
 import com.cmclinnovations.stack.clients.core.StackClient;
+import com.cmclinnovations.stack.clients.core.StackHost;
 import com.cmclinnovations.stack.clients.rdf4j.Rdf4jEndpointConfig;
 import com.cmclinnovations.stack.services.config.ServiceConfig;
 
 public class GrlcService extends ContainerService {
 
     public static final String TYPE = "grlc";
 
+    private static final String EXTERNAL_PORT_KEY = "EXTERNAL_PORT";
     private static final String GRLC_SERVER_NAME_KEY = "GRLC_SERVER_NAME";
     private static final String GRLC_SPARQL_ENDPOINT_KEY = "GRLC_SPARQL_ENDPOINT";
 
@@ -19,13 +21,12 @@ public GrlcService(String stackName, ServiceConfig config) {
     @Override
     protected void doPreStartUpConfiguration() {
 
-        // String serverName = (StackClient.getStackHost()
-        // .getWithDefaults(null, "", "", "") + "rest/")
-        // .replaceAll("/+", "\\\\/");
-
-        String serverName = StackClient.getStackHost().getStringBuilder()
-                .withName()
-                .withPort()
+        StackHost stackHost = StackClient.getStackHost();
+        String serverName = stackHost.getStringBuilder()
+                // Assume running locally if name not set
+                .withName("localhost")
+                // Assume using Nginx external port if name not set, otherwise no port (80/443 assumed)
+                .withPort(stackHost.getName().isPresent() ? null : System.getenv(EXTERNAL_PORT_KEY))
                 .withPath()
                 .withExtraPath("rest")
                 .build()
diff --git a/stack-clients/src/test/java/com/cmclinnovations/stack/StackHostTest.java b/stack-clients/src/test/java/com/cmclinnovations/stack/StackHostTest.java
@@ -9,7 +9,7 @@
 import com.cmclinnovations.stack.clients.utils.JsonHelper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-public class StackHostTest {
+class StackHostTest {
     ObjectMapper objectMapper = JsonHelper.getMapper();
 
     @Test
@@ -45,6 +45,19 @@ void testNameJson() {
                 () -> Assertions.assertEquals("host", stackHost.getStringBuilder().withName().build()));
     }
 
+        @Test
+    void testEmptyStrings() {        
+        StackHost stackHostDefault = new StackHost();
+        StackHost stackHostJson = Assertions
+                .assertDoesNotThrow(() -> objectMapper.readValue("{\"proto\":\"\", \"name\":\"\",\"port\":\" \",\"path\":\" \"}", StackHost.class));
+        Assertions.assertAll(
+                () -> Assertions.assertEquals(stackHostDefault.getProto(), stackHostJson.getProto()),
+                () -> Assertions.assertEquals(stackHostDefault.getName(), stackHostJson.getName()),
+                () -> Assertions.assertEquals(stackHostDefault.getPort(), stackHostJson.getPort()),
+                () -> Assertions.assertEquals(stackHostDefault.getPath(), stackHostJson.getPath()),
+                () -> Assertions.assertEquals("", stackHostJson.getStringBuilder().withName().build()));
+    }
+
     @Test
     void testWithNameConstructor() {
         StackHost stackHost = new StackHost("myhost");
diff --git a/stack-data-uploader/docker-compose.yml b/stack-data-uploader/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   stack-data-uploader:
-    image: ghcr.io/theworldavatar/stack-data-uploader${IMAGE_SUFFIX}:1.52.0
+    image: ghcr.io/theworldavatar/stack-data-uploader${IMAGE_SUFFIX}:1.53.0
     secrets:
       - blazegraph_password
       - postgis_password
diff --git a/stack-data-uploader/pom.xml b/stack-data-uploader/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>com.cmclinnovations</groupId>
     <artifactId>stack-data-uploader</artifactId>
-    <version>1.52.0</version>
+    <version>1.53.0</version>
 
     <name>Stack Data Uploader</name>
     <url>https://theworldavatar.io</url>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>com.cmclinnovations</groupId>
             <artifactId>stack-clients</artifactId>
-            <version>1.52.0</version>
+            <version>1.53.0</version>
         </dependency>
 
         <dependency>
diff --git a/stack-manager/docker-compose.yml b/stack-manager/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   stack-manager:
-    image: ghcr.io/theworldavatar/stack-manager${IMAGE_SUFFIX}:1.52.0
+    image: ghcr.io/theworldavatar/stack-manager${IMAGE_SUFFIX}:1.53.0
     environment:
       EXTERNAL_PORT: "${EXTERNAL_PORT-3838}"
       STACK_BASE_DIR: "${STACK_BASE_DIR}"
diff --git a/stack-manager/pom.xml b/stack-manager/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>com.cmclinnovations</groupId>
     <artifactId>stack-manager</artifactId>
-    <version>1.52.0</version>
+    <version>1.53.0</version>
 
     <name>Stack Manager</name>
     <url>https://theworldavatar.io</url>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>com.cmclinnovations</groupId>
             <artifactId>stack-clients</artifactId>
-            <version>1.52.0</version>
+            <version>1.53.0</version>
         </dependency>
 
         <dependency>

Original file line number	Diff line number	Diff line change
`@@ -23,19 +23,19 @@ public StackHost(String hostName) {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public Optional<String> getProto() {`
`26`		`- return proto;`
	`26`	`+ return proto.filter(p -> !p.isBlank());`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public Optional<String> getName() {`
`30`		`- return name;`
	`30`	`+ return name.filter(n -> !n.isBlank());`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public Optional<String> getPort() {`
`34`		`- return port;`
	`34`	`+ return port.filter(p -> !p.isBlank());`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public Optional<String> getPath() {`
`38`		`- return path;`
	`38`	`+ return path.filter(p -> !p.isBlank());`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public Builder getStringBuilder() {`
`@@ -52,42 +52,42 @@ public class Builder {`
`52`	`52`	`private boolean finalSlash = false;`
`53`	`53`
`54`	`54`	`public Builder withProto() {`
`55`		`- proto.ifPresent(p -> protoOut = p);`
	`55`	`+ getProto().ifPresent(p -> protoOut = p);`
`56`	`56`	`return this;`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`public Builder withProto(String defaultProto) {`
`60`		`- protoOut = proto.orElse(defaultProto);`
	`60`	`+ protoOut = getProto().orElse(defaultProto);`
`61`	`61`	`return this;`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public Builder withName() {`
`65`		`- name.ifPresent(n -> nameOut = n);`
	`65`	`+ getName().ifPresent(n -> nameOut = n);`
`66`	`66`	`return this;`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`public Builder withName(String defaultName) {`
`70`		`- nameOut = name.orElse(defaultName);`
	`70`	`+ nameOut = getName().orElse(defaultName);`
`71`	`71`	`return this;`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`public Builder withPort() {`
`75`		`- port.ifPresent(p -> portOut = p);`
	`75`	`+ getPort().ifPresent(p -> portOut = p);`
`76`	`76`	`return this;`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`public Builder withPort(String defaultPort) {`
`80`		`- portOut = port.orElse(defaultPort);`
	`80`	`+ portOut = getPort().orElse(defaultPort);`
`81`	`81`	`return this;`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`public Builder withPath() {`
`85`		`- path.ifPresent(p -> pathOut = p);`
	`85`	`+ getPath().ifPresent(p -> pathOut = p);`
`86`	`86`	`return this;`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`public Builder withPath(String defaultPath) {`
`90`		`- pathOut = path.orElse(defaultPath);`
	`90`	`+ pathOut = getPath().orElse(defaultPath);`
`91`	`91`	`return this;`
`92`	`92`	`}`
`93`	`93`