Merge pull request #860 from pascalgrimaud/ci-sonar-analysis-for-gene…

…rated-projects

Ci sonar analysis for generated projects

.github/workflows/github-actions.yml

@@ -99,14 +99,13 @@ jobs:
     strategy:
       matrix:
         app:
-          - full-default
-          - tomcat-mysql-ehcachexml
-          - undertow-simplecache
-          - tomcat-configserver
-          - undertow-consul
-          - tomcat-eureka
-          - tomcat-mongodb
+          - fullapp
+          - mysqlapp
           - flywayapp
+          - undertowapp
+          - eurekaapp
+          - consulapp
+          - mongodbapp
           - angularapp
           - reactapp
           - vueapp
@@ -141,11 +140,21 @@ jobs:
           key: ${{ runner.os }}-maven-${{ matrix.app }}-${{ steps.cache_md5sum.outputs.md5sum_pom_xml }}
           restore-keys: |
             ${{ runner.os }}-maven-
+      - name: 'Test: starting Sonar'
+        working-directory: /tmp/jhlite/${{ matrix.app }}/
+        run: |
+          docker-compose -f src/main/docker/sonar.yml up -d
+          sleep 30
+          docker ps -a
       - name: 'Test: verify ${{ matrix.app }}'
         working-directory: /tmp/jhlite/${{ matrix.app }}/
         run: |
           chmod +x mvnw
-          ./mvnw clean verify
+          ./mvnw clean verify sonar:sonar
+      - name: 'Test: check local Sonar Analysis'
+        run: |
+          sleep 15
+          ./tests-ci/sonar.sh ${{ matrix.app }}
   #--------------------------------------------------
   # Send analysis to Codecov
   #--------------------------------------------------

src/main/java/tech/jhipster/lite/common/domain/FileUtils.java

