spring-boot: sonar fixes

jhipster · Dec 3, 2024 · 4ce39d0 · 4ce39d0
1 parent 2d5edbf
commit 4ce39d0
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 22 deletions.
diff --git a/...c/test/java/_package_/_entityPackage_/service/criteria/_entityClass_CriteriaTest.java.ejs b/...c/test/java/_package_/_entityPackage_/service/criteria/_entityClass_CriteriaTest.java.ejs
@@ -4,6 +4,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
+import java.util.Objects;
 import org.assertj.core.api.Condition;
 import org.junit.jupiter.api.Test;
 
@@ -21,7 +22,7 @@ class <%- entityClass %>CriteriaTest {
 
         setAllFilters(<%- persistInstance %>Criteria);
 
-        assertThat(<%- persistInstance %>Criteria).is(criteriaFiltersAre(filter -> filter != null));
+        assertThat(<%- persistInstance %>Criteria).is(criteriaFiltersAre(Objects::nonNull));
     }
 
     @Test
@@ -62,7 +63,7 @@ class <%- entityClass %>CriteriaTest {
 
 
         assertThat(copy).satisfies(
-            criteria -> assertThat(criteria).is(criteriaFiltersAre(filter -> filter != null)),
+            criteria -> assertThat(criteria).is(criteriaFiltersAre(Objects::nonNull)),
             criteria -> assertThat(criteria).isEqualTo(<%- persistInstance %>Criteria)
         );
     }

diff --git a/...mplates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs b/...mplates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs
@@ -986,13 +986,16 @@ _%>
   if (field.fieldTypeBigDecimal) { %>sameNumber(<% } %><%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %><%
   if (field.fieldTypeBinary && !field.blobContentTypeText) { %><%
     if (databaseTypeCassandra) { %>.array()<% } %>)<% } else
-  if (field.fieldTypeInteger) { %><% } else
   if (field.fieldTypeLong) { %>.intValue()<% } else
-  if (field.fieldTypeFloat || field.fieldTypeDouble) { %>.doubleValue()<% } else
+  if (field.fieldTypeFloat) { %>.doubleValue()<% } else
   if (field.fieldTypeBigDecimal) { %>)<% } else
-  if (field.fieldTypeBoolean) { %>.booleanValue()<% } else
   if (field.fieldTypeZonedDateTime) { %>)<% } else
-  if (!field.fieldTypeString) { %>.toString()<% } %>))<%= !reactive ? ')' : '' %><%_ } _%>;
+  if (
+    !field.fieldTypeString &&
+    !field.fieldTypeBoolean &&
+    !field.fieldTypeInteger &&
+    !field.fieldTypeDouble
+  ) { %>.toString()<% } %>))<%= !reactive ? ')' : '' %><%_ } _%>;
     }
 <% if (implementsEagerLoadApis && !databaseTypeNeo4j && !databaseTypeCouchbase) { %>
     @SuppressWarnings({"unchecked"})
@@ -1073,13 +1076,16 @@ _%>
   if (field.fieldTypeBigDecimal) { %>sameNumber(<% } %><%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %><%
   if (field.fieldTypeBinary && !field.blobContentTypeText) { %><%
     if (databaseTypeCassandra) { %>.array()<% } %>)<% } else
-  if (field.fieldTypeInteger) { %><% } else
   if (field.fieldTypeLong) { %>.intValue()<% } else
-  if (field.fieldTypeFloat || field.fieldTypeDouble) { %>.doubleValue()<% } else
+  if (field.fieldTypeFloat) { %>.doubleValue()<% } else
   if (field.fieldTypeBigDecimal) { %>)<% } else
-  if (field.fieldTypeBoolean) { %>.booleanValue()<% } else
   if (field.fieldTypeZonedDateTime) { %>)<% } else
