Refactor duplicate logic for creating applications inplace - Fixes #9696 and #9654

Author: graemerocher

grails-shell/src/main/groovy/org/grails/cli/profile/commands/CreateAppCommand.groovy

@@ -343,46 +343,24 @@ class CreateAppCommand extends ArgumentCompletingCommand implements ProfileRepos
             return false
         }
         String groupAndAppName = args ? args[0] : null
-
-
-
         if(inPlace) {
             appname = new File(".").canonicalFile.name
-            if(groupAndAppName) {
-                groupname = groupAndAppName
-                defaultPackage = groupname
-            }
-            else {
-                try {
-                    defaultPackage = createValidPackageName()
-                } catch (IllegalArgumentException e ) {
-                    GrailsConsole.instance.error(e.message)
-                    return false
-                }
-                groupname = defaultPackage
-            }
-        }
-        else {
             if(!groupAndAppName) {
-                GrailsConsole.getInstance().error("Specify an application name or use --inplace to create an application in the current directory")
-                return false
-            }
-            List<String> parts = groupAndAppName.split(/\./) as List
-            if(parts.size() == 1) {
-                appname = parts[0]
-                try {
-                    defaultPackage = createValidPackageName()
-                } catch (IllegalArgumentException e ) {
-                    GrailsConsole.instance.error(e.message)
-                    return false
-                }
-                groupname = defaultPackage
-            } else {
-                appname = parts[-1]
-                groupname = parts[0..-2].join('.')
-                defaultPackage = groupname
+                groupAndAppName = appname
             }
         }
+        
+        if(!groupAndAppName) {
+            GrailsConsole.getInstance().error("Specify an application name or use --inplace to create an application in the current directory")
+            return false
+        }
+
+        try {
+            defaultPackage = establishGroupAndAppName(groupAndAppName)
+        } catch (IllegalArgumentException e ) {
+            GrailsConsole.instance.error(e.message)
+            return false
+        }
 
 
         variables.APPNAME = appname
@@ -400,6 +378,21 @@ class CreateAppCommand extends ArgumentCompletingCommand implements ProfileRepos
         variables['grails.app.group'] = groupname
     }
 
+    private String establishGroupAndAppName(String groupAndAppName) {
+        String defaultPackage
+        List<String> parts = groupAndAppName.split(/\./) as List
+        if (parts.size() == 1) {
+            appname = parts[0]
+            defaultPackage = createValidPackageName()
+            groupname = defaultPackage
+        } else {
+            appname = parts[-1]
+            groupname = parts[0..-2].join('.')
+            defaultPackage = groupname
+        }
+        return defaultPackage
+    }
+
     private String createValidPackageName() {
         String defaultPackage = appname.split(/[-]+/).collect { String token -> (token.toLowerCase().toCharArray().findAll  { char ch -> Character.isJavaIdentifierPart(ch) } as char[]) as String }.join('.')
         if(!GrailsNameUtils.isValidJavaPackage(defaultPackage)) {