@@ -66,7 +66,7 @@ public static Path getPathOf(String... paths) {
   public static InputStream getInputStream(String... paths) {
     InputStream in = FileUtils.class.getResourceAsStream(FILE_SEPARATOR + getPath(paths));
     if (in == null) {
-      throw new GeneratorException("File not found in classpath");
+      throw new GeneratorException("File '" + getPath(paths) + "' not found in classpath");
     }
     return in;
   }

src/main/java/tech/jhipster/lite/generator/client/angular/core/domain/AngularDomainService.java

@@ -82,11 +82,11 @@ public void addAngularFiles(Project project) {
   public void addImages(Project project) {
     projectRepository.add(
       project,
-      getPath(SOURCE_WEBAPP, "/content/images"),
+      getPath(SOURCE_WEBAPP, "content/images"),
       "JHipster-Lite-neon-red.png",
       "src/main/webapp/content/images"
     );
-    projectRepository.add(project, getPath(SOURCE_WEBAPP, "/content/images"), "AngularLogo.svg", "src/main/webapp/content/images");
+    projectRepository.add(project, getPath(SOURCE_WEBAPP, "content/images"), "AngularLogo.svg", "src/main/webapp/content/images");
   }
 
   public void addJestSonar(Project project) {

src/main/resources/generator/client/angular/src/main/webapp/app/common/primary/app/app.component.html.mustache

@@ -5,13 +5,13 @@
   <h1>{{=<% %>=}}{{ appName }}<%={{ }}=%>: Angular + TypeScript</h1>
   <p>
     Recommended IDE setup:
-    <a href="https://code.visualstudio.com/" target="_blank">VSCode</a>
+    <a href="https://code.visualstudio.com/" target="_blank" rel="noopener">VSCode</a>
   </p>
 
   <p>
-    <a href="https://angular.io/tutorial" target="_blank">Angular Documentation</a>
+    <a href="https://angular.io/tutorial" target="_blank" rel="noopener">Angular Documentation</a>
     |
-    <a href="https://angular.io/cli" target="_blank">Angular CLI Documentation</a>
+    <a href="https://angular.io/cli" target="_blank" rel="noopener">Angular CLI Documentation</a>
   </p>
 
   <p>

src/main/resources/generator/client/vite/vue/webapp/app/common/primary/app/StyledApp.html.mustache

@@ -5,17 +5,17 @@
   <h1>{{=<% %>=}}{{ appName }}<%={{ }}=%>: Vue 3 + TypeScript + Vite</h1>
   <p>
     Recommended IDE setup:
-    <a href="https://code.visualstudio.com/" target="_blank">VSCode</a>
+    <a href="https://code.visualstudio.com/" target="_blank" rel="noopener">VSCode</a>
     +
-    <a href="https://github.com/johnsoncodehk/volar" target="_blank">Volar</a>
+    <a href="https://github.com/johnsoncodehk/volar" target="_blank" rel="noopener">Volar</a>
   </p>
 
   <p>
-    <a href="https://vitejs.dev/guide/features.html" target="_blank">
+    <a href="https://vitejs.dev/guide/features.html" target="_blank" rel="noopener">
       Vite Documentation
     </a>
     |
-    <a href="https://v3.vuejs.org/" target="_blank">Vue 3 Documentation</a>
+    <a href="https://v3.vuejs.org/" target="_blank" rel="noopener">Vue 3 Documentation</a>
   </p>
 
   <p>

src/main/resources/generator/server/springboot/user/sqldatabase/UserEntity_without_sequence.java.mustache

@@ -12,8 +12,7 @@ import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.annotations.BatchSize;
-
-import tech.jhipster.beer.user.domain.UserConstants;
+import {{packageName}}.user.domain.UserConstants;
 
 /**
  * A user.

tests-ci/config/consulapp.json

@@ -0,0 +1,8 @@
+{
+  "folder": "/tmp/jhlite/consulapp",
+  "generator-jhipster": {
+    "projectName": "ConsulApp Project",
+    "baseName": "consulapp",
+    "packageName": "tech.jhipster.consulapp"
+  }
+}

tests-ci/config/eurekaapp.json

@@ -0,0 +1,8 @@
+{
+  "folder": "/tmp/jhlite/eurekaapp",
+  "generator-jhipster": {
+    "projectName": "EurekaApp Project",
+    "baseName": "eurekaapp",
+    "packageName": "tech.jhipster.eurekaapp"
+  }
+}

tests-ci/config/fullapp.json

@@ -0,0 +1,8 @@
+{
+  "folder": "/tmp/jhlite/fullapp",
+  "generator-jhipster": {
+    "projectName": "Fullapp Project",
+    "baseName": "fullapp",
+    "packageName": "tech.jhipster.fullapp"
+  }
+}

tests-ci/config/fullstack.json

@@ -0,0 +1,8 @@
+{
+  "folder": "/tmp/jhlite/fullstack",
+  "generator-jhipster": {
+    "projectName": "Full Stack Project",
+    "baseName": "fullstack",
+    "packageName": "tech.jhipster.fullstack"
+  }
+}

tests-ci/config/mongodbapp.json

@@ -0,0 +1,8 @@
+{
+  "folder": "/tmp/jhlite/mongodbapp",
+  "generator-jhipster": {
+    "projectName": "MongoDB App Project",
+    "baseName": "mongodbapp",
+    "packageName": "tech.jhipster.mongodbapp"
+  }
+}

tests-ci/config/mysqlapp.json

@@ -0,0 +1,8 @@
+{
+  "folder": "/tmp/jhlite/mysqlapp",
+  "generator-jhipster": {
+    "projectName": "MySQL Project",
+    "baseName": "mysqlapp",
+    "packageName": "tech.jhipster.mysqlapp"
+  }
+}

tests-ci/config/undertowapp.json

@@ -0,0 +1,8 @@
+{
+  "folder": "/tmp/jhlite/undertowapp",
+  "generator-jhipster": {
+    "projectName": "UndertowApp Project",
+    "baseName": "undertowapp",
+    "packageName": "tech.jhipster.undertowapp"
+  }
+}