[ofbiz-framework] branch trunk updated: Improved: Checkstyle: Variable name must match pattern (OFBIZ-11926)

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new ae8b2d8  Improved: Checkstyle: Variable name must match pattern (OFBIZ-11926)
ae8b2d8 is described below

commit ae8b2d89b047d039382d555250b73161c2c2b438
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Wed Sep 16 10:13:37 2020 +0200

    Improved: Checkstyle: Variable name must match pattern (OFBIZ-11926)
   
    Removes last remaining "Must have at least one statement" issues by using
    Debug.logVerbose
   
    Decreases tasks.checkstyleMain.maxErrors from 543 to 535
   
    Thanks: Suraj for report
---
 .../org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java  | 10 ++++------
 build.gradle                                                   |  2 +-
 .../src/main/java/org/apache/ofbiz/base/util/KeyStoreUtil.java |  2 +-
 .../main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java   |  2 +-
 .../main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java    |  2 +-
 .../main/java/org/apache/ofbiz/entity/model/ModelReader.java   |  5 ++---
 .../src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java  |  1 +
 .../java/org/apache/ofbiz/widget/renderer/FormRenderer.java    |  1 +
 .../main/java/org/apache/ofbiz/widget/renderer/Paginator.java  |  1 +
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java
index 1cfd26f..7691d60 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java
@@ -428,8 +428,7 @@ public class TaxAuthorityServices {
                     .where(mainCondition).orderBy("minItemPrice", "minPurchase", "fromDate").filterByDate().queryList();
 
             if (lookupList.isEmpty()) {
-                Debug.logWarning("In TaxAuthority Product Rate no records were found for condition:" + mainCondition
-                        .toString(), MODULE);
+                Debug.logWarning("In TaxAuthority Product Rate no records were found for condition:" + mainCondition.toString(), MODULE);
                 return adjustments;
             }
 
@@ -471,14 +470,13 @@ public class TaxAuthorityServices {
                 // get glAccountId from TaxAuthorityGlAccount entity using the payToPartyId as
                 // the organizationPartyId
                 GenericValue taxAuthorityGlAccount = EntityQuery.use(delegator).from("TaxAuthorityGlAccount")
-                        .where("taxAuthPartyId", taxAuthPartyId, "taxAuthGeoId", taxAuthGeoId, "organizationPartyId",
-                                payToPartyId).queryOne();
+                        .where("taxAuthPartyId", taxAuthPartyId, "taxAuthGeoId", taxAuthGeoId, "organizationPartyId", payToPartyId).queryOne();
                 String taxAuthGlAccountId = null;
                 if (taxAuthorityGlAccount != null) {
                     taxAuthGlAccountId = taxAuthorityGlAccount.getString("glAccountId");
                 } else {
-                    // TODO: what to do if no TaxAuthorityGlAccount found? Use some default, or is
-                    // that done elsewhere later on?
+                    // TODO: what to do if no TaxAuthorityGlAccount found? Use some default, or is that done elsewhere later on?
+                    Debug.logVerbose("what to do if no TaxAuthorityGlAccount found?", MODULE);
                 }
 
                 GenericValue productPrice = null;
diff --git a/build.gradle b/build.gradle
index c8e92d6..398b283 100644
--- a/build.gradle
+++ b/build.gradle
@@ -289,7 +289,7 @@ checkstyle {
     // the sum of errors found last time it was changed after using the
     // ‘checkstyle’ tool present in the framework and in the official
     // plugins.
-    tasks.checkstyleMain.maxErrors = 543
+    tasks.checkstyleMain.maxErrors = 535
     // Currently there are a lot of errors so we need to temporarily
     // hide them to avoid polluting the terminal output.
     showViolations = false
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/KeyStoreUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/KeyStoreUtil.java
index 3ae3eed..796058d 100755
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/KeyStoreUtil.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/KeyStoreUtil.java
@@ -206,8 +206,8 @@ public final class KeyStoreUtil {
         String line;
 
         // ignore up to the header
-        //TODO: Correct it for checkstyle
         while ((line = reader.readLine()) != null && !line.equals(header)) {
+            Debug.logVerbose("Ignore up to the header...", MODULE);
         }
 
         // no header found
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java
index d4f87ff..74324e0 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java
@@ -1166,7 +1166,7 @@ public class DatabaseUtil {
                     }
                     rsCols = dbData.getColumns(null, lookupSchemaName, "%", "%");
                     if (!rsCols.next()) {
-                        // TODO: now what to do? I guess try one table name at a time...
+                        Debug.logVerbose("Now what to do? I guess try one table name at a time...", MODULE);
                     } else {
                         foundCols = true;
                     }
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java
index 06aabeb..81a324b 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java
@@ -390,7 +390,7 @@ public final class SqlJdbcUtil {
             ModelViewEntity modelViewEntity = (ModelViewEntity) modelEntity;
 
             if ("ansi".equals(joinStyle) || "ansi-no-parenthesis".equals(joinStyle)) {
-                // nothing to do here, all done in the JOIN clauses
+                Debug.logVerbose("Nothing to do here, all done in the JOIN clauses...", MODULE);
             } else if ("theta-oracle".equals(joinStyle) || "theta-mssql".equals(joinStyle)) {
                 boolean isOracleStyle = "theta-oracle".equals(joinStyle);
                 boolean isMssqlStyle = "theta-mssql".equals(joinStyle);
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelReader.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelReader.java
index 5f15212..c6ea3a2 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelReader.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelReader.java
@@ -335,9 +335,8 @@ public class ModelReader implements Serializable {
                     for (String curEntityName : new TreeSet<>(this.getEntityNames())) {
                         ModelEntity curModelEntity = this.getModelEntity(curEntityName);
                         if (curModelEntity instanceof ModelViewEntity) {
-                            // for view-entities auto-create relationships for all member-entity
-                            // relationships that have all corresponding fields in the view-entity
-
+                            Debug.logVerbose("for view-entities auto-create relationships for all member-entity"
+                                    + "relationships that have all corresponding fields in the view-entity...", MODULE);
                         } else {
                             // for entities auto-create many relationships for all type one relationships
                             // just in case we add a new relation to the same entity, keep in a separate
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java
index 8908ac6..71a87c9 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java
@@ -306,6 +306,7 @@ public final class SimpleMethod extends MiniLangElement {
                     // MiniLangValidate|W| Invalid element found Method = facilityGenericPermission, File =
                     // file:/C:/projectsASF/Git/ofbiz-framework/applications/product/minilang/product/inventory/InventoryServices.xml,
                     // Element = <else>, Line 71
+                    Debug.logVerbose("Prevents false warnings like reported at https://s.apache.org/o7tmu", MODULE);
                 } else {
                     MiniLangValidate.handleError("Invalid element found", simpleMethod, curOperElem);
                 }
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java
index e1dc1af..1a056ef 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java
@@ -1121,6 +1121,7 @@ public class FormRenderer {
             if (stayingOnRow) {
                 // no spacer cell, might add later though...
                 //formStringRenderer.renderFormatFieldRowSpacerCell(writer, context, currentFormField);
+                Debug.logVerbose("no spacer cell, might add later though...", MODULE);
             } else {
                 if (haveRenderedOpenFieldRow) {
                     // render row formatting close
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/Paginator.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/Paginator.java
index c52d358..152249d 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/Paginator.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/Paginator.java
@@ -60,6 +60,7 @@ public final class Paginator {
         int highIndex = 0;
         int listSize = modelForm.getOverrideListSize(context);
         if (listSize > 0) {
+            Debug.logVerbose("If listSize > 0, do nothing", MODULE);
         } else if (entryList instanceof EntityListIterator) {
             EntityListIterator iter = (EntityListIterator) entryList;
             try {