Fix empty lines

eclipse-ee4j · Jul 7, 2021 · 897712c · 897712c
1 parent 9e272c1
commit 897712c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 28 deletions.
diff --git a/starter-core/src/main/java/org/eclipse/starter/core/service/StarterService.java b/starter-core/src/main/java/org/eclipse/starter/core/service/StarterService.java
@@ -42,12 +42,12 @@ public StarterService() {
     @Inject
     private ZipCreator zipCreator;
 
-    private Map<String, SpecificationHandler> specificationHandlers;
+    private final Map<String, SpecificationHandler> specificationHandlers;
 
     public byte[] generateArchive(
             String artifactId, String groupId, String projectName, String jakartaVersion) {
 
-        Project project = populateModel(artifactId, groupId, projectName, jakartaVersion);
+        Project project = populateModel(artifactId, groupId, jakartaVersion);
 
         Map<String, Object> variables = populateVariables(project);
 
@@ -75,12 +75,13 @@ private Map<String, Object> populateVariables(Project project) {
         variables.put("packageName", project.getPackageName());
         variables.put("projectName", project.getProjectName());
         variables.put("jakartaVersion", project.getJakartaVersion());
+        variables.put("jakartaPackage", project.getJakartaVersion().startsWith("9") ? "jakarta" : "javax");
 
         return variables;
     }
 
     private Project populateModel(
-            String artifactId, String groupId, String projectName, String jakartaVersion) {
+            String artifactId, String groupId, String jakartaVersion) {
 
         Project project = new Project();
 
@@ -96,11 +97,7 @@ private Project populateModel(
 
         project.setGroupId(groupId);
 
-        if (projectName == null || projectName.trim().equals("")) {
-            projectName = "MyProject";
-        }
-
-        project.setProjectName(projectName);
+        project.setProjectName(artifactId);
 
         project.setPackageName(groupId + "." + artifactId);
 

diff --git a/starter-core/src/main/resources/jax-rs/HelloController.java.tpl b/starter-core/src/main/resources/jax-rs/HelloController.java.tpl
@@ -1,15 +1,7 @@
 package [# th:text="${packageName}"/].jaxrs;
 
-[# th:switch="${jakartaVersion}"]
-[# th:case="'8.0.0'"]
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-[/]
-[# th:case="'9.1.0'"]
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-[/]
-[/]
+import [# th:text="${jakartaPackage}"/].ws.rs.GET;
+import [# th:text="${jakartaPackage}"/].ws.rs.Path;
 
 /**
  *

diff --git a/starter-core/src/main/resources/jax-rs/RestApplication.java.tpl b/starter-core/src/main/resources/jax-rs/RestApplication.java.tpl
@@ -1,15 +1,7 @@
 package [# th:text="${packageName}"/].jaxrs;
 
-[# th:switch="${jakartaVersion}"]
-[# th:case="'8.0.0'"]
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.core.Application;
-[/]
-[# th:case="'9.1.0'"]
-import jakarta.ws.rs.ApplicationPath;
-import jakarta.ws.rs.core.Application;
-[/]
-[/]
+import [# th:text="${jakartaPackage}"/].ws.rs.ApplicationPath;
+import [# th:text="${jakartaPackage}"/].ws.rs.core.Application;
 
 /**
  *