Migrate checktyle.xml to the root directory of the project, fix ESLin…

…t issues
jhipster · Sep 20, 2019 · 51163b8 · 51163b8
1 parent 53d2d40
commit 51163b8
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 36 deletions.
diff --git a/generators/server/files.js b/generators/server/files.js
@@ -158,7 +158,7 @@ const serverFiles = {
     ],
     serverBuild: [
         {
-            templates: [{ file: 'config/checkstyle/checkstyle.xml', method: 'copy', noEjs: true }]
+            templates: [{ file: 'checkstyle.xml', method: 'copy', noEjs: true }]
         },
         {
             condition: generator => generator.buildTool === 'gradle',

diff --git a/generators/server/templates/checkstyle.xml b/generators/server/templates/checkstyle.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "https://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<module name="Checker">
+
+    <!-- Configure checker to use UTF-8 encoding -->
+    <property name="charset" value="UTF-8"/>
+    <!-- Configure checker to run on files with these extensions -->
+    <property name="fileExtensions" value=""/>
+    <!-- For detailed checkstyle configuration, see https://github.com/spring-io/nohttp/tree/master/nohttp-checkstyle -->
+    <module name="io.spring.nohttp.checkstyle.check.NoHttpCheck">
+    </module>
+</module>
diff --git a/generators/server/templates/config/checkstyle/checkstyle.xml b/generators/server/templates/config/checkstyle/checkstyle.xml
diff --git a/generators/server/templates/pom.xml.ejs b/generators/server/templates/pom.xml.ejs
@@ -858,7 +858,7 @@
                     </dependency>
                 </dependencies>
                 <configuration>
-                    <configLocation>config/checkstyle/checkstyle.xml</configLocation>
+                    <configLocation>checkstyle.xml</configLocation>
                     <includes>pom.xml,README.md</includes>
                 </configuration>
                 <executions>

diff --git a/test/utils/expected-files.js b/test/utils/expected-files.js
@@ -131,7 +131,6 @@ const expectedFiles = {
     },
 
     gradle: [
-        'config/checkstyle/checkstyle.xml',
         'gradle.properties',
         'build.gradle',
         'settings.gradle',
@@ -142,17 +141,11 @@ const expectedFiles = {
         'gradle/profile_prod.gradle',
         'gradle/sonar.gradle',
         'gradle/wrapper/gradle-wrapper.jar',
-        'gradle/wrapper/gradle-wrapper.properties'
+        'gradle/wrapper/gradle-wrapper.properties',
+        'checkstyle.xml'
     ],
 
-    maven: [
-        'pom.xml',
-        'mvnw',
-        'mvnw.cmd',
-        '.mvn/wrapper/maven-wrapper.jar',
-        '.mvn/wrapper/maven-wrapper.properties',
-        'config/checkstyle/checkstyle.xml'
-    ],
+    maven: ['pom.xml', 'mvnw', 'mvnw.cmd', '.mvn/wrapper/maven-wrapper.jar', '.mvn/wrapper/maven-wrapper.properties', 'checkstyle.xml'],
 
     common: ['.prettierignore', '.prettierrc', 'README.md', '.gitignore', '.gitattributes', '.editorconfig'],