From 48a45df29c27d24d08b4a4dc3007ca5bca888307 Mon Sep 17 00:00:00 2001
From: kilo52 <phil.gaiser@raven-computing.com>
Date: Mon, 15 Jan 2024 20:22:41 +0100
Subject: [PATCH] Make specification of Java namespace mandatory.

Changed the _validate_java_namespace() form input validation function
to disallow empty inputs so that a namespace must be specified by the
user in all Java projects. Refactored the affected code in
the form_java_namespace() function.
---
 java/init.sh | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/java/init.sh b/java/init.sh
index 3cbc1b5..452f94a 100644
--- a/java/init.sh
+++ b/java/init.sh
@@ -148,7 +148,8 @@ function form_java_version() {
 function _validate_java_namespace() {
   local input="$1";
   if [ -z "$input" ]; then
-    return 0;
+    logI "Please specify a namespace";
+    return 1;
   fi
   # Check for expected pattern
   local re="^[a-z.]*$";
@@ -212,15 +213,8 @@ function form_java_namespace() {
   read_user_input_text _validate_java_namespace;
   local entered_namespace="$USER_INPUT_ENTERED_TEXT";
 
-  # Validate given answer
-  if [ -z "$entered_namespace" ]; then
-    logI "No namespace will be used";
-  fi
   var_namespace="$entered_namespace";
-  var_namespace_trailing_sep="";
-  if ! [ -z "$var_namespace" ]; then
-    var_namespace_trailing_sep="$var_namespace.";
-  fi
+  var_namespace_trailing_sep="${var_namespace}.";
   if [[ $var_namespace == *"."* ]]; then
     var_namespace_0="${var_namespace%%.*}";
   else