-  if (!field.fieldTypeString) { %>.toString()<% } %>))<%_ } _%>;
+  if (
+    !field.fieldTypeString &&
+    !field.fieldTypeBoolean &&
+    !field.fieldTypeInteger &&
+    !field.fieldTypeDouble
+  ) { %>.toString()<% } %>))<%_ } _%>;
     }
 <%_ if (jpaMetamodelFiltering) {  %>
 
@@ -1313,13 +1319,16 @@ _%>
       if (field.fieldTypeZonedDateTime) { %>sameInstant(<% } else
       if (field.fieldTypeBigDecimal) { %>sameNumber(<% } %><%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %><%
       if (field.fieldTypeBinary && !field.blobContentTypeText) { %><% if (databaseTypeCassandra) { %>.array()<% } %>)<% } else
-      if (field.fieldTypeInteger) { %><% } else
       if (field.fieldTypeLong) { %>.intValue()<% } else
-      if (field.fieldTypeFloat || field.fieldTypeDouble) { %>.doubleValue()<% } else
+      if (field.fieldTypeFloat) { %>.doubleValue()<% } else
       if (field.fieldTypeBigDecimal) { %>)<% } else
-      if (field.fieldTypeBoolean) { %>.booleanValue()<% } else
       if (field.fieldTypeZonedDateTime) { %>)<% } else
-      if (!field.fieldTypeString) { %>.toString()<% } %>))<%_ } _%>;
+      if (
+        !field.fieldTypeString &&
+        !field.fieldTypeBoolean &&
+        !field.fieldTypeInteger &&
+        !field.fieldTypeDouble
+      ) { %>.toString()<% } %>))<%_ } _%>;
 
         // Check, that the count call also returns 1
         webTestClient.get().uri(ENTITY_API_URL + "/count?sort=<%= primaryKey.name %>,desc&" + filter)
@@ -1356,13 +1365,16 @@ _%>
     if (field.fieldTypeBigDecimal) { %>sameNumber(<% } %><%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %><%
     if (field.fieldTypeBinary && !field.blobContentTypeText) { %><%
       if (databaseTypeCassandra) { %>.array()<% } %>)<% } else
-    if (field.fieldTypeInteger) { %><% } else
     if (field.fieldTypeLong) { %>.intValue()<% } else
-    if (field.fieldTypeFloat || field.fieldTypeDouble) { %>.doubleValue()<% } else
+    if (field.fieldTypeFloat) { %>.doubleValue()<% } else
     if (field.fieldTypeBigDecimal) { %>)<% } else
-    if (field.fieldTypeBoolean) { %>.booleanValue()<% } else
     if (field.fieldTypeZonedDateTime) { %>)<% } else
-    if (!field.fieldTypeString) { %>.toString()<% } %>)))<% }); %>;
+    if (
+      !field.fieldTypeString &&
+      !field.fieldTypeBoolean &&
+      !field.fieldTypeInteger &&
+      !field.fieldTypeDouble
+    ) { %>.toString()<% } %>)))<% }); %>;
 
         // Check, that the count call also returns 1
         rest<%= entityClass %>MockMvc.perform(get(ENTITY_API_URL + "/count?sort=<%= primaryKey.name %>,desc&" + filter))
@@ -1877,13 +1889,16 @@ _%>
   if (field.fieldTypeBigDecimal) { %>sameNumber(<% } %><%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %><%
   if (field.fieldTypeBinary && !field.blobContentTypeText) { %><%
     if (databaseTypeCassandra) { %>.array()<% } %>)<% } else
-  if (field.fieldTypeInteger) { %><% } else
   if (field.fieldTypeLong) { %>.intValue()<% } else
-  if (field.fieldTypeFloat || field.fieldTypeDouble) { %>.doubleValue()<% } else
+  if (field.fieldTypeFloat) { %>.doubleValue()<% } else
   if (field.fieldTypeBigDecimal) { %>)<% } else
-  if (field.fieldTypeBoolean) { %>.booleanValue()<% } else
   if (field.fieldTypeZonedDateTime) { %>)<% } else
-  if (!field.fieldTypeString) { %>.toString()<% } %>))<%= !reactive ? ')' : '' %><%_ } _%>;
+  if (
+    !field.fieldTypeString &&
+    !field.fieldTypeBoolean &&
+    !field.fieldTypeInteger &&
+    !field.fieldTypeDouble
+  ) { %>.toString()<% } %>))<%= !reactive ? ')' : '' %><%_ } _%>;
     }
 <%_ } _%>