chore: refactor and allow empty

aws-greengrass · Aug 22, 2024 · 4a67f70 · 4a67f70
1 parent 8947375
commit 4a67f70
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/server/src/main/java/com/aws/greengrass/cli/CLIEventStreamAgent.java b/server/src/main/java/com/aws/greengrass/cli/CLIEventStreamAgent.java
@@ -488,9 +488,7 @@ public CreateLocalDeploymentResponse handleRequest(CreateLocalDeploymentRequest
                     }
                 }
 
-                if (request.getGroupName().contains(":")) {
-                    throw new InvalidArgumentsError("Thing group name cannot contain colon characters");
-                }
+                validateThingGroupName(request);
 
                 String deploymentId = UUID.randomUUID().toString();
                 LocalOverrideRequest localOverrideRequest = LocalOverrideRequest.builder().requestId(deploymentId)
@@ -541,6 +539,11 @@ public CreateLocalDeploymentResponse handleRequest(CreateLocalDeploymentRequest
             });
         }
 
+        private void validateThingGroupName(CreateLocalDeploymentRequest request) {
+            if (!Utils.isEmpty(request.getGroupName()) && request.getGroupName().contains(":")) {
+                throw new InvalidArgumentsError("Thing group name cannot contain colon characters");
+            }
+        }
 
         @Override
         public void handleStreamEvent(EventStreamJsonMessage streamRequestEvent) {