[ofbiz-framework] branch trunk updated: Improved: Corrected all checkstyle issues related to succeeding space for comma in framework directory. (OFBIZ-11805) Thanks Jacques and Ritesh Kumar for review.

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[ofbiz-framework] branch trunk updated: Improved: Corrected all checkstyle issues related to succeeding space for comma in framework directory. (OFBIZ-11805) Thanks Jacques and Ritesh Kumar for review.

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

surajk 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 3bb2230  Improved: Corrected all checkstyle issues related to succeeding space for comma in framework directory. (OFBIZ-11805) Thanks Jacques and Ritesh Kumar for review.
3bb2230 is described below

commit 3bb22302c7a521ed179134cb5f9c359d0b13c64e
Author: Suraj Khurana <[hidden email]>
AuthorDate: Thu Jul 9 12:07:29 2020 +0530

    Improved: Corrected all checkstyle issues related to succeeding space for comma in framework directory.
    (OFBIZ-11805)
    Thanks Jacques and Ritesh Kumar for review.
---
 .../main/java/org/apache/ofbiz/base/util/FileUtil.java   |  2 +-
 .../main/java/org/apache/ofbiz/base/util/UtilCodec.java  | 10 +++++-----
 .../main/java/org/apache/ofbiz/base/util/UtilNumber.java |  2 +-
 .../java/org/apache/ofbiz/base/util/UtilValidate.java    |  2 +-
 .../java/org/apache/ofbiz/base/util/cache/UtilCache.java | 12 ++++++------
 .../main/java/org/apache/ofbiz/common/FindServices.java  |  2 +-
 .../java/org/apache/ofbiz/common/UrlServletHelper.java   |  2 +-
 .../org/apache/ofbiz/common/email/EmailServices.java     |  2 +-
 .../org/apache/ofbiz/common/qrcode/QRCodeServices.java   |  2 +-
 .../org/apache/ofbiz/common/status/StatusServices.java   |  2 +-
 .../main/java/org/apache/ofbiz/common/uom/UomWorker.java |  2 +-
 .../ofbiz/entity/cache/AbstractEntityConditionCache.java |  2 +-
 .../org/apache/ofbiz/entity/condition/EntityClause.java  |  8 ++++----
 .../ofbiz/entity/condition/EntityComparisonOperator.java |  2 +-
 .../apache/ofbiz/entity/condition/EntityCondition.java   |  8 ++++----
 .../org/apache/ofbiz/entity/condition/EntityExpr.java    |  4 ++--
 .../apache/ofbiz/entity/condition/EntityFieldMap.java    |  2 +-
 .../apache/ofbiz/entity/condition/EntityOperator.java    |  8 ++++----
 .../org/apache/ofbiz/entity/util/EntitySaxReader.java    |  4 ++--
 .../entityext/permission/EntityPermissionChecker.java    |  4 ++--
 .../entityext/synchronization/EntitySyncContext.java     | 16 ++++++++--------
 .../apache/ofbiz/service/engine/XMLRPCClientEngine.java  |  2 +-
 .../java/org/apache/ofbiz/service/job/JobManager.java    | 12 ++++++------
 .../java/org/apache/ofbiz/base/start/StartupCommand.java |  8 ++++----
 .../org/apache/ofbiz/testtools/TestRunContainer.java     |  2 +-
 .../java/org/apache/ofbiz/webapp/event/CoreEvents.java   |  4 ++--
 .../java/org/apache/ofbiz/webapp/event/EventFactory.java |  4 ++--
 .../java/org/apache/ofbiz/webapp/view/ViewFactory.java   |  4 ++--
 .../org/apache/ofbiz/widget/cache/AbstractCache.java     |  2 +-
 .../java/org/apache/ofbiz/widget/cache/ScreenCache.java  |  4 ++--
 .../apache/ofbiz/widget/model/IterateSectionWidget.java  |  2 +-
 .../java/org/apache/ofbiz/widget/model/ModelTheme.java   |  6 +++---
 .../org/apache/ofbiz/widget/renderer/FormRenderer.java   |  2 +-
 .../ofbiz/widget/renderer/macro/MacroFormRenderer.java   |  2 +-
 34 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/FileUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/FileUtil.java
