response to reviews

openmrs · Sep 25, 2024 · 0fe80e8 · 0fe80e8
1 parent dfbf81b
commit 0fe80e8
Showing 1 changed file with 4 additions and 18 deletions.
diff --git a/maven-plugin/src/main/java/org/openmrs/maven/plugins/CreateProject.java b/maven-plugin/src/main/java/org/openmrs/maven/plugins/CreateProject.java
@@ -263,25 +263,11 @@ private void createModule() throws MojoExecutionException {
 				.promptForValueIfMissingWithDefault(DESCRIPTION_PROMPT_TMPL, moduleDescription, "", "no description");
 
 		if (TYPE_CONTENT_PACKAGE.equals(type)) {
+			groupId = "org.openmrs.content";
 			wizard.showMessage(CONTENT_MAVEN_INFO);
-			groupId = wizard.promptForValueIfMissingWithDefault(GROUP_ID_PROMPT_TMPL, groupId, "groupId", "org.openmrs.content");
-			while (!groupId.matches("[a-z][a-z0-9.]*")) {
-				wizard.showError("The specified groupId " + groupId
-						+ " is not valid. It must start from a letter and can contain only alphanumerics and dots.");
-				groupId = null;
-				groupId = wizard
-						.promptForValueIfMissingWithDefault(GROUP_ID_PROMPT_TMPL, groupId, "groupId", "org.openmrs.content");
-			}
 		} else {
-			wizard.showMessage(MAVEN_INFO);
-			groupId = wizard.promptForValueIfMissingWithDefault(GROUP_ID_PROMPT_TMPL, groupId, "groupId", "org.openmrs.module");
-			while (!groupId.matches("[a-z][a-z0-9.]*")) {
-				wizard.showError("The specified groupId " + groupId
-						+ " is not valid. It must start from a letter and can contain only alphanumerics and dots.");
-				groupId = null;
-				groupId = wizard
-						.promptForValueIfMissingWithDefault(GROUP_ID_PROMPT_TMPL, groupId, "groupId", "org.openmrs.module");
-			}
+			groupId = "org.openmrs.module";
+			wizard.showMessage(CONTENT_MAVEN_INFO);
 		}
 
 		artifactId = moduleId;
@@ -306,7 +292,7 @@ private void createModule() throws MojoExecutionException {
 		}
 
 		archetypeVersion = getSdkVersion();
-		packageName = TYPE_CONTENT_PACKAGE.equals(type) ? "org.openmrs.content." + artifactId : "org.openmrs.module." + artifactId;
+		packageName = groupId + "." + artifactId;
 
 		Properties properties = new Properties();
 		properties.setProperty("artifactId", artifactId);