Skip to content

Commit 31e52fe

Browse files
committed
Merge branch 'improve/java-require-namespace'
2 parents 9cf40d8 + 48a45df commit 31e52fe

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

java/init.sh

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ function form_java_version() {
112112
function _validate_java_namespace() {
113113
local input="$1";
114114
if [ -z "$input" ]; then
115-
return 0;
115+
logI "Please specify a namespace";
116+
return 1;
116117
fi
117118
# Check for expected pattern
118119
local re="^[a-z.]*$";
@@ -178,16 +179,9 @@ function form_java_namespace() {
178179
read_user_input_text _validate_java_namespace;
179180
local entered_namespace="$USER_INPUT_ENTERED_TEXT";
180181

181-
# Validate given answer
182-
if [ -z "$entered_namespace" ]; then
183-
logI "No namespace will be used";
184-
fi
185182
var_namespace="$entered_namespace";
186183
var_namespace_path="${var_namespace//.//}";
187-
var_namespace_trailing_sep="";
188-
if [ -n "$var_namespace" ]; then
189-
var_namespace_trailing_sep="$var_namespace.";
190-
fi
184+
var_namespace_trailing_sep="${var_namespace}.";
191185
if [[ $var_namespace == *"."* ]]; then
192186
var_namespace_0="${var_namespace%%.*}";
193187
else

0 commit comments

Comments
 (0)