index f407e4f..45e1e5d 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/FileUtil.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/FileUtil.java
@@ -386,7 +386,7 @@ public final class FileUtil {
        File inFile = new File(fileName);
        if (inFile.exists()) {
             try (
-           BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(inFile),StandardCharsets.UTF_8));
+           BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(inFile), StandardCharsets.UTF_8));
             ) {
                return containsString(in, searchString);
            }
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
index c2793d9..58fbd34 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
@@ -87,7 +87,7 @@ public class UtilCodec {
     public static interface SimpleEncoder {
         public String encode(String original);
         /**
-         * @deprecated Use {@link #sanitize(String,String)} instead
+         * @deprecated Use {@link #sanitize(String, String)} instead
          */
         @Deprecated
         public String sanitize(String outString); // Only really useful with HTML, else it simply calls encode() method
@@ -109,7 +109,7 @@ public class UtilCodec {
             return htmlCodec.encode(IMMUNE_HTML, original);
         }
         /**
-         * @deprecated Use {@link #sanitize(String,String)} instead
+         * @deprecated Use {@link #sanitize(String, String)} instead
          */
         @Override
         @Deprecated
@@ -220,7 +220,7 @@ public class UtilCodec {
             return xmlCodec.encode(IMMUNE_XML, original);
         }
         /**
-         * @deprecated Use {@link #sanitize(String,String)} instead
+         * @deprecated Use {@link #sanitize(String, String)} instead
          */
         @Override
         @Deprecated
@@ -244,7 +244,7 @@ public class UtilCodec {
             }
         }
         /**
-         * @deprecated Use {@link #sanitize(String,String)} instead
+         * @deprecated Use {@link #sanitize(String, String)} instead
          */
         @Override
         @Deprecated
@@ -277,7 +277,7 @@ public class UtilCodec {
             return original;
         }
         /**
-         * @deprecated Use {@link #sanitize(String,String)} instead
+         * @deprecated Use {@link #sanitize(String, String)} instead
          */
         @Override
         @Deprecated
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilNumber.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilNumber.java
index 8a0bf96..46348dc 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilNumber.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilNumber.java
@@ -216,7 +216,7 @@ public final class UtilNumber {
      * @param   file     - Name of the property file
      * @param   property - Name of the config property from arithmeticPropertiesFile (e.g., "invoice.rounding")
      * @return  int - Rounding mode to pass to BigDecimal's methods. Defaults to BigDecimal.ROUND_HALF_UP
-     * @deprecated Use {@link #getRoundingMode(String,String)} instead
+     * @deprecated Use {@link #getRoundingMode(String, String)} instead
      */
     @Deprecated
     public static int  getBigDecimalRoundingMode(String file, String property) {
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java
index 5c1f309..610c875 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java
@@ -176,7 +176,7 @@ public final class UtilValidate {
     }
 
     /** Check whether map m is empty. */
-    public static <K,E> boolean isEmpty(Map<K,E> m) {
+    public static <K, E> boolean isEmpty(Map<K, E> m) {
         return (m == null) || m.isEmpty();
     }
 
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/UtilCache.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/UtilCache.java
index 439b143..a9cf89e 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/UtilCache.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/UtilCache.java
@@ -754,32 +754,32 @@ public class UtilCache<K, V> implements Serializable, EvictionListener<Object, C
         return storeCache(new UtilCache<>(cacheName, sizeLimit, maxInMemory, expireTime, useSoftReference, name));
     }
 
-    public static <K,V> UtilCache<K, V> createUtilCache(String name, int sizeLimit, long expireTime, boolean useSoftReference) {
+    public static <K, V> UtilCache<K, V> createUtilCache(String name, int sizeLimit, long expireTime, boolean useSoftReference) {
         String cacheName = name + getNextDefaultIndex(name);
         return storeCache(new UtilCache<>(cacheName, sizeLimit, sizeLimit, expireTime, useSoftReference, name));
     }
 
-    public static <K,V> UtilCache<K, V> createUtilCache(String name, int sizeLimit, long expireTime) {
+    public static <K, V> UtilCache<K, V> createUtilCache(String name, int sizeLimit, long expireTime) {
         String cacheName = name + getNextDefaultIndex(name);
         return storeCache(new UtilCache<>(cacheName, sizeLimit, sizeLimit, expireTime, false, name));
     }
 
-    public static <K,V> UtilCache<K, V> createUtilCache(int sizeLimit, long expireTime) {
+    public static <K, V> UtilCache<K, V> createUtilCache(int sizeLimit, long expireTime) {
         String cacheName = "specified" + getNextDefaultIndex("specified");
         return storeCache(new UtilCache<>(cacheName, sizeLimit, sizeLimit, expireTime, false, "specified"));
     }
 
-    public static <K,V> UtilCache<K, V> createUtilCache(String name, boolean useSoftReference) {
+    public static <K, V> UtilCache<K, V> createUtilCache(String name, boolean useSoftReference) {
         String cacheName = name + getNextDefaultIndex(name);
         return storeCache(new UtilCache<>(cacheName, 0, 0, 0, useSoftReference, "default", name));
     }
 
-    public static <K,V> UtilCache<K, V> createUtilCache(String name) {
+    public static <K, V> UtilCache<K, V> createUtilCache(String name) {
         String cacheName = name + getNextDefaultIndex(name);
         return storeCache(new UtilCache<>(cacheName, 0, 0, 0, false, "default", name));
     }
 
-    public static <K,V> UtilCache<K, V> createUtilCache() {
+    public static <K, V> UtilCache<K, V> createUtilCache() {
         String cacheName = "default" + getNextDefaultIndex("default");
         return storeCache(new UtilCache<>(cacheName, 0, 0, 0, false, "default"));
     }
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/FindServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/FindServices.java
index 5da39db..f116105 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/FindServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/FindServices.java
@@ -805,7 +805,7 @@ public class FindServices {
                 item = list.get(0);
             }
         } catch (ClassCastException | NullPointerException | GenericEntityException e) {
-            Debug.logInfo("Problem getting list Item" + e,MODULE);
+            Debug.logInfo("Problem getting list Item" + e, MODULE);
         }
 
         if (UtilValidate.isNotEmpty(item)) {
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/UrlServletHelper.java b/framework/common/src/main/java/org/apache/ofbiz/common/UrlServletHelper.java
index 62a0921..8ca6ecb 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/UrlServletHelper.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/UrlServletHelper.java
@@ -269,7 +269,7 @@ public final class UrlServletHelper {
             str = str.substring(1);
         }
         while(str.endsWith("-")){
-            str = str.substring(0,str.length() - 1);
+            str = str.substring(0, str.length() - 1);
         }
         while(str.indexOf("--") != -1){
             str = str.replace("--","-");
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
index 8ea8faf..6968f22 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
@@ -277,7 +277,7 @@ public class EmailServices {
                 // check for multipart message (with attachments)
                 // BodyParts contain a list of Maps items containing content(String) and type(String) of the attachement
                 MimeMultipart mp = new MimeMultipart();
-                Debug.logInfo(bodyParts.size() + " multiparts found",MODULE);
+                Debug.logInfo(bodyParts.size() + " multiparts found", MODULE);
                 for (Map<String, Object> bodyPart: bodyParts) {
                     Object bodyPartContent = bodyPart.get("content");
                     MimeBodyPart mbp = new MimeBodyPart();
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeServices.java
index fd94204..f2e1caf 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeServices.java
@@ -72,7 +72,7 @@ public class QRCodeServices {
     private static final int WHITE = 0xFFFFFFFF;
 
     /** Streams QR Code to the result. */
-    public static Map<String, Object> generateQRCodeImage(DispatchContext ctx,Map<String, Object> context) {
+    public static Map<String, Object> generateQRCodeImage(DispatchContext ctx, Map<String, Object> context) {
         Locale locale = (Locale) context.get("locale");
         String message = (String) context.get("message");
         Integer width = (Integer) context.get("width");
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java
index 78f3c27..322eb8b 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java
@@ -66,7 +66,7 @@ public class StatusServices {
             }
         }
         Map<String, Object> ret =  new LinkedHashMap<>();
-        ret.put("statusItems",statusItems);
+        ret.put("statusItems", statusItems);
         return ret;
     }
 
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/uom/UomWorker.java b/framework/common/src/main/java/org/apache/ofbiz/common/uom/UomWorker.java
index a2a9352..8faf7b5 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/uom/UomWorker.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/uom/UomWorker.java
@@ -115,7 +115,7 @@ public class UomWorker {
         if (svcOutMap.get(ModelService.RESPONSE_MESSAGE).equals(ModelService.RESPOND_SUCCESS) && svcOutMap.get("convertedValue") != null) {
             return (BigDecimal) svcOutMap.get("convertedValue");
         }
-        Debug.logError("Failed to perform conversion for value [" + originalValue.toPlainString() + "] from Uom [" + uomId + "] to Uom [" + uomIdTo + "]",MODULE);
+        Debug.logError("Failed to perform conversion for value [" + originalValue.toPlainString() + "] from Uom [" + uomId + "] to Uom [" + uomIdTo + "]", MODULE);
         return null;
     }
 }
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/AbstractEntityConditionCache.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/AbstractEntityConditionCache.java
index a3d9f4e..424e53f 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/AbstractEntityConditionCache.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/AbstractEntityConditionCache.java
@@ -117,7 +117,7 @@ public abstract class AbstractEntityConditionCache<K, V> extends AbstractCache<E
         return conditionCache;
     }
 
-    protected static final <K,V> boolean isNull(Map<K,V> value) {
+    protected static final <K, V> boolean isNull(Map<K, V> value) {
         return value == null || value == GenericEntity.NULL_ENTITY || value == GenericValue.NULL_VALUE;
     }
 
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityClause.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityClause.java
index 8dd7701..b05ffeb 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityClause.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityClause.java
@@ -83,11 +83,11 @@ public class EntityClause {
         return value;
     }
 
-    public <L,R> EntityOperator<L,R> getInterFieldOperation() {
+    public <L, R> EntityOperator<L, R> getInterFieldOperation() {
         return UtilGenerics.cast(interFieldOperation);
     }
 
-    public <L,R> EntityOperator<L,R> getIntraFieldOperation() {
+    public <L, R> EntityOperator<L, R> getIntraFieldOperation() {
         return UtilGenerics.cast(intraFieldOperation);
     }
 
@@ -107,11 +107,11 @@ public class EntityClause {
         this.secondField = secondField;
     }
 
-    public <L,R> void setInterFieldOperation(EntityOperator<L,R> interFieldOperation) {
+    public <L, R> void setInterFieldOperation(EntityOperator<L, R> interFieldOperation) {
         this.interFieldOperation = interFieldOperation;
     }
 
-    public <L,R> void setIntraFieldOperation(EntityOperator<L,R> intraFieldOperation) {
+    public <L, R> void setIntraFieldOperation(EntityOperator<L, R> intraFieldOperation) {
         this.intraFieldOperation = intraFieldOperation;
     }
 
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java
index db90d4d..0a7547b 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java
@@ -249,7 +249,7 @@ public abstract class EntityComparisonOperator<L, R> extends EntityOperator<L, R
         }
     }
 
-    public static final <L,R> boolean compareLike(L lhs, R rhs) {
+    public static final <L, R> boolean compareLike(L lhs, R rhs) {
         PatternMatcher matcher = new Perl5Matcher();
         if (lhs == null) {
             if (rhs != null) {
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityCondition.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityCondition.java
index 413cfe6..54ce0f6 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityCondition.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityCondition.java
@@ -55,7 +55,7 @@ public interface EntityCondition extends IsEmpty, Serializable {
      * @param rhs the right hand side element
      * @return a condition expression representing a comparison between two elements
      */
-    static <L,R,LL,RR> EntityExpr makeCondition(L lhs, EntityComparisonOperator<LL,RR> operator, R rhs) {
+    static <L, R, LL, RR> EntityExpr makeCondition(L lhs, EntityComparisonOperator<LL, RR> operator, R rhs) {
         return new EntityExpr(lhs, operator, rhs);
     }
 
@@ -137,8 +137,8 @@ public interface EntityCondition extends IsEmpty, Serializable {
      * @param joinOp the binary infix operator used to join the field/value comparisons
      * @return a condition expression representing a combination of field/value comparisons
      */
-    static <L,R> EntityFieldMap makeCondition(Map<String, ? extends Object> fieldMap,
-            EntityComparisonOperator<L,R> compOp, EntityJoinOperator joinOp) {
+    static <L, R> EntityFieldMap makeCondition(Map<String, ? extends Object> fieldMap,
+            EntityComparisonOperator<L, R> compOp, EntityJoinOperator joinOp) {
         return new EntityFieldMap(fieldMap, compOp, joinOp);
     }
 
@@ -171,7 +171,7 @@ public interface EntityCondition extends IsEmpty, Serializable {
      * @param keysValues the field/values pairs to match
      * @return a condition expression representing a combination of field/value comparisons
      */
-    static <L,R> EntityFieldMap makeCondition(EntityComparisonOperator<L,R> compOp, EntityJoinOperator joinOp,
+    static <L, R> EntityFieldMap makeCondition(EntityComparisonOperator<L, R> compOp, EntityJoinOperator joinOp,
             Object... keysValues) {
         return new EntityFieldMap(compOp, joinOp, keysValues);
     }
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityExpr.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityExpr.java
index 4288810..45d890b 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityExpr.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityExpr.java
@@ -58,7 +58,7 @@ public final class EntityExpr implements EntityCondition {
      * @throws IllegalArgumentException if {@code lhs} or {@code operator} are {@code null},
      *         or if {@code rhs} is null when the operator is not an equality check.
      */
-    public <L,R,LL,RR> EntityExpr(L lhs, EntityComparisonOperator<LL,RR> operator, R rhs) {
+    public <L, R, LL, RR> EntityExpr(L lhs, EntityComparisonOperator<LL, RR> operator, R rhs) {
         if (lhs == null) {
             throw new IllegalArgumentException("The field name/value cannot be null");
         }
@@ -120,7 +120,7 @@ public final class EntityExpr implements EntityCondition {
      *
      * @return the operator used to combine the two sides of the condition expression.
      */
-    public <L,R> EntityOperator<L,R> getOperator() {
+    public <L, R> EntityOperator<L, R> getOperator() {
         return UtilGenerics.cast(operator);
     }
 
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldMap.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldMap.java
index 7c787ec..a518db0 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldMap.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldMap.java
@@ -50,7 +50,7 @@ public final class EntityFieldMap extends EntityConditionListBase<EntityExpr> {
      * @param op the operator used to compared each entry in the condition field map.
      * @return a list of condition expression
      */
-    private static <V> List<EntityExpr> makeConditionList(Map<String, V> fieldMap, EntityComparisonOperator<?,V> op) {
+    private static <V> List<EntityExpr> makeConditionList(Map<String, V> fieldMap, EntityComparisonOperator<?, V> op) {
         return (fieldMap == null)
             ? Collections.emptyList()
             : fieldMap.entrySet().stream()
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityOperator.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityOperator.java
index bee6bc4..cfc78b5 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityOperator.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityOperator.java
@@ -61,22 +61,22 @@ public abstract class EntityOperator<L, R> implements Serializable {
 
     private static HashMap<String, EntityOperator<?,?>> registry = new HashMap<>();
 
-    private static <L,R> void registerCase(String name, EntityOperator<L,R> operator) {
+    private static <L, R> void registerCase(String name, EntityOperator<L, R> operator) {
         registry.put(name.toLowerCase(Locale.getDefault()), operator);
         registry.put(name.toUpperCase(Locale.getDefault()), operator);
     }
 
-    public static <L,R> void register(String name, EntityOperator<L,R> operator) {
+    public static <L, R> void register(String name, EntityOperator<L, R> operator) {
         registerCase(name, operator);
         registerCase(name.replaceAll("-", "_"), operator);
         registerCase(name.replaceAll("_", "-"), operator);
     }
 
-    public static <L,R> EntityOperator<L,R> lookup(String name) {
+    public static <L, R> EntityOperator<L, R> lookup(String name) {
         return UtilGenerics.cast(registry.get(name));
     }
 
-    public static <L,R> EntityComparisonOperator<L,R> lookupComparison(String name) {
+    public static <L, R> EntityComparisonOperator<L, R> lookupComparison(String name) {
         EntityOperator<?,?> operator = lookup(name);
         if (!(operator instanceof EntityComparisonOperator<?,?>)) {
             throw new IllegalArgumentException(name + " is not a comparison operator");
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java
index 57eab05..3fd0fba 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java
@@ -155,7 +155,7 @@ public class EntitySaxReader extends DefaultHandler {
         this.continueOnFail = continueOnFail;
     }
 
-    public void setPlaceholderValues(Map<String,Object> placeholderValues) {
+    public void setPlaceholderValues(Map<String, Object> placeholderValues) {
         this.placeholderValues = placeholderValues;
     }
 
@@ -314,7 +314,7 @@ public class EntitySaxReader extends DefaultHandler {
                 throw new SAXException("Could not find transform template with resource path: " + templatePath);
             } else {
                 try {
-                    BufferedReader templateReader = new BufferedReader(new InputStreamReader(templateUrl.openStream(),StandardCharsets.UTF_8));
+                    BufferedReader templateReader = new BufferedReader(new InputStreamReader(templateUrl.openStream(), StandardCharsets.UTF_8));
 
                     StringWriter outWriter = new StringWriter();
                     Configuration config = FreeMarkerWorker.newConfiguration();
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/permission/EntityPermissionChecker.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/permission/EntityPermissionChecker.java
index f64a822..fc97de1 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/permission/EntityPermissionChecker.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/permission/EntityPermissionChecker.java
@@ -435,7 +435,7 @@ public class EntityPermissionChecker {
 
                 /*
                    String ownedEntityId = entity.getString("owner" + entityName + "Id");
-                   GenericValue ownedEntity = delegator.findOne(entityName,UtilMisc.toMap(pkFieldName, ownedEntityId), true);
+                   GenericValue ownedEntity = delegator.findOne(entityName, UtilMisc.toMap(pkFieldName, ownedEntityId), true);
                    while (ownedEntity != null) {
                        if (!alreadyCheckedIds.contains(ownedEntityId)) {
                         // Decided to let the original purposes only be used in permission checking
@@ -456,7 +456,7 @@ public class EntityPermissionChecker {
                        //purposes.put(ownedEntityId, purposeList);
                         //roles.put(ownedEntityId, roleList);
                            ownedEntityId = ownedEntity.getString("owner" + entityName + "Id");
-                           ownedEntity = delegator.findOne(entityName,UtilMisc.toMap(pkFieldName, ownedEntityId), true);
+                           ownedEntity = delegator.findOne(entityName, UtilMisc.toMap(pkFieldName, ownedEntityId), true);
                        } else {
                           ownedEntity = null;
                        }
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncContext.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncContext.java
index 7de955d..101026e 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncContext.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncContext.java
@@ -309,7 +309,7 @@ public class EntitySyncContext {
             }
             this.startDate = (Timestamp) initialHistoryRes.get("startDate");
 
-            Map<String, Object> result = dispatcher.runSync("updateEntitySync", UtilMisc.toMap("entitySyncId", entitySyncId, "lastHistoryStartDate", this.startDate, "userLogin", userLogin),60,true);
+            Map<String, Object> result = dispatcher.runSync("updateEntitySync", UtilMisc.toMap("entitySyncId", entitySyncId, "lastHistoryStartDate", this.startDate, "userLogin", userLogin),60, true);
             if (ServiceUtil.isError(result)) {
                 throw new SyncDataErrorException(errorMsg, null, null, result, null);
             }
@@ -772,9 +772,9 @@ public class EntitySyncContext {
             this.totalRowsToRemove += this.toRemoveAlreadyDeleted + this.toRemoveDeleted;
 
             // store latest result on EntitySync, ie update lastSuccessfulSynchTime, should run in own tx
-            Map<String, Object> updateEsRunResult = dispatcher.runSync("updateEntitySync", UtilMisc.toMap("entitySyncId", entitySyncId, "lastSuccessfulSynchTime", this.currentRunEndTime, "userLogin", userLogin),60,true);
+            Map<String, Object> updateEsRunResult = dispatcher.runSync("updateEntitySync", UtilMisc.toMap("entitySyncId", entitySyncId, "lastSuccessfulSynchTime", this.currentRunEndTime, "userLogin", userLogin),60, true);
 
-            GenericValue entitySyncHistory = EntityQuery.use(delegator).from("EntitySyncHistory").where("startDate",startDate, "entitySyncId", entitySyncId).queryOne();
+            GenericValue entitySyncHistory = EntityQuery.use(delegator).from("EntitySyncHistory").where("startDate", startDate, "entitySyncId", entitySyncId).queryOne();
             if (entitySyncHistory != null) {
                 // store result of service call on history with results so far, should run in own tx
                 ModelService model = dispatcher.getDispatchContext().getModelService("updateEntitySyncHistory");
@@ -832,7 +832,7 @@ public class EntitySyncContext {
         // the lastSuccessfulSynchTime on EntitySync will already be set, so just set status as completed
         String esErrMsg = "Could not mark Entity Sync as complete, but all synchronization was successful";
         try {
-            Map<String, Object> completeEntitySyncRes = dispatcher.runSync("updateEntitySync", UtilMisc.toMap("entitySyncId", entitySyncId, "runStatusId", newStatusId, "userLogin", userLogin), 60,true);
+            Map<String, Object> completeEntitySyncRes = dispatcher.runSync("updateEntitySync", UtilMisc.toMap("entitySyncId", entitySyncId, "runStatusId", newStatusId, "userLogin", userLogin), 60, true);
             if (ServiceUtil.isError(completeEntitySyncRes)) {
                 // what to do here? try again?
                 throw new SyncDataErrorException(esErrMsg, null, null, completeEntitySyncRes, null);
@@ -925,7 +925,7 @@ public class EntitySyncContext {
     public void saveSyncErrorInfo(String runStatusId, List<Object> errorMessages) {
         // set error statuses on the EntitySync and EntitySyncHistory entities
         try {
-            Map<String, Object> errorEntitySyncRes = dispatcher.runSync("updateEntitySync", UtilMisc.toMap("entitySyncId", entitySyncId, "runStatusId", runStatusId, "userLogin", userLogin), 60,true);
+            Map<String, Object> errorEntitySyncRes = dispatcher.runSync("updateEntitySync", UtilMisc.toMap("entitySyncId", entitySyncId, "runStatusId", runStatusId, "userLogin", userLogin), 60, true);
             if (ServiceUtil.isError(errorEntitySyncRes)) {
                 errorMessages.add("Could not save error run status [" + runStatusId + "] on EntitySync with ID [" + entitySyncId + "]: " + errorEntitySyncRes.get(ModelService.ERROR_MESSAGE));
             }
@@ -959,7 +959,7 @@ public class EntitySyncContext {
         try {
             // not running, get started NOW
             // set running status on entity sync, run in its own tx
-            Map<String, Object> startEntitySyncRes = dispatcher.runSync("updateEntitySync", UtilMisc.toMap("entitySyncId", entitySyncId, "runStatusId", "ESR_RUNNING", "userLogin", userLogin), 60,true);
+            Map<String, Object> startEntitySyncRes = dispatcher.runSync("updateEntitySync", UtilMisc.toMap("entitySyncId", entitySyncId, "runStatusId", "ESR_RUNNING", "userLogin", userLogin), 60, true);
             if (ModelService.RESPOND_ERROR.equals(startEntitySyncRes.get(ModelService.RESPONSE_MESSAGE))) {
                 throw new SyncDataErrorException(markErrorMsg, null, null, startEntitySyncRes, null);
             }
@@ -1039,7 +1039,7 @@ public class EntitySyncContext {
             try {
                 // not running, get started NOW
                 // set running status on entity sync, run in its own tx
-                Map<String, Object> startEntitySyncRes = dispatcher.runSync("updateEntitySync", UtilMisc.toMap("entitySyncId", entitySyncId, "runStatusId", "ESR_RUNNING", "userLogin", userLogin),60,true);
+                Map<String, Object> startEntitySyncRes = dispatcher.runSync("updateEntitySync", UtilMisc.toMap("entitySyncId", entitySyncId, "runStatusId", "ESR_RUNNING", "userLogin", userLogin),60, true);
                 if (ModelService.RESPOND_ERROR.equals(startEntitySyncRes.get(ModelService.RESPONSE_MESSAGE))) {
                     throw new SyncDataErrorException(markErrorMsg, null, null, startEntitySyncRes, null);
                 }
@@ -1111,7 +1111,7 @@ public class EntitySyncContext {
         try {
             // not running, get started NOW
             // set running status on entity sync, run in its own tx
-            Map<String, Object> startEntitySyncRes = dispatcher.runSync("updateEntitySync", UtilMisc.toMap("entitySyncId", entitySyncId, "runStatusId", "ESR_RUNNING", "preOfflineSynchTime", this.lastSuccessfulSynchTime, "userLogin", userLogin),60,true);
+            Map<String, Object> startEntitySyncRes = dispatcher.runSync("updateEntitySync", UtilMisc.toMap("entitySyncId", entitySyncId, "runStatusId", "ESR_RUNNING", "preOfflineSynchTime", this.lastSuccessfulSynchTime, "userLogin", userLogin),60, true);
             if (ModelService.RESPOND_ERROR.equals(startEntitySyncRes.get(ModelService.RESPONSE_MESSAGE))) {
                 throw new SyncDataErrorException(markErrorMsg, null, null, startEntitySyncRes, null);
             }
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java
index f2b6deb..8cc7a7a 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java
@@ -143,7 +143,7 @@ public class XMLRPCClientEngine extends GenericAsyncEngine {
             }
         }
 
-        List<Map<String,Object>> listParams = UtilMisc.toList(params);
+        List<Map<String, Object>> listParams = UtilMisc.toList(params);
         try {
             result = UtilGenerics.cast(client.execute(serviceName, listParams.toArray()));
         } catch (XmlRpcException e) {
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobManager.java b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobManager.java
index 3404601..0988f29 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobManager.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobManager.java
@@ -381,7 +381,7 @@ public final class JobManager {
      *@param startTime
      *            The time in milliseconds the service should run
      *@param frequency
-     *            The frequency of the recurrence (HOURLY,DAILY,MONTHLY etc)
+     *            The frequency of the recurrence (HOURLY, DAILY, MONTHLY etc)
      *@param interval
      *            The interval of the frequency recurrence
      *@param count
@@ -401,7 +401,7 @@ public final class JobManager {
      *@param startTime
      *            The time in milliseconds the service should run
      *@param frequency
-     *            The frequency of the recurrence (HOURLY,DAILY,MONTHLY etc)
+     *            The frequency of the recurrence (HOURLY, DAILY, MONTHLY etc)
      *@param interval
      *            The interval of the frequency recurrence
      *@param count
@@ -423,7 +423,7 @@ public final class JobManager {
      *@param startTime
      *            The time in milliseconds the service should run
      *@param frequency
-     *            The frequency of the recurrence (HOURLY,DAILY,MONTHLY etc)
+     *            The frequency of the recurrence (HOURLY, DAILY, MONTHLY etc)
      *@param interval
      *            The interval of the frequency recurrence
      *@param endTime
@@ -445,7 +445,7 @@ public final class JobManager {
      *@param startTime
      *            The time in milliseconds the service should run
      *@param frequency
-     *            The frequency of the recurrence (HOURLY,DAILY,MONTHLY etc)
+     *            The frequency of the recurrence (HOURLY, DAILY, MONTHLY etc)
      *@param interval
      *            The interval of the frequency recurrence
      *@param count
@@ -488,7 +488,7 @@ public final class JobManager {
      *@param startTime
      *            The time in milliseconds the service should run
      *@param frequency
-     *            The frequency of the recurrence (HOURLY,DAILY,MONTHLY etc)
+     *            The frequency of the recurrence (HOURLY, DAILY, MONTHLY etc)
      *@param interval
      *            The interval of the frequency recurrence
      *@param count
@@ -528,7 +528,7 @@ public final class JobManager {
      *@param startTime
      *            The time in milliseconds the service should run
      *@param frequency
-     *            The frequency of the recurrence (HOURLY,DAILY,MONTHLY etc)
+     *            The frequency of the recurrence (HOURLY, DAILY, MONTHLY etc)
      *@param interval
      *            The interval of the frequency recurrence
      *@param count
diff --git a/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupCommand.java b/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupCommand.java
index 8cc892e..21f1e07 100644
--- a/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupCommand.java
+++ b/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupCommand.java
@@ -32,12 +32,12 @@ import java.util.Map;
  */
 public final class StartupCommand {
     private String name;
-    private Map<String,String> properties;
+    private Map<String, String> properties;
 
     public String getName() {
         return name;
     }
-    public Map<String,String> getProperties() {
+    public Map<String, String> getProperties() {
         return properties;
     }
 
@@ -51,12 +51,12 @@ public final class StartupCommand {
         private final String name;
 
         //optional parameters
-        private Map<String,String> properties;
+        private Map<String, String> properties;
 
         public Builder(String name) {
             this.name = name;
         }
-        public Builder properties(Map<String,String> properties) {
+        public Builder properties(Map<String, String> properties) {
             this.properties = properties;
             return this;
         }
diff --git a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java
index b8a1df3..21dbd94 100644
--- a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java
+++ b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java
@@ -123,7 +123,7 @@ public class TestRunContainer implements Container {
         }
     }
 
-    private static JunitSuiteWrapper prepareJunitSuiteWrapper(Map<String,String> testProps) throws ContainerException {
+    private static JunitSuiteWrapper prepareJunitSuiteWrapper(Map<String, String> testProps) throws ContainerException {
         String component = testProps.get("component");
         String suiteName = testProps.get("suitename");
         String testCase = testProps.get("case");
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/CoreEvents.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/CoreEvents.java
index 7888130..1661941 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/CoreEvents.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/CoreEvents.java
@@ -99,7 +99,7 @@ public class CoreEvents {
      *
      *  SERVICE_NAME      - Name of the service to invoke
      *  SERVICE_TIME      - First time the service will occur
-     *  SERVICE_FREQUENCY - The type of recurrence (SECONDLY,MINUTELY,DAILY,etc)
+     *  SERVICE_FREQUENCY - The type of recurrence (SECONDLY, MINUTELY, DAILY,etc)
      *  SERVICE_INTERVAL  - The interval of the frequency (every 5 minutes, etc)
      *
      * @param request HttpServletRequest
@@ -368,7 +368,7 @@ public class CoreEvents {
             if (entry.getValue() != null && "on".equalsIgnoreCase(request.getParameter(key)) && !"_CLEAR_PREVIOUS_PARAMS_".equals(key)) {
                 String[] servicePath = key.split("\\|\\|");
                 String partialKey = servicePath[servicePath.length-1];
-                savedFields.put(partialKey, getObjectFromServicePath(key ,syncServiceResult));
+                savedFields.put(partialKey, getObjectFromServicePath(key , syncServiceResult));
             }
         }
         if (null!=session.getAttribute("_SAVED_SYNC_RESULT_")) {
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/EventFactory.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/EventFactory.java
index 4510e9e..b647104 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/EventFactory.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/EventFactory.java
@@ -41,8 +41,8 @@ public class EventFactory {
     public EventFactory(ServletContext context, URL controllerConfigURL) {
         // load all the event handlers
         try {
-            Map<String,String> handlers = ConfigXMLReader.getControllerConfig(controllerConfigURL).getEventHandlerMap();
-            for (Map.Entry<String,String> handlerEntry: handlers.entrySet()) {
+            Map<String, String> handlers = ConfigXMLReader.getControllerConfig(controllerConfigURL).getEventHandlerMap();
+            for (Map.Entry<String, String> handlerEntry: handlers.entrySet()) {
                 EventHandler handler = (EventHandler) ObjectType.getInstance(handlerEntry.getValue());
                 handler.init(context);
                 this.handlers.put(handlerEntry.getKey(), handler);
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewFactory.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewFactory.java
index 3617ee4..5a16d4c 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewFactory.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewFactory.java
@@ -43,9 +43,9 @@ public class ViewFactory {
     public ViewFactory(ServletContext context, URL controllerConfigURL) {
         // load all the view handlers
         try {
-            Set<Map.Entry<String,String>> handlerEntries = ConfigXMLReader.getControllerConfig(controllerConfigURL).getViewHandlerMap().entrySet();
+            Set<Map.Entry<String, String>> handlerEntries = ConfigXMLReader.getControllerConfig(controllerConfigURL).getViewHandlerMap().entrySet();
             if (handlerEntries != null) {
-                for (Map.Entry<String,String> handlerEntry: handlerEntries) {
+                for (Map.Entry<String, String> handlerEntry: handlerEntries) {
                     ViewHandler handler = (ViewHandler) ObjectType.getInstance(handlerEntry.getValue());
                     handler.setName(handlerEntry.getKey());
                     handler.init(context);
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/AbstractCache.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/AbstractCache.java
index 2ed704c..de4394f 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/AbstractCache.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/AbstractCache.java
@@ -44,7 +44,7 @@ public abstract class AbstractCache {
         return getCacheNamePrefix() + widgetName;
     }
 
-    protected <K,V> UtilCache<K,V> getCache(String widgetName) {
+    protected <K, V> UtilCache<K, V> getCache(String widgetName) {
         return UtilCache.findCache(getCacheName(widgetName));
     }
 
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/ScreenCache.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/ScreenCache.java
index d4f6e5c..aed24af 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/ScreenCache.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/ScreenCache.java
@@ -29,7 +29,7 @@ public class ScreenCache extends AbstractCache {
     }
 
     public GenericWidgetOutput get(String screenName, WidgetContextCacheKey wcck) {
-        UtilCache<WidgetContextCacheKey,GenericWidgetOutput> screenCache = getCache(screenName);
+        UtilCache<WidgetContextCacheKey, GenericWidgetOutput> screenCache = getCache(screenName);
         if (screenCache == null) {
             return null;
         }
@@ -42,7 +42,7 @@ public class ScreenCache extends AbstractCache {
     }
 
     public GenericWidgetOutput remove(String screenName, WidgetContextCacheKey wcck) {
-        UtilCache<WidgetContextCacheKey,GenericWidgetOutput> screenCache = getCache(screenName);
+        UtilCache<WidgetContextCacheKey, GenericWidgetOutput> screenCache = getCache(screenName);
         if (Debug.verboseOn()) {
             Debug.logVerbose("Removing from ScreenCache with key [" + wcck + "], will remove from this cache: " + (screenCache == null ? "[No cache found to remove from]" : screenCache.getName()), MODULE);
         }
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/IterateSectionWidget.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/IterateSectionWidget.java
index e00d236..baaef77 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/IterateSectionWidget.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/IterateSectionWidget.java
@@ -189,7 +189,7 @@ public class IterateSectionWidget extends ModelScreenWidget {
             contextMs.put("itemIndex", itemIndex);
 
             if (iterateIndex < listSize) {
-                contextMs.put("iterateId",String.valueOf(entryName+iterateIndex));
+                contextMs.put("iterateId", String.valueOf(entryName+iterateIndex));
                 iterateIndex++;
             }
             for (ModelScreenWidget.Section section: this.sectionList) {
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTheme.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTheme.java
index 429e5aa..7e770b2 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTheme.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTheme.java
@@ -423,13 +423,13 @@ public class ModelTheme implements Serializable {
         return null;
     }
 
-    public Map<String,String> getModelCommonScreens() {
+    public Map<String, String> getModelCommonScreens() {
         return modelCommonScreensMap;
     }
-    public Map<String,String> getModelCommonForms() {
+    public Map<String, String> getModelCommonForms() {
         return modelCommonFormsMap;
     }
-    public Map<String,String> getModelCommonMenus() {
+    public Map<String, String> getModelCommonMenus() {
         return modelCommonMenusMap;
     }
 
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 52d18db..d4533b8 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
@@ -1208,7 +1208,7 @@ public class FormRenderer {
                     itemIndex++;
                 }
             } catch (GenericEntityException gee) {
-                Debug.logError(gee,MODULE);
+                Debug.logError(gee, MODULE);
             }
         } else {
             while (iter.hasNext()) {
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
index a87a573..6e69c72 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
@@ -3036,7 +3036,7 @@ public final class MacroFormRenderer implements FormStringRenderer {
             sb.append(updateArea.getAreaId()).append(",");
             String ajaxTarget = updateArea.getAreaTarget(context);
             String urlPath = UtilHttp.removeQueryStringFromTarget(ajaxTarget);
-            sb.append(this.rh.makeLink(this.request, this.response,urlPath)).append(",");
+            sb.append(this.rh.makeLink(this.request, this.response, urlPath)).append(",");
             String queryString = UtilHttp.getQueryStringFromTarget(ajaxTarget).replace("?", "");
             Map<String, Object> parameters = UtilHttp.getQueryStringOnlyParameterMap(queryString);
             Map<String, Object> ctx = UtilGenerics.cast(context);