Merge branch 'main' into AddAxiosVueApp

jhipster · May 6, 2022 · 8447768 · 8447768
2 parents 1e3c67c + ddef5fa
commit 8447768
Show file tree

Hide file tree

Showing 64 changed files with 4,759 additions and 2,848 deletions.
diff --git a/.gitignore b/.gitignore
@@ -142,6 +142,7 @@ Desktop.ini
 ######################
 # Others
 ######################
+infinitest.filters
 *.class
 *.*~
 *~

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,16 +36,17 @@
     "pinia": "2.0.13",
     "pinia-plugin-persist": "1.0.0",
     "vue": "3.2.33",
-    "vue-router": "4.0.14"
+    "vue-router": "4.0.15"
   },
   "devDependencies": {
     "@pinia/testing": "0.0.11",
     "@prettier/plugin-xml": "2.1.0",
     "@rushstack/eslint-patch": "1.1.3",
-    "@types/jest": "27.4.1",
+    "@types/bootstrap": "5.1.10",
+    "@types/jest": "27.5.0",
     "@types/sinon": "10.0.11",
-    "@typescript-eslint/parser": "5.21.0",
-    "@vitejs/plugin-vue": "2.3.1",
+    "@typescript-eslint/parser": "5.22.0",
+    "@vitejs/plugin-vue": "2.3.2",
     "@vue/eslint-config-typescript": "10.0.0",
     "@vue/test-utils": "2.0.0-rc.21",
     "cypress": "9.6.0",
@@ -64,7 +65,7 @@
     "sinon": "13.0.2",
     "ts-jest": "26.5.6",
     "typescript": "4.6.4",
-    "vite": "2.9.6",
+    "vite": "2.9.8",
     "vue-jest": "5.0.0-alpha.10",
     "vue-tsc": "0.34.11"
   },

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -18,7 +18,7 @@ sonar.exclusions=src/main/webapp/main.ts, src/main/webapp/app/main.ts, src/main/
 
 sonar.typescript.tsconfigPath=tsconfig.json
 
-sonar.issue.ignore.multicriteria=S3437,S4502,S4684,S4032,UndocumentedApi
+sonar.issue.ignore.multicriteria=S3437,S4502,S4684,S4032,S5778,S1133,UndocumentedApi
 
 # Rule https://rules.sonarsource.com/java/RSPEC-3437 is ignored, as a JPA-managed field cannot be transient
 sonar.issue.ignore.multicriteria.S3437.resourceKey=src/main/java/**/*
@@ -39,3 +39,11 @@ sonar.issue.ignore.multicriteria.S4684.ruleKey=java:S4684
 # Rule: Packages containing only "package-info.java" should be removed
 sonar.issue.ignore.multicriteria.S4032.resourceKey=src/main/java/**/*
 sonar.issue.ignore.multicriteria.S4032.ruleKey=java:S4032
+
+# Rule: Only one method invocation is expected when testing runtime exceptions
+sonar.issue.ignore.multicriteria.S5778.resourceKey=src/test/java/**/*
+sonar.issue.ignore.multicriteria.S5778.ruleKey=java:S5778
+
+# Rule: Deprecated code should be removed
+sonar.issue.ignore.multicriteria.S1133.resourceKey=src/main/java/**/*
+sonar.issue.ignore.multicriteria.S1133.ruleKey=java:S1133
diff --git a/src/main/java/tech/jhipster/lite/common/domain/WordUtils.java b/src/main/java/tech/jhipster/lite/common/domain/WordUtils.java
@@ -43,8 +43,9 @@ public static String indent(int times) {
   }
 
   public static String indent(int times, int spaceNumber) {
-    Assert.notLowerThan("times", times, 1);
-    Assert.notLowerThan("spaceNumber", spaceNumber, 1);
+    Assert.field("times", times).min(1);
+    Assert.field("spaceNumber", spaceNumber).min(1);
+
     return " ".repeat(times * spaceNumber);
   }